Commit Graph

  • 4a3fd0df2a Merge branch 'refactor/favs' into 'master' master Ling, Alex 2025-06-17 12:08:20 +00:00
  • 8abcd3a979 feat:admin mode display Barf-Vader 2025-06-17 13:03:58 +01:00
  • ade34ac7ca feat: hide favs for admin Barf-Vader 2025-06-17 12:33:35 +01:00
  • 3edae91e12 Merge branch 'refactor/favs' into 'master' Ling, Alex 2025-06-17 00:09:21 +00:00
  • fcd11be506 feat: fixed refactor 🤡 Barf-Vader 2025-06-17 01:04:18 +01:00
  • 670ecf3526 fix: what Gleb Koval 2025-06-17 00:46:51 +01:00
  • e3e5e9eb69 fix: attempt at fixing image re-arranging Gleb Koval 2025-06-17 00:31:21 +01:00
  • d086700d6d Merge branch 'refactor/favs' into 'master' Ling, Alex 2025-06-16 22:30:30 +00:00
  • 03bca19527 fix: Types Barf-Vader 2025-06-16 23:25:42 +01:00
  • 0239f86985 feat: delete Barf-Vader 2025-06-16 22:40:54 +01:00
  • e518f63714 Merge branch 'refactor/favs' into 'master' Ling, Alex 2025-06-16 20:36:42 +00:00
  • 9306b42098 refactor: everything Barf-Vader 2025-06-16 21:27:47 +01:00
  • a2277a0c8b Merge branch 'realtime' into 'master' Ling, Alex 2025-06-16 20:29:27 +00:00
  • 02c8b25b94 Merge branch 'refactor/favs' into 'master' Ling, Alex 2025-06-16 17:08:28 +00:00
  • 7d4e5bf4d1 fix:unbold Barf-Vader 2025-06-16 18:04:08 +01:00
  • f48d457f5b refactor: more constrast, clearer favs Barf-Vader 2025-06-16 17:54:40 +01:00
  • ba05fd478f style: remove unused payload Gleb Koval 2025-06-16 17:19:10 +01:00
  • 9399a653a3 feat: realtime updates for study spaces and reports Gleb Koval 2025-06-16 17:08:11 +01:00
  • 7332c0376b Merge branch 'fix-filter-buttons' into 'master' Ling, Alex 2025-06-16 15:44:44 +00:00
  • b8af5c8374 fix: put filter navigation buttons on the bottom Gleb Koval 2025-06-16 16:03:46 +01:00
  • bfb361c82a Merge branch 'fix/open-now' into 'master' Ling, Alex 2025-06-15 13:54:04 +00:00
  • 947bb35f93 fix: open now displays correct times Barf-Vader 2025-06-15 14:49:44 +01:00
  • 8af787c61c fix: fixed all-day timing submissions Gleb Koval 2025-06-13 15:09:00 +01:00
  • ef157d4015 Merge branch 'fix/directions' into 'master' Temesgen, Tadios 2025-06-13 13:47:35 +00:00
  • 958e6f61a4 fix: Added migrations for addition of direction column to study_spaces TadiosT 2025-06-13 14:42:05 +01:00
  • 9708713794 Merge branch 'feat/open-now' into 'master' Ling, Alex 2025-06-13 13:22:42 +00:00
  • 764385d660 fix: removed non used imports Barf-Vader 2025-06-13 14:18:05 +01:00
  • 9bcd1788bf fix: removed console.log Barf-Vader 2025-06-13 13:56:08 +01:00
  • 37665bcb3a fix: timing Barf-Vader 2025-06-13 13:51:15 +01:00
  • 268392deed refactor: open timings Barf-Vader 2025-06-13 13:18:53 +01:00
  • e96aeb2cfc Merge branch 'map-sorting' into 'master' Gleb Koval 2025-06-13 12:57:01 +00:00
  • b22943968e fix: remove unused imports Gleb Koval 2025-06-13 13:52:33 +01:00
  • f9812b3391 Merge branch 'feat/directions' into 'master' Caspar Jojo Asaam 2025-06-13 12:48:49 +00:00
  • 95c38c6f9f fix: signout without refresh Gleb Koval 2025-06-13 13:32:54 +01:00
  • 2ef9a63027 feat: map sorting and separate filter Gleb Koval 2025-06-13 13:27:51 +01:00
  • 602bf07d02 fix: fixed style and type check issues TadiosT 2025-06-13 13:20:46 +01:00
  • f4517ef467 feat: Added feature to allow users to give directions for study spaces. These directions appear when you click on a study space. TadiosT 2025-06-13 13:06:10 +01:00
  • b8f31aef5b Merge branch 'fix/fave-only-on-session' into 'master' Caspar Jojo Asaam 2025-06-13 11:47:24 +00:00
  • d767bc4fad fix: Fixed favourites to not show up when a user hasn't been logged in Caspar Jojo Asaam 2025-06-13 12:43:31 +01:00
  • 7f305287f0 Merge branch 'fix/fave-migration' into 'master' Caspar Jojo Asaam 2025-06-13 11:09:51 +00:00
  • 2219f7a3b9 fix: Added the migration of the favourite study space table Caspar Jojo Asaam 2025-06-13 12:05:39 +01:00
  • ce6c391d81 feat: sort by location Gleb Koval 2025-06-12 23:50:24 +01:00
  • b737c67377 Merge branch 'fix/time-filtering' into 'master' Caspar Jojo Asaam 2025-06-13 08:45:11 +00:00
  • 93b3bf23be fix: Fixed uploading study space error which subsequently fixes persistent favouriting now Caspar Jojo Asaam 2025-06-13 09:41:27 +01:00
  • ee190d90db Merge branch 'feat/faves' into 'master' Caspar Jojo Asaam 2025-06-13 02:40:19 +00:00
  • be04f2d869 feat: Implemented Favouriting for a user Caspar Jojo Asaam 2025-06-13 03:36:16 +01:00
  • ba0ae11abd Merge branch 'refactor/simpler-timings' into 'master' Ling, Alex 2025-06-13 02:11:41 +00:00
  • e4a5641eeb fix: pass style check Barf-Vader 2025-06-13 03:06:00 +01:00
  • 8be06bba8b refactor: simpler timing inputs Barf-Vader 2025-06-13 02:57:23 +01:00
  • 4c91968582 fix: fix view report refactor/timings Barf-Vader 2025-06-12 17:52:16 +01:00
  • 8e49454b6f refactor: moved search into Navbar component Barf-Vader 2025-06-12 17:28:09 +01:00
  • 07742ad405 fix: fix function for signups Gleb Koval 2025-06-12 16:48:23 +01:00
  • 9882594551 Merge branch 'r-merge' into 'master' Temesgen, Tadios 2025-06-12 15:33:48 +00:00
  • 950ab5193a merge: Resolved merge conflicts Caspar Jojo Asaam 2025-06-12 16:21:20 +01:00
  • 49a1e93dfe Merge branch 'master' into 'feat/filter-by-time' feat/filter-by-time Temesgen, Tadios 2025-06-12 14:54:04 +00:00
  • 0c3d0a00b8 Merge branch 'logins' into 'master' Gleb Koval 2025-06-12 14:46:20 +00:00
  • 788007c1cc feat: complete logins Gleb Koval 2025-06-12 15:27:55 +01:00
  • 3bdee89eed feat: initial logins Gleb Koval 2025-06-12 13:58:59 +01:00
  • 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 Caspar Jojo Asaam 2025-06-12 15:40:20 +01:00
  • b516196d38 Merge branch 'feat/feedback' into 'master' Ling, Alex 2025-06-12 14:34:35 +00:00
  • 8a6f447202 fix: tag input now works Barf-Vader 2025-06-12 01:48:15 +01:00
  • 5b7f63f63f feat: Added feedback feature Barf-Vader 2025-06-12 01:43:53 +01:00
  • 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 Caspar Jojo Asaam 2025-06-12 14:59:22 +01:00
  • 7117f85ef7 feat: added migration for a study_space_hours table and allowed for the user to make time inputs when submitting a new space Caspar Jojo Asaam 2025-06-12 10:10:41 +01:00
  • 7c0f9b3f52 Merge branch 'fix/filter-by-tags' into 'master' Caspar Jojo Asaam 2025-06-12 01:03:39 +00:00
  • 8de3d9d48c fix: Fixed type and style errors. TadiosT 2025-06-12 00:48:49 +01:00
  • 2c8d7e00b5 fix: Search bar on main page no longer overflows. Selected tags no longer appear in dropdown. Can no longer filter by contradiction tags. TadiosT 2025-06-12 00:41:50 +01:00
  • ed2721ff4c fix: re-enable typing in tag text box Gleb Koval 2025-06-11 23:52:45 +01:00
  • c8eef97d99 Merge branch 'feat/admin-mode' into 'master' feat/favourites Ling, Alex 2025-06-11 18:00:54 +00:00
  • 8d3a21498f fix: no longer can delete when deleting a report Barf-Vader 2025-06-11 18:22:14 +01:00
  • 6bae8bb361 feat: added edit button to admin mode Barf-Vader 2025-06-11 18:06:04 +01:00
  • e7a7275af7 Merge remote-tracking branch 'origin/edit-mode' into feat/admin-mode Barf-Vader 2025-06-11 17:57:18 +01:00
  • a33fba2cd6 feat: reports page Barf-Vader 2025-06-11 17:56:45 +01:00
  • e2795ff257 feat: edit page edit-mode Gleb Koval 2025-06-11 17:53:55 +01:00
  • 2eceee2889 Merge branch 'feat/filter-by-tags' into 'master' Temesgen, Tadios 2025-06-11 02:45:22 +00:00
  • 348229691f Merge branch 'feat/filter-by-tags' of https://gitlab.doc.ic.ac.uk/gk1623/drp-48 into feat/filter-by-tags TadiosT 2025-06-11 03:40:34 +01:00
  • 3d95ea3763 fix: Changed filteredStudySpaces from function to string[]. TadiosT 2025-06-11 03:40:20 +01:00
  • d7fcf9d9ff Merge branch 'master' into 'feat/filter-by-tags' Temesgen, Tadios 2025-06-11 02:30:09 +00:00
  • e9d6db605a fix: Fix to filteredTags in main page. Removed use of TagFilter component. TadiosT 2025-06-11 03:22:19 +01:00
  • 7971e996fe Merge branch 'fix/overflow' into 'master' Ling, Alex 2025-06-11 00:11:09 +00:00
  • be921610f6 fix: overflow in report and space page Barf-Vader 2025-06-11 01:06:39 +01:00
  • 4ced9347bb fix: actually fixed overwlow in SpaceCard Barf-Vader 2025-06-11 00:56:56 +01:00
  • 871891c842 Merge branch 'google-maps-integration' into 'master' Gleb Koval 2025-06-10 23:18:56 +00:00
  • af08bc663b feat: add gmaps api key to CI Gleb Koval 2025-06-10 19:06:23 +01:00
  • f7969432ec fix(lint): remove unused marker Gleb Koval 2025-06-10 19:04:57 +01:00
  • bd7f9bc991 feat: google maps Gleb Koval 2025-06-10 19:00:22 +01:00
  • e68cc4e0ea Merge branch 'feat/reports' into 'master' Ling, Alex 2025-06-10 23:11:10 +00:00
  • bdda39c7fe refactor: added typing for props, fixed overflow Barf-Vader 2025-06-11 00:03:29 +01:00
  • 2b73fe13bd feat: setup posthog for metrics (might or might not be useful) Gleb Koval 2025-06-10 23:44:21 +01:00
  • 4d8cffc726 fix: cant submit report while uploading Barf-Vader 2025-06-10 18:30:09 +01:00
  • d982bf550e feat: reports Barf-Vader 2025-06-10 18:25:42 +01:00
  • 5eb7a9f58c feat: Centred the filtering bar in the main page. TadiosT 2025-06-10 15:00:12 +01:00
  • 61da21b7db fix: Style and type check changes. TadiosT 2025-06-10 05:45:29 +01:00
  • 201467c73a feat: Added filtering by compulsory tags and changed filtering logic. TadiosT 2025-06-10 05:37:52 +01:00
  • 19d451fa8e feat: Added filtering by optional tags in the main page. Created TagFilter component for modularisation. TadiosT 2025-06-10 05:24:15 +01:00
  • b727665238 Merge branch 'compulsory-tags' into 'master' Ling, Alex 2025-06-09 18:30:56 +00:00
  • 6a9f5ca21d refactor: Fixed minor typing issue with space Barf-Vader 2025-06-09 19:26:57 +01:00
  • 61915cd6a6 refactor: used a record for tag colouring Barf-Vader 2025-06-09 19:16:55 +01:00
  • 3cec498192 feat: added compulsory tags Barf-Vader 2025-06-09 17:25:12 +01:00
  • f6f09c8492 Added compulsory tags in db table Barf-Vader 2025-06-09 14:53:56 +01:00