Merge pull request #151 from hack4impact-calpoly/demo_day_branch

fix: signout not valoid and lint error
hack4impact-calpoly · May 30, 2023 · 542090d · 542090d
2 parents eeb251a + a95e8c4
commit 542090d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src/components/authentication/notValidated.jsx b/src/components/authentication/notValidated.jsx
@@ -2,6 +2,7 @@ import React from "react";
 import styled from "styled-components";
 import { Container, Col, Row } from "react-bootstrap";
 import "firebase/auth";
+import HeaderWithNav from "../navigation/nav-header";
 
 const StyledDiv = styled.div`
   height: 100vh;
@@ -38,6 +39,7 @@ const StyledCol = styled(Col)`
 export default function Discussion() {
   return (
     <StyledDiv>
+      <HeaderWithNav />
       <StyledContainer fluid>
         <StyledRow>
           <StyledCol sm={12} md={8} lg={6} xl={5}>

diff --git a/src/components/pages/schedule/calendar/newCalendar.jsx b/src/components/pages/schedule/calendar/newCalendar.jsx
@@ -32,10 +32,10 @@ const StyledButton = styled.button`
   }
 `;
 
-const StyledDiv = styled.div`
-  padding: 10px;
-  font-size: 18px;
-`;
+// const StyledDiv = styled.div`
+//   padding: 10px;
+//   font-size: 18px;
+// `;
 
 export default function NewCalendar() {
   const [showShiftModal, setShiftModal] = useState(false);