Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update master w/ dev #507

Merged
merged 33 commits into from
Jul 6, 2024
Merged

Update master w/ dev #507

merged 33 commits into from
Jul 6, 2024

Conversation

richard-xue-vrx
Copy link
Contributor

No description provided.

renovate bot and others added 30 commits March 22, 2024 16:52
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
* Added and applied ESLint and Prettier

* Added and applied ESLint and Prettier to BE

* switch ci/cd to npm

* Add pre-commit hooks and linting CI

* Rename lint step to lint

---------

Co-authored-by: Franco Reyes <franco.javier.reyes@gmail.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
#433)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Bumps [@babel/traverse](https://github.com/babel/babel/tree/HEAD/packages/babel-traverse) from 7.22.8 to 7.24.1.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.24.1/packages/babel-traverse)

---
updated-dependencies:
- dependency-name: "@babel/traverse"
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…#442)

Bumps the npm_and_yarn group group in /app with 2 updates: [react-native](https://github.com/facebook/react-native/tree/HEAD/packages/react-native) and [react-devtools-core](https://github.com/facebook/react/tree/HEAD/packages/react-devtools-core).


Updates `react-native` from 0.70.8 to 0.73.6
- [Release notes](https://github.com/facebook/react-native/releases)
- [Changelog](https://github.com/facebook/react-native/blob/main/CHANGELOG.md)
- [Commits](https://github.com/facebook/react-native/commits/v0.73.6/packages/react-native)

Updates `react-devtools-core` from 4.24.0 to 4.28.5
- [Release notes](https://github.com/facebook/react/releases)
- [Changelog](https://github.com/facebook/react/blob/main/CHANGELOG.md)
- [Commits](https://github.com/facebook/react/commits/HEAD/packages/react-devtools-core)

---
updated-dependencies:
- dependency-name: react-native
  dependency-type: direct:production
  dependency-group: npm_and_yarn-security-group
- dependency-name: react-devtools-core
  dependency-type: indirect
  dependency-group: npm_and_yarn-security-group
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
* Added testing framework with Sponsors tests

* Added Jest for NodeJS backend

* Updated CI GitHub Action

* add mapping for @common directory to jest config

* add simple backend test

* Removed inclusion

---------

Co-authored-by: Franco Reyes <franco.javier.reyes@gmail.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
…#432)

* Fixed duplicate SearchOptions being prepended to recentSearches array

* Ran prettier fix, w/ new search engine changes

---------

Co-authored-by: Richard Xue <vrx@Richards-MBP.hub>
Co-authored-by: Richard Xue <vrx@Richards-MacBook-Pro.local>
Co-authored-by: Jessica Feng <54833118+JessicaF@users.noreply.github.com>
* add render with redux

* lint

* ignore non tests files
* 461: update building drawer to take up whole screen given it is within mobile screen breakpoints

* 461: add testing for building drawer component for static & responsive traits

* 461: add extra small test cases

---------

Co-authored-by: Mark Tran <z5421592@ad.unsw.edu.au>
* added medium screen size height and made the small
size smaller so the gap between features & FAQ
is smaller

* added tests for features component and changed
medium spacing to be smaller

* fixed overlap

* rg

* got rid of commented out code

* Fix spacing between FAQ on large screen sizes

---------

Co-authored-by: Kelly Su <z5418860@ad.unsw.edu.au>
Co-authored-by: Jessica <Jessica.Feng101@gmail.com>
* made mobile view faq wider

* added test for faq

* changed test from js to tsx file

* lint fix

* Removed unnecessary async function

* Fix import sorting

---------

Co-authored-by: Jessica <Jessica.Feng101@gmail.com>
* added whiteSpace adjustments to RoomBoxHeading style line 89

* implemented test but doesnt work

* Updated test, still does not work

* Made a new file for RoomAvailabilityBox component to test the room directly, implemented test that passes

* removed RoomAvailabilityBox component declared in BuildingDrawer

* removed package-lock.json from the root folder
Bumps [express](https://github.com/expressjs/express) from 4.19.1 to 4.19.2.
- [Release notes](https://github.com/expressjs/express/releases)
- [Changelog](https://github.com/expressjs/express/blob/master/History.md)
- [Commits](expressjs/express@4.19.1...4.19.2)

---
updated-dependencies:
- dependency-name: express
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Jessica Feng <54833118+JessicaF@users.noreply.github.com>
* fix(deps): update dependency usehooks-ts to v3

* Fixed Map using new usehooks-ts

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Jessica <Jessica.Feng101@gmail.com>
* fix(deps): update dependency @mui/x-date-pickers to v7

* Fixed and upgraded MUI date picker

* Fixed BuildingDrawer date picker

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Jessica Feng <54833118+JessicaF@users.noreply.github.com>
Co-authored-by: Jessica <Jessica.Feng101@gmail.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
* added previous day and next day arrows on mobile view. also added some tests
however they are not very extensive and may need to be improved upon.

* fixed most issues specified with testing and also
removed the hover effect of the icon button which
clashed with the general style of the page

* disabledMaskedInput on mui datepicker to solve
console warning issue

---------

Co-authored-by: Jessica <Jessica.Feng101@gmail.com>
mark-trann and others added 3 commits June 1, 2024 16:41
* Add dark mode toggle to navbar + add context to handle dark mode toggles + add dark mode palette

* Add dark mode look to building drawer

* Add dark mode to date and time selectors in building drawer

* Add dark mode to room page

* Fix style color for sort & filter dropdowns + reduce brightness for booking calendar in dark mode

* Fix make a booking button for dark mode

* Add dark mode to maps

* revise palette to remove bug of secondary text being mixed with ui palette

* Move map style to a helper function to reduce code in main Map.tsx file

* Add dark mode to landing page

* Fix build fail for dark mode on landing page

* Revert back to not use isalternate + remove comment + fix toggleDarkMode object

* Remove comment + use semicolon

* Remove white line on top right corner of calendar

* Remove unnecessary css

---------

Co-authored-by: Mark Tran <z5421592@ad.unsw.edu.au>
…#473)

* made button move responsive to device size

* added BookingButton test

* fixed lint

* Non-working tests

* Updated tests (still not working)

* Implemented button- no tests

* test made on button component

* test made on button component

* Updated booking button styling

* Removed unneeded alignItems

---------

Co-authored-by: Livia Wang <z5417230@ad.unsw.edu.au>
Co-authored-by: Jessica <Jessica.Feng101@gmail.com>
@JessicaF
Copy link
Contributor

JessicaF commented Jul 3, 2024

Maybe it's time to perform a full send

@richard-xue-vrx
Copy link
Contributor Author

Maybe it is time to fullsend :(

@richard-xue-vrx richard-xue-vrx merged commit 7bbcfab into master Jul 6, 2024
11 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants