Merge remote-tracking branch 'origin/ProfilePageAndLogin'

This commit is contained in:
Reimar 2024-08-26 09:11:10 +02:00
commit 3e0f7229c4
Signed by: Reimar
GPG Key ID: 93549FA07F0AE268
19 changed files with 364 additions and 353 deletions

BIN
Mobile/assets/logo.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 30 KiB

View File

@ -1 +0,0 @@
{"inputs":[],"outputs":[]}

View File

@ -1 +0,0 @@
{"inputs":[],"outputs":[]}

View File

@ -1 +0,0 @@
{"inputs":[],"outputs":[]}

View File

@ -1,11 +0,0 @@
.git
build/
.idea
.vscode
*.iml
*.log
.dart_tool/
.packages
.flutter-plugins
.flutter-plugins-dependencies
.flutter-versions

View File

@ -1 +0,0 @@
516798f188c0e5e5f173ebddd87b8d0b

View File

@ -1,206 +0,0 @@
'use strict';
const MANIFEST = 'flutter-app-manifest';
const TEMP = 'flutter-temp-cache';
const CACHE_NAME = 'flutter-app-cache';
const RESOURCES = {"assets/AssetManifest.bin": "693635b5258fe5f1cda720cf224f158c",
"assets/AssetManifest.bin.json": "69a99f98c8b1fb8111c5fb961769fcd8",
"assets/AssetManifest.json": "2efbb41d7877d10aac9d091f58ccd7b9",
"assets/FontManifest.json": "dc3d03800ccca4601324923c0b1d6d57",
"assets/fonts/MaterialIcons-Regular.otf": "0bce9903b954d8e416b6fe79155f122c",
"assets/NOTICES": "12f6a7042ed1645a5cabf5d072de4770",
"assets/packages/cupertino_icons/assets/CupertinoIcons.ttf": "e986ebe42ef785b27164c36a9abc7818",
"assets/shaders/ink_sparkle.frag": "ecc85a2e95f5e9f53123dcaf8cb9b6ce",
"canvaskit/canvaskit.js": "c86fbd9e7b17accae76e5ad116583dc4",
"canvaskit/canvaskit.js.symbols": "38cba9233b92472a36ff011dc21c2c9f",
"canvaskit/canvaskit.wasm": "3d2a2d663e8c5111ac61a46367f751ac",
"canvaskit/chromium/canvaskit.js": "43787ac5098c648979c27c13c6f804c3",
"canvaskit/chromium/canvaskit.js.symbols": "4525682ef039faeb11f24f37436dca06",
"canvaskit/chromium/canvaskit.wasm": "f5934e694f12929ed56a671617acd254",
"canvaskit/skwasm.js": "445e9e400085faead4493be2224d95aa",
"canvaskit/skwasm.js.symbols": "741d50ffba71f89345996b0aa8426af8",
"canvaskit/skwasm.wasm": "e42815763c5d05bba43f9d0337fa7d84",
"canvaskit/skwasm.worker.js": "bfb704a6c714a75da9ef320991e88b03",
"conf/app.conf": "27b9f8f06e2c2ba98a11a9a2b7d808b2",
"conf/nginx.conf": "6b627505ce964c6c803ec3a50243940c",
"Dockerfile": "814e0c8e66fb59c1d44cb098b2ab06d2",
"favicon.png": "5dcef449791fa27946b3d35ad8803796",
"flutter.js": "c71a09214cb6f5f8996a531350400a9a",
"icons/Icon-192.png": "ac9a721a12bbc803b44f645561ecb1e1",
"icons/Icon-512.png": "96e752610906ba2a93c65f8abe1645f1",
"icons/Icon-maskable-192.png": "c457ef57daa1d16f64b27b786ec2ea3c",
"icons/Icon-maskable-512.png": "301a7604d45b3e739efc881eb04896ea",
"index.html": "48f49a7687916ae75958435b3e706b15",
"/": "48f49a7687916ae75958435b3e706b15",
"main.dart.js": "a41b85bb4fd7ed263adb109950286daf",
"manifest.json": "6818dc0048f086a6849c17ab04b5b189",
"version.json": "9ed43ffa08b5c3b81f0154dc4943c58e"};
// The application shell files that are downloaded before a service worker can
// start.
const CORE = ["main.dart.js",
"index.html",
"assets/AssetManifest.bin.json",
"assets/FontManifest.json"];
// During install, the TEMP cache is populated with the application shell files.
self.addEventListener("install", (event) => {
self.skipWaiting();
return event.waitUntil(
caches.open(TEMP).then((cache) => {
return cache.addAll(
CORE.map((value) => new Request(value, {'cache': 'reload'})));
})
);
});
// During activate, the cache is populated with the temp files downloaded in
// install. If this service worker is upgrading from one with a saved
// MANIFEST, then use this to retain unchanged resource files.
self.addEventListener("activate", function(event) {
return event.waitUntil(async function() {
try {
var contentCache = await caches.open(CACHE_NAME);
var tempCache = await caches.open(TEMP);
var manifestCache = await caches.open(MANIFEST);
var manifest = await manifestCache.match('manifest');
// When there is no prior manifest, clear the entire cache.
if (!manifest) {
await caches.delete(CACHE_NAME);
contentCache = await caches.open(CACHE_NAME);
for (var request of await tempCache.keys()) {
var response = await tempCache.match(request);
await contentCache.put(request, response);
}
await caches.delete(TEMP);
// Save the manifest to make future upgrades efficient.
await manifestCache.put('manifest', new Response(JSON.stringify(RESOURCES)));
// Claim client to enable caching on first launch
self.clients.claim();
return;
}
var oldManifest = await manifest.json();
var origin = self.location.origin;
for (var request of await contentCache.keys()) {
var key = request.url.substring(origin.length + 1);
if (key == "") {
key = "/";
}
// If a resource from the old manifest is not in the new cache, or if
// the MD5 sum has changed, delete it. Otherwise the resource is left
// in the cache and can be reused by the new service worker.
if (!RESOURCES[key] || RESOURCES[key] != oldManifest[key]) {
await contentCache.delete(request);
}
}
// Populate the cache with the app shell TEMP files, potentially overwriting
// cache files preserved above.
for (var request of await tempCache.keys()) {
var response = await tempCache.match(request);
await contentCache.put(request, response);
}
await caches.delete(TEMP);
// Save the manifest to make future upgrades efficient.
await manifestCache.put('manifest', new Response(JSON.stringify(RESOURCES)));
// Claim client to enable caching on first launch
self.clients.claim();
return;
} catch (err) {
// On an unhandled exception the state of the cache cannot be guaranteed.
console.error('Failed to upgrade service worker: ' + err);
await caches.delete(CACHE_NAME);
await caches.delete(TEMP);
await caches.delete(MANIFEST);
}
}());
});
// The fetch handler redirects requests for RESOURCE files to the service
// worker cache.
self.addEventListener("fetch", (event) => {
if (event.request.method !== 'GET') {
return;
}
var origin = self.location.origin;
var key = event.request.url.substring(origin.length + 1);
// Redirect URLs to the index.html
if (key.indexOf('?v=') != -1) {
key = key.split('?v=')[0];
}
if (event.request.url == origin || event.request.url.startsWith(origin + '/#') || key == '') {
key = '/';
}
// If the URL is not the RESOURCE list then return to signal that the
// browser should take over.
if (!RESOURCES[key]) {
return;
}
// If the URL is the index.html, perform an online-first request.
if (key == '/') {
return onlineFirst(event);
}
event.respondWith(caches.open(CACHE_NAME)
.then((cache) => {
return cache.match(event.request).then((response) => {
// Either respond with the cached resource, or perform a fetch and
// lazily populate the cache only if the resource was successfully fetched.
return response || fetch(event.request).then((response) => {
if (response && Boolean(response.ok)) {
cache.put(event.request, response.clone());
}
return response;
});
})
})
);
});
self.addEventListener('message', (event) => {
// SkipWaiting can be used to immediately activate a waiting service worker.
// This will also require a page refresh triggered by the main worker.
if (event.data === 'skipWaiting') {
self.skipWaiting();
return;
}
if (event.data === 'downloadOffline') {
downloadOffline();
return;
}
});
// Download offline will check the RESOURCES for all files not in the cache
// and populate them.
async function downloadOffline() {
var resources = [];
var contentCache = await caches.open(CACHE_NAME);
var currentContent = {};
for (var request of await contentCache.keys()) {
var key = request.url.substring(origin.length + 1);
if (key == "") {
key = "/";
}
currentContent[key] = true;
}
for (var resourceKey of Object.keys(RESOURCES)) {
if (!currentContent[resourceKey]) {
resources.push(resourceKey);
}
}
return contentCache.addAll(resources);
}
// Attempt to download the resource online before falling back to
// the offline cache.
function onlineFirst(event) {
return event.respondWith(
fetch(event.request).then((response) => {
return caches.open(CACHE_NAME).then((cache) => {
cache.put(event.request, response.clone());
return response;
});
}).catch((error) => {
return caches.open(CACHE_NAME).then((cache) => {
return cache.match(event.request).then((response) => {
if (response != null) {
return response;
}
throw error;
});
});
})
);
}

