Commit Graph

141 Commits

Author SHA1 Message Date
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
Barf-Vader
f6f09c8492 Added compulsory tags in db table 2025-06-09 15:02:00 +01:00
769a20607b fix: remove individual study (usually implicit) 2025-06-06 04:29:44 +01:00
b12076fc53 feat: add "crowded", "well lit", "poorly lit" tags 2025-06-06 04:27:17 +01:00
Temesgen, Tadios
822beb8708 Merge branch 'feat/upload-tags' into 'master'
feat: added tags on upload and view tweaked navbar

See merge request gk1623/drp-48!6

Co-authored-by: Gleb Koval <gleb@koval.net>
Co-authored-by: Barf-Vader <47476490+Barf-Vader@users.noreply.github.com>
2025-06-06 03:16:06 +00:00
6f798bc479 feat: display tags instead of description on main page 2025-06-06 04:11:22 +01:00
1f5054efbb feat: enter to select tag, and some fixes
fix: keep tag input focused on tag select (no delay hack)
fix: entire tag button clickable (padding within button rather than menu)
2025-06-06 04:11:22 +01:00
Barf-Vader
c4c8834d50 fix: added key to each block 2025-06-06 04:11:22 +01:00
Barf-Vader
e625afd3b4 feat: added tags on upload and view tweaked navbar 2025-06-06 04:11:22 +01:00
022d9089e0 fix: disallow duplicate creation
Contributes to #25
2025-06-06 03:26:15 +01:00
cf8d4725f7 fix: certain content can result in horizontal scroll 2025-06-06 03:25:02 +01:00
ebf33d47a2 Merge branch 'feat/multiple-images' into 'master'
feat: multi-image uploads

See merge request gk1623/drp-48!5
2025-06-05 16:53:16 +00:00