Ling, Alex
02c8b25b94
Merge branch 'refactor/favs' into 'master'
...
refactor: more constrast, clearer favs
See merge request gk1623/drp-48!30
Co-authored-by: Barf-Vader <47476490+Barf-Vader@users.noreply.github.com >
2025-06-16 17:08:28 +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
Ling, Alex
7332c0376b
Merge branch 'fix-filter-buttons' into 'master'
...
fix: put filter navigation buttons on the bottom
See merge request gk1623/drp-48!28
Co-authored-by: Gleb Koval <gleb@koval.net >
2025-06-16 15:44:44 +00:00
b8af5c8374
fix: put filter navigation buttons on the bottom
2025-06-16 16:03:46 +01:00
Ling, Alex
bfb361c82a
Merge branch 'fix/open-now' into 'master'
...
fix: open now displays correct times
See merge request gk1623/drp-48!27
Co-authored-by: Barf-Vader <47476490+Barf-Vader@users.noreply.github.com >
2025-06-15 13:54:04 +00: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
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
Ling, Alex
9708713794
Merge branch 'feat/open-now' into 'master'
...
Feat/open now
See merge request gk1623/drp-48!25
Co-authored-by: Barf-Vader <47476490+Barf-Vader@users.noreply.github.com >
2025-06-13 13:22:42 +00: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
b8f31aef5b
Merge branch 'fix/fave-only-on-session' into 'master'
...
merge: Merged fix/fave-only-on-session to master
See merge request gk1623/drp-48!22
Co-authored-by: Caspar Jojo Asaam <caspar@Caspars-MacBook-Pro-6597.local >
2025-06-13 11:47:24 +00: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
Caspar Jojo Asaam
7f305287f0
Merge branch 'fix/fave-migration' into 'master'
...
merge: Merged fix/fave-migration to master
See merge request gk1623/drp-48!21
Co-authored-by: Caspar Jojo Asaam <caspar@Caspars-MacBook-Pro-6597.local >
2025-06-13 11:09:51 +00:00
Caspar Jojo Asaam
2219f7a3b9
fix: Added the migration of the favourite study space table
...
Co-Authored-By: Tadios Temesgen <tt2022@ic.ac.uk >
2025-06-13 12:05:39 +01:00
ce6c391d81
feat: sort by location
2025-06-13 10:56:08 +01:00
Caspar Jojo Asaam
b737c67377
Merge branch 'fix/time-filtering' into 'master'
...
merge: fix/time-filtering into master
See merge request gk1623/drp-48!20
Co-authored-by: Caspar Jojo Asaam <caspar@dyn3155-98.wlan.ic.ac.uk >
2025-06-13 08:45:11 +00: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
ee190d90db
Merge branch 'feat/faves' into 'master'
...
merge: Merge feat/faves into master
See merge request gk1623/drp-48!19
Co-authored-by: Caspar Jojo Asaam <caspar@dyn3155-98.wlan.ic.ac.uk >
2025-06-13 02:40:19 +00: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
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
