Merge pull request #14 from CPSC319-Winter-term-2/cochrane

hide navbar sidebar bug fixes
This commit is contained in:
Jincheng Lu 2022-03-11 13:19:11 -08:00 committed by GitHub
commit dbbc6225cf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 9 deletions

7
package-lock.json generated
View File

@ -4552,7 +4552,6 @@
"dependencies": {
"anymatch": "~3.1.2",
"braces": "~3.0.2",
"fsevents": "~2.3.2",
"glob-parent": "~5.1.2",
"is-binary-path": "~2.1.0",
"is-glob": "~4.0.1",
@ -7708,12 +7707,6 @@
"dev": true,
"dependencies": {
"imagemin": "^7.0.1",
"imagemin-gifsicle": "^7.0.0",
"imagemin-mozjpeg": "^9.0.0",
"imagemin-optipng": "^8.0.0",
"imagemin-pngquant": "^9.0.2",
"imagemin-svgo": "^9.0.0",
"imagemin-webp": "^7.0.0",
"loader-utils": "^2.0.0",
"object-assign": "^4.1.1",
"schema-utils": "^2.7.1"

View File

@ -8,6 +8,7 @@ import Contacts from "./components/contacts/Contacts";
import Calendar from "./components/calendar/Calendar";
import { ThemeProvider } from "@emotion/react";
import ProtectedRoute from "./ProtectedRoute";
import MeetingDetails from "./components/meeting-details/MeetingDetails";
import Theme from "./Theme";
@ -31,6 +32,7 @@ const App: React.FC = () => {
</Route>
</Routes>
</Router>
<MeetingDetails open={meetingInfoOpen} setOpen={setMeetingInfoOpen} />
</ThemeProvider>
);
};

View File

@ -7,7 +7,6 @@ import {
MeetingStatus,
SidebarUserObj,
} from "./components/sidebar/SidebarUser";
import MeetingDetails from "./components/meeting-details/MeetingDetails";
import {Box} from "@mui/material";
const ProtectedRoute = () => {
@ -52,7 +51,6 @@ const ProtectedRoute = () => {
<Sidebar users={sidebarUsers} />
</Box>
</Box>
<MeetingDetails open={meetingInfoOpen} setOpen={setMeetingInfoOpen} />
</>
: <Navigate to="/login" state={{ from: location }} replace />
);