Commit Graph

197 Commits

Author SHA1 Message Date
944da22e60 changed uri.parse source 2022-05-13 09:47:56 +02:00
Your Name
2dfde338b9 new war file 2022-05-13 08:53:25 +02:00
3230a5ffa0 just made markers take you to info page on tap 2022-05-13 00:40:35 +02:00
f6afe9494f info window that takes data from besttime, for now it just gets the rating and venue name that was already provided in the google map marker object. 2022-05-13 00:35:39 +02:00
Axel Davidsson
823df32859 skapat filterfönstret 2022-05-12 20:05:53 +02:00
StanislavAlpatiev
45632c12ed fixed backup route for markers so that it works with localhost 2022-05-12 18:57:04 +02:00
StanislavAlpatiev
9fa2bab47b added a backend for markers 2022-05-12 18:38:00 +02:00
StanislavAlpatiev
b29228d83f added a backend for markers 2022-05-12 18:36:15 +02:00
sabina
f7181807ab updated Bookmarks.dart 2022-05-12 17:16:27 +02:00
Your Name
5a7a25d603 changed cafe parameters again, loaded 49 cafes with info into database thru besttime api 2022-05-12 15:12:19 +02:00
MarekMazur
996a812a1b LogIn.dart, SignUp.dart design implementiation 2022-05-12 14:42:09 +02:00
U-LAPTOP-2P102F0N\lollo
19699579ad Created a settings button and started to implement the sign out feature 2022-05-12 13:13:29 +02:00
Your Name
fefa2fd46c Merge remote-tracking branch 'origin/Test' into Test
# Conflicts:
#	backend/src/main/java/com/dsv/pvt/fikafocus/cafe/CafeController.java
2022-05-12 12:50:44 +02:00
Your Name
df4de3547e changed cafe parameters 2022-05-12 12:49:40 +02:00
StanislavAlpatiev
e85c1112d6 added a test comment 2022-05-12 12:20:49 +02:00
StanislavAlpatiev
e1dfebf678 addid a new endpoint to backend 2022-05-12 12:17:07 +02:00
MarekMazur
b593921480 LogIn.dart further color standardizing 2022-05-12 12:08:32 +02:00
StanislavAlpatiev
f44063b3bd added APIDataloader class 2022-05-12 12:02:17 +02:00
MarekMazur
2abc14b5fe LogIn.dart final design for input boxes implemented, standardised colors 2022-05-12 11:58:44 +02:00
StanislavAlpatiev
e12b0f61ed GoogleMapMarkerInfoWindow.dart added 2022-05-12 10:37:19 +02:00
StanislavAlpatiev
ac58ce7c85 fixed package and imports for files in backend user folder 2022-05-12 08:15:25 +02:00
StanislavAlpatiev
11be370597 added more attributes to GoogleMapMarker class object 2022-05-11 21:55:25 +02:00
StanislavAlpatiev
c79dfa3d63 added marker creation method in googleMap class 2022-05-11 20:09:02 +02:00
StanislavAlpatiev
234ff89af4 added marker creation method in googleMap class 2022-05-11 20:07:00 +02:00
MarekMazur
703d4664bf icons added, LogIn.dart design altered 2022-05-11 19:54:16 +02:00
MarekMazur
336b428e5a modified design LogIn.dart 2022-05-11 19:31:27 +02:00
U-LAPTOP-2P102F0N\lollo
03be508b04 Worked with the design on menubar and profile 2022-05-11 18:47:46 +02:00
63f058c07d war fil 2022-05-11 15:28:05 +02:00
5c21ee5972 Merge remote-tracking branch 'origin/Test' into Test 2022-05-11 14:25:35 +02:00
934b81cc0c removed test files 2022-05-11 14:19:49 +02:00
MarekMazur
3210bb6b73 Merge remote-tracking branch 'origin/Test' into Test 2022-05-11 13:54:00 +02:00
MarekMazur
3fe913ce8e added font_awesome dependency, small changes to LogIn.dart 2022-05-11 13:53:36 +02:00
axeldav
3fc14dfbcc ändrat strukturen, flyttat från mainController till UserController 2022-05-11 13:50:05 +02:00
MarekMazur
fdf7605bc5 added Google font dependency 2022-05-11 13:07:17 +02:00
StanislavAlpatiev
dd60c849c6 added farhads files 2022-05-11 11:56:22 +02:00
StanislavAlpatiev
42e2fa42b3 added farhads bookmark page 2022-05-11 11:09:36 +02:00
StanislavAlpatiev
00ffd477b3 trying to remove the .idea folder from branch 2022-05-10 19:56:31 +02:00
StanislavAlpatiev
a2a7b2d7ce trying to remove the .idea folder from branch 2022-05-10 19:55:53 +02:00
c3cb2f9529 .gitignore
so that the .idea folder does not get pushed to our repo
2022-05-10 19:54:52 +02:00
StanislavAlpatiev
c4cd54be5c commented out maincontroller class to test if spring worked 2022-05-10 19:44:32 +02:00
StanislavAlpatiev
4dd6a6a727 fixed the package variables in farhads code so that it works in user folder 2022-05-10 19:30:49 +02:00
StanislavAlpatiev
395d211f40 added farhads files to backend user folder 2022-05-10 14:47:55 +02:00
StanislavAlpatiev
a83b482cbb first commit 2022-05-10 14:08:47 +02:00
5957478c09 ran mvnw package 2022-05-10 12:10:28 +02:00
60099d0bcb ran mvnw package 2022-05-10 12:04:14 +02:00
7c92ebedf4 ran mvnw package 2022-05-10 11:56:23 +02:00
43cc780dd9 now it seems that we know how to read current busyness 2022-05-05 15:46:46 +02:00
Arvin
25ddbcf725 extracted venue name, lng, lat from json 2022-05-05 15:21:32 +02:00
92ee35e82c how to get number of venues that json returns
basically: use findParents() to put entries/nodes into a list, and get list size()
2022-05-05 15:11:40 +02:00
41202f8fe3 a way to print venue names with jsonNode 2022-05-05 14:50:14 +02:00