Commit Graph

  • 9e58beae1b added sabina's files StanislavAlpatiev 2022-05-16 11:46:04 +02:00
  • 9b41bcaeb8 added lollo's files StanislavAlpatiev 2022-05-16 11:38:47 +02:00
  • 471a036c8d added mareks files StanislavAlpatiev 2022-05-16 11:17:13 +02:00
  • 7746c957fb updated cafe.dart StanislavAlpatiev 2022-05-14 15:34:56 +02:00
  • 8ce1e97827 Revert "updated Cafe.dart to use a ListView Builder" Test StanislavAlpatiev 2022-05-14 14:38:21 +02:00
  • bd05e801ef Merge remote-tracking branch 'origin/Test' into Test Anton 2022-05-14 14:14:52 +02:00
  • ec78d714e9 updated Cafe.dart to use a ListView Builder StanislavAlpatiev 2022-05-14 12:57:21 +02:00
  • eee8f7f146 implemented cafe page structure and design StanislavAlpatiev 2022-05-14 12:14:15 +02:00
  • f9e3d92855 info window now shows up on google map. Anton 2022-05-14 01:29:44 +02:00
  • 9e2debf937 updated Bookmarks.dart sabina 2022-05-13 22:17:08 +02:00
  • cbad39282d implemented currentLocation as part of the bestTime query StanislavAlpatiev 2022-05-13 21:26:23 +02:00
  • 67a98512c9 removed 'previous arrow' in app bar for profile and favorite page StanislavAlpatiev 2022-05-13 20:46:27 +02:00
  • 1dff3e76b2 fixed visability bug with filter menu StanislavAlpatiev 2022-05-13 20:18:20 +02:00
  • 55dd59bbc5 implemented marker generation via filter menu StanislavAlpatiev 2022-05-13 18:04:05 +02:00
  • ffcdf4d9e2 hämtar från api med hjälp av filtret Axel Davidsson 2022-05-13 17:03:31 +02:00
  • 61c9175758 added permission requst before being able to use createMarkers() StanislavAlpatiev 2022-05-13 16:41:16 +02:00
  • 4960a377c9 updated Bookmarks.dart sabina 2022-05-13 14:42:14 +02:00
  • 5e447ca85f war file updated aswell Your Name 2022-05-13 13:54:56 +02:00
  • c69b9f6ba4 database for favourites created. need to add controllers for endpoints Your Name 2022-05-13 13:54:11 +02:00
  • 15121fc730 removed debug banner sabina 2022-05-13 12:41:39 +02:00
  • 1c5477c5e4 updated Bookmarks.dart sabina 2022-05-13 11:21:56 +02:00
  • 944da22e60 changed uri.parse source Anton 2022-05-13 09:47:56 +02:00
  • 2dfde338b9 new war file Your Name 2022-05-13 08:53:25 +02:00
  • 3230a5ffa0 just made markers take you to info page on tap Anton 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. Anton 2022-05-13 00:35:39 +02:00
  • 823df32859 skapat filterfönstret Axel Davidsson 2022-05-12 20:05:53 +02:00
  • 45632c12ed fixed backup route for markers so that it works with localhost StanislavAlpatiev 2022-05-12 18:57:04 +02:00
  • 9fa2bab47b added a backend for markers StanislavAlpatiev 2022-05-12 18:38:00 +02:00
  • b29228d83f added a backend for markers StanislavAlpatiev 2022-05-12 18:36:15 +02:00
  • f7181807ab updated Bookmarks.dart sabina 2022-05-12 17:16:27 +02:00
  • 5a7a25d603 changed cafe parameters again, loaded 49 cafes with info into database thru besttime api Your Name 2022-05-12 15:12:19 +02:00
  • 996a812a1b LogIn.dart, SignUp.dart design implementiation MarekMazur 2022-05-12 14:42:09 +02:00
  • 19699579ad Created a settings button and started to implement the sign out feature U-LAPTOP-2P102F0N\lollo 2022-05-12 13:13:29 +02:00
  • fefa2fd46c Merge remote-tracking branch 'origin/Test' into Test Your Name 2022-05-12 12:50:44 +02:00
  • df4de3547e changed cafe parameters Your Name 2022-05-12 12:49:40 +02:00
  • e85c1112d6 added a test comment StanislavAlpatiev 2022-05-12 12:20:49 +02:00
  • e1dfebf678 addid a new endpoint to backend StanislavAlpatiev 2022-05-12 12:17:07 +02:00
  • b593921480 LogIn.dart further color standardizing MarekMazur 2022-05-12 12:08:32 +02:00
  • f44063b3bd added APIDataloader class StanislavAlpatiev 2022-05-12 12:02:17 +02:00
  • 2abc14b5fe LogIn.dart final design for input boxes implemented, standardised colors MarekMazur 2022-05-12 11:58:44 +02:00
  • d0fdf613c0 new besttime jenkinstest Your Name 2022-05-12 11:43:21 +02:00
  • e12b0f61ed GoogleMapMarkerInfoWindow.dart added StanislavAlpatiev 2022-05-12 10:37:19 +02:00
  • ac58ce7c85 fixed package and imports for files in backend user folder StanislavAlpatiev 2022-05-12 08:15:25 +02:00
  • 11be370597 added more attributes to GoogleMapMarker class object StanislavAlpatiev 2022-05-11 21:55:25 +02:00
  • c79dfa3d63 added marker creation method in googleMap class StanislavAlpatiev 2022-05-11 20:09:02 +02:00
  • 234ff89af4 added marker creation method in googleMap class StanislavAlpatiev 2022-05-11 20:07:00 +02:00
  • 703d4664bf icons added, LogIn.dart design altered MarekMazur 2022-05-11 19:54:16 +02:00
  • 336b428e5a modified design LogIn.dart MarekMazur 2022-05-11 19:31:27 +02:00
  • 03be508b04 Worked with the design on menubar and profile U-LAPTOP-2P102F0N\lollo 2022-05-11 18:47:46 +02:00
  • 63f058c07d war fil Anton 2022-05-11 15:28:05 +02:00
  • 5c21ee5972 Merge remote-tracking branch 'origin/Test' into Test Anton 2022-05-11 14:25:35 +02:00
  • 934b81cc0c removed test files Anton 2022-05-11 14:19:49 +02:00
  • 3210bb6b73 Merge remote-tracking branch 'origin/Test' into Test MarekMazur 2022-05-11 13:54:00 +02:00
  • 3fe913ce8e added font_awesome dependency, small changes to LogIn.dart MarekMazur 2022-05-11 13:53:36 +02:00
  • 3fc14dfbcc ändrat strukturen, flyttat från mainController till UserController axeldav 2022-05-11 13:50:05 +02:00
  • fdf7605bc5 added Google font dependency MarekMazur 2022-05-11 13:07:17 +02:00
  • dd60c849c6 added farhads files StanislavAlpatiev 2022-05-11 11:56:22 +02:00
  • 42e2fa42b3 added farhads bookmark page StanislavAlpatiev 2022-05-11 11:09:36 +02:00
  • 00ffd477b3 trying to remove the .idea folder from branch StanislavAlpatiev 2022-05-10 19:56:31 +02:00
  • a2a7b2d7ce trying to remove the .idea folder from branch StanislavAlpatiev 2022-05-10 19:55:53 +02:00
  • c3cb2f9529 .gitignore stal5991 2022-05-10 19:54:52 +02:00
  • c4cd54be5c commented out maincontroller class to test if spring worked StanislavAlpatiev 2022-05-10 19:44:32 +02:00
  • 4dd6a6a727 fixed the package variables in farhads code so that it works in user folder StanislavAlpatiev 2022-05-10 19:30:49 +02:00
  • 395d211f40 added farhads files to backend user folder StanislavAlpatiev 2022-05-10 14:47:55 +02:00
  • a83b482cbb first commit StanislavAlpatiev 2022-05-10 14:08:47 +02:00
  • 5957478c09 ran mvnw package Anton 2022-05-10 12:10:28 +02:00
  • 60099d0bcb ran mvnw package Anton 2022-05-10 12:04:14 +02:00
  • 7c92ebedf4 ran mvnw package Anton 2022-05-10 11:56:23 +02:00
  • 43cc780dd9 now it seems that we know how to read current busyness Anton 2022-05-05 15:46:46 +02:00
  • 25ddbcf725 extracted venue name, lng, lat from json Arvin 2022-05-05 15:21:32 +02:00
  • 92ee35e82c how to get number of venues that json returns Anton 2022-05-05 15:11:40 +02:00
  • 41202f8fe3 a way to print venue names with jsonNode Anton 2022-05-05 14:50:14 +02:00
  • b923e8bfc6 added json parser method that uses jackson (an alternative to what we have) Anton 2022-05-05 14:26:33 +02:00
  • ab394f94b8 added json parser method that uses jackson (an alternative to what we have) Anton 2022-05-05 14:20:26 +02:00
  • 9fbd9b7694 idea for method that would be useful to implement Anton 2022-05-05 07:49:59 +02:00
  • c56b2c5847 An Idea 220504 16:45:08 Anton 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. Anton 2022-05-04 15:47:35 +02:00
  • 71272c478a besttime api Arvin 2022-05-03 17:22:40 +02:00
  • bbe41cd1db la till en ytterligare funktion i CafeController Axel Davidsson 2022-05-02 23:25:49 +02:00
  • 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 Axel Davidsson 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 Anton 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 Anton 2022-05-01 08:46:50 +02:00
  • 76f49aa23d added new file MainController.java - to handle HTTP requests sabina 2022-04-27 16:58:28 +02:00
  • 0d1362a2f7 added new file UserRepository.java - repository that holds user records sabina 2022-04-27 16:53:26 +02:00
  • 0a55c9cb17 added new file User.java - @Entity Model (DTO) sabina 2022-04-27 16:44:48 +02:00
  • 11f1657058 updated pom.xml sabina 2022-04-27 16:36:42 +02:00
  • 6ab1e0631d updated application.properties file sabina 2022-04-27 16:27:16 +02:00
  • 167336ba8a controller class added to repo again Arvin 2022-04-26 09:59:41 +02:00
  • cf291ba3aa Merge branch 'master' of https://gitea.dsv.su.se/arso9914/FikaAndFocus Arvin 2022-04-25 19:49:19 +02:00
  • 75aee314e0 import RestController and GetMapping sabina 2022-04-25 19:20:55 +02:00
  • 24f14a9a51 la till mariadb och sql i maven dependencies. skapa Database-class för test av läsa från databas Axel Davidsson 2022-04-25 19:08:17 +02:00
  • 957b980cae test axeldav 2022-04-16 20:56:41 +02:00
  • 28277e068a test Anton 2022-04-12 16:26:38 +02:00
  • 09ae1a841e test Anton 2022-04-12 16:24:53 +02:00
  • c5fc273c49 test Anton 2022-04-12 16:22:07 +02:00
  • 1aadc3014b test Anton 2022-04-12 16:20:23 +02:00
  • f53472efa4 Update 'pom.xml' arso9914 2022-04-11 16:15:09 +02:00
  • 5265571650 Update 'pom.xml' arso9914 2022-04-11 16:10:28 +02:00
  • d934025b72 Update 'pom.xml' arso9914 2022-04-11 16:04:16 +02:00
  • 45fd25066f Revert "back to java 8" Arvin 2022-04-11 16:03:07 +02:00