Commit Graph

197 Commits

Author SHA1 Message Date
4c525eb9d5 renamed imports 2022-05-18 14:50:12 +02:00
cde2f87473 Fixade snyggade till i loginpage 2022-05-18 14:40:02 +02:00
50a3d59445 Added favoritepage - not yet fullt working,
venue-class
2022-05-18 14:33:39 +02:00
7faf633b0c Merge pull request 'google_markers' (#14) from google_markers into master
Reviewed-on: #14
2022-05-18 13:48:59 +02:00
1c0e250036 push google_markers 2022-05-18 13:46:18 +02:00
3ec8f99248 added some changes 2022-05-18 13:43:21 +02:00
9a8e4a1a94 Merge pull request 'venue-page-update FA-icons and weather status text' (#13) from venue-page into master
Reviewed-on: #13
2022-05-18 13:40:56 +02:00
Adam Sundberg
5d07a72d45 minor change 2022-05-18 13:37:21 +02:00
7dfa42134d kommentera bort firebase 2022-05-18 13:35:38 +02:00
Adam Sundberg
1dbf5befed Fixed conflict 'pubspec.yaml' 2022-05-18 12:56:17 +02:00
Adam Sundberg
555e509a2b Design with dedicated FA-icons and text status 2022-05-18 12:41:38 +02:00
Shakir
48a1fbc766 Added ShadowMap widget 2022-05-17 18:07:41 +02:00
59861dcb05 pull from master 2022-05-17 12:19:23 +02:00
a3d96281b8 add plugin 2022-05-17 12:17:21 +02:00
96f31fa1df fix some problem 2022-05-17 12:11:50 +02:00
2c4c201b3d pull from master 2022-05-17 11:07:39 +02:00
8044ca4ca5 added som plugins and get user location function 2022-05-17 11:02:21 +02:00
0e1814d371 Merge pull request 'Merge Loginpage to master' (#9) from LoginPage into master
Reviewed-on: #9
2022-05-17 10:19:57 +02:00
d272d8a32b connected feedback to database 2022-05-17 10:15:35 +02:00
8f6ac6273c Merge branch 'master' of gitea.dsv.su.se:maze6343/pvt-project-google-maps into LoginPage
 Conflicts:
	.dart_tool/flutter_build/135902ccfd9441c8b100a2259407ace7/.filecache
	.dart_tool/flutter_build/135902ccfd9441c8b100a2259407ace7/app.dill
	.dart_tool/flutter_build/135902ccfd9441c8b100a2259407ace7/debug_ios_bundle_flutter_assets.stamp
	.dart_tool/flutter_build/135902ccfd9441c8b100a2259407ace7/flutter_assets.d
	.dart_tool/flutter_build/135902ccfd9441c8b100a2259407ace7/kernel_snapshot.d
	.dart_tool/flutter_build/135902ccfd9441c8b100a2259407ace7/kernel_snapshot.stamp
	.dart_tool/flutter_build/135902ccfd9441c8b100a2259407ace7/outputs.json
	.dart_tool/package_config.json
	.dart_tool/package_config_subset
	.flutter-plugins
	.flutter-plugins-dependencies
	.packages
	build/ios/Debug-iphonesimulator/App.framework/App
	build/ios/Debug-iphonesimulator/App.framework/_CodeSignature/CodeResources
	build/ios/Debug-iphonesimulator/App.framework/flutter_assets/AssetManifest.json
	build/ios/Debug-iphonesimulator/App.framework/flutter_assets/NOTICES.Z
	build/ios/Debug-iphonesimulator/App.framework/flutter_assets/kernel_blob.bin
	build/ios/Debug-iphonesimulator/Pods_Runner.framework/Pods_Runner
	build/ios/Debug-iphonesimulator/Pods_Runner.framework/_CodeSignature/CodeDirectory
	build/ios/Debug-iphonesimulator/Pods_Runner.framework/_CodeSignature/CodeRequirements-1
	build/ios/Debug-iphonesimulator/Runner.app/Frameworks/App.framework/App
	build/ios/Debug-iphonesimulator/Runner.app/Frameworks/App.framework/_CodeSignature/CodeResources
	build/ios/Debug-iphonesimulator/Runner.app/Frameworks/App.framework/flutter_assets/AssetManifest.json
	build/ios/Debug-iphonesimulator/Runner.app/Frameworks/App.framework/flutter_assets/NOTICES.Z
	build/ios/Debug-iphonesimulator/Runner.app/Frameworks/App.framework/flutter_assets/kernel_blob.bin
	build/ios/Debug-iphonesimulator/Runner.app/Runner
	build/ios/Debug-iphonesimulator/Runner.app/_CodeSignature/CodeResources
	build/ios/Debug-iphonesimulator/Runner.swiftmodule/x86_64-apple-ios-simulator.swiftmodule
	build/ios/Debug-iphonesimulator/google_maps_flutter/google_maps_flutter.framework/_CodeSignature/CodeDirectory
	build/ios/Debug-iphonesimulator/google_maps_flutter/google_maps_flutter.framework/_CodeSignature/CodeRequirements-1
	build/ios/Debug-iphonesimulator/google_maps_flutter/google_maps_flutter.framework/google_maps_flutter
	build/ios/iphonesimulator/Runner.app/Frameworks/App.framework/App
	build/ios/iphonesimulator/Runner.app/Frameworks/App.framework/_CodeSignature/CodeResources
	build/ios/iphonesimulator/Runner.app/Frameworks/App.framework/flutter_assets/AssetManifest.json
	build/ios/iphonesimulator/Runner.app/Frameworks/App.framework/flutter_assets/NOTICES.Z
	build/ios/iphonesimulator/Runner.app/Frameworks/App.framework/flutter_assets/kernel_blob.bin
	build/ios/iphonesimulator/Runner.app/Runner
	build/ios/iphonesimulator/Runner.app/_CodeSignature/CodeResources
	ios/Podfile.lock
	pubspec.lock
2022-05-17 08:59:36 +02:00
ef57648790 connected feedback to database 2022-05-17 08:53:44 +02:00
1f21467b9d Merge pull request 'Weather service' (#8) from venue-page into master
Reviewed-on: #8
2022-05-16 17:30:57 +02:00
3e0abe57b4 Merge branch 'master' into venue-page 2022-05-16 17:30:40 +02:00
Adam Sundberg
acb80a6d33 minor change for conflict 2022-05-16 17:28:01 +02:00
Adam Sundberg
bd41f97e13 Added support for fetching current weather 2022-05-16 17:14:37 +02:00
24e80a5812 Merge branch 'master' of gitea.dsv.su.se:maze6343/pvt-project-google-maps into google_markers 2022-05-16 13:41:08 +02:00
fed5edebbc update marker 2022-05-16 13:39:11 +02:00
a3a5c939b0 update marker 2022-05-16 13:38:48 +02:00
83e14e1d5b google_markers (#6)
Reviewed-on: #6
2022-05-16 11:36:25 +02:00
fb4fa23ce6 do merge 2022-05-16 11:34:33 +02:00
f033c16bd7 Merge branch 'master' into map-page 2022-05-16 11:29:26 +02:00
d6b1c31a2e added create account functionality, users will be added to database 2022-05-13 13:46:31 +02:00
327f48decd göra gitt pull 2022-05-12 20:10:42 +02:00
3fb16f52ff get data from json file 2022-05-12 20:09:08 +02:00
adamlindroth
19ab7e6c60 Lägger till CreateAccountPage 2022-05-12 13:43:28 +02:00
adamlindroth
a8428ad50f fixade dependencies 2022-05-12 13:32:50 +02:00
adamlindroth
15fc0bc7eb Merge med mårtens branch 2022-05-12 13:30:20 +02:00
adamlindroth
f04b853eed Untracked files 2022-05-12 11:44:52 +02:00
8b0995e389 added class user, updated loginpage 2022-05-12 11:07:34 +02:00
5cf8d57a3d added class user, updated loginpage 2022-05-12 11:05:14 +02:00
adamlindroth
5559a07af8 lade till google sign-in 2022-05-12 11:00:11 +02:00
66574fac77 Merge pull request 'Update 'lib/FeedbackPage.dart'' (#5) from nisa9769-patch-2 into master
Reviewed-on: #5
2022-05-11 16:51:40 +02:00
34827a36a9 Update 'lib/FeedbackPage.dart' 2022-05-11 16:51:13 +02:00
92d0664d51 Merge pull request 'lade till feedback fil' (#4) from nisa9769-patch-1 into master
Reviewed-on: #4
2022-05-11 16:47:09 +02:00
56bd3fbeee lade till feedback fil 2022-05-11 16:45:27 +02:00
3e28e9022a added class user, updated loginpage 2022-05-11 15:35:46 +02:00
3cf3a4bef3 create new branch markers 2022-05-11 10:16:31 +02:00
ddfa92c557 added filerna för att göra git pull 2022-05-10 12:32:09 +02:00
Adam Sundberg
92dd2491ce addition to gitignore 2022-05-10 12:00:13 +02:00
f74b039e71 Merge pull request 'LoginPage' (#3) from LoginPage into master
Reviewed-on: #3
2022-05-09 14:20:49 +02:00