diff --git a/.flutter-plugins-dependencies b/.flutter-plugins-dependencies
index 9d91de0..3d6b98a 100644
--- a/.flutter-plugins-dependencies
+++ b/.flutter-plugins-dependencies
@@ -1 +1 @@
-{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"firebase_auth","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\firebase_auth-1.4.1\\\\","dependencies":["firebase_core"]},{"name":"firebase_core","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\firebase_core-1.17.0\\\\","dependencies":[]},{"name":"flutter_native_splash","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\flutter_native_splash-2.1.6\\\\","dependencies":[]},{"name":"geocoding","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\geocoding-2.0.4\\\\","dependencies":[]},{"name":"geolocator_apple","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\geolocator_apple-2.1.3\\\\","dependencies":[]},{"name":"google_maps_flutter","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\google_maps_flutter-2.1.5\\\\","dependencies":[]},{"name":"google_sign_in_ios","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\google_sign_in_ios-5.3.1\\\\","dependencies":[]},{"name":"location","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\location-4.4.0\\\\","dependencies":[]},{"name":"package_info_plus","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\package_info_plus-1.4.2\\\\","dependencies":[]},{"name":"path_provider_ios","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\path_provider_ios-2.0.9\\\\","dependencies":[]},{"name":"webview_flutter_wkwebview","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\webview_flutter_wkwebview-2.7.5\\\\","dependencies":[]}],"android":[{"name":"firebase_auth","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\firebase_auth-1.4.1\\\\","dependencies":["firebase_core"]},{"name":"firebase_core","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\firebase_core-1.17.0\\\\","dependencies":[]},{"name":"flutter_native_splash","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\flutter_native_splash-2.1.6\\\\","dependencies":[]},{"name":"flutter_plugin_android_lifecycle","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\flutter_plugin_android_lifecycle-2.0.6\\\\","dependencies":[]},{"name":"geocoding","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\geocoding-2.0.4\\\\","dependencies":[]},{"name":"geolocator_android","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\geolocator_android-3.1.8\\\\","dependencies":[]},{"name":"google_api_headers","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\google_api_headers-1.3.0\\\\","dependencies":["package_info_plus"]},{"name":"google_maps_flutter","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\google_maps_flutter-2.1.5\\\\","dependencies":["flutter_plugin_android_lifecycle"]},{"name":"google_sign_in_android","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\google_sign_in_android-5.2.8\\\\","dependencies":[]},{"name":"location","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\location-4.4.0\\\\","dependencies":[]},{"name":"package_info_plus","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\package_info_plus-1.4.2\\\\","dependencies":[]},{"name":"path_provider_android","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\path_provider_android-2.0.14\\\\","dependencies":[]},{"name":"webview_flutter_android","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\webview_flutter_android-2.8.8\\\\","dependencies":[]}],"macos":[{"name":"firebase_auth","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\firebase_auth-1.4.1\\\\","dependencies":["firebase_core"]},{"name":"firebase_core","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\firebase_core-1.17.0\\\\","dependencies":[]},{"name":"geolocator_apple","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\geolocator_apple-2.1.3\\\\","dependencies":[]},{"name":"location","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\location-4.4.0\\\\","dependencies":[]},{"name":"package_info_plus_macos","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\package_info_plus_macos-1.3.0\\\\","dependencies":[]},{"name":"path_provider_macos","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\path_provider_macos-2.0.6\\\\","dependencies":[]}],"linux":[{"name":"package_info_plus_linux","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\package_info_plus_linux-1.0.5\\\\","dependencies":[]},{"name":"path_provider_linux","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\path_provider_linux-2.1.6\\\\","dependencies":[]}],"windows":[{"name":"geolocator_windows","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\geolocator_windows-0.1.1\\\\","dependencies":[]},{"name":"package_info_plus_windows","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\package_info_plus_windows-1.0.5\\\\","dependencies":[]},{"name":"path_provider_windows","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\path_provider_windows-2.0.6\\\\","dependencies":[]}],"web":[{"name":"firebase_auth_web","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\firebase_auth_web-1.3.1\\\\","dependencies":["firebase_core_web"]},{"name":"firebase_core_web","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\firebase_core_web-1.6.4\\\\","dependencies":[]},{"name":"flutter_native_splash","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\flutter_native_splash-2.1.6\\\\","dependencies":[]},{"name":"geolocator_web","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\geolocator_web-2.1.5\\\\","dependencies":[]},{"name":"google_sign_in_web","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\google_sign_in_web-0.10.1+2\\\\","dependencies":[]},{"name":"location_web","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\location_web-3.1.1\\\\","dependencies":[]},{"name":"package_info_plus_web","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\package_info_plus_web-1.0.5\\\\","dependencies":[]}]},"dependencyGraph":[{"name":"firebase_auth","dependencies":["firebase_auth_web","firebase_core"]},{"name":"firebase_auth_web","dependencies":["firebase_core","firebase_core_web"]},{"name":"firebase_core","dependencies":["firebase_core_web"]},{"name":"firebase_core_web","dependencies":[]},{"name":"flutter_native_splash","dependencies":[]},{"name":"flutter_plugin_android_lifecycle","dependencies":[]},{"name":"geocoding","dependencies":[]},{"name":"geolocator","dependencies":["geolocator_android","geolocator_apple","geolocator_web","geolocator_windows"]},{"name":"geolocator_android","dependencies":[]},{"name":"geolocator_apple","dependencies":[]},{"name":"geolocator_web","dependencies":[]},{"name":"geolocator_windows","dependencies":[]},{"name":"google_api_headers","dependencies":["package_info_plus"]},{"name":"google_maps_flutter","dependencies":["flutter_plugin_android_lifecycle"]},{"name":"google_sign_in","dependencies":["google_sign_in_android","google_sign_in_ios","google_sign_in_web"]},{"name":"google_sign_in_android","dependencies":[]},{"name":"google_sign_in_ios","dependencies":[]},{"name":"google_sign_in_web","dependencies":[]},{"name":"location","dependencies":["location_web"]},{"name":"location_web","dependencies":[]},{"name":"package_info_plus","dependencies":["package_info_plus_linux","package_info_plus_macos","package_info_plus_windows","package_info_plus_web"]},{"name":"package_info_plus_linux","dependencies":[]},{"name":"package_info_plus_macos","dependencies":[]},{"name":"package_info_plus_web","dependencies":[]},{"name":"package_info_plus_windows","dependencies":[]},{"name":"path_provider","dependencies":["path_provider_android","path_provider_ios","path_provider_linux","path_provider_macos","path_provider_windows"]},{"name":"path_provider_android","dependencies":[]},{"name":"path_provider_ios","dependencies":[]},{"name":"path_provider_linux","dependencies":[]},{"name":"path_provider_macos","dependencies":[]},{"name":"path_provider_windows","dependencies":[]},{"name":"webview_flutter","dependencies":["webview_flutter_android","webview_flutter_wkwebview"]},{"name":"webview_flutter_android","dependencies":[]},{"name":"webview_flutter_wkwebview","dependencies":[]}],"date_created":"2022-05-23 12:51:22.034309","version":"2.10.5"}
\ No newline at end of file
+{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"firebase_auth","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\firebase_auth-1.4.1\\\\","dependencies":["firebase_core"]},{"name":"firebase_core","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\firebase_core-1.17.0\\\\","dependencies":[]},{"name":"flutter_native_splash","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\flutter_native_splash-2.1.6\\\\","dependencies":[]},{"name":"geocoding","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\geocoding-2.0.4\\\\","dependencies":[]},{"name":"geolocator_apple","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\geolocator_apple-2.1.3\\\\","dependencies":[]},{"name":"google_maps_flutter","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\google_maps_flutter-2.1.5\\\\","dependencies":[]},{"name":"google_sign_in_ios","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\google_sign_in_ios-5.3.1\\\\","dependencies":[]},{"name":"location","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\location-4.4.0\\\\","dependencies":[]},{"name":"package_info_plus","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\package_info_plus-1.4.2\\\\","dependencies":[]},{"name":"path_provider_ios","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\path_provider_ios-2.0.9\\\\","dependencies":[]},{"name":"webview_flutter_wkwebview","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\webview_flutter_wkwebview-2.7.5\\\\","dependencies":[]}],"android":[{"name":"firebase_auth","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\firebase_auth-1.4.1\\\\","dependencies":["firebase_core"]},{"name":"firebase_core","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\firebase_core-1.17.0\\\\","dependencies":[]},{"name":"flutter_native_splash","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\flutter_native_splash-2.1.6\\\\","dependencies":[]},{"name":"flutter_plugin_android_lifecycle","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\flutter_plugin_android_lifecycle-2.0.6\\\\","dependencies":[]},{"name":"geocoding","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\geocoding-2.0.4\\\\","dependencies":[]},{"name":"geolocator_android","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\geolocator_android-3.1.8\\\\","dependencies":[]},{"name":"google_api_headers","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\google_api_headers-1.3.0\\\\","dependencies":["package_info_plus"]},{"name":"google_maps_flutter","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\google_maps_flutter-2.1.5\\\\","dependencies":["flutter_plugin_android_lifecycle"]},{"name":"google_sign_in_android","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\google_sign_in_android-5.2.8\\\\","dependencies":[]},{"name":"location","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\location-4.4.0\\\\","dependencies":[]},{"name":"package_info_plus","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\package_info_plus-1.4.2\\\\","dependencies":[]},{"name":"path_provider_android","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\path_provider_android-2.0.14\\\\","dependencies":[]},{"name":"webview_flutter_android","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\webview_flutter_android-2.8.8\\\\","dependencies":[]}],"macos":[{"name":"firebase_auth","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\firebase_auth-1.4.1\\\\","dependencies":["firebase_core"]},{"name":"firebase_core","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\firebase_core-1.17.0\\\\","dependencies":[]},{"name":"geolocator_apple","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\geolocator_apple-2.1.3\\\\","dependencies":[]},{"name":"location","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\location-4.4.0\\\\","dependencies":[]},{"name":"package_info_plus_macos","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\package_info_plus_macos-1.3.0\\\\","dependencies":[]},{"name":"path_provider_macos","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\path_provider_macos-2.0.6\\\\","dependencies":[]}],"linux":[{"name":"package_info_plus_linux","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\package_info_plus_linux-1.0.5\\\\","dependencies":[]},{"name":"path_provider_linux","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\path_provider_linux-2.1.6\\\\","dependencies":[]}],"windows":[{"name":"geolocator_windows","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\geolocator_windows-0.1.1\\\\","dependencies":[]},{"name":"package_info_plus_windows","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\package_info_plus_windows-1.0.5\\\\","dependencies":[]},{"name":"path_provider_windows","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\path_provider_windows-2.0.6\\\\","dependencies":[]}],"web":[{"name":"firebase_auth_web","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\firebase_auth_web-1.3.1\\\\","dependencies":["firebase_core_web"]},{"name":"firebase_core_web","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\firebase_core_web-1.6.4\\\\","dependencies":[]},{"name":"flutter_native_splash","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\flutter_native_splash-2.1.6\\\\","dependencies":[]},{"name":"geolocator_web","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\geolocator_web-2.1.5\\\\","dependencies":[]},{"name":"google_sign_in_web","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\google_sign_in_web-0.10.1+2\\\\","dependencies":[]},{"name":"location_web","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\location_web-3.1.1\\\\","dependencies":[]},{"name":"package_info_plus_web","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\package_info_plus_web-1.0.5\\\\","dependencies":[]}]},"dependencyGraph":[{"name":"firebase_auth","dependencies":["firebase_auth_web","firebase_core"]},{"name":"firebase_auth_web","dependencies":["firebase_core","firebase_core_web"]},{"name":"firebase_core","dependencies":["firebase_core_web"]},{"name":"firebase_core_web","dependencies":[]},{"name":"flutter_native_splash","dependencies":[]},{"name":"flutter_plugin_android_lifecycle","dependencies":[]},{"name":"geocoding","dependencies":[]},{"name":"geolocator","dependencies":["geolocator_android","geolocator_apple","geolocator_web","geolocator_windows"]},{"name":"geolocator_android","dependencies":[]},{"name":"geolocator_apple","dependencies":[]},{"name":"geolocator_web","dependencies":[]},{"name":"geolocator_windows","dependencies":[]},{"name":"google_api_headers","dependencies":["package_info_plus"]},{"name":"google_maps_flutter","dependencies":["flutter_plugin_android_lifecycle"]},{"name":"google_sign_in","dependencies":["google_sign_in_android","google_sign_in_ios","google_sign_in_web"]},{"name":"google_sign_in_android","dependencies":[]},{"name":"google_sign_in_ios","dependencies":[]},{"name":"google_sign_in_web","dependencies":[]},{"name":"location","dependencies":["location_web"]},{"name":"location_web","dependencies":[]},{"name":"package_info_plus","dependencies":["package_info_plus_linux","package_info_plus_macos","package_info_plus_windows","package_info_plus_web"]},{"name":"package_info_plus_linux","dependencies":[]},{"name":"package_info_plus_macos","dependencies":[]},{"name":"package_info_plus_web","dependencies":[]},{"name":"package_info_plus_windows","dependencies":[]},{"name":"path_provider","dependencies":["path_provider_android","path_provider_ios","path_provider_linux","path_provider_macos","path_provider_windows"]},{"name":"path_provider_android","dependencies":[]},{"name":"path_provider_ios","dependencies":[]},{"name":"path_provider_linux","dependencies":[]},{"name":"path_provider_macos","dependencies":[]},{"name":"path_provider_windows","dependencies":[]},{"name":"webview_flutter","dependencies":["webview_flutter_android","webview_flutter_wkwebview"]},{"name":"webview_flutter_android","dependencies":[]},{"name":"webview_flutter_wkwebview","dependencies":[]}],"date_created":"2022-05-23 13:51:54.190623","version":"2.10.5"}
\ No newline at end of file
diff --git a/lib/FeedbackPage.dart b/lib/FeedbackPage.dart
index b8ec1a7..8e664c9 100644
--- a/lib/FeedbackPage.dart
+++ b/lib/FeedbackPage.dart
@@ -12,8 +12,6 @@ Color _colorContainerHappy = _backgroundColor;
 Color _colorContainerMediumHappy = _backgroundColor;
 Color _colorContainerUpset = _backgroundColor;
 
