Commit Graph

320 Commits

Author SHA1 Message Date
787b28cc23 allow trip_type edit of trip 2023-05-03 16:51:37 +02:00
c9932b550b add faq route 2023-05-03 16:31:27 +02:00
Marie Birner
1f29779ede [TASK] layout trip_types and add onclick join msg javascript 2023-05-03 16:14:18 +02:00
Marie Birner
15644e8a0b Merge commit 'e5088bddb0ab694abac5f6d2ab2d76a5042e52bb' into feature/frontend-triptype
# Conflicts:
#	templates/index.html.tera
2023-05-03 15:26:41 +02:00
bb4dba7bc9 only allow guests to register for specific events; don't even show them the other trips 2023-04-29 18:57:01 +02:00
Philipp
a2a124d8c0 if clause forms add trip and add event 2023-04-28 22:12:13 +02:00
5421a3658d Merge branch 'feature/cancelation' into 'main'
Feature/cancelation

See merge request PhilippHofer/rot!6
2023-04-28 19:50:48 +00:00
2730687d97 Merge branch 'feature/input-labels' into 'main'
show input labels in default case

See merge request PhilippHofer/rot!8
2023-04-28 19:47:00 +00:00
29234e08af Update index.html.tera 2023-04-28 19:42:12 +00:00
Philipp
cb4d53c7f7 style delete button in admin view 2023-04-28 21:22:41 +02:00
0861d8b8d6 first draft of using trip types 2023-04-28 21:21:21 +02:00
Philipp
e51bd5882f show input labels in default case 2023-04-28 21:06:14 +02:00
Philipp
d6b0ce1603 show cancelation in sidebar 2023-04-28 20:46:46 +02:00
Philipp
cecf15320d show status of trip by adding icon and text 2023-04-28 20:22:46 +02:00
Philipp
cdebcefae8 show alert messages in admin view 2023-04-28 19:47:33 +02:00
Philipp
9baae98ecb show alert messages in admin view 2023-04-28 19:44:32 +02:00
ce8ea22190 Merge branch 'delete-user' into 'main'
allow 'deletion' of user

