Updated UI and singleton services

.vscode/launch.json

@@ -14,7 +14,7 @@
       "flutterMode": "release"
     },
     {
-      "name": "Flutter (Chrome)",
+      "name": "dev debug mode",
       "program": "lib/main.dart",
       "deviceId": "chrome",
       "request": "launch",

lib/main.dart

@@ -1,10 +1,10 @@
 import 'package:flutter/material.dart';
 import 'package:firebase_core/firebase_core.dart';
 import 'package:flutter_native_splash/flutter_native_splash.dart';
-import 'package:lost_found_steelhacks/authentication/auth.dart';
-import 'package:lost_found_steelhacks/authentication/wrapper.dart';
+import 'package:lost_found_steelhacks/pages/home_page.dart';
+import 'package:lost_found_steelhacks/services/auth.dart';
+import 'package:lost_found_steelhacks/routing/wrapper.dart';
 import 'package:lost_found_steelhacks/pages/login_page.dart';
-import 'package:lost_found_steelhacks/pages/map_page.dart';
 import 'package:lost_found_steelhacks/themes/app_theme.dart';
 import 'package:lost_found_steelhacks/themes/theme_manager.dart';
 import 'package:provider/provider.dart';
@@ -35,6 +35,7 @@ class MyApp extends StatefulWidget {
 }
 
 class _MyAppState extends State<MyApp> {
+
   @override
   void dispose() {
     themeManager.removeListener(themeListener);
@@ -66,7 +67,7 @@ class _MyAppState extends State<MyApp> {
             debugShowCheckedModeBanner: false,
             routes: {
               'loginPage': (context) => const LoginPage(),
-              'mapPage': (context) => const MapPage(),
+              'mapPage': (context) => const HomePage(),
               '/': (context) => const Wrapper()
             },
             initialRoute: '/',

lib/models/app_user.dart

@@ -0,0 +1,27 @@
+// ignore_for_file: slash_for_doc_comments
+
+import 'package:cloud_firestore/cloud_firestore.dart';
+import 'package:google_maps_flutter/google_maps_flutter.dart';
+
+
+/**
+ * Data model for User document in Firestore
+ */
+class AppUser {
+  final String uid;
+  final String email;
+  final String firstName;
+  final String lastName;
+  final GeoPoint location;
+
+  AppUser(
+      {required this.uid,
+      required this.email,
+      required this.firstName,
+      required this.lastName,
+      required this.location});
+
+  LatLng getLatLng() {
+    return LatLng(location.latitude, location.longitude);
+  }
+}

lib/models/item.dart

@@ -0,0 +1,56 @@
+// ignore_for_file: slash_for_doc_comments
+
+import 'package:cloud_firestore/cloud_firestore.dart';
+
+/**
+ * Data model for Item document in Firestore
+ */
+class Item {
+  String id;
+  final String userId;
+  final Timestamp? timeCreated;
+  final String? itemName;
+  final String? description;
+  final num? phone;
+  final String? picture;
+  final GeoPoint? location;
+
+  Item(
+      {
+      this.id = "",
+      required this.userId,
+      this.timeCreated,
+      this.itemName,
+      this.description,
+      this.phone,
+      this.picture,
+      this.location});
+
+  factory Item.fromFirestore(
+    QueryDocumentSnapshot snapshot,
+    SnapshotOptions? options,
+  ) {
+    Map<String, dynamic> data = snapshot.data() as Map<String, dynamic>;
+
+    return Item(
+        id: snapshot.id,
+        userId: data['userId'],
+        itemName: data['itemName'],
+        description: data['description'],
+        location: data['location'],
+        phone: data['phone'],
+        picture: data['picture'] is int ? '' : data['picture']); //because some pictures entries are of numbers
+  }
+
+  Map<String, dynamic> toFirestore() {
+    return {
+      'userId': userId,
+      'timeCreated': timeCreated,
+      'description': description,
+      'itemName': itemName,
+      'location': location,
+      'phone': phone,
+      'picture': picture
+    };
+  }
+}