-var timestamp;
-
 
 Map<String, bool> _satisfactionBoolean = {
   "VeryHappy": false,
@@ -54,14 +52,13 @@ class FormForFeedbackState extends State<FormForFeedback> {
   var dataBase = mysql();
 
 
-  Future<void> feedbackVerification(String satisfaction, String typeOfFeedback, String writtenFeedback, String timestamp ) async {
+  Future<void> feedbackVerification(String satisfaction, String typeOfFeedback, String writtenFeedback) async {
     await dataBase.getConnection().then((conn) async {
-      String sql = "INSERT INTO maen0574.User_feedback (id, Satisfaction, Type_of_feedback, Written_feedback, timestamp) VALUES (null, '$satisfaction', '$typeOfFeedback', '$writtenFeedback', '$timestamp);";
+      String sql = "INSERT INTO maen0574.User_feedback (Satisfaction, Type_of_feedback, Written_feedback) VALUES ('$satisfaction', '$typeOfFeedback', '$writtenFeedback');";
       await conn.query(sql).then((results) {
         for(var row in results) {
-          print(row[0].toString());
           setState(() {});
-          form(row[0].toString(), row[1].toString(), row[2].toString(), row[3]);
+          form(row[0].toString(), row[1].toString(), row[2].toString(), row[3].toString());
         }
       });
     });
@@ -339,31 +336,48 @@ class FormForFeedbackState extends State<FormForFeedback> {
               InkWell(
 
                 onTap: () async {
-
-                  if(writtenFeedback.text.contains("'")) {
+                  print(writtenFeedback.text);
+                  if (writtenFeedback.text.contains("'")) {
                     print('not allowed to use atrophies');
                     return;
                   }
 
-                  timestamp = DateTime.now().millisecondsSinceEpoch.toString();
-                  await feedbackVerification(satisfaction.text, typeOfFeedback.text, writtenFeedback.text, timestamp);
-                  if (_formKey.currentState!.validate()) {
+                  await feedbackVerification(satisfaction.text, typeOfFeedback.text, writtenFeedback.text);
+                  print(satisfaction.text);
+                  print(typeOfFeedback.text);
+                  print(writtenFeedback.text);
 
-                    print(satisfaction.text);
-                    print(typeOfFeedback.text);
-                    print(writtenFeedback.text);
-                    print(timestamp);
+                  //pop-up thank you for answering
 
-                    Navigator.push(
-                      context,
-                      MaterialPageRoute(builder: (context) =>
-                          BottomNavPage()), //Replace Container() with call to account-page.
-                    );
-                  }
+                  showDialog<String>(
+                    context: context,
+                    builder: (BuildContext context) =>
+                        AlertDialog(
+                          title: const Text('Thank you'),
+                          content: const Text('Thank you for your feedback, '
+                              'you will now be sent back to the map'),
+                          actions: <Widget>[
+                            TextButton(
+                              child: const Text('Ok'),
+                              onPressed: () =>
+                                  Navigator.push(
+                                    context,
+                                    MaterialPageRoute(builder: (context) =>
+                                        BottomNavPage()),
+                                    //Replace Container() with call to account-page.
+                                  ),
+                            ),
+                          ],
+                        ),
+                      );
+                  pressedEmojiColor("clear");
+                  pressedTypeOfFeedback("clear");
+                  writtenFeedback.text = '';
                 },
 
+
                 child: Container(
-                  color: _colorContainerHappy,
+                  color: Colors.purple,
                   child: Column(
                     mainAxisAlignment: MainAxisAlignment.center,
                     children: const <Widget>[
@@ -381,15 +395,11 @@ class FormForFeedbackState extends State<FormForFeedback> {
 
             const SizedBox(height: 30),
 
-          ],
-          ),
-
+        ],
         ),
-
-
+    ),
       ),
-    );
-
+      );
   }
 }
 
@@ -441,6 +451,17 @@ void pressedEmojiColor (String s) {
     _satisfactionBoolean["Upset"] == false;
     _colorContainerUpset = _backgroundColor;
   }
+
+  if(s == "clear"){
+    _satisfactionBoolean["VeryHappy"] = false;
+    _colorContainerVeryHappy = _backgroundColor;
+    _satisfactionBoolean["MediumHappy"] == false;
+    _colorContainerMediumHappy = _backgroundColor;
+    _satisfactionBoolean["Happy"] == false;
+    _colorContainerHappy = _backgroundColor;
+    _satisfactionBoolean["Upset"] == false;
+    _colorContainerUpset = _backgroundColor;
+  }
 }
 
 void pressedTypeOfFeedback(String s) {
@@ -487,4 +508,15 @@ void pressedTypeOfFeedback(String s) {
     _typeOfFeedback["Compliment"] == false;
     check1 = false;
   }
+
+  if (s == "clear") {
+    _typeOfFeedback["Mistake in sun accuracy"] == false;
+    check4 = false;
+    _typeOfFeedback["Complaint"] == false;
+    check2 = false;
+    _typeOfFeedback["Bug"] == false;
+    check3 = false;
+    _typeOfFeedback["Compliment"] == false;
+    check1 = false;
+  }
 }
\ No newline at end of file
diff --git a/lib/Form.dart b/lib/Form.dart
index 73e7451..8e3a0cc 100644
--- a/lib/Form.dart
+++ b/lib/Form.dart
@@ -2,12 +2,10 @@ class form {
   late String satisfaction;
   late String typeOfFeedback;
   late String writtenFeedback;
-  late String timestamp;
 
   form(String satisfaction, String typeOfFeedback, String writtenFeedback, String timestamp){
     this.satisfaction = satisfaction;
     this.typeOfFeedback = typeOfFeedback;
     this.writtenFeedback = writtenFeedback;
-    this.timestamp = timestamp;
   }
 }
\ No newline at end of file