See merge request PhilippHofer/rot!2
2023-04-28 17:39:09 +00:00
Philipp
071f88c9a7 change header message box sidebar 2023-04-28 19:35:21 +02:00
Philipp
9384c78f42 change header message box sidebar 2023-04-28 19:33:56 +02:00
055c330a3e allow 'deletion' of user 2023-04-28 19:29:20 +02:00
Philipp
1e29fab4d1 fix divider visual bug between events and trips 2023-04-28 19:27:36 +02:00
Philipp
62617b4b42 show if_guest next to name change color 2023-04-28 19:16:15 +02:00
Philipp
ed684a0ff5 show if_guest next to name 2023-04-28 19:04:35 +02:00
Philipp
a8dbf6b025 add missing sidebar 2023-04-28 18:55:51 +02:00
Philipp
7950b23c49 TASK improve structure index file 2023-04-28 18:35:42 +02:00
d535d241e4 more clear about how many rowers should be added 2023-04-21 21:12:27 +02:00
55ca9a5c15 add optional min=0 field; add time for starting time 2023-04-18 21:41:16 +02:00
b50d546a5c show how many people can join trip, even if no one is registered yet 2023-04-18 11:09:14 +02:00
57750620b0 add example of time format 2023-04-18 11:06:29 +02:00
30c7637693 make 'Steuern' gray if already enough cox enrolled 2023-04-17 19:37:21 +02:00
ac534cf690 make 'Steuern' gray if already enough cox enrolled 2023-04-17 19:34:22 +02:00
d9bb190301 be more precise with cox_needed 2023-04-17 19:21:19 +02:00
Marie Birner
1e9f3a74fb [BUGFIX] favicon & title tag head 2023-04-13 21:27:05 +02:00
Marie Birner
5a40f8ebd6 [BUGFIX] layout shift after filterung 2023-04-10 23:10:24 +02:00
Marie Birner
25a27b492c [WIP] filter btns session storage 2023-04-10 22:42:00 +02:00
Marie Birner
504192e5f2 [TASK] improve functionality cox_needed filter 2023-04-10 15:00:25 +02:00
Marie Birner
2112d2bdae [BUGFIX] refactor buttons 2023-04-09 19:03:04 +02:00
Marie Birner
e7a4b2e8b9 [TASK] refactor sidebar close btn 2023-04-08 09:24:36 +02:00
Marie Birner
d8049dd1e6 [TASK] refactor sidebar 2023-04-08 09:17:46 +02:00
Marie Birner
f1c812b436 [TASK] refactor sidebar 2023-04-08 09:14:48 +02:00
Marie Birner
276e2fae88 [BUGIFX] edit trip styling 2023-04-08 07:44:31 +02:00
Marie Birner
8f5c0f1b05 [BUGFIX] rounded is_cox add trip 2023-04-08 07:33:32 +02:00
Marie Birner
41ee9f05d6 [TASK] change card layout 2023-04-08 07:29:39 +02:00
Marie Birner
f2df222f89 [TASK] add filter and change aria-pressed style button 2023-04-07 21:59:25 +02:00
Marie Birner
e8799e5766 [TASK] style edit form trip 2023-04-07 21:30:55 +02:00
712f47c7ff enable date-locale feature; update dependencies 2023-04-07 20:51:10 +02:00
Marie Birner
fb6dee0fcc [TASK] add day of week 2023-04-07 12:46:21 +02:00
Marie Birner
bca65e15c6 Merge commit '769bc7f1770230a51896073ee440f7f68b8e51be' 2023-04-07 12:37:58 +02:00
Marie Birner
69c7eebd54 [WIP] filter btn cox list view 2023-04-07 12:37:33 +02:00
0b961ca1b8 merge 2023-04-07 11:58:00 +02:00
1d03dd59b2 allow cox to edit own trips 2023-04-07 11:54:56 +02:00
Marie Birner
3b04cdc5ca [BUGFIX] hide forms if not used 2023-04-07 11:39:23 +02:00
Marie Birner
9303d5ce3d Merge commit 'eeb7af4fc10b76f6d606c6290f86c6971a189ae6'
# Conflicts:
#	templates/index.html.tera
2023-04-07 11:37:48 +02:00
Marie Birner
2d75e7696d [TASK] refactor sidebar forms (reduced size dramatically) 2023-04-07 11:35:39 +02:00
eeb7af4fc1 only show delete_trip button when no one is registered 2023-04-07 11:17:25 +02:00
3f9d5bb4c7 allow trip to be deleted if noone has registered yet 2023-04-07 11:16:39 +02:00
Marie Birner
5e4df13289 [TASK] refactor list in sidebar (cox, rower) 2023-04-07 10:39:15 +02:00
Marie Birner
7190e14c2f [TASK] refactor alert messages 2023-04-07 09:57:38 +02:00
Marie Birner
1490b191af [TASK] refactor code and add base css components 2023-04-07 09:44:08 +02:00
Marie Birner
0ee9967d3a [TASK] improve styling list view 2023-04-07 08:57:18 +02:00
Marie Birner
10f7869a3f [TASK] rm buttons classes register / deregister 2023-04-07 08:21:17 +02:00
Marie Birner
fe69ea670e [BUGFIX] checkboxes name 2023-04-06 22:13:00 +02:00
Marie Birner
484e4e4175 Merge commit '4d49574ebb9565523acf16853be3d4922f2a6e63' 2023-04-06 20:29:50 +02:00
Marie Birner
c775193721 [BUGFIX] checkboxes name 2023-04-06 20:29:33 +02:00
4d49574ebb add cox_needed attribute 2023-04-06 20:08:58 +02:00
12672917bb hide register button when necessary 2023-04-06 19:53:22 +02:00
57fac61931 Merge branch 'main' of gitlab.com:PhilippHofer/rot 2023-04-06 19:21:49 +02:00
5aa1deb323 use helper variable to compute amount of needed cox 2023-04-06 19:21:40 +02:00
Marie Birner
ebbfc5a828 [BUGFIX] link back to list view from admin interface 2023-04-06 19:12:36 +02:00
Marie Birner
34746b100d [TASK] admin user interface replace checkbox with macros checkbox 2023-04-06 18:40:23 +02:00
Marie Birner
d721303b9e [BUGFIX] Mobile Breakpoint: Add user broken user admin interface 2023-04-06 18:30:02 +02:00
Marie Birner
7156e38d6c [TASK] widen container 2023-04-06 18:20:02 +02:00
Marie Birner
9a41614922 [TASK] rm required from password field login 2023-04-06 18:19:42 +02:00
Marie Birner
ecab5b4fc6 [TASK] style planned events and sidebar forms 2023-04-06 17:54:08 +02:00
d5d55909ff fix typo 2023-04-06 14:05:55 +02:00
Marie Birner
735bcdd30d [TASK] styling password reset page 2023-04-06 13:56:48 +02:00
Marie Birner
4ac18e954a [TASK] styling user / cox / admin 2023-04-06 13:50:32 +02:00
Marie Birner
039bf9d922 [TASK] styling user / cox / admin 2023-04-06 13:47:52 +02:00
Marie Birner
abb82ceb5a [TASK] add overlays sidebar 2023-04-06 13:15:40 +02:00
Marie Birner
5f82b8a786 [TASK] add footer and make app mobile compatible 2023-04-06 11:00:44 +02:00
Marie Birner
9c42f99f11 [TASK] add amount of filter results to search 2023-04-06 10:45:33 +02:00
Marie Birner
8105693b27 [TASK] implement search on user interface 2023-04-06 10:27:04 +02:00
Marie Birner
d04dde15da [TASK] add header 2023-04-06 09:30:43 +02:00
Marie Birner
0e7c03a2b2 [WIP] list view 2023-04-05 22:35:52 +02:00
051d20e627 wording 2023-04-05 22:28:11 +02:00
Marie Birner
563c5e1bbb [TASK] styling login & user admin interface 2023-04-05 22:20:12 +02:00
f609ee1cb4 allow admin to create user 2023-04-05 20:56:36 +02:00
Marie Birner
602da85abe [TASK] add frontend process and basic files 2023-04-05 19:33:31 +02:00
727e6257d2 use new struct 2023-04-05 17:27:42 +02:00
f7c7f9aaf8 show registration time for rowers 2023-04-05 17:25:22 +02:00
21b87f9471 cox always see full year 2023-04-04 15:42:26 +02:00
476c4db255 allow to show full year 2023-04-04 15:38:47 +02:00
cedaba5709 push 2023-04-04 15:16:21 +02:00
3d907487a1 add planned_trip functionality 2023-04-04 12:19:56 +02:00
3dfc64071c finish admin tasks 2023-04-04 10:44:14 +02:00
303624ab83 show name of loggedin_user; add logout functionality 2023-04-03 22:10:12 +02:00
d50f3d9746 start working on auth 2023-04-03 16:11:26 +02:00
f01b073654 clean repo 2023-03-26 13:59:48 +02:00
Marie Birner
a166b73ebe [TASK] add favicon 2023-03-25 14:33:22 +01:00
cde862f97f always use your own name for registrations; except if the user has the add_different_user permission 2023-03-23 11:13:19 +01:00
3d2289763d don't show name on new trip creation 2023-03-14 19:24:20 +01:00
48c9a481cc push 2023-03-14 16:49:32 +01:00
c79a342ce8 push 2023-03-14 14:00:53 +01:00
d586cda61b properly format time 2023-03-12 13:41:09 +01:00
273676ff54 rephrase to 'Abmelden'; allow for cox as well 2023-03-12 13:32:42 +01:00
b86d80c3dd fix failed merge.... 2023-03-12 13:21:23 +01:00
Philipp
ec87d101e1 sort rowsers by registratoin datetime 2023-03-05 16:35:58 +01:00
02cd893370 rebase 2023-03-05 16:33:02 +01:00
ff36557a60 switch to datetime (instead of string) + show proper timezone 2023-03-04 13:36:36 +01:00
Marie Birner
68c3628e61 Merge branch 'frontend'
# Conflicts:
#	templates/base.html.tera
2023-03-04 11:43:28 +01:00
Marie Birner
30121e7d48 [DRAFT] first skin, add local font DejaVu Sans 2023-03-04 11:39:10 +01:00
2cc9b12674 switch to beautiful unicode-icons 2023-03-04 10:56:34 +01:00
edf59251d0 allow deleting registrations 2023-02-16 13:47:51 +01:00
306ae13467 add flash 2023-02-16 11:59:01 +01:00
6e54b29288 final touches 2023-02-16 11:26:41 +01:00
432962f5a9 push 2023-02-09 17:08:07 +01:00
9a72413934 Push 2023-02-09 15:29:44 +01:00
5200150828 push 2023-02-09 12:16:04 +01:00
1934fef0dd finish day CRU 2023-02-08 22:02:17 +01:00
9fd0481f73 initial push 2023-02-08 16:25:06 +01:00