Commit Graph
122 Commits
Author SHA1 Message Date
davide 972461dab4 Merge branch 'master' of git.elab.kth.se:davide/KUKapp 2019-01-26 17:10:58 +01:00
davide 680be19b07 Started plan_meal function 2019-01-23 08:38:08 +01:00
davide f20243b247 Added pattern checking for deadline 2019-01-23 08:37:38 +01:00
marek 574e3114fa backendpoint for planing a new meal. Not particularily tested with a proper POST form though so use with care. 2018-12-15 19:44:15 +01:00
marek 18d8d2ede9 Merge branch 'master' of https://git.elab.kth.se/davide/KUKapp 2018-12-15 19:18:21 +01:00
marek 259961da6e adding me to meals 2018-12-15 19:18:09 +01:00
davide baeed56490 Merge branch 'master' of git.elab.kth.se:davide/KUKapp 2018-12-15 19:13:54 +01:00
davide b1d8323c30 IMPORTANT REFACTOR 2018-12-15 19:13:40 +01:00
marek 1061b7c08e Merge branch 'master' of https://git.elab.kth.se/davide/KUKapp 2018-12-15 19:04:31 +01:00
marek 77ecebc9c7 fixed "add me" on meal view page 2018-12-15 19:04:19 +01:00
davide d0ff0ceb46 I just fixed it 2018-12-15 19:03:07 +01:00
davide 37ee3a1611 Fixed confirmed cook size 2018-12-15 18:56:08 +01:00
davide 616840676f Merge branch 'master' of git.elab.kth.se:davide/KUKapp 2018-12-15 18:51:19 +01:00
davide fcbc47b3ae Fixed get estimated kuk 2018-12-15 18:50:56 +01:00
davide b535de925c Fixed ginormous user thumbnail 2018-12-15 18:50:11 +01:00
marek 0829704105 Merge branch 'master' of https://git.elab.kth.se/davide/KUKapp 2018-12-15 18:36:52 +01:00
marek 25024433a4 endpoint for removing me from meal 2018-12-15 18:36:22 +01:00
davide fd94641203 Added 'can join until' 2018-12-15 18:25:11 +01:00
davide fa7fcbb337 Merge branch 'master' of git.elab.kth.se:davide/KUKapp 2018-12-15 18:24:38 +01:00
davide ba5e35993d Implemented get kuk candidate 2018-12-15 18:24:26 +01:00
davide 64396c29d8 Implemented apply temp meal 2018-12-15 18:16:36 +01:00
davide 7cf3580844 Two different user search mode 2018-12-15 18:15:57 +01:00
davide e3bfe39695 Fetching is_lazy 2018-12-15 18:13:36 +01:00
davide 1e6137370e Differentiating between user search modes. Small fixes. 2018-12-15 18:12:49 +01:00
davide 1f5b4cedfd Fixed some styling 2018-12-15 18:11:42 +01:00
marek ce75733204 made app not crash when trying to plan a meal without being logged in 2018-12-15 17:43:46 +01:00
davide 68ef11a2b0 Updated point array 2018-12-15 17:32:58 +01:00
davide 423c8f227f Removed extra ahmed 2018-12-05 12:37:49 +01:00
davide d174707e21 Meal planner template 2018-12-05 12:25:53 +01:00
davide 36e16c511b Javascript for the meal planner page 2018-12-05 12:25:28 +01:00
davide 95dc07d1e7 Added get kuk candidate endpoint. Behaviour still to implement 2018-12-05 12:25:14 +01:00
davide 78a62e20b9 Some styling for meal plannes 2018-12-04 17:37:33 +01:00
davide 181214c5c6 Added mealplanner and searchuser endpoint 2018-12-04 17:36:58 +01:00
davide 5f7b38b839 Changed endpoint name 2018-12-04 17:36:21 +01:00
davide 7441ee742b Removed unnecessary file 2018-12-02 15:10:03 +01:00
davide 8d596a55ab Added view meal history button 2018-12-02 15:09:52 +01:00
davide 2d1afdc721 Sensibl file renaming 2018-12-02 14:57:31 +01:00
davide 6df0ac3dfc Small template fix 2018-12-02 14:54:05 +01:00
davide 50c03e582b Capitalizing username 2018-12-02 14:46:47 +01:00
davide 3853c6aeb3 Adapted view meal page to newer backend 2018-12-02 14:46:30 +01:00
davide 1e0668ad77 Added view meal endpoint 2018-12-02 14:46:00 +01:00
davide cdd6d2f1e3 English 2018-12-02 14:09:14 +01:00
davide faaf3828a1 Included meal id in get upcoming meals query 2018-12-02 14:07:31 +01:00
davide 6c691e1aae Checking if user is already eating 2018-12-01 19:38:16 +01:00
davide 89c27077fd Asking for confirmation on past meals 2018-12-01 19:38:00 +01:00
davide a0fa4a9d4d Same as before 2018-12-01 18:25:19 +01:00
davide 0b760577c6 Preserving datetime objects in upcoming meals passed to template 2018-12-01 18:25:08 +01:00
davide 22f997b15c Removed user 0 from leaderbpard 2018-12-01 18:14:01 +01:00
davide c2c3b2b4cb Added plan meal button 2018-12-01 18:11:31 +01:00
davide 8abd54e9d2 Main page does not require login. Fixed login redirection 2018-12-01 17:37:33 +01:00