Commit Graph

67 Commits

Author SHA1 Message Date
Ling, Alex
a2277a0c8b Merge branch 'realtime' into 'master'
feat: realtime updates for study spaces and reports

See merge request gk1623/drp-48!29

Co-authored-by: Gleb Koval <gleb@koval.net>
2025-06-16 20:29:27 +00:00
Barf-Vader
7d4e5bf4d1 fix:unbold 2025-06-16 18:04:08 +01:00
Barf-Vader
f48d457f5b refactor: more constrast, clearer favs 2025-06-16 18:00:15 +01:00
9399a653a3 feat: realtime updates for study spaces and reports 2025-06-16 17:08:11 +01:00
Temesgen, Tadios
ef157d4015 Merge branch 'fix/directions' into 'master'
fix: Added migrations for addition of direction column to study_spaces

See merge request gk1623/drp-48!26

Co-authored-by: TadiosT <tadios.temesgen@gmail.com>
2025-06-13 13:47:35 +00:00
TadiosT
958e6f61a4 fix: Added migrations for addition of direction column to study_spaces 2025-06-13 14:42:05 +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
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
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
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
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
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
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
Barf-Vader
4ced9347bb fix: actually fixed overwlow in SpaceCard 2025-06-11 00:56:56 +01:00
bd7f9bc991 feat: google maps 2025-06-11 00:14:02 +01:00
Barf-Vader
bdda39c7fe refactor: added typing for props, fixed overflow 2025-06-11 00:03:29 +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
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
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
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
6f798bc479 feat: display tags instead of description on main page 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
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
485063f8d2 feat: multi-image uploads 2025-06-05 17:47:08 +01:00
Barf-Vader
0e074e9301 feat: Added avaliable tags and tag column to table
Coauthored-by: gk1623
2025-06-05 17:38:49 +01:00
6e45851892 feat: carousel image display 2025-06-05 17:01:03 +01:00