Ling, Alex
ba0ae11abd
Merge branch 'refactor/simpler-timings' into 'master'
...
Refactor/simpler timings
See merge request gk1623/drp-48!18
Co-authored-by: Barf-Vader <47476490+Barf-Vader@users.noreply.github.com >
2025-06-13 02:11:41 +00:00
Barf-Vader
e4a5641eeb
fix: pass style check
2025-06-13 03:06:00 +01:00
Barf-Vader
8be06bba8b
refactor: simpler timing inputs
2025-06-13 02:58:24 +01:00
07742ad405
fix: fix function for signups
2025-06-12 16:48:41 +01:00
Temesgen, Tadios
9882594551
Merge branch 'r-merge' into 'master'
...
merge: Merged r-merge into master
See merge request gk1623/drp-48!17
Co-authored-by: Caspar Jojo Asaam <caspar@Caspars-MacBook-Pro-6597.local >
Co-authored-by: Caspar Jojo Asaam <caspar@dyn3159-95.wlan.ic.ac.uk >
2025-06-12 15:33:48 +00:00
Caspar Jojo Asaam
950ab5193a
merge: Resolved merge conflicts
...
Co-Authored-By: Tadios Temesgen <tt2022@ic.ac.uk >
2025-06-12 16:21:20 +01:00
0c3d0a00b8
Merge branch 'logins' into 'master'
...
feat: logins and toggleable admin mode
See merge request gk1623/drp-48!15
2025-06-12 14:46:20 +00:00
788007c1cc
feat: complete logins
2025-06-12 15:42:29 +01:00
3bdee89eed
feat: initial logins
2025-06-12 15:42:29 +01:00
Caspar Jojo Asaam
30f44b0ac6
feat: Added current opening times to each study space on the main page. In the expanded card, you can view the opening times for the full week. Improved ui
...
Co-Authored-By: Tadios Temesgen <tt2022@ic.ac.uk >
2025-06-12 15:40:20 +01:00
Ling, Alex
b516196d38
Merge branch 'feat/feedback' into 'master'
...
Feat/feedback
See merge request gk1623/drp-48!13
Co-authored-by: Barf-Vader <47476490+Barf-Vader@users.noreply.github.com >
2025-06-12 14:34:35 +00:00
Barf-Vader
8a6f447202
fix: tag input now works
2025-06-12 15:30:32 +01:00
Barf-Vader
5b7f63f63f
feat: Added feedback feature
2025-06-12 15:30:32 +01:00
Caspar Jojo Asaam
afe7b3078d
feat: Added current opening times to each study space on the main page. In the expanded card, you can view the opening times for the full week. Improved ui
...
Co-Authored-By: Tadios Temesgen <tt2022@ic.ac.uk >
2025-06-12 14:59:22 +01:00
Caspar Jojo Asaam
7117f85ef7
feat: added migration for a study_space_hours table and allowed for the user to make time inputs when submitting a new space
...
Co-Authored-By: Tadios Temesgen <tt2022@ic.ac.uk >
2025-06-12 10:10:41 +01:00
Caspar Jojo Asaam
7c0f9b3f52
Merge branch 'fix/filter-by-tags' into 'master'
...
fix: Search bar on main page no longer overflows. Selected tags no longer...
See merge request gk1623/drp-48!14
Co-authored-by: TadiosT <tadios.temesgen@gmail.com >
2025-06-12 01:03:39 +00:00
TadiosT
8de3d9d48c
fix: Fixed type and style errors.
...
Co-Authored By: Caspar Asaam <caspar@dyn3159-95.wlan.ic.ac.uk >
2025-06-12 00:48:49 +01:00
TadiosT
2c8d7e00b5
fix: Search bar on main page no longer overflows. Selected tags no longer appear in dropdown. Can no longer filter by contradiction tags.
...
Co-Authored By: Caspar Asaam <caspar@dyn3159-95.wlan.ic.ac.uk >
2025-06-12 00:41:50 +01:00
ed2721ff4c
fix: re-enable typing in tag text box
2025-06-11 23:52:45 +01:00
Ling, Alex
c8eef97d99
Merge branch 'feat/admin-mode' into 'master'
...
Feat/admin mode
See merge request gk1623/drp-48!12
Co-authored-by: Barf-Vader <47476490+Barf-Vader@users.noreply.github.com >
Co-authored-by: Gleb Koval <gleb@koval.net >
2025-06-11 18:00:54 +00:00
Barf-Vader
8d3a21498f
fix: no longer can delete when deleting a report
2025-06-11 18:22:14 +01:00
Barf-Vader
6bae8bb361
feat: added edit button to admin mode
2025-06-11 18:06:04 +01:00
Barf-Vader
e7a7275af7
Merge remote-tracking branch 'origin/edit-mode' into feat/admin-mode
2025-06-11 17:57:18 +01:00
Barf-Vader
a33fba2cd6
feat: reports page
2025-06-11 17:56:45 +01:00
e2795ff257
feat: edit page
2025-06-11 17:53:55 +01:00
Temesgen, Tadios
2eceee2889
Merge branch 'feat/filter-by-tags' into 'master'
...
feat: Added filtering by optional tags in the main page. Created TagFilter...
See merge request gk1623/drp-48!10
Co-authored-by: TadiosT <tadios.temesgen@gmail.com >
2025-06-11 02:45:22 +00:00
TadiosT
348229691f
Merge branch 'feat/filter-by-tags' of https://gitlab.doc.ic.ac.uk/gk1623/drp-48 into feat/filter-by-tags
2025-06-11 03:40:34 +01:00
TadiosT
3d95ea3763
fix: Changed filteredStudySpaces from function to string[].
...
Co-Authored By: Caspar Asaam caspar@dyn3159-95.wlan.ic.ac.uk
2025-06-11 03:40:20 +01:00
Temesgen, Tadios
d7fcf9d9ff
Merge branch 'master' into 'feat/filter-by-tags'
...
# Conflicts:
# src/lib/index.ts
2025-06-11 02:30:09 +00:00
TadiosT
e9d6db605a
fix: Fix to filteredTags in main page. Removed use of TagFilter component.
...
Co-Authored By: Caspar Asaam <caspar@dyn3159-95.wlan.ic.ac.uk >
2025-06-11 03:22:19 +01:00
Ling, Alex
7971e996fe
Merge branch 'fix/overflow' into 'master'
...
Fix/overflow
See merge request gk1623/drp-48!11
Co-authored-by: Barf-Vader <47476490+Barf-Vader@users.noreply.github.com >
2025-06-11 00:11:09 +00:00
Barf-Vader
be921610f6
fix: overflow in report and space page
2025-06-11 01:06:39 +01:00
Barf-Vader
4ced9347bb
fix: actually fixed overwlow in SpaceCard
2025-06-11 00:56:56 +01:00
871891c842
Merge branch 'google-maps-integration' into 'master'
...
feat: google maps
See merge request gk1623/drp-48!9
2025-06-10 23:18:56 +00:00
af08bc663b
feat: add gmaps api key to CI
2025-06-11 00:14:02 +01:00
f7969432ec
fix(lint): remove unused marker
2025-06-11 00:14:02 +01:00
bd7f9bc991
feat: google maps
2025-06-11 00:14:02 +01:00
Ling, Alex
e68cc4e0ea
Merge branch 'feat/reports' into 'master'
...
feat: reports
See merge request gk1623/drp-48!8
Co-authored-by: Barf-Vader <47476490+Barf-Vader@users.noreply.github.com >
2025-06-10 23:11:10 +00:00
Barf-Vader
bdda39c7fe
refactor: added typing for props, fixed overflow
2025-06-11 00:03:29 +01:00
2b73fe13bd
feat: setup posthog for metrics (might or might not be useful)
2025-06-10 23:44:21 +01:00
Barf-Vader
4d8cffc726
fix: cant submit report while uploading
2025-06-10 18:30:09 +01:00
Barf-Vader
d982bf550e
feat: reports
2025-06-10 18:25:42 +01:00
TadiosT
5eb7a9f58c
feat: Centred the filtering bar in the main page.
...
Co-Authored By: Caspar Asaam <caspar@dyn3159-95.wlan.ic.ac.uk >
2025-06-10 15:00:12 +01:00
TadiosT
61da21b7db
fix: Style and type check changes.
...
Co-Authored By: Caspar Asaam <caspar@dyn3159-95.wlan.ic.ac.uk >
2025-06-10 05:45:29 +01:00
TadiosT
201467c73a
feat: Added filtering by compulsory tags and changed filtering logic.
...
Co-Authored By: Caspar Asaam <caspar@dyn3159-95.wlan.ic.ac.uk >
2025-06-10 05:37:52 +01:00
TadiosT
19d451fa8e
feat: Added filtering by optional tags in the main page. Created TagFilter component for modularisation.
...
Co-Authored By: Caspar Asaam <caspar@dyn3159-95.wlan.ic.ac.uk >
2025-06-10 05:24:15 +01:00
Ling, Alex
b727665238
Merge branch 'compulsory-tags' into 'master'
...
Compulsory tags
See merge request gk1623/drp-48!7
Co-authored-by: Barf-Vader <47476490+Barf-Vader@users.noreply.github.com >
2025-06-09 18:30:56 +00:00
Barf-Vader
6a9f5ca21d
refactor: Fixed minor typing issue with space
2025-06-09 19:26:57 +01:00
Barf-Vader
61915cd6a6
refactor: used a record for tag colouring
2025-06-09 19:16:55 +01:00
Barf-Vader
3cec498192
feat: added compulsory tags
2025-06-09 17:25:12 +01:00
