78 Commits

Author SHA1 Message Date
Your Name
d0fdf613c0 new besttime 2022-05-12 11:43:21 +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
b923e8bfc6 added json parser method that uses jackson (an alternative to what we have) 2022-05-05 14:26:33 +02:00
ab394f94b8 added json parser method that uses jackson (an alternative to what we have) 2022-05-05 14:20:26 +02:00
9fbd9b7694 idea for method that would be useful to implement 2022-05-05 07:49:59 +02:00
c56b2c5847 An Idea 220504 16:45:08 2022-05-04 16:49:45 +02:00
73ab677eff Mainly added a new class to test API interaction. This time I've divided the previous code into methods. And some methods will take query filters as parameters. I see this as a potential starting point for creating more methods, for example one that is specifically returns all venue_names. 2022-05-04 15:47:35 +02:00
Arvin
71272c478a besttime api 2022-05-03 17:22:40 +02:00
Axel Davidsson
bbe41cd1db la till en ytterligare funktion i CafeController 2022-05-02 23:25:49 +02:00
Axel Davidsson
defe70d291 ändrat i strukturen, Dom heter cafe2 och review2 för att det blev strul med hur databasen automatiskt läser av klasserna. nån höll också på och editera i samma tabeller via nån annanstans, så blev knas 2022-05-02 22:29:04 +02:00
428126dd80 added Test_API_interaction class, and dependency for it. For now it only parses the response from http://localhost:8080/demo/all 2022-05-01 08:56:14 +02:00
51387fa550 added Test_API_interaction class, and dependency for it. For now it only parses the response from http://localhost:8080/demo/all 2022-05-01 08:46:50 +02:00
sabina
76f49aa23d added new file MainController.java - to handle HTTP requests 2022-04-27 16:58:28 +02:00
sabina
0d1362a2f7 added new file UserRepository.java - repository that holds user records 2022-04-27 16:53:26 +02:00
sabina
0a55c9cb17 added new file User.java - @Entity Model (DTO) 2022-04-27 16:44:48 +02:00
sabina
11f1657058 updated pom.xml 2022-04-27 16:36:42 +02:00
sabina
6ab1e0631d updated application.properties file 2022-04-27 16:27:16 +02:00
Arvin
167336ba8a controller class added to repo again 2022-04-26 09:59:41 +02:00
Arvin
cf291ba3aa Merge branch 'master' of https://gitea.dsv.su.se/arso9914/FikaAndFocus 2022-04-25 19:49:19 +02:00
sabina
75aee314e0 import RestController and GetMapping 2022-04-25 19:20:55 +02:00
Axel Davidsson
24f14a9a51 la till mariadb och sql i maven dependencies. skapa Database-class för test av läsa från databas 2022-04-25 19:08:17 +02:00