Merge branch 'main' into fixed-ui-inconsistencies

cornell-dti · May 3, 2024 · de9cf78 · de9cf78
2 parents aa57808 + 5d848a4
commit de9cf78
Show file tree

Hide file tree

Showing 11 changed files with 444 additions and 186 deletions.
diff --git a/backend/scripts/add_price_and_bedroom_attributes.ts b/backend/scripts/add_price_and_bedroom_attributes.ts
@@ -1,14 +1,15 @@
-import { Review } from '@common/types/db-types';
 import { db } from '../src/firebase-config';
 
-// This script will add the price and bedrooms attributes to all the reviews that do not have them
+/*
+ This script will add the price and bedrooms attributes to all the reviews that do not have them
+*/
 
 const reviewCollection = db.collection('reviews');
 
 reviewCollection.get().then((querySnapshot) => {
  querySnapshot.forEach((doc) => {
  console.log('Review Before Changes: ', doc.data());
- // Version 1: Using Update?
+ // Update the review with price and bedrooms attributes using update method
  reviewCollection.doc(doc.id).update({
  price: 0,
  bedrooms: 0,

diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx
@@ -1,6 +1,6 @@
 import React, { ReactElement, useEffect, useState } from 'react';
 import './App.scss';
-import { BrowserRouter as Router, Route, Switch } from 'react-router-dom';
+import { Route, Switch, useLocation } from 'react-router-dom';
 import HomePage from './pages/HomePage';
 import FAQPage from './pages/FAQPage';
 import ReviewPage from './pages/ReviewPage';
@@ -95,7 +95,7 @@ hotjar.initialize(HJID, HJSV);
 
 const App = (): ReactElement => {
  const [user, setUser] = useState<firebase.User | null>(null);
-
+ const { pathname } = useLocation();
  useEffect(() => {
  const setData = async () => {
  await axios.post('/api/set-data');
@@ -105,50 +105,45 @@ const App = (): ReactElement => {
 
  return (
  <ThemeProvider theme={theme}>
- <Router>
- <NavBar headersData={headersData} user={user} setUser={setUser} />
- <div className="root">
- <Switch>
- <Route exact path="/" component={() => <HomePage user={user} setUser={setUser} />} />
+ <NavBar headersData={headersData} user={user} setUser={setUser} />
+ <div className="root">
+ <Switch>
+ <Route exact path="/" component={() => <HomePage user={user} setUser={setUser} />} />
 
-  <Route exact path="/faq" component={FAQPage} />
-  <Route
-  exact
-  path="/reviews"
-  component={() => <ReviewPage user={user} setUser={setUser} />}
-  />
+ <Route exact path="/faq" component={FAQPage} />
+ <Route
+ exact
+ path="/reviews"
+ component={() => <ReviewPage user={user} setUser={setUser} />}
+ />
 
- <Route exact path="/policies" component={Policies} />
- <Route
- path="/location/:location"
- component={() => <LocationPage user={user} setUser={setUser} />}
- />
- <Route
- path="/landlord/:landlordId"
- component={() => <LandlordPage user={user} setUser={setUser} />}
- />
- <Route
- path="/profile"
- component={() => <ProfilePage user={user} setUser={setUser} />}
- />
- <Route
- path="/bookmarks"
- component={() => <BookmarksPage user={user} setUser={setUser} />}
- />
- <Route
- path="/apartment/:aptId"
- component={() => <ApartmentPage user={user} setUser={setUser} />}
- />
- <Route exact path="/notfound" component={NotFoundPage} />
- <Route
- path="/search"
- component={() => <SearchResultsPage user={user} setUser={setUser} />}
- />
- {isAdmin(user) && <Route exact path="/admin" component={AdminPage} />}
- </Switch>
- </div>
- <Footer />
- </Router>
+ <Route exact path="/policies" component={Policies} />
+ <Route
+ path="/location/:location"
+ component={() => <LocationPage user={user} setUser={setUser} />}
+ />
+ <Route
+ path="/landlord/:landlordId"
+ component={() => <LandlordPage user={user} setUser={setUser} />}
+ />
+ <Route path="/profile" component={() => <ProfilePage user={user} setUser={setUser} />} />
+ <Route
+ path="/bookmarks"
+ component={() => <BookmarksPage user={user} setUser={setUser} />}
+ />
+ <Route
+ path="/apartment/:aptId"
+ component={() => <ApartmentPage user={user} setUser={setUser} />}
+ />
+ <Route exact path="/notfound" component={NotFoundPage} />
+ <Route
+ path="/search"
+ component={() => <SearchResultsPage user={user} setUser={setUser} />}
+ />
+ {isAdmin(user) && <Route exact path="/admin" component={AdminPage} />}
+ </Switch>
+ </div>
+ {pathname !== '/faq' && <Footer />}
  </ThemeProvider>
  );
 };

diff --git a/frontend/src/assets/default_icon.svg b/frontend/src/assets/default_icon.svg
diff --git a/frontend/src/colors.js b/frontend/src/colors.js
@@ -1,15 +1,18 @@
 export const colors = {
  red1: '#B94630',
+ red1Transparent: 'rgba(185, 70, 48, 0.8)',
  red2: '#EB5757',
  red3: '#E8725C',
  red4: '#FFCFC7',
  red5: '#FFF6F6',
  red6: '#FFF2F2',
+ darkred: '#9C3B29',
  black: '#000000',
  gray1: '#5D5D5D',
  gray2: '#898989',
  gray3: '#F9F9F9',
  gray4: '#C4C4C4',
+ gray5: '#E8E8E8',
  white: '#FFFFFF',
  landlordCardRed: '#F3664B',
  green1: '#68BB59',