diff --git a/src/.dart_tool/package_config.json b/src/.dart_tool/package_config.json index 4967e2d..9724db6 100644 --- a/src/.dart_tool/package_config.json +++ b/src/.dart_tool/package_config.json @@ -31,12 +31,6 @@ "packageUri": "lib/", "languageVersion": "2.18" }, - { - "name": "cupertino_icons", - "rootUri": "file:///C:/Users/86131/AppData/Local/Pub/Cache/hosted/pub.dev/cupertino_icons-1.0.6", - "packageUri": "lib/", - "languageVersion": "2.19" - }, { "name": "fake_async", "rootUri": "file:///C:/Users/86131/AppData/Local/Pub/Cache/hosted/pub.dev/fake_async-1.3.1", @@ -105,21 +99,13 @@ }, { "name": "sqflite", -<<<<<<< HEAD "rootUri": "file:///C:/Users/86131/AppData/Local/Pub/Cache/hosted/pub.dev/sqflite-2.3.0", -======= - "rootUri": "file:///C:/Users/17651/AppData/Local/Pub/Cache/hosted/pub.dev/sqflite-2.3.0", ->>>>>>> b3e9191f62a63dd34a67b874f663f99b9537752c "packageUri": "lib/", "languageVersion": "3.0" }, { "name": "sqflite_common", -<<<<<<< HEAD "rootUri": "file:///C:/Users/86131/AppData/Local/Pub/Cache/hosted/pub.dev/sqflite_common-2.5.0", -======= - "rootUri": "file:///C:/Users/17651/AppData/Local/Pub/Cache/hosted/pub.dev/sqflite_common-2.5.0", ->>>>>>> b3e9191f62a63dd34a67b874f663f99b9537752c "packageUri": "lib/", "languageVersion": "3.0" }, @@ -147,12 +133,6 @@ "packageUri": "lib/", "languageVersion": "2.18" }, - { - "name": "synchronized", - "rootUri": "file:///C:/Users/17651/AppData/Local/Pub/Cache/hosted/pub.dev/synchronized-3.1.0", - "packageUri": "lib/", - "languageVersion": "2.18" - }, { "name": "term_glyph", "rootUri": "file:///C:/Users/86131/AppData/Local/Pub/Cache/hosted/pub.dev/term_glyph-1.2.1", @@ -184,11 +164,7 @@ "languageVersion": "3.1" } ], -<<<<<<< HEAD - "generated": "2023-10-17T13:12:11.527001Z", -======= - "generated": "2023-10-17T14:06:28.851103Z", ->>>>>>> b3e9191f62a63dd34a67b874f663f99b9537752c + "generated": "2023-10-18T00:09:25.397919Z", "generator": "pub", "generatorVersion": "3.1.1" } diff --git a/src/.dart_tool/package_config_subset b/src/.dart_tool/package_config_subset index d761dd8..45b6f95 100644 --- a/src/.dart_tool/package_config_subset +++ b/src/.dart_tool/package_config_subset @@ -18,10 +18,6 @@ collection 2.18 file:///C:/Users/86131/AppData/Local/Pub/Cache/hosted/pub.dev/collection-1.17.2/ file:///C:/Users/86131/AppData/Local/Pub/Cache/hosted/pub.dev/collection-1.17.2/lib/ -cupertino_icons -2.19 -file:///C:/Users/86131/AppData/Local/Pub/Cache/hosted/pub.dev/cupertino_icons-1.0.6/ -file:///C:/Users/86131/AppData/Local/Pub/Cache/hosted/pub.dev/cupertino_icons-1.0.6/lib/ fake_async 2.12 file:///C:/Users/86131/AppData/Local/Pub/Cache/hosted/pub.dev/fake_async-1.3.1/ @@ -52,7 +48,6 @@ file:///C:/Users/86131/AppData/Local/Pub/Cache/hosted/pub.dev/path-1.8.3/ file:///C:/Users/86131/AppData/Local/Pub/Cache/hosted/pub.dev/path-1.8.3/lib/ source_span 2.18 -<<<<<<< HEAD file:///C:/Users/86131/AppData/Local/Pub/Cache/hosted/pub.dev/source_span-1.10.0/ file:///C:/Users/86131/AppData/Local/Pub/Cache/hosted/pub.dev/source_span-1.10.0/lib/ sqflite @@ -63,18 +58,6 @@ sqflite_common 3.0 file:///C:/Users/86131/AppData/Local/Pub/Cache/hosted/pub.dev/sqflite_common-2.5.0/ file:///C:/Users/86131/AppData/Local/Pub/Cache/hosted/pub.dev/sqflite_common-2.5.0/lib/ -======= -file:///C:/Users/17651/AppData/Local/Pub/Cache/hosted/pub.dev/source_span-1.10.0/ -file:///C:/Users/17651/AppData/Local/Pub/Cache/hosted/pub.dev/source_span-1.10.0/lib/ -sqflite -3.0 -file:///C:/Users/17651/AppData/Local/Pub/Cache/hosted/pub.dev/sqflite-2.3.0/ -file:///C:/Users/17651/AppData/Local/Pub/Cache/hosted/pub.dev/sqflite-2.3.0/lib/ -sqflite_common -3.0 -file:///C:/Users/17651/AppData/Local/Pub/Cache/hosted/pub.dev/sqflite_common-2.5.0/ -file:///C:/Users/17651/AppData/Local/Pub/Cache/hosted/pub.dev/sqflite_common-2.5.0/lib/ ->>>>>>> b3e9191f62a63dd34a67b874f663f99b9537752c stack_trace 2.18 file:///C:/Users/86131/AppData/Local/Pub/Cache/hosted/pub.dev/stack_trace-1.11.0/ @@ -85,21 +68,12 @@ file:///C:/Users/86131/AppData/Local/Pub/Cache/hosted/pub.dev/stream_channel-2.1 file:///C:/Users/86131/AppData/Local/Pub/Cache/hosted/pub.dev/stream_channel-2.1.1/lib/ string_scanner 2.18 -<<<<<<< HEAD file:///C:/Users/86131/AppData/Local/Pub/Cache/hosted/pub.dev/string_scanner-1.2.0/ file:///C:/Users/86131/AppData/Local/Pub/Cache/hosted/pub.dev/string_scanner-1.2.0/lib/ synchronized 2.18 file:///C:/Users/86131/AppData/Local/Pub/Cache/hosted/pub.dev/synchronized-3.1.0/ file:///C:/Users/86131/AppData/Local/Pub/Cache/hosted/pub.dev/synchronized-3.1.0/lib/ -======= -file:///C:/Users/17651/AppData/Local/Pub/Cache/hosted/pub.dev/string_scanner-1.2.0/ -file:///C:/Users/17651/AppData/Local/Pub/Cache/hosted/pub.dev/string_scanner-1.2.0/lib/ -synchronized -2.18 -file:///C:/Users/17651/AppData/Local/Pub/Cache/hosted/pub.dev/synchronized-3.1.0/ -file:///C:/Users/17651/AppData/Local/Pub/Cache/hosted/pub.dev/synchronized-3.1.0/lib/ ->>>>>>> b3e9191f62a63dd34a67b874f663f99b9537752c term_glyph 2.12 file:///C:/Users/86131/AppData/Local/Pub/Cache/hosted/pub.dev/term_glyph-1.2.1/ diff --git a/src/.flutter-plugins b/src/.flutter-plugins index 601daa6..6b2e6c6 100644 --- a/src/.flutter-plugins +++ b/src/.flutter-plugins @@ -1,6 +1,2 @@ # This is a generated file; do not edit or check into version control. -<<<<<<< HEAD sqflite=C:\\Users\\86131\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\sqflite-2.3.0\\ -======= -sqflite=C:\\Users\\17651\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\sqflite-2.3.0\\ ->>>>>>> b3e9191f62a63dd34a67b874f663f99b9537752c diff --git a/src/.flutter-plugins-dependencies b/src/.flutter-plugins-dependencies index 912b0f4..1d4a214 100644 --- a/src/.flutter-plugins-dependencies +++ b/src/.flutter-plugins-dependencies @@ -1,5 +1 @@ -<<<<<<< HEAD -{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"sqflite","path":"C:\\\\Users\\\\86131\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dev\\\\sqflite-2.3.0\\\\","native_build":true,"dependencies":[]}],"android":[{"name":"sqflite","path":"C:\\\\Users\\\\86131\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dev\\\\sqflite-2.3.0\\\\","native_build":true,"dependencies":[]}],"macos":[{"name":"sqflite","path":"C:\\\\Users\\\\86131\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dev\\\\sqflite-2.3.0\\\\","native_build":true,"dependencies":[]}],"linux":[],"windows":[],"web":[]},"dependencyGraph":[{"name":"sqflite","dependencies":[]}],"date_created":"2023-10-17 23:37:06.534861","version":"3.13.3"} -======= -{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"sqflite","path":"C:\\\\Users\\\\17651\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dev\\\\sqflite-2.3.0\\\\","native_build":true,"dependencies":[]}],"android":[{"name":"sqflite","path":"C:\\\\Users\\\\17651\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dev\\\\sqflite-2.3.0\\\\","native_build":true,"dependencies":[]}],"macos":[{"name":"sqflite","path":"C:\\\\Users\\\\17651\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dev\\\\sqflite-2.3.0\\\\","native_build":true,"dependencies":[]}],"linux":[],"windows":[],"web":[]},"dependencyGraph":[{"name":"sqflite","dependencies":[]}],"date_created":"2023-10-17 22:31:12.840798","version":"3.13.3"} ->>>>>>> b3e9191f62a63dd34a67b874f663f99b9537752c +{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"sqflite","path":"C:\\\\Users\\\\86131\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dev\\\\sqflite-2.3.0\\\\","native_build":true,"dependencies":[]}],"android":[{"name":"sqflite","path":"C:\\\\Users\\\\86131\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dev\\\\sqflite-2.3.0\\\\","native_build":true,"dependencies":[]}],"macos":[{"name":"sqflite","path":"C:\\\\Users\\\\86131\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dev\\\\sqflite-2.3.0\\\\","native_build":true,"dependencies":[]}],"linux":[],"windows":[],"web":[]},"dependencyGraph":[{"name":"sqflite","dependencies":[]}],"date_created":"2023-10-18 08:09:25.525794","version":"3.13.3"} \ No newline at end of file diff --git a/src/.idea/dataSources/e0ede5d9-8294-4b67-a394-2fc6c7a89d03.xml b/src/.idea/dataSources/e0ede5d9-8294-4b67-a394-2fc6c7a89d03.xml deleted file mode 100644 index cc7fb29..0000000 --- a/src/.idea/dataSources/e0ede5d9-8294-4b67-a394-2fc6c7a89d03.xml +++ /dev/null @@ -1,1632 +0,0 @@ - - - - - 3.43.0 - - - 1 - - - - - - 1 - - - 1 - - - 1 - - - 1 - - - 1 - - - 1 - - - 1 - - - 1 - - - 1 - - - 1 - - - - window - - - 1 - - - 1 - - - 1 - - - - 1 - 1 - - - - - 1 - 1 - - - 1 - - - 1 - - - - - window - - - window - - - - - - 1 - 1 - - - 1 - 1 - - - 1 - - - window - - - - 1 - - - window - - - 1 - - - 1 - 1 - - - - - - 1 - - - 1 - - - window - - - 1 - - - 1 - - - 1 - - - 1 - - - 1 - - - 1 - - - 1 - 1 - - - 1 - - - 1 - - - 1 - 1 - - - window - 1 - - - window - 1 - - - 1 - 1 - - - 1 - 1 - - - 1 - - - 1 - - - 1 - 1 - - - 1 - 1 - - - 1 - 1 - - - 1 - - - 1 - - - 1 - 1 - - - window - - - window - - - - window - - - window - - - window - - - - 1 - - - 1 - - - 1 - - - 1 - - - 1 - - - - 1 - - - 1 - - - 1 - - - 1 - - - aggregate - - - 1 - - - - - - 1 - 1 - - - window - - - aggregate - - - 1 - 1 - - - window - - - 1 - - - aggregate - - - window - - - window - - - 1 - - - 1 - - - - - - - - window - - - 1 - - - 1 - - - 1 - - - 1 - 1 - - - - 1 - - - 1 - - - - - window - - - 1 - - - - - - 1 - - - window - - - 1 - - - - - 1 - - - 1 - - - 1 - - - 1 - - - 1 - - - - - 1 - - - - - 1 - - - - aggregate - - - - 1 - 1 - - - 1 - - - 1 - - - 1 - - - window - - - 1 - - - 1 - - - 1 - 1 - - - 1 - - - window - - - - 1 - - - 1 - - - 1 - - - 1 - - - 1 - - - 1 - 1 - - - 1 - - - 1 - - - aggregate - - - aggregate - - - 1 - - - - - - - - - - - - - -
-
-
-
-
- 1 -
- - R - - - 1 - - - 2 - - - R - - - 1 - - - 2 - - - R - - - 1 - - - R - - - 1 - - - R - - - 1 - - - R - - - 1 - - - R - - - 1 - - - R - - - 1 - - - R - - - 1 - - - 2 - - - R - - - 1 - - - R - - - 1 - - - 2 - - - R - - - 1 - - - R - - - R - - - 1 - - - R - - - 1 - - - R - - - R - - - R - - - 1 - - - 2 - - - R - - - 1 - - - 2 - - - 3 - - - R - - - R - - - 1 - - - R - - - 1 - - - R - - - 1 - - - R - - - 1 - - - R - - - 1 - - - R - - - R - - - R - - - R - - - R - - - R - - - R - - - 1 - - - R - - - R - - - 1 - - - 2 - - - R - - - 1 - - - R - - - 1 - - - R - - - 1 - - - R - - - R - - - 1 - - - R - - - 1 - - - 2 - - - R - - - 1 - - - R - - - R - - - 1 - - - 2 - - - R - - - 1 - - - 2 - - - R - - - 1 - - - R - - - R - - - 1 - - - 2 - - - R - - - 1 - - - 2 - - - 3 - - - R - - - 1 - - - 2 - - - R - - - 1 - - - R - - - R - - - 1 - - - 2 - - - R - - - 1 - - - R - - - R - - - 1 - - - R - - - 1 - - - 2 - - - R - - - R - - - R - - - 1 - - - 2 - - - R - - - 1 - - - R - - - R - - - R - - - R - - - 1 - - - 2 - - - R - - - 1 - - - R - - - R - - - 1 - - - 2 - - - R - - - 1 - - - 2 - - - 3 - - - R - - - R - - - 1 - - - R - - - 1 - - - 2 - - - R - - - 1 - - - 2 - - - 3 - - - R - - - 1 - - - 2 - - - R - - - 1 - - - R - - - 1 - - - 2 - - - 3 - - - R - - - 1 - - - 2 - - - R - - - 1 - - - R - - - 1 - - - R - - - 1 - - - 2 - - - R - - - 1 - - - 2 - - - R - - - 1 - - - R - - - 1 - - - R - - - 1 - - - R - - - 1 - - - R - - - 1 - - - 2 - - - R - - - 1 - - - 2 - - - R - - - 1 - - - R - - - 1 - - - 2 - - - R - - - R - - - 1 - - - R - - - 1 - - - R - - - R - - - 1 - - - R - - - 1 - - - 2 - - - R - - - 1 - - - R - - - 1 - - - 2 - - - R - - - 1 - - - R - - - 1 - - - 2 - - - R - - - 1 - - - R - - - 1 - - - R - - - 1 - - - R - - - 1 - - - 2 - - - R - - - 1 - - - 2 - - - R - - - 1 - - - 2 - - - R - - - R - - - R - - - 1 - - - 2 - - - R - - - 1 - - - 2 - - - R - - - R - - - 1 - - - R - - - 1 - - - R - - - 1 - - - R - - - R - - - 1 - - - R - - - R - - - 1 - - - 2 - - - 3 - - - R - - - 1 - - - 2 - - - R - - - 1 - - - R - - - 1 - - - 2 - - - R - - - 1 - - - 2 - - - R - - - R - - - R - - - 1 - - - R - - - 1 - - - 2 - - - R - - - 1 - - - 2 - - - R - - - 1 - - - R - - - 1 - - - R - - - 1 - - - R - - - R - - - 1 - - - R - - - 1 - - - R - - - 1 - - - 2 - - - R - - - R - - - R - - - 1 - - - R - - - 1 - - - R - - - 1 - - - R - - - 1 - - - 2 - - - R - - - R - - - 1 - - - 2 - - - 3 - - - R - - - 1 - - - 2 - - - 3 - - - R - - - 1 - - - R - - - 1 - - - R - - - 1 - - - R - - - 1 - - - R - - - R - - - 1 - - - 2 - - - R - - - 1 - - - R - - - R - - - 1 - - - 2 - - - R - - - 1 - - - R - - - 1 - - - R - - - 1 - - - 2 - - - R - - - 1 - - - R - - - R - - - 1 - - - R - - - 1 - - - R - - - 1 - - - R - - - 1 - - - R - - - 1 - - - 1 - INTEGER|0s - - - 2 - TEXT|0s - - - 3 - BOOLEAN|0s - - - AdminID - 1 - - - MuseumName - MuseumInfo - MuseumName - - - 1 - INTEGER|0s - - - 2 - TEXT|0s - - - 3 - TEXT|0s - - - 4 - TEXT|0s - - - CollectionID - 1 - - - MuseumName - MuseumInfo - MuseumName - - - 1 - INTEGER|0s - - - 2 - TEXT|0s - - - 3 - TEXT|0s - - - 4 - TEXT|0s - - - 5 - BLOB|0s - - - 6 - DATETIME|0s - - - PostID - 1 - - - MuseumName - MuseumInfo - MuseumName - - - 1 - TEXT|0s - - - 2 - TEXT|0s - - - 3 - TEXT|0s - - - 4 - TEXT|0s - - - 1 - MuseumName - - 1 - - - MuseumName - 1 - sqlite_autoindex_MuseumInfo_1 - - - 1 - INTEGER|0s - - - 2 - TEXT|0s - - - 3 - TEXT|0s - - - 4 - TEXT|0s - - - 5 - TEXT|0s - - - 6 - TEXT|0s - - - ServiceInfoID - 1 - - - MuseumName - MuseumInfo - MuseumName - - - 1 - TEXT|0s - - - 2 - TEXT|0s - - - 3 - TEXT|0s - - - 4 - INT|0s - - - 5 - TEXT|0s - - - \ No newline at end of file diff --git a/src/.idea/libraries/Dart_Packages.xml b/src/.idea/libraries/Dart_Packages.xml deleted file mode 100644 index ad60e0c..0000000 --- a/src/.idea/libraries/Dart_Packages.xml +++ /dev/null @@ -1,228 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/.idea/libraries/Flutter_Plugins.xml b/src/.idea/libraries/Flutter_Plugins.xml index c055131..b0f6971 100644 --- a/src/.idea/libraries/Flutter_Plugins.xml +++ b/src/.idea/libraries/Flutter_Plugins.xml @@ -1,8 +1,6 @@ - - - + diff --git a/src/android/travelguide_android.iml b/src/android/travelguide_android.iml index 370cb08..54cb696 100644 --- a/src/android/travelguide_android.iml +++ b/src/android/travelguide_android.iml @@ -26,6 +26,5 @@ - \ No newline at end of file diff --git a/src/lib/travelguideapp/ui/pages/MuseumInfoPage.dart b/src/lib/travelguideapp/ui/pages/MuseumInfoPage.dart index 3d89f89..e52c1ae 100644 --- a/src/lib/travelguideapp/ui/pages/MuseumInfoPage.dart +++ b/src/lib/travelguideapp/ui/pages/MuseumInfoPage.dart @@ -3,11 +3,9 @@ import 'CollectionListPage.dart'; import 'MapPage.dart'; import 'MuseumInfoExtendPage.dart'; import 'ServicePage.dart'; -<<<<<<< HEAD + import 'LoginPage.dart'; -======= ->>>>>>> b3e9191f62a63dd34a67b874f663f99b9537752c void main() { runApp(MaterialApp( home: MuseumInfoPage(), diff --git a/src/pubspec.lock b/src/pubspec.lock index 9e08085..d48afdd 100644 --- a/src/pubspec.lock +++ b/src/pubspec.lock @@ -41,14 +41,6 @@ packages: url: "https://pub.dev" source: hosted version: "1.17.2" - cupertino_icons: - dependency: "direct main" - description: - name: cupertino_icons - sha256: d57953e10f9f8327ce64a508a355f0b1ec902193f66288e8cb5070e7c47eeb2d - url: "https://pub.dev" - source: hosted - version: "1.0.6" fake_async: dependency: transitive description: @@ -108,7 +100,7 @@ packages: source: hosted version: "1.9.1" path: - dependency: "direct main" + dependency: transitive description: name: path sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917" diff --git a/src/pubspec.yaml b/src/pubspec.yaml index c2201c9..4c6c3f5 100644 --- a/src/pubspec.yaml +++ b/src/pubspec.yaml @@ -34,9 +34,7 @@ dependencies: # The following adds the Cupertino Icons font to your application. # Use with the CupertinoIcons class for iOS style icons. - cupertino_icons: ^1.0.2 - sqflite: ^2.3.0 - path: ^1.8.3 + dev_dependencies: flutter_test: diff --git a/src/travelguide.iml b/src/travelguide.iml index 49c08d0..3844432 100644 --- a/src/travelguide.iml +++ b/src/travelguide.iml @@ -9,7 +9,6 @@ - \ No newline at end of file