Haldis/haldis
2
0
Fork 0
Code Issues 39 Pull requests Packages Projects Releases Wiki Activity
674 commits 9 branches 0 tags 3.9 MiB
Commit graph

461 commits

Author SHA1 Message Date
Midgard 02a82621b7
Improve footer: improve spacing, https URL 2021-07-24 17:51:26 +02:00
Midgard adcc0dd69e
Confine li spacing to .main 2021-07-24 17:51:26 +02:00
Midgard 4a96c0c286
Correct phone URL, add phone URL on location 2021-07-24 17:51:26 +02:00
Midgard e82742eb62
Remove pills introduced in previous commit 2021-07-24 17:51:26 +02:00
Midgard 16bd9243d4
Aggregate comments 2021-07-24 17:51:26 +02:00
Midgard 1ff8ceb521
Improve design 
Remove main CSS from shop view page. Make it theme independent and
maximize contrast.

Improve spacing in "add item" list.

Refactor old term "showcase" to "shop_view" in code.
 2021-07-24 17:51:25 +02:00
Midgard 58d270e582
HLDS: change :: to double space and require it 
Require double space before tags and price, like in the plain text
accounting format of ledger. This makes it easier to differentiate
between prices mentioned in descriptions and the price for the dish.
 2021-07-24 17:51:25 +02:00
Midgard 00cdc587b0
Add space at bottom in show view 
On big orders the bottom of the page was awkward.
 2021-07-24 17:51:25 +02:00
redfast00 90ea53d20e
Change komoot API from .de to .io 2021-07-24 17:45:19 +02:00
Midgard 65d6de21fa
Change no courier text from "No-one" to "no-one yet" 2021-06-19 01:00:22 +02:00
redfast00 fad23fbeda
Add option to download menus, make DB creation easier 2020-12-04 20:21:12 +01:00
redfast00 f5a8303362
Don't crash when the theme does not have any options 
Hotfix for prod, pushing straight to master
 2020-12-04 05:17:34 +01:00
Midgard 787669823c
Improve spacing between items in ordered dishes 2020-10-13 02:27:31 +02:00
Midgard 695331dd1a
Fix margin in ordered dishes, less bold 2020-10-13 02:18:43 +02:00
Midgard 342e94a7bf
Remove aligned price in menu and my_items 2020-10-13 02:10:45 +02:00
Midgard d3e6c1b08c
Use columns in order info faster, align prices in menu 2020-10-13 02:08:52 +02:00
Midgard c23a11bfdb
Fix flow quirks in "order information" section 2020-10-13 02:01:07 +02:00
Midgard 8cefb48768
Collapse other dishes, save expanded dish in hash 2020-10-13 01:42:03 +02:00
Midgard 17b3bc1c7a
Merge branch 'design' 2020-10-12 22:41:27 +02:00
Midgard 837dc682bc
Tweak UI a bit after demo 2020-10-12 22:40:27 +02:00
Midgard 6a052fae73
Take price of choice references into account 2020-09-26 01:10:37 +02:00
Midgard 9641435b64
Add norobot tag on order pages 2020-09-26 00:39:50 +02:00
Midgard 0ab0824913
Remove disused labels 2020-09-26 00:30:40 +02:00
Midgard 7856302028
Improve order menu design 2020-09-25 21:12:41 +02:00
Midgard a841be3c48
Complete menu migration to separate repo 2020-09-25 19:48:25 +02:00
Midgard 0b93307f1f
Fix mobile order page, show dish descriptions 2020-09-01 16:35:18 +02:00
Midgard 6651a8d513
Show less TODOs on order page 2020-09-01 16:26:29 +02:00
Midgard 8ccc508747
Tweak layout 2020-08-26 19:30:01 +02:00
Midgard f516ffe8c6
Don't crash when no user name 2020-08-26 19:30:00 +02:00
Midgard 1bea3d2fcc
Show stop date if needed, change to "add from favourites" 2020-08-26 19:30:00 +02:00
Midgard 48d67cbd89
Remove weird d from colours, add separate bg 2020-08-26 19:30:00 +02:00
Midgard f49952b4f2
Correct incorrect comment 2020-08-26 19:30:00 +02:00
Midgard 63ce1c5551
Show options for choices on location page 2020-08-26 19:30:00 +02:00
Midgard 65ed818875
Start redesign of order page 2020-08-26 19:29:59 +02:00
redfast00 b1f3d786e8
Remove print statements polluting our logs 2020-08-21 21:02:21 +02:00
Midgard cd67eab29b
Remove colons after some titles 
Some titles had a colon, some hadn't. Titles don't need colons.
 2020-08-08 15:43:58 +02:00
