Commit Graph
69 Commits
Author SHA1 Message Date
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
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
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
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
davide 84f37a8780 Displaying if the deadline has passed 2018-12-01 17:24:12 +01:00
davide a60ce39974 Template uses flask login 2018-11-30 23:48:24 +01:00
davide 54787f68d5 Temportaty ugly hack 2018-11-30 23:47:22 +01:00
davide ab292c7b2e Capitalizing username 2018-11-30 23:43:23 +01:00
davide 63712eca1f Proper login 2018-11-30 23:26:38 +01:00
davide b12a9b90e0 Merge branch 'master' of git.elab.kth.se:davide/KUKapp 2018-11-30 22:42:37 +01:00
davide 59b6785121 Fixed some visuals 2018-11-30 22:42:05 +01:00
davide 049b0e66ba Correctly displaying stuff 2018-11-30 22:37:04 +01:00
davide 17428dffdf Merge branch 'master' of git.elab.kth.se:davide/KUKapp 2018-11-30 22:11:13 +01:00
davide 2cefc5e5fd Fixed date format. Added time. Corrected template 2018-11-30 22:11:00 +01:00
davide a24d793287 Some fixes and additions 2018-11-30 21:54:49 +01:00
davide 50c01cdf9d Merge branch 'master' of git.elab.kth.se:davide/KUKapp
# Conflicts:
#	kukv1.py
2018-11-30 20:57:11 +01:00
davide 0f6b449bf0 Calculating friendly timedelta string 2018-11-30 20:55:33 +01:00
davide 056de43a91 Querying upcoming meals 2018-11-30 20:18:03 +01:00
davide f91baa7d93 Minor style adjustments 2018-11-30 18:44:45 +01:00
davide e44d43af0e Major restyling. Now with better HTML and CSS practices! 2018-11-29 00:07:30 +01:00
davide 6c5b5e3432 Started meal list template 2018-11-28 21:34:36 +01:00
davide ff15cb81c1 Added test data 2018-11-28 21:34:09 +01:00
davide 8fc7a954ab Merge branch 'master' of git.elab.kth.se:davide/KUKapp 2018-11-28 21:19:25 +01:00
davide cdc6284d5c Fixed some styling 2018-11-28 21:18:28 +01:00
davide 60ae824f2a Converted to python 3 2018-11-20 14:09:53 +01:00
davide eb7b29f221 Messages now redirect after 3 seconds 2017-10-22 21:25:39 +02:00
davide 59e71e9e8b Added background color 2017-10-22 21:16:02 +02:00
davide 362ec8a147 Fixed cook picture 2017-10-22 20:21:42 +02:00
davide ecf2c9aadd Merged frontend 2017-10-08 18:35:38 +02:00
davide 8a9ab2bf99 Removed unnecessary parts 2017-10-08 18:01:19 +02:00
davide 65fcd3a6be Added confirmed check 2017-10-08 17:40:53 +02:00
davide f2c0b8c9c0 Added flask code example 2017-10-08 16:58:11 +02:00
davide f689d1acac Merge branch 'master' of https://github.com/exclamationMark/KUKapp 2017-10-08 16:56:25 +02:00
davide 319e0e9658 Added login function and user-dependent behavior 2017-10-08 16:55:46 +02:00