diff --git a/components/Sidebar/index.js b/components/Sidebar/index.js index 23b851d..f5642b8 100644 --- a/components/Sidebar/index.js +++ b/components/Sidebar/index.js @@ -48,8 +48,8 @@ function Sidebar({ events, title }) {
- - {title} + + {title || 'Untitled'} {events.slice().reverse().map((evt) => { diff --git a/components/requests/EventStatus.js b/components/events/EventStatus.js similarity index 100% rename from components/requests/EventStatus.js rename to components/events/EventStatus.js diff --git a/components/requests/FailedAttempts.js b/components/events/FailedAttempts.js similarity index 100% rename from components/requests/FailedAttempts.js rename to components/events/FailedAttempts.js diff --git a/components/requests/SeedData.js b/components/events/SeedData.js similarity index 100% rename from components/requests/SeedData.js rename to components/events/SeedData.js diff --git a/components/requests/TimelineAccordion.js b/components/events/TimelineAccordion.js similarity index 100% rename from components/requests/TimelineAccordion.js rename to components/events/TimelineAccordion.js diff --git a/components/shared/dashboard/Navbar/index.js b/components/shared/dashboard/Navbar/index.js index e3a9ad9..60c55ae 100644 --- a/components/shared/dashboard/Navbar/index.js +++ b/components/shared/dashboard/Navbar/index.js @@ -63,8 +63,10 @@ export default function Navbar() { }; const menuUseEffect = () => { + let cancelled = false; const getBridges = async () => { // await axios.get('http://localhost:3001/bridges') + // if (!cancelled) // .then((res) => { // setBridges(res.data); // }); @@ -76,6 +78,8 @@ export default function Navbar() { }; getBridges(); + // eslint-disable-next-line no-unused-vars + return () => { cancelled = true; }; }; // Determine the width of the 'Dashboard' link & diff --git a/pages/requests/[slug].js b/pages/events/[slug].js similarity index 89% rename from pages/requests/[slug].js rename to pages/events/[slug].js index 36254c6..752d3f4 100644 --- a/pages/requests/[slug].js +++ b/pages/events/[slug].js @@ -3,12 +3,12 @@ import PropTypes from 'prop-types'; import { Grid, makeStyles, Typography } from '@material-ui/core'; import { Timeline } from '@material-ui/lab'; -import EventStatus from '../../components/requests/EventStatus'; -import FailedAttempts from '../../components/requests/FailedAttempts'; +import EventStatus from '../../components/events/EventStatus'; +import FailedAttempts from '../../components/events/FailedAttempts'; import Navbar from '../../components/shared/dashboard/Navbar/index'; -import { SeedData } from '../../components/requests/SeedData'; +import { SeedData } from '../../components/events/SeedData'; import Sidebar from '../../components/Sidebar'; -import TimelineAccordion from '../../components/requests/TimelineAccordion'; +import TimelineAccordion from '../../components/events/TimelineAccordion'; import ProtectRoute from '../../utils/ProtectRoute'; const useStyles = makeStyles(() => ({ @@ -24,7 +24,7 @@ const useStyles = makeStyles(() => ({ }, })); -function Requests({ +function Events({ event, sidebarEvents, title, url, }) { const classes = useStyles(); @@ -95,7 +95,7 @@ export async function getServerSideProps() { }; } -Requests.propTypes = { +Events.propTypes = { title: PropTypes.string.isRequired, url: PropTypes.string.isRequired, event: PropTypes.shape({ @@ -120,4 +120,4 @@ Requests.propTypes = { ).isRequired, }; -export default Requests; +export default Events; diff --git a/src/contexts/auth.js b/src/contexts/auth.js index b74bb35..547ce7c 100644 --- a/src/contexts/auth.js +++ b/src/contexts/auth.js @@ -16,14 +16,16 @@ function AuthProvider({ children }) { // Helper function that enables us to fire off requests without // having the set the header token each time. useEffect(() => { + let userLoaded = false; async function loadUserFromCookies() { const token = Cookies.get('token'); - if (token) { + if (!userLoaded && token) { api.defaults.headers['BRIDGE-JWT'] = token; } } loadUserFromCookies(); + return () => { userLoaded = true; }; }, []); // Fires off an api request to fetch the JWT. diff --git a/utils/formatDate.js b/utils/formatDate.js index 7d085ca..0f344d9 100644 --- a/utils/formatDate.js +++ b/utils/formatDate.js @@ -1,8 +1,7 @@ // formats ruby timestamps to a date and time string -// ruby timestamp format: "2020-11-19T16:44:53.702Z"; +// ruby timestamp format: "2020-11-19 16:44:53"; function formatDate(timeStamp) { - const date = timeStamp.split(' ')[0]; - const time = timeStamp.split(' ')[1].split('.')[0]; + const [date, time] = timeStamp.split(' '); return { date, time }; }