UBC/Alley-HSBC-Frontend
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

hide navbar sidebar bug fixes

Browse Source
This commit is contained in:
CodeServer 2022-03-11 21:17:00 +00:00
parent 1d27b92536
commit 6b9d210e21
3 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
package-lock.json generated
View File

@ -4552,7 +4552,6 @@
"dependencies": { "dependencies": {
"anymatch": "~3.1.2", "anymatch": "~3.1.2",
"braces": "~3.0.2", "braces": "~3.0.2",
"fsevents": "~2.3.2",
"glob-parent": "~5.1.2", "glob-parent": "~5.1.2",
"is-binary-path": "~2.1.0", "is-binary-path": "~2.1.0",
"is-glob": "~4.0.1", "is-glob": "~4.0.1",
@ -7708,12 +7707,6 @@
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"imagemin": "^7.0.1", "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", "loader-utils": "^2.0.0",
"object-assign": "^4.1.1", "object-assign": "^4.1.1",
"schema-utils": "^2.7.1" "schema-utils": "^2.7.1"

2
src/App.tsx
View File

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

2
src/ProtectedRoute.tsx
View File

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