Commit Graph

74 Commits

Author SHA1 Message Date
Barf-Vader
f48d457f5b refactor: more constrast, clearer favs 2025-06-16 18:00:15 +01:00
b8af5c8374 fix: put filter navigation buttons on the bottom 2025-06-16 16:03:46 +01:00
Barf-Vader
947bb35f93 fix: open now displays correct times 2025-06-15 14:49:44 +01:00
8af787c61c fix: fixed all-day timing submissions 2025-06-13 15:09:00 +01:00
Barf-Vader
764385d660 fix: removed non used imports 2025-06-13 14:18:05 +01:00
Barf-Vader
9bcd1788bf fix: removed console.log 2025-06-13 14:08:31 +01:00
Barf-Vader
37665bcb3a fix: timing 2025-06-13 14:08:31 +01:00
Barf-Vader
268392deed refactor: open timings 2025-06-13 14:07:59 +01:00
e96aeb2cfc Merge branch 'map-sorting' into 'master'
feat: map sorting and separate filter page

See merge request gk1623/drp-48!23
2025-06-13 12:57:01 +00:00
b22943968e fix: remove unused imports 2025-06-13 13:52:33 +01:00
Caspar Jojo Asaam
f9812b3391 Merge branch 'feat/directions' into 'master'
feat: Added feature to allow users to give directions for study spaces. These...

See merge request gk1623/drp-48!24

Co-authored-by: TadiosT <tadios.temesgen@gmail.com>
2025-06-13 12:48:49 +00:00
95c38c6f9f fix: signout without refresh 2025-06-13 13:32:54 +01:00
2ef9a63027 feat: map sorting and separate filter 2025-06-13 13:27:51 +01:00
TadiosT
602bf07d02 fix: fixed style and type check issues 2025-06-13 13:20:46 +01:00
TadiosT
f4517ef467 feat: Added feature to allow users to give directions for study spaces. These directions appear when you click on a study space.
Co-authored-by: Asaam, Caspar <caspar.asaam22@imperial.ac.uk>
2025-06-13 13:06:10 +01:00
Caspar Jojo Asaam
d767bc4fad fix: Fixed favourites to not show up when a user hasn't been logged in
Co-Authored-By: Tadios Temesgen <tt2022@ic.ac.uk>
2025-06-13 12:43:31 +01:00
ce6c391d81 feat: sort by location 2025-06-13 10:56:08 +01:00
Caspar Jojo Asaam
93b3bf23be fix: Fixed uploading study space error which subsequently fixes persistent favouriting now
Co-Authored-By: Tadios Temesgen <tt2022@ic.ac.uk>
2025-06-13 09:41:27 +01:00
Caspar Jojo Asaam
be04f2d869 feat: Implemented Favouriting for a user
Co-Authored-By: Tadios Temesgen <tt2022@ic.ac.uk>
2025-06-13 03:36:16 +01: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
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
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
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
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
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
Barf-Vader
be921610f6 fix: overflow in report and space page 2025-06-11 01:06:39 +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
2b73fe13bd feat: setup posthog for metrics (might or might not be useful) 2025-06-10 23:44:21 +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