Midgard 7464ee4ea4
Improve order and order item admin views 2020-07-29 23:26:47 +02:00
Midgard f6753172ec
Polish the admin interface a bit 2020-07-29 23:14:57 +02:00
Midgard aa1cd97773
Revert "Remove admin view" 
This reverts commit a62e2bd9f7.
 2020-07-29 21:01:47 +02:00
Midgard 84957f3175
Fix theme on order items page 2020-07-24 12:42:39 +02:00
Midgard 65fa6441b1
Remove incorrect comment 
The comment says that mypy gives a "Missing return statement" but it
links to an issue on the mypy bug tracker about the same error message
reported after exhaustive enum matching. This is a completely different
situation, here the "Missing return statement" is warranted: this part
of the code is reachable so an explicit `return None` is wanted for this
function that returns an Optional.
 2020-07-18 23:50:49 +02:00
Midgard 67df1cebff
Update link to zeus.gent and https 2020-07-18 20:09:03 +02:00
Midgard 2d3ae10f90
Better document Passenger file to avoid surprises 2020-07-18 04:14:32 +02:00
Midgard 8a01e74323
Fix Passenger startup script 2020-07-18 03:58:42 +02:00
Midgard dc1596ee71
Fix shadowed variable name 2020-07-18 03:38:55 +02:00
Midgard ff57afca9a
Fix themes 2020-07-18 03:29:27 +02:00
Midgard 4f7ffc0e3d
Reformat with black 2020-07-17 11:40:15 +02:00
Midgard fd5b432837
Make Airbrake/Errbit support optional 2020-07-17 11:06:37 +02:00
Midgard d904f3c562
Make Airbrake optional 2020-07-17 10:42:16 +02:00
Midgard 6282eed349
Improve app.py 
It should always create and expose the app object for uWSGI.
 2020-07-17 10:24:57 +02:00
Midgard 5d6db78e6e
Strip newline from HLDS data version 2020-06-22 19:05:49 +02:00
Midgard 1fa38d08c6
Sort comments in order views 2020-03-10 18:39:11 +01:00
Midgard 289b36b918
Correct timer behaviour, reload when time up 2020-03-05 00:40:16 +01:00
Midgard aba8301758
Better condition for moving price to options 
There's no point in doing this for Ocean Garden's stuff that has a fixed
price.
 2020-03-04 22:56:45 +01:00
Midgard 0f9a816eea
Make choice updating after dish change smoother 2020-03-04 22:35:55 +01:00
Midgard 54dc1f23bf
Show choices immediately when changing dish 2020-03-04 22:07:33 +01:00
Midgard b8eb40e448
Add JSON representation for dish 2020-03-04 21:04:16 +01:00
Midgard f60c1d180c
Stub for choice selection 2020-03-03 16:21:01 +01:00
Midgard c52ba3b6d9
Stop parsing names at comment marker 2020-02-29 22:26:17 +01:00
Midgard a860998858
Add choices to location view 2020-02-29 22:26:00 +01:00
Midgard 45a110db23
Add price range on location view 2020-02-29 21:56:04 +01:00
Midgard f2112ec26d
Restore form field location 
Ugh, how did that happen
 2020-02-29 20:04:14 +01:00
Midgard 13097b8156
Remove GitHub buttons script include 
It has no purpose and is bad for privacy.
 2020-02-29 17:39:28 +01:00
Midgard 04a1f0acb1
Rename from .min.css to .css 
This file is not minified, so the .min.css is wrong.
Also remove the executable flag from some non-executable files.
 2020-02-29 17:38:25 +01:00
