Commit graph

313 commits

Author SHA1 Message Date
kindtanton
40e4bf4fba Changed the way of concatinating strings in app.py 2019-12-06 12:48:37 +01:00
kindtanton
ee627b7dfa Plausible fix for internal server error when requesting the css 2019-12-06 12:32:51 +01:00
kindtanton
79c6195d42 merged 2019-12-05 21:10:45 +01:00
kindtanton
d34369df11 merged + added scss cache to gitignore 2019-12-05 20:38:07 +01:00
kindtanton
c5f82afc6a Created css for 'kerstmis' 2019-12-05 19:39:35 +01:00
Pieter-Jan Cassiman
a71f7434d1 Updated code to deal with dates that wrap around the new year 2019-12-05 19:19:36 +01:00
Pieter-Jan Cassiman
15f8f6c5d9 Updated theme dates 2019-12-05 19:19:03 +01:00
0d7b43705b
Remove seeds for legacy tables 2019-12-01 21:05:19 +01:00
ca199f4a3b
Add first version of the HLDS parser 2019-12-01 02:35:03 +01:00
kindtanton
c0936d5a45 Fix font-family variable
There was 1 quotation mark to much at the end of the font-family variable
which was causing some browsers to fall back to the default font face
-which was not the default font face of haldis.
2019-11-22 17:47:15 +01:00
Pieter-Jan Cassiman
204e1945da Added functionality to automatically choose the relevant seasonal theme 2019-11-22 12:22:25 +01:00
Pieter-Jan Cassiman
0b88c9b660 Added file for storing and parsing all themes 2019-11-22 12:21:46 +01:00
kindtanton
eb61d3286b Styled the home page for the christmas theme + little tweaks 2019-11-22 07:53:24 +01:00
kindtanton
608e708a1d Changed the way themes work. The client sends a cookie containing the theme which the server uses to send the correct css file. 2019-11-21 10:52:08 +01:00
mcbloch
da4e844946
add a nice font for the sint theme 2019-11-19 18:32:48 +01:00
kindtanton
cd47d05c16 Added 'sinterklaas' theme 2019-11-16 14:54:45 +01:00
Jan-Pieter Baert
7d2653ac42
Make it easier to distinguish orders from
their extra's
2019-10-31 11:11:52 +01:00
kindtanton
6e3e5e7fb5 added Halloween theme 2019-10-30 23:40:36 +01:00
kindtanton
8e4c9b789c Dark theme does not interfere with the light theme. Dark theme works for input fields and date picker. 2019-10-29 10:23:54 +01:00
kindtanton
dfa3a8bc9e color and ui fixes 2019-10-28 16:09:21 +01:00
Jan-Pieter Baert
38923abd3d
Remove error comparing str and int
Here the elif compares to 0, while username is a string, which causes
errors.
2019-10-28 13:51:50 +01:00
redfast00
ab97b3105b
Merge pull request #153 from KindtAnton/master
Dark theme users can toggle off darkmode + button color fix
2019-10-25 00:42:44 +02:00
kindtanton
d865cd1b79 Dark theme users can toggle off darkmode + button color fix 2019-10-24 16:15:35 +02:00
Maxime
9b1ae9069e
Merge pull request #152 from ZeusWPI/hotfix
Fix order_... renaming
2019-10-24 14:15:50 +02:00
Jan-Pieter Baert
a544836590
Fix order_... renaming 2019-10-24 14:13:13 +02:00
kindtanton
d670b4d247 Added dark mode 2019-10-24 13:50:51 +02:00
Jan-Pieter Baert
112cafecbb
Merge pull request #142 from ZeusWPI/fix-pylint-formatting
Fix pylint formatting for Haldis
2019-10-24 13:42:06 +02:00
Jan-Pieter Baert
b837ec8b5b
Remove the long extra confirmation
If people fuck it up it would be on their local system, only the sysadmin can fuck up the real haldis
2019-10-22 14:10:56 +02:00
Jan-Pieter Baert
8a0e6e3047
Merge branch 'master' into fix-pylint-formatting 2019-10-16 15:00:45 +02:00
39f30b55c7
Ignore case in database creation script 2019-10-03 14:53:03 +02:00
f41817a5dd
Disable webhook for testlocation, add test to seed 2019-10-03 14:53:02 +02:00
13b846461c
Eliminate third-party resources
Inline select2. Remove Roboto web font (just be happy about what the
system offers us, it's gonna be all right).
2019-10-03 14:52:59 +02:00
redfast00
dddf13454a
Merge pull request #146 from ZeusWPI/fix-hooks-for-real-now
Fix hooks for real now
2019-09-16 23:36:41 +02:00
redfast00
2a8634ecaf
Merge pull request #145 from ZeusWPI/fix-109
Fix #109
2019-09-16 23:18:48 +02:00
redfast00
e8294949da
Fix hooks for real now 2019-09-16 23:14:52 +02:00
redfast00
33d2575271
Merge pull request #144 from ZeusWPI/order-courier-delete-items
Allow courrier to delete item in order
2019-09-14 00:14:52 +02:00
Jan-Pieter Baert
f394fb7911
Fix unresolved merge conflict 2019-09-13 16:51:38 +02:00
redfast00
ea6202473b
Fix #109 2019-09-13 15:51:49 +02:00
0af72376a1
Increase line length limit to 100
Up from 80.
2019-09-12 20:53:26 +02:00
Jan-Pieter Baert
48641adf90
Fix pylint for Haldis 2019-09-12 20:53:25 +02:00
Jan-Pieter Baert
c4f9222558
Fix pylint for views and templates 2019-09-12 20:50:17 +02:00
Jan-Pieter Baert
ec82639c5c
Fix pylint for models files 2019-09-12 20:50:17 +02:00
Jan-Pieter Baert
d21f2d48f5
Fix pylint for database files 2019-09-12 20:50:15 +02:00
Jan-Pieter Baert
cff24dc096
Allow courrier to delete item in order 2019-09-12 18:42:29 +02:00
redfast00
69f98cde9e
Fix wsgi for server deploy 2019-09-11 22:47:06 +02:00
redfast00
5b2f6de323
Fix webhook not having app context 2019-09-11 22:38:01 +02:00
redfast00
5e2d5e659c
Convert forms to POST requests, fix euro filter, fix user close debt 2019-09-11 16:44:36 +02:00
redfast00
b12bcc882d
Make cookies more secure 2019-09-11 16:43:42 +02:00
redfast00
d75732fdcf
Fix db init script 2019-09-11 04:10:24 +02:00
Jan-Pieter Baert
c64e4bd998
Run black and isort on all code 2019-09-08 02:04:34 +02:00
Jan-Pieter Baert
15794b06b7
Add typing to general app files 2019-09-08 01:58:21 +02:00
Jan-Pieter Baert
b7fa92a22a
Add typing to view files 2019-09-08 01:34:16 +02:00
Jan-Pieter Baert
27cb10f745
Add typing to model files 2019-09-08 00:41:50 +02:00
Jan-Pieter Baert
51edd1bdc1
Add typing to database files 2019-09-07 15:05:24 +02:00
mcbloch
d591f846d8
add and run black formatter 2019-09-05 03:33:29 +02:00
mcbloch
f59ec75bea
forgot to remove the old endpoint 2019-09-05 03:25:17 +02:00
mcbloch
e660627249
move routes endpoint to debug blueprint 2019-09-04 17:18:11 +02:00
mcbloch
e5f16f7292
remove unneeded line 2019-09-03 15:01:44 +02:00
mcbloch
d254889f6d
remove old migrations, run via manager 2019-09-03 13:56:13 +02:00
mcbloch
ffa11a6a87
remove python 2, deprecated af 2019-08-31 00:50:01 +02:00
mcbloch
0538c9f984
remove author variables 2019-08-29 15:58:15 +02:00
mcbloch
d0863325a5
Restructuring the codebase!
But for real, it's a real shitstorm in there.
- Added context by making the init go through a function
  and not implicitly happen via imports
- Fixup all context and contextless function mixups
- splitup the models in sensible different files
- give the dump of view functions in views/__init__.py their own file
- add all routes via blueprints, not half of them
- move the slack notifications function and class to its own file,
    no idea what it was doing in a views file in the first place.
2019-08-28 03:46:04 +02:00
iepoev
d7d12f88c4 add stefanos script 2019-08-22 19:44:07 +02:00
redfast00
87903a6d4a
Add Fitchen script 2019-06-28 18:57:41 +02:00
Maxime
e9293f7947
Merge branch 'master' into feature/104/show-map-on-location-page 2019-05-31 17:15:40 +00:00
Maxime
5020556dcb
Merge pull request #121 from ZeusWPI/feature/order_items
add order items screen
2019-05-31 17:12:43 +00:00
mcbloch
ec9c034539 add media querries for side padding 2019-05-31 19:05:40 +02:00
Sammy Delanghe
94e0291c5a make setup script work on other debian - tiny css improvement 2019-05-31 01:07:01 +02:00
Tom Naessens
6327809bbd Merge branch 'master' into feature/104/show-map-on-location-page 2019-05-31 09:29:07 +12:00
Tom Naessens
7de4dbf5c4 Hide create order button when a user is not logged in 2019-05-31 09:27:44 +12:00
Tom Naessens
8e682f0216 Merge branch 'master' into feature/104/show-map-on-location-page 2019-05-31 09:22:26 +12:00
4e143b9b97
Merge pull request #124 from ZeusWPI/feature/120/order-button-on-location-page
Adds a button on the location/ and locations/ page to start a new order
2019-05-31 08:51:00 +12:00
Tom Naessens
41a289fb47 Add a small padding-top above location map for mobile devices 2019-05-30 19:40:17 +12:00
Maxime
3465742021
Merge pull request #122 from ZeusWPI/fix/Create-text-on-edit
fixed Create new order message on order edit
2019-05-30 08:58:22 +02:00
Tom Naessens
0619cef246 Some layouting 2019-05-30 18:46:28 +12:00
Tom Naessens
6e74e0e078 Cleaner layout 2019-05-30 18:36:56 +12:00
Tom Naessens
1f3c480967 Basic code, still needs some layout changes 2019-05-30 18:29:08 +12:00
Tom Naessens
2d4ad2a605 Adds a button on the location/ and locations/ page to start a new order at the given location #120 2019-05-30 14:10:47 +12:00
75f3b80acb
fixed Create new order message on order edit 2019-05-30 02:30:22 +02:00
mcbloch
2d9f7e7fc5 add extra order items screen, clickable div with shadow 2019-05-29 20:12:19 +02:00
mcbloch
02c9abe28c add location name to browser title 2019-05-29 18:02:55 +02:00
56ef2654a5
added open new tab on marker click 2019-05-29 15:48:38 +02:00
7555b9d65c
fixed poput location 2019-05-28 19:52:38 +02:00
Maxime
7802464c66
Merge pull request #113 from ZeusWPI/fix_map
Fix map
2019-04-30 17:28:50 +02:00
mcbloch
dd3fe26b86 add anchor so the marker points to the correct location 2019-04-06 19:31:04 +02:00
mcbloch
94fedf8097 Merge remote-tracking branch 'origin' into fix_map 2019-04-06 19:20:06 +02:00
mcbloch
31a731c1b8 do not query osm for 'None' locations 2019-04-06 19:05:52 +02:00
redfast00
909b3fc2e6
Remove Google Analytics 2019-04-05 23:31:36 +02:00
redfast00
b2c637b343
Serve own bootstrap 2019-04-05 23:26:57 +02:00
redfast00
34aca21a0b
Don't load over protocol-relative URI 2019-04-05 23:10:12 +02:00
mcbloch
83e4a10bbc fix big ass close order issue #107 2019-04-05 18:24:24 +02:00
mcbloch
a3f0dffc30 move script to separate js file, add loging for bad adresses 2019-04-04 20:41:43 +02:00
mcbloch
3a5f31bfac add database population script 2019-04-04 18:27:50 +02:00
Maxime
82d870e825
Merge pull request #95 from Kortika/feature/map
Feature/map
2019-04-04 17:51:00 +02:00
mcbloch
18c2008959 squash database migrations, update model to be equal to the server 2019-04-02 18:03:14 +02:00
Maxime
cd3e31d44b
Merge pull request #96 from ZeusWPI/date_time_update
Date time update. 
Update looks good, merging.
2019-04-01 23:41:08 +02:00
Kobe Mertens
c32f2ac387 improved formatting of prices 2019-02-16 21:03:56 +01:00
klaasgoethals
71e16064d3 Added startdate and starttime on order page 2019-02-15 19:03:35 +01:00
klaasgoethals
4322f620d7 Show stoptime AND countdown on home and order page 2019-02-15 16:47:02 +01:00
Sitt Min Oo
a472efad7c revert change to locations.html 2019-02-14 19:51:12 +01:00