127 Commits

Author SHA1 Message Date
f952e53581 Cleaning 2022-06-01 13:10:04 +02:00
Adam Sundberg
664563df35 clean up, and a few tests 2022-06-01 12:49:49 +02:00
739bb5fc6e Final version? 2022-05-30 18:21:43 +02:00
defc482611 Final version? 2022-05-30 18:04:05 +02:00
6a8aa8c4e1 Merge remote-tracking branch 'origin/master' 2022-05-30 17:45:12 +02:00
5d1039d28b polished classes 2022-05-30 17:37:03 +02:00
fcc0e0c7c8 Added outdoorseatingarea with raw data from DB 2022-05-30 17:05:08 +02:00
a9fe97cae6 Merge branch 'master' of gitea.dsv.su.se:maze6343/pvt-project-google-maps into LoginPage
 Conflicts:
	.dart_tool/package_config.json
	.dart_tool/package_config_subset
	.flutter-plugins
	.flutter-plugins-dependencies
	.packages
	lib/ListViewPage.dart
	lib/Map.dart
	lib/login/signInPage.dart
	lib/venuePage.dart
	pubspec.lock
2022-05-30 16:10:30 +02:00
fefdd965b9 Added outdoorseatingarea with raw data from DB 2022-05-30 15:57:49 +02:00
c1c098ad66 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	lib/main.dart
2022-05-30 15:45:20 +02:00
Adam Sundberg
cd5495d4b5 minor edit 2022-05-30 15:29:22 +02:00
Adam Sundberg
5270b3ee81 change to modalBottomSheet 2022-05-30 15:22:51 +02:00
Adam Sundberg
95ba70c7f3 merge 2022-05-30 14:17:30 +02:00
Adam Sundberg
1f659c8913 New bottomsheet and venue features 2022-05-30 14:06:35 +02:00
5c428f8453 HomePage and Globals updated 2022-05-30 14:05:48 +02:00
3bac5c5c5c Merge remote-tracking branch 'origin/master' 2022-05-30 13:56:17 +02:00
2b6e2bb4ad HomePage and Globals updated 2022-05-30 13:42:12 +02:00
9f3b64c326 added test file 2022-05-30 13:40:53 +02:00
dce681c798 added ManageAccountPage_test.dart 2022-05-30 13:36:47 +02:00
cab9f25612 Merge pull request 'VenuInfo improved' (#49) from shas6395 into master
Reviewed-on: #49
2022-05-30 12:33:16 +02:00
fc045a6f87 VenuInfo improved 2022-05-30 12:29:25 +02:00
fec6bef35f Markers showing depending on camera location, encrypting passwords 2022-05-30 11:00:30 +02:00
7f3cefdadd Markers showing depending on camera location, encrypting passwords 2022-05-30 10:48:51 +02:00
Nikolina Sandstedt
7ebb64a08f hamburgarmenyn hade försvunnit, så lade till den igen 2022-05-28 05:29:15 +02:00
Nikolina Sandstedt
26beaa855c fixade så att användare navigeras direkt till kartan 2022-05-28 04:49:56 +02:00
Nikolina Sandstedt
51fe8f7eb2 ändrade så att användaren tas direkt till kartan istället för hemskärmen 2022-05-28 04:41:58 +02:00
475e036c7f VenuInfo blabla 2022-05-27 11:30:28 +02:00
c1178a7994 Merge branch 'master' of gitea.dsv.su.se:maze6343/pvt-project-google-maps into LoginPage
 Conflicts:
	.flutter-plugins-dependencies
	lib/Map.dart
	lib/venuePage.dart
2022-05-27 10:48:16 +02:00
Shakir
992b4be7d0 VenueInfo 2022-05-26 20:51:03 +02:00
38accf9553 Markers showing depending on camera location 2022-05-26 12:33:30 +02:00
Adam Sundberg
9f359b944e Fixes for conflicts 2022-05-26 11:21:45 +02:00
Adam Sundberg
c5455eb2aa Merge branch 'master' into venue-page
# Conflicts:
#	lib/ListViewPage.dart
#	lib/Map.dart
#	lib/main.dart
2022-05-26 10:59:59 +02:00
Adam Sundberg
0c0600c493 Added list view 2022-05-26 10:39:45 +02:00
4aa63a77ae complete ManageAccountPage 2022-05-25 22:15:41 +02:00
b5de86173e update ManageAccountPage 2022-05-25 21:53:51 +02:00
adamlindroth
9260520cb8 Fixade konflikter 2022-05-25 15:27:42 +02:00
adamlindroth
c65e9e24a1 Strul 2022-05-25 15:21:02 +02:00
adamlindroth
2c186f202b Färdigställt filterrutan 2022-05-25 15:06:45 +02:00
Adam Sundberg
d41908c203 Added functionality for navigation in the app 2022-05-25 14:03:24 +02:00
Nikolina Sandstedt
e872f91013 ändrade font i create login 2022-05-25 12:34:36 +02:00
Nikolina Sandstedt
929eba0d70 fixade knapp i feedback 2022-05-25 12:16:13 +02:00
Nikolina Sandstedt
bc9172d75a fixade problem med merge 2022-05-25 12:02:58 +02:00
adamlindroth
b51ee4156b Mergade med master 2022-05-25 11:55:49 +02:00
adamlindroth
7165a96a2e Lade till en filterknapp i appbar 2022-05-25 11:45:08 +02:00
Nikolina Sandstedt
6493f99658 la till 2022-05-25 11:44:43 +02:00
Nikolina Sandstedt
9509d7565d la till hamburgarmeny 2022-05-25 11:18:03 +02:00
Adam Sundberg
66efb8117a Added support to creating VenueObjects from data 2022-05-25 10:44:56 +02:00
d86af8d2ae implement ManageAccountPage 2022-05-24 21:40:46 +02:00
adamlindroth
6593498f2c gitignore fuckar 2022-05-24 16:47:34 +02:00
ecc446d44d Completed signin with gmail 2022-05-24 13:13:25 +02:00