Midgard b44d34003d
Make whitespace match convention 
Convention according to our EditorConfig.
 2020-02-29 17:37:33 +01:00
Midgard 172d5d1e08
Fix dish change detection once and for all 2020-02-29 15:40:14 +01:00
Midgard aa331b6843
Fix error when anonymous name has accidentally been allowed to be None 2020-02-28 13:43:39 +01:00
Midgard bba3a0cd3a
Fix bug in ordering 2020-02-27 11:21:16 +01:00
Midgard d9685b00d9
Fix stats view 
Toss unused FatDish model.
 2020-02-26 21:33:41 +01:00
Midgard 729dab2ba4
Fix anonymous ordering and dish change 2020-02-26 21:25:51 +01:00
Midgard e15b085006
Add message about options appearing on submit 2020-02-26 20:16:50 +01:00
Midgard ccb034ef7f
Fix bug on anonymous order view 
Change to temporary message
 2020-02-26 18:10:09 +01:00
Midgard 2892a7dc25
Add no_text options 2020-02-25 19:09:28 +01:00
Midgard 646858aac3
Populate HLDS data version field 2020-02-25 17:51:53 +01:00
Midgard a62e2bd9f7
Remove admin view 2020-02-25 17:51:14 +01:00
Midgard 38e10257d2
Drop product ID migration 
Actually really really a lot of work and almost no benefit.
 2020-02-25 16:29:43 +01:00
Midgard e54a89e12c
Change telephone to phone 2020-02-24 21:04:57 +01:00
Midgard 0bfcf658db
Allow multiple spaces after attribute in location header 2020-02-24 18:33:59 +01:00
Midgard 2b962e99d4
Eliminate excessive whitespace in options 
These would show when editing the option by pressing backspace
 2020-02-24 14:33:43 +01:00
Midgard 6495184af2
Fix appearance of multiselect 2020-02-24 14:32:11 +01:00
Midgard b8ac141310
Fix mistake in dish change detection 
When the form is submitted, the URL has no dish parameter any more.
To fix this, add a hidden form field to say which dish the form was for.
 2020-02-24 14:20:36 +01:00
Midgard 94d4a403cb
Fix price of common choices being inflated 2020-02-24 00:58:35 +01:00
Midgard 13560b04cd
Take into account price of options 2020-02-24 00:42:24 +01:00
Midgard 1025ade758
Fix validation and saving for multi_choice, add price range 2020-02-24 00:31:14 +01:00
Midgard 513e495665
Add own logic and form elements 
Bypass WTForms and use manually written <select> and all that.
 2020-02-23 23:31:11 +01:00
Midgard f900c85931
Add form for choices, submitting fails 2020-02-21 18:38:30 +01:00
Midgard 91e76c2b45
Improve location view 2020-02-18 19:33:52 +01:00
Midgard 04fb06d187
Use order.location_name instead of order.location.name 2020-01-27 22:59:07 +01:00
Midgard 85f36a8fe4
Remove crippling downgrade code 2020-01-27 22:03:15 +01:00
Midgard 5049382bf1
Add proxy script: python modules are annoying 2020-01-27 19:36:27 +01:00
Midgard 2db02b9326
Parse incorrect attributes but semantic error 2020-01-27 19:15:24 +01:00
Midgard 6768a35808
Improve spacing on "ordered items" page 2020-01-27 05:32:59 +01:00
Midgard 0e779e59b9
Use order.is_closed() 2020-01-27 03:52:29 +01:00
Midgard aa63023383
Improve order items page and other stuff 2020-01-27 03:46:05 +01:00
Midgard 8ed38f178c
Fix and improve "ordered items" page 2020-01-27 03:01:49 +01:00
Midgard 6f24b52855
Make creating order and adding items work 2020-01-27 02:33:55 +01:00
Midgard 161a5031e5
Update location views 2020-01-27 00:57:51 +01:00
Midgard 3380d790bc
Store attributes directly on model instead of in map 2020-01-27 00:48:26 +01:00
Midgard b7cc2048d6
Forbid tags and price on choice blocks 2020-01-27 00:26:51 +01:00
Midgard fb9b0d7960
Rename "base" to "dish" 2020-01-26 23:51:29 +01:00