View File

@ -1,9 +1,8 @@
import 'dart:math';
import 'package:flutter/material.dart';
import 'package:shared_preferences/shared_preferences.dart';
import 'package:http/http.dart' as http;
import 'dart:convert';
import 'base/variables.dart';
enum ApiService {
auth,
@ -67,7 +66,10 @@ Future<bool> isLoggedIn(BuildContext context) async {
final prefs = await SharedPreferences.getInstance();
final token = prefs.getString('token');
if (token == null) return false;
if (token == null){
loggedIn = false;
return false;
}
try {
String base64 = token.split('.')[1];

View File

@ -1,47 +1,43 @@
import 'package:flutter/material.dart';
import 'package:mobile/api.dart' as api;
import 'package:shared_preferences/shared_preferences.dart';
import 'package:google_fonts/google_fonts.dart';
import 'variables.dart';
class SideMenu extends StatefulWidget {
final Widget body;
final int selectedIndex ;
const SideMenu({super.key, required this.body});
const SideMenu({super.key, required this.body, required this.selectedIndex});
@override
State<SideMenu> createState() => _SideMenuState();
}
class _SideMenuState extends State<SideMenu> {
final GlobalKey<ScaffoldState> _scaffoldKey = GlobalKey<ScaffoldState>();
int _selectedIndex = 0;
bool _isLoggedIn = false;
late int _selectedIndex;
void _onItemTapped(int index) {
setState(() {
_selectedIndex = index;
});
}
Future<void> _postNavigationCallback(dynamic _) async {
final isLoggedIn = await api.isLoggedIn(context);
setState(() => _isLoggedIn = isLoggedIn);
// Close sidebar
if (mounted && _scaffoldKey.currentState?.isDrawerOpen == true) {
Navigator.pop(context);
}
@override
void initState() {
super.initState();
_selectedIndex = widget.selectedIndex; // Initialize _selectedIndex with the value from the widget
}
void _logout() async {
final prefs = await SharedPreferences.getInstance();
prefs.remove('token');
setState(() => _isLoggedIn = false);
setState(() {
loggedIn = false;
});
if (mounted) {
ScaffoldMessenger.of(context).showSnackBar(
const SnackBar(content: Text('Successfully logged out')));
Navigator.pop(context);
Navigator.pushReplacementNamed(context, '/login');
}
}
@ -50,35 +46,57 @@ class _SideMenuState extends State<SideMenu> {
super.didChangeDependencies();
api
.isLoggedIn(context)
.then((value) => setState(() => _isLoggedIn = value));
.isLoggedIn(context).then((value) {
setState(() {
loggedIn = value; // Update the second variable here
});
});
}
@override
Widget build(BuildContext context) {
Widget build(BuildContext context) {
return Scaffold(
appBar: AppBar(
backgroundColor: Theme.of(context).colorScheme.inversePrimary,
title: const Text('SkanTavels'),
title: Row(
children: [
const SizedBox(width: 55),
Text('SkanTravels',
style: GoogleFonts.jacquesFrancois(
fontSize: 30,
color: Colors.black,
),
),
],
),
),
drawer: Drawer(
child: ListView(
padding: EdgeInsets.zero,
children: [
const DrawerHeader(
decoration: BoxDecoration(
color: Colors.blue,
DrawerHeader(
child: Column(
children: [
const Image(
image: AssetImage('assets/logo.png'),
height: 100,
),
child: Text('Drawer Header'),
Text(
'SkanTravels',
style: GoogleFonts.jacquesFrancois(
fontSize: 20,
color: Color(0xFF1862E7),
),
),
],
)
),
ListTile(
title: const Text('Home'),
leading: const Icon(Icons.home),
selected: _selectedIndex == 0,
onTap: () {
// Update the state of the app
_onItemTapped(0);
// Then close the drawer
Navigator.pushReplacementNamed(context, '/home');
},
),
@ -87,9 +105,6 @@ class _SideMenuState extends State<SideMenu> {
leading: const Icon(Icons.star),
selected: _selectedIndex == 1,
onTap: () {
// Update the state of the app
_onItemTapped(1);
// Then close the drawer
Navigator.pushReplacementNamed(context, '/favorites');
},
),
@ -98,9 +113,6 @@ class _SideMenuState extends State<SideMenu> {
leading: const Icon(Icons.person),
selected: _selectedIndex == 2,
onTap: () {
// Update the state of the app
_onItemTapped(2);
// Then close the drawer
Navigator.pushReplacementNamed(context, '/profile');
},
),
@ -109,7 +121,7 @@ class _SideMenuState extends State<SideMenu> {
thickness: 2,
indent: 40,
),
...(_isLoggedIn
...(loggedIn
? [
ListTile(
title: const Text('Log out'),
@ -124,9 +136,6 @@ class _SideMenuState extends State<SideMenu> {
leading: const Icon(Icons.add_box_outlined),
selected: _selectedIndex == 3,
onTap: () {
// Update the state of the app
_onItemTapped(3);
// Then close the drawer
Navigator.pushReplacementNamed(context, '/register');
},
),
@ -135,9 +144,6 @@ class _SideMenuState extends State<SideMenu> {
leading: const Icon(Icons.login),
selected: _selectedIndex == 4,
onTap: () {
// Update the state of the app
_onItemTapped(4);
// Then close the drawer
Navigator.pushReplacementNamed(context, '/login');
},
)
@ -147,5 +153,5 @@ class _SideMenuState extends State<SideMenu> {
),
body: widget.body,
);
}
}
}

View File

@ -0,0 +1,6 @@
import 'package:mobile/models.dart';
//Global variables
bool loggedIn = false;
User? user;

View File

@ -34,8 +34,9 @@ class _FavoritesPage extends State<FavoritesPage> {
@override
Widget build(BuildContext context) {
return SideMenu(
selectedIndex: 1,
body: Container(
decoration: BoxDecoration(color: Color(0xFFF9F9F9)),
decoration: const BoxDecoration(color: Color(0xFFF9F9F9)),
width: MediaQuery.of(context).size.width,
padding: const EdgeInsets.all(20.0),
child: Column(children:

View File

@ -1,6 +1,10 @@
import 'package:flutter/material.dart';
import 'package:mobile/base/sidemenu.dart';
import 'package:mobile/base/variables.dart';
import 'package:mobile/models.dart';
import 'package:shared_preferences/shared_preferences.dart';
import 'package:google_fonts/google_fonts.dart';
import 'dart:convert';
import 'api.dart' as api;
class LoginPage extends StatefulWidget {
@ -22,8 +26,17 @@ class _LoginPageState extends State<LoginPage> {
if (token == null) return;
// Assuming token is a JSON string
Map<String, dynamic> json = jsonDecode(token);
Login jsonUser = Login.fromJson(json);
final prefs = await SharedPreferences.getInstance();
prefs.setString('token', token);
prefs.setString('token', jsonUser.token);
prefs.setString('id', jsonUser.id);
setState(()
{loggedIn == true;});
if (mounted) {
ScaffoldMessenger.of(context).showSnackBar(const SnackBar(content: Text('Successfully logged in')));
@ -34,12 +47,24 @@ class _LoginPageState extends State<LoginPage> {
@override
Widget build(BuildContext context) {
return SideMenu(
selectedIndex: 4,
body: Scaffold(
body: Center(
child: Container(
constraints: const BoxConstraints(minWidth: 100, maxWidth: 400),
child: Column(children: [
const SizedBox(height: 80),
const Image(
image: AssetImage('assets/logo.png'),
height: 200,
),
Text(
'SkanTravels',
style: GoogleFonts.jacquesFrancois(
fontSize: 30,
color: const Color(0xFF1862E7),
),
),
const SizedBox(height: 40),
const Text('Email'),
TextField(controller: emailInput),
const SizedBox(height: 30),
@ -53,6 +78,7 @@ class _LoginPageState extends State<LoginPage> {
const SizedBox(height: 30),
ElevatedButton(onPressed: _login, child: const Text('Login')),
const SizedBox(height: 10),
const Text('or'),
TextButton(
child: const Text('Register account'),
onPressed: () => Navigator.pushReplacementNamed(context, '/register')

View File

@ -71,6 +71,7 @@ class _MyHomePageState extends State<MyHomePage> {
@override
Widget build(BuildContext context) {
return SideMenu(
selectedIndex: 0,
body: Scaffold(
key: _scaffoldKey,
//drawer: navigationMenu,

View File

@ -6,3 +6,35 @@ class Favorite {
Favorite(this.id, this.userId, this.lat, this.lng);
}
class Login {
String token;
String id;
Login(this.token, this.id);
factory Login.fromJson(Map<String, dynamic> json) {
return Login(
json['token'],
json['id'],
);
}
}
class User {
String id;
String email;
String username;
DateTime createdAt;
User( this.id, this.email, this.username, this.createdAt);
factory User.fromJson(Map<String, dynamic> json) {
return User(
json['id'],
json['email'],
json['username'],
DateTime.parse(json['createdAt']),
);
}
}

View File

@ -1,14 +1,118 @@
import 'package:flutter/material.dart';
import 'base/sidemenu.dart'; // Import the base layout widget
import 'dart:convert';
class ProfilePage extends StatelessWidget {
import 'package:flutter/material.dart';
import 'package:mobile/base/variables.dart';
import 'package:mobile/models.dart';
import 'package:shared_preferences/shared_preferences.dart';
import 'base/sidemenu.dart';
import 'api.dart' as api;
class ProfilePage extends StatefulWidget {
const ProfilePage({super.key});
@override
State<ProfilePage> createState() => _ProfilePageState();
}
class _ProfilePageState extends State<ProfilePage> {
User? userData;
@override
void initState() {
super.initState();
getProfile();
}
Future<void> getProfile() async {
if (!loggedIn) {
WidgetsBinding.instance.addPostFrameCallback((_) {
ScaffoldMessenger.of(context).showSnackBar(
const SnackBar(content: Text('Please log in')),
);
Navigator.pushReplacementNamed(context, '/login');
});
return;
}
if (user != null) {
setState(() {
userData = user!;
});
} else {
final prefs = await SharedPreferences.getInstance();
String? id = prefs.getString('id');
if (id != null) {
final response = await api
.request(context, api.ApiService.auth, 'GET', '/api/users/$id', null);
if (response == null) return;
Map<String, dynamic> json = jsonDecode(response);
User jsonUser = User.fromJson(json);
setState(() {
userData = jsonUser;
user = jsonUser;
});
}
}
}
@override
Widget build(BuildContext context) {
return const SideMenu(
body: Center(
child: Text('This is Page 1'),
return SideMenu(
selectedIndex: 2,
body: Stack(
children: [
const Align(
alignment: Alignment.topLeft,
child: Padding(
padding: EdgeInsets.all(16.0),
child: Text(
'Your Profile',
style: TextStyle(fontSize: 18, fontWeight: FontWeight.bold),
),
),
),
Center(
child: userData == null
? const CircularProgressIndicator()
: Column(
mainAxisAlignment: MainAxisAlignment.center,
children: [
const Icon(
Icons.account_circle,
size: 100,
color: Colors.grey,
),
const SizedBox(height: 20),
Text(
userData!.username,
style: const TextStyle(
fontSize: 24,
fontWeight: FontWeight.bold,
),
),
const SizedBox(height: 10),
Text(
userData!.email,
style: const TextStyle(
fontSize: 16,
color: Colors.grey,
),
),
const SizedBox(height: 50),
ElevatedButton(
onPressed: () {
// Add your edit action here
},
child: const Text('Edit'),
),
],
),
),
],
),
);
}

View File

@ -1,5 +1,6 @@
import 'package:flutter/material.dart';
import 'package:mobile/base/sidemenu.dart';
import 'package:google_fonts/google_fonts.dart';
import 'api.dart' as api;
class RegisterPage extends StatefulWidget {
@ -38,12 +39,24 @@ class _RegisterPageState extends State<RegisterPage> {
@override
Widget build(BuildContext context) {
return SideMenu(
selectedIndex: 3,
body: Scaffold(
body: Center(
child: Container(
constraints: const BoxConstraints(minWidth: 100, maxWidth: 400),
child: Column(children: [
const SizedBox(height: 80),
const Image(
image: AssetImage('assets/logo.png'),
height: 200,
),
Text(
'SkanTravels',
style: GoogleFonts.jacquesFrancois(
fontSize: 30,
color: Color(0xFF1862E7),
),
),
const SizedBox(height: 40),
const Text('Username'),
TextField(controller: usernameInput),
const SizedBox(height: 30),
@ -70,6 +83,7 @@ class _RegisterPageState extends State<RegisterPage> {
ElevatedButton(
onPressed: _register, child: const Text('Register')),
const SizedBox(height: 10),
const Text('or'),
TextButton(
child: const Text('Login'),
onPressed: () => Navigator.pushReplacementNamed(context, '/login')),

View File

@ -5,8 +5,10 @@
import FlutterMacOS
import Foundation
import path_provider_foundation
import shared_preferences_foundation
func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin"))
SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin"))
}

View File

@ -41,6 +41,14 @@ packages:
url: "https://pub.dev"
source: hosted
version: "1.18.0"
crypto:
dependency: transitive
description:
name: crypto
sha256: ec30d999af904f33454ba22ed9a86162b35e52b44ac4807d1d93c288041d7d27
url: "https://pub.dev"
source: hosted
version: "3.0.5"
cupertino_icons:
dependency: "direct main"
description:
@ -112,6 +120,14 @@ packages:
description: flutter
source: sdk
version: "0.0.0"
google_fonts:
dependency: "direct main"
description:
name: google_fonts
sha256: b1ac0fe2832c9cc95e5e88b57d627c5e68c223b9657f4b96e1487aa9098c7b82
url: "https://pub.dev"
source: hosted
version: "6.2.1"
http:
dependency: "direct main"
description:
@ -232,6 +248,30 @@ packages:
url: "https://pub.dev"
source: hosted
version: "1.9.0"
path_provider:
dependency: transitive
description:
name: path_provider
sha256: fec0d61223fba3154d87759e3cc27fe2c8dc498f6386c6d6fc80d1afdd1bf378
url: "https://pub.dev"
source: hosted
version: "2.1.4"
path_provider_android:
dependency: transitive
description:
name: path_provider_android
sha256: "6f01f8e37ec30b07bc424b4deabac37cacb1bc7e2e515ad74486039918a37eb7"
url: "https://pub.dev"
source: hosted
version: "2.2.10"
path_provider_foundation:
dependency: transitive
description:
name: path_provider_foundation
sha256: f234384a3fdd67f989b4d54a5d73ca2a6c422fa55ae694381ae0f4375cd1ea16
url: "https://pub.dev"
source: hosted
version: "2.4.0"
path_provider_linux:
dependency: transitive
description:

View File

@ -38,6 +38,7 @@ dependencies:
# Use with the CupertinoIcons class for iOS style icons.
cupertino_icons: ^1.0.6
shared_preferences: ^2.3.2
google_fonts: ^6.2.1
dev_dependencies:
flutter_test:
@ -55,15 +56,12 @@ dev_dependencies:
# The following section is specific to Flutter packages.
flutter:
# The following line ensures that the Material Icons font is
# included with your application, so that you can use the icons in
# the material Icons class.
assets:
- assets/
uses-material-design: true
# To add assets to your application, add an assets section, like this:
# assets:
# - images/a_dot_burr.jpeg
# - images/a_dot_ham.jpeg
# An image asset can refer to one or more resolution-specific "variants", see
# https://flutter.dev/assets-and-images/#resolution-aware