From a32aae33f6ec70f17948cf2fc44e1d483436c0f9 Mon Sep 17 00:00:00 2001 From: cbolles Date: Fri, 15 Sep 2023 12:18:13 -0400 Subject: [PATCH 1/3] Remove un-used components --- packages/client/src/App.tsx | 15 ++++++--------- packages/client/src/apis/placeholder.tsx | 0 .../client/src/context/EnvironmentContext.tsx | 10 ---------- packages/client/src/pages/Authenticate.tsx | 0 .../client/src/pages/contribute/Contribute.tsx | 2 +- 5 files changed, 7 insertions(+), 20 deletions(-) delete mode 100644 packages/client/src/apis/placeholder.tsx delete mode 100644 packages/client/src/context/EnvironmentContext.tsx delete mode 100644 packages/client/src/pages/Authenticate.tsx diff --git a/packages/client/src/App.tsx b/packages/client/src/App.tsx index 6eb692f0..3fe01248 100644 --- a/packages/client/src/App.tsx +++ b/packages/client/src/App.tsx @@ -17,7 +17,6 @@ import { DownloadTags } from './pages/studies/DownloadTags'; import { LoginPage } from './pages/LoginPage'; import { DatasetControls } from './pages/datasets/DatasetControls'; import { AuthCallback } from './pages/AuthCallback'; -import { EnvironmentContextProvider } from './context/EnvironmentContext'; import { AuthProvider, useAuth, AUTH_TOKEN_STR } from './context/AuthContext'; import { AdminGuard } from './guards/AdminGuard'; import { LogoutPage } from './pages/LogoutPage'; @@ -69,14 +68,12 @@ const App: FC = () => { return ( - - - - - - - - + + + + + + ); diff --git a/packages/client/src/apis/placeholder.tsx b/packages/client/src/apis/placeholder.tsx deleted file mode 100644 index e69de29b..00000000 diff --git a/packages/client/src/context/EnvironmentContext.tsx b/packages/client/src/context/EnvironmentContext.tsx deleted file mode 100644 index 1e9ada29..00000000 --- a/packages/client/src/context/EnvironmentContext.tsx +++ /dev/null @@ -1,10 +0,0 @@ -import { createContext, useState } from 'react'; - -export const EnvironmentContext = createContext({ study: '', project: '' }); - -export const EnvironmentContextProvider = (props: any) => { - const [study] = useState('sn1'); - const project = 'pn1'; - - return {props.children}; -}; diff --git a/packages/client/src/pages/Authenticate.tsx b/packages/client/src/pages/Authenticate.tsx deleted file mode 100644 index e69de29b..00000000 diff --git a/packages/client/src/pages/contribute/Contribute.tsx b/packages/client/src/pages/contribute/Contribute.tsx index e97bf7bf..d12822e2 100644 --- a/packages/client/src/pages/contribute/Contribute.tsx +++ b/packages/client/src/pages/contribute/Contribute.tsx @@ -1,4 +1,4 @@ -import { Container, Typography, Box, Stack, Button, Grid } from '@mui/material'; +import { Typography, Box, Stack, Button } from '@mui/material'; import placeholder from './placeholder.png'; import { useNavigate } from 'react-router-dom'; From 821a834f31f0c89d01baf9ce471367076c0086ea Mon Sep 17 00:00:00 2001 From: cbolles Date: Fri, 15 Sep 2023 16:59:00 -0400 Subject: [PATCH 2/3] Rename components --- packages/client/src/App.tsx | 6 ++--- ...ddDataset.tsx => AddDataset.component.tsx} | 0 ...rolComponent.tsx => Control.component.tsx} | 2 +- ...ponent.tsx => DatasetAccess.component.tsx} | 2 +- ...onent.tsx => DatasetControl.component.tsx} | 2 +- ...ironment.tsx => Environment.component.tsx} | 0 .../{MenuComponent.tsx => Menu.component.tsx} | 0 ...ionBar.tsx => NavigationBar.component.tsx} | 0 ...orm.tsx => NewStudyJsonForm.component.tsx} | 0 .../{SideBar.tsx => SideBar.component.tsx} | 2 +- ...ldComponent.tsx => TagField.component.tsx} | 2 +- ...eview.tsx => TagFormPreview.component.tsx} | 0 ...omponent.tsx => TagTraining.component.tsx} | 4 ++-- .../{TagView.tsx => TagView.component.tsx} | 0 ...sDisplay.tsx => TagsDisplay.component.tsx} | 6 ++--- ...ntries.tsx => UploadEntries.component.tsx} | 0 packages/client/src/main.tsx | 8 +++---- .../src/pages/datasets/DatasetControls.tsx | 8 +++---- .../src/pages/datasets/ProjectAccess.tsx | 6 ++--- .../src/pages/projects/ProjectControl.tsx | 4 ++-- .../client/src/pages/studies/NewStudy.tsx | 22 +++++++++---------- .../client/src/pages/studies/StudyControl.tsx | 6 ++--- .../src/pages/studies/UserPermissions.tsx | 2 +- packages/client/src/theme/ThemeProvider.tsx | 2 +- 24 files changed, 42 insertions(+), 42 deletions(-) rename packages/client/src/components/{AddDataset.tsx => AddDataset.component.tsx} (100%) rename packages/client/src/components/{ControlComponent.tsx => Control.component.tsx} (95%) rename packages/client/src/components/{DatasetAccessComponent.tsx => DatasetAccess.component.tsx} (96%) rename packages/client/src/components/{DatasetControlComponent.tsx => DatasetControl.component.tsx} (91%) rename packages/client/src/components/{Environment.tsx => Environment.component.tsx} (100%) rename packages/client/src/components/{MenuComponent.tsx => Menu.component.tsx} (100%) rename packages/client/src/components/{NavigationBar.tsx => NavigationBar.component.tsx} (100%) rename packages/client/src/components/{NewStudyJsonForm.tsx => NewStudyJsonForm.component.tsx} (100%) rename packages/client/src/components/{SideBar.tsx => SideBar.component.tsx} (98%) rename packages/client/src/components/{TagFieldComponent.tsx => TagField.component.tsx} (95%) rename packages/client/src/components/{TagFormPreview.tsx => TagFormPreview.component.tsx} (100%) rename packages/client/src/components/{TagTrainingComponent.tsx => TagTraining.component.tsx} (94%) rename packages/client/src/components/{TagView.tsx => TagView.component.tsx} (100%) rename packages/client/src/components/{TagsDisplay.tsx => TagsDisplay.component.tsx} (95%) rename packages/client/src/components/{UploadEntries.tsx => UploadEntries.component.tsx} (100%) diff --git a/packages/client/src/App.tsx b/packages/client/src/App.tsx index 3fe01248..4eb43623 100644 --- a/packages/client/src/App.tsx +++ b/packages/client/src/App.tsx @@ -2,13 +2,13 @@ import './App.css'; import { BrowserRouter, Route, Routes } from 'react-router-dom'; import { HomePage } from './pages/Home'; import { ThemeProvider } from './theme/ThemeProvider'; -import { NavBar } from './components/NavigationBar'; +import { NavBar } from './components/NavigationBar.component'; import { NewProject } from './pages/projects/NewProject'; import { ProjectControl } from './pages/projects/ProjectControl'; import { SuccessPage } from './pages/SuccessPage'; import { NewStudy } from './pages/studies/NewStudy'; import { ContributePage } from './pages/contribute/Contribute'; -import { TagView } from './components/TagView'; +import { TagView } from './components/TagView.component'; import { StudyControl } from './pages/studies/StudyControl'; import { ProjectAccess } from './pages/datasets/ProjectAccess'; import { ProjectUserPermissions } from './pages/projects/ProjectUserPermissions'; @@ -22,7 +22,7 @@ import { AdminGuard } from './guards/AdminGuard'; import { LogoutPage } from './pages/LogoutPage'; import { CssBaseline, Box, styled } from '@mui/material'; import { FC, ReactNode, useState } from 'react'; -import { SideBar } from './components/SideBar'; +import { SideBar } from './components/SideBar.component'; import { ProjectProvider } from './context/ProjectContext'; import { ApolloClient, ApolloProvider, InMemoryCache, concat, createHttpLink } from '@apollo/client'; import { setContext } from '@apollo/client/link/context'; diff --git a/packages/client/src/components/AddDataset.tsx b/packages/client/src/components/AddDataset.component.tsx similarity index 100% rename from packages/client/src/components/AddDataset.tsx rename to packages/client/src/components/AddDataset.component.tsx diff --git a/packages/client/src/components/ControlComponent.tsx b/packages/client/src/components/Control.component.tsx similarity index 95% rename from packages/client/src/components/ControlComponent.tsx rename to packages/client/src/components/Control.component.tsx index 7dae949f..866a0edd 100644 --- a/packages/client/src/components/ControlComponent.tsx +++ b/packages/client/src/components/Control.component.tsx @@ -13,7 +13,7 @@ interface Table { tableRows: Row[]; } -export const ControlComponent: React.FC = ({ tableRows }: Table) => { +export const Control: React.FC
= ({ tableRows }: Table) => { const [rows, setRows] = useState(tableRows); const [rowModesModel, setRowModesModel] = useState({}); diff --git a/packages/client/src/components/DatasetAccessComponent.tsx b/packages/client/src/components/DatasetAccess.component.tsx similarity index 96% rename from packages/client/src/components/DatasetAccessComponent.tsx rename to packages/client/src/components/DatasetAccess.component.tsx index 047b4be9..b1f0ea36 100644 --- a/packages/client/src/components/DatasetAccessComponent.tsx +++ b/packages/client/src/components/DatasetAccess.component.tsx @@ -38,7 +38,7 @@ const renderSwitchEditInputCell: GridColDef['renderCell'] = (params) => { return ; }; -export const DatasetAccessComponent: React.FC
= ({ tableRows }: Table) => { +export const DatasetAccess: React.FC
= ({ tableRows }: Table) => { const [rows] = useState(tableRows); const [rowModesModel, setRowModesModel] = useState({}); diff --git a/packages/client/src/components/DatasetControlComponent.tsx b/packages/client/src/components/DatasetControl.component.tsx similarity index 91% rename from packages/client/src/components/DatasetControlComponent.tsx rename to packages/client/src/components/DatasetControl.component.tsx index a8c46d59..e58660d9 100644 --- a/packages/client/src/components/DatasetControlComponent.tsx +++ b/packages/client/src/components/DatasetControl.component.tsx @@ -17,7 +17,7 @@ interface Table { columns: GridColDef[]; } -export const DatasetControlComponent: React.FC
= ({ tableRows, columns }: Table) => { +export const DatasetControl: React.FC
= ({ tableRows, columns }: Table) => { const [rows] = useState(tableRows); const [rowModesModel, setRowModesModel] = useState({}); diff --git a/packages/client/src/components/Environment.tsx b/packages/client/src/components/Environment.component.tsx similarity index 100% rename from packages/client/src/components/Environment.tsx rename to packages/client/src/components/Environment.component.tsx diff --git a/packages/client/src/components/MenuComponent.tsx b/packages/client/src/components/Menu.component.tsx similarity index 100% rename from packages/client/src/components/MenuComponent.tsx rename to packages/client/src/components/Menu.component.tsx diff --git a/packages/client/src/components/NavigationBar.tsx b/packages/client/src/components/NavigationBar.component.tsx similarity index 100% rename from packages/client/src/components/NavigationBar.tsx rename to packages/client/src/components/NavigationBar.component.tsx diff --git a/packages/client/src/components/NewStudyJsonForm.tsx b/packages/client/src/components/NewStudyJsonForm.component.tsx similarity index 100% rename from packages/client/src/components/NewStudyJsonForm.tsx rename to packages/client/src/components/NewStudyJsonForm.component.tsx diff --git a/packages/client/src/components/SideBar.tsx b/packages/client/src/components/SideBar.component.tsx similarity index 98% rename from packages/client/src/components/SideBar.tsx rename to packages/client/src/components/SideBar.component.tsx index 0af456b5..a481001a 100644 --- a/packages/client/src/components/SideBar.tsx +++ b/packages/client/src/components/SideBar.component.tsx @@ -3,7 +3,7 @@ import { Collapse, Divider, Drawer, List, ListItem, ListItemButton, ListItemIcon import { ExpandMore, ExpandLess, School, Dataset, Work, Logout, GroupWork } from '@mui/icons-material'; import { useAuth } from '../context/AuthContext'; import { useNavigate } from 'react-router-dom'; -import { Environment } from './Environment'; +import { Environment } from './Environment.component'; interface SideBarProps { open: boolean; diff --git a/packages/client/src/components/TagFieldComponent.tsx b/packages/client/src/components/TagField.component.tsx similarity index 95% rename from packages/client/src/components/TagFieldComponent.tsx rename to packages/client/src/components/TagField.component.tsx index 81895078..9ddf3a7f 100644 --- a/packages/client/src/components/TagFieldComponent.tsx +++ b/packages/client/src/components/TagField.component.tsx @@ -13,7 +13,7 @@ interface FieldProps { index: number; } -export const TagFieldComponent: React.FC = ({ field, valid, validate, index }: FieldProps) => { +export const TagFieldView: React.FC = ({ field, valid, validate, index }: FieldProps) => { const [jsonData, setJsonData] = useState({}); const [schema, setSchema] = useState({}); const [uiSchema, setUiSchema] = useState({ type: 'object' }); diff --git a/packages/client/src/components/TagFormPreview.tsx b/packages/client/src/components/TagFormPreview.component.tsx similarity index 100% rename from packages/client/src/components/TagFormPreview.tsx rename to packages/client/src/components/TagFormPreview.component.tsx diff --git a/packages/client/src/components/TagTrainingComponent.tsx b/packages/client/src/components/TagTraining.component.tsx similarity index 94% rename from packages/client/src/components/TagTrainingComponent.tsx rename to packages/client/src/components/TagTraining.component.tsx index aa1efe4d..3e19e0dd 100644 --- a/packages/client/src/components/TagTrainingComponent.tsx +++ b/packages/client/src/components/TagTraining.component.tsx @@ -1,5 +1,5 @@ import { Box, Accordion, AccordionSummary, Typography, AccordionDetails, Container } from '@mui/material'; -import { DatasetControlComponent } from './DatasetControlComponent'; +import { DatasetControl } from './DatasetControl.component'; import ExpandMoreIcon from '@mui/icons-material/ExpandMore'; import { GridColDef } from '@mui/x-data-grid'; @@ -93,7 +93,7 @@ export const TagTrainingComponent = () => { - + diff --git a/packages/client/src/components/TagView.tsx b/packages/client/src/components/TagView.component.tsx similarity index 100% rename from packages/client/src/components/TagView.tsx rename to packages/client/src/components/TagView.component.tsx diff --git a/packages/client/src/components/TagsDisplay.tsx b/packages/client/src/components/TagsDisplay.component.tsx similarity index 95% rename from packages/client/src/components/TagsDisplay.tsx rename to packages/client/src/components/TagsDisplay.component.tsx index 7f2abc81..97bbe591 100644 --- a/packages/client/src/components/TagsDisplay.tsx +++ b/packages/client/src/components/TagsDisplay.component.tsx @@ -10,10 +10,10 @@ import VideocamIcon from '@mui/icons-material/Videocam'; import DeleteIcon from '@mui/icons-material/Delete'; import { materialRenderers } from '@jsonforms/material-renderers'; import { TagField, TagFieldType } from '../models/TagField'; -import { TagFormPreviewDialog } from './TagFormPreview'; +import { TagFormPreviewDialog } from './TagFormPreview.component'; import { TagFieldGeneratorService } from '../services/tag-field-generator.service'; import { useState } from 'react'; -import { TagFieldComponent } from './TagFieldComponent'; +import { TagFieldView } from './TagField.component'; type TagPreviewInformation = { previewDataSchema: any; @@ -114,7 +114,7 @@ export const TagsDisplay: React.FC = () => { {tagFields.length > 0 ? ( tagFields.map((value: TagField, index: number) => ( - + - + ) : ( - + <> {getSectionComponent()} @@ -71,7 +71,7 @@ export const NewStudy: React.FC = () => { {activeStep === steps.length - 1 ? 'Finish' : 'Next'} - + )} diff --git a/packages/client/src/pages/studies/StudyControl.tsx b/packages/client/src/pages/studies/StudyControl.tsx index 3cce760a..f79e5a05 100644 --- a/packages/client/src/pages/studies/StudyControl.tsx +++ b/packages/client/src/pages/studies/StudyControl.tsx @@ -1,5 +1,5 @@ -import {Typography} from '@mui/material'; -import { ControlComponent } from '../../components/ControlComponent'; +import { Typography } from '@mui/material'; +import { Control } from '../../components/Control.component'; // currently hardcoded values, but eventully // there will be a fetching function that retrieves project information @@ -42,7 +42,7 @@ export const StudyControl: React.FC = () => { return ( <> Study Control - + ); }; diff --git a/packages/client/src/pages/studies/UserPermissions.tsx b/packages/client/src/pages/studies/UserPermissions.tsx index 90718c7c..78dd260b 100644 --- a/packages/client/src/pages/studies/UserPermissions.tsx +++ b/packages/client/src/pages/studies/UserPermissions.tsx @@ -1,4 +1,4 @@ -import { Box, Switch, Typography } from '@mui/material'; +import { Switch, Typography } from '@mui/material'; import useEnhancedEffect from '@mui/material/utils/useEnhancedEffect'; import { DataGrid, GridColDef, GridRenderCellParams, useGridApiContext } from '@mui/x-data-grid'; import { GridRowModesModel } from '@mui/x-data-grid-pro'; diff --git a/packages/client/src/theme/ThemeProvider.tsx b/packages/client/src/theme/ThemeProvider.tsx index ff012cef..b7ade79b 100644 --- a/packages/client/src/theme/ThemeProvider.tsx +++ b/packages/client/src/theme/ThemeProvider.tsx @@ -1,4 +1,4 @@ -import React, { FC } from 'react'; +import { FC } from 'react'; import { CssBaseline } from '@mui/material'; import { ThemeProvider as MuiThemeProvider, createTheme } from '@mui/material/styles'; From d7cf56ebc2edeb070b3ec821971d9a183db31a9f Mon Sep 17 00:00:00 2001 From: cbolles Date: Fri, 15 Sep 2023 17:04:21 -0400 Subject: [PATCH 3/3] Rename contexts --- packages/client/src/App.tsx | 6 +++--- packages/client/src/components/Environment.component.tsx | 4 ++-- packages/client/src/components/SideBar.component.tsx | 2 +- .../src/context/{AuthContext.tsx => Auth.context.tsx} | 4 ++-- .../src/context/{ProjectContext.tsx => Project.context.tsx} | 0 .../client/src/context/{Study.tsx => Study.context.tsx} | 4 ++-- packages/client/src/pages/AuthCallback.tsx | 2 +- packages/client/src/pages/Home.tsx | 2 +- packages/client/src/pages/LoginPage.tsx | 2 +- packages/client/src/pages/LogoutPage.tsx | 2 +- 10 files changed, 14 insertions(+), 14 deletions(-) rename packages/client/src/context/{AuthContext.tsx => Auth.context.tsx} (94%) rename packages/client/src/context/{ProjectContext.tsx => Project.context.tsx} (100%) rename packages/client/src/context/{Study.tsx => Study.context.tsx} (91%) diff --git a/packages/client/src/App.tsx b/packages/client/src/App.tsx index 4eb43623..a51e646f 100644 --- a/packages/client/src/App.tsx +++ b/packages/client/src/App.tsx @@ -17,16 +17,16 @@ import { DownloadTags } from './pages/studies/DownloadTags'; import { LoginPage } from './pages/LoginPage'; import { DatasetControls } from './pages/datasets/DatasetControls'; import { AuthCallback } from './pages/AuthCallback'; -import { AuthProvider, useAuth, AUTH_TOKEN_STR } from './context/AuthContext'; +import { AuthProvider, useAuth, AUTH_TOKEN_STR } from './context/Auth.context'; import { AdminGuard } from './guards/AdminGuard'; import { LogoutPage } from './pages/LogoutPage'; import { CssBaseline, Box, styled } from '@mui/material'; import { FC, ReactNode, useState } from 'react'; import { SideBar } from './components/SideBar.component'; -import { ProjectProvider } from './context/ProjectContext'; +import { ProjectProvider } from './context/Project.context'; import { ApolloClient, ApolloProvider, InMemoryCache, concat, createHttpLink } from '@apollo/client'; import { setContext } from '@apollo/client/link/context'; -import {StudyProvider} from './context/Study'; +import {StudyProvider} from './context/Study.context'; const drawerWidth = 256; const Main = styled('main', { shouldForwardProp: (prop) => prop !== 'open' })<{ diff --git a/packages/client/src/components/Environment.component.tsx b/packages/client/src/components/Environment.component.tsx index 652c61a2..b1cf81f2 100644 --- a/packages/client/src/components/Environment.component.tsx +++ b/packages/client/src/components/Environment.component.tsx @@ -1,6 +1,6 @@ import { Select, MenuItem, FormControl, InputLabel, Stack, Paper, Typography } from '@mui/material'; -import { useProject } from '../context/ProjectContext'; -import { useStudy } from '../context/Study'; +import { useProject } from '../context/Project.context'; +import { useStudy } from '../context/Study.context'; import { Dispatch, SetStateAction, FC } from 'react'; export const Environment: FC = () => { diff --git a/packages/client/src/components/SideBar.component.tsx b/packages/client/src/components/SideBar.component.tsx index a481001a..f92c2864 100644 --- a/packages/client/src/components/SideBar.component.tsx +++ b/packages/client/src/components/SideBar.component.tsx @@ -1,7 +1,7 @@ import { FC, ReactNode, useState } from 'react'; import { Collapse, Divider, Drawer, List, ListItem, ListItemButton, ListItemIcon, ListItemText } from '@mui/material'; import { ExpandMore, ExpandLess, School, Dataset, Work, Logout, GroupWork } from '@mui/icons-material'; -import { useAuth } from '../context/AuthContext'; +import { useAuth } from '../context/Auth.context'; import { useNavigate } from 'react-router-dom'; import { Environment } from './Environment.component'; diff --git a/packages/client/src/context/AuthContext.tsx b/packages/client/src/context/Auth.context.tsx similarity index 94% rename from packages/client/src/context/AuthContext.tsx rename to packages/client/src/context/Auth.context.tsx index cf1579d6..73192b17 100644 --- a/packages/client/src/context/AuthContext.tsx +++ b/packages/client/src/context/Auth.context.tsx @@ -27,7 +27,7 @@ export interface AuthProviderProps { children: ReactNode; } -export const AuthProvider: FC = (props) => { +export const AuthProvider: FC = ({ children }) => { const [authenticated, setAuthenticated] = useState(false); const [token, setToken] = useState(null); const [decodedToken, setDecodedToken] = useState(null); @@ -88,7 +88,7 @@ export const AuthProvider: FC = (props) => { } }, [token]); - return ; + return {children}; }; const saveToken = (token: string) => { diff --git a/packages/client/src/context/ProjectContext.tsx b/packages/client/src/context/Project.context.tsx similarity index 100% rename from packages/client/src/context/ProjectContext.tsx rename to packages/client/src/context/Project.context.tsx diff --git a/packages/client/src/context/Study.tsx b/packages/client/src/context/Study.context.tsx similarity index 91% rename from packages/client/src/context/Study.tsx rename to packages/client/src/context/Study.context.tsx index 41bee296..2e1d64dc 100644 --- a/packages/client/src/context/Study.tsx +++ b/packages/client/src/context/Study.context.tsx @@ -1,7 +1,7 @@ import { Dispatch, FC, ReactNode, SetStateAction, createContext, useContext, useState, useEffect } from 'react'; import { Study } from '../graphql/graphql'; -import { useProject } from './ProjectContext'; -import {useFindStudiesLazyQuery} from '../graphql/study/study'; +import { useProject } from './Project.context'; +import { useFindStudiesLazyQuery } from '../graphql/study/study'; export interface StudyContextProps { study: Study | null; diff --git a/packages/client/src/pages/AuthCallback.tsx b/packages/client/src/pages/AuthCallback.tsx index 00b5a571..4e1359e2 100644 --- a/packages/client/src/pages/AuthCallback.tsx +++ b/packages/client/src/pages/AuthCallback.tsx @@ -1,6 +1,6 @@ import { CircularProgress, Stack } from '@mui/material'; import { useEffect } from 'react'; -import { useAuth } from '../context/AuthContext'; +import { useAuth } from '../context/Auth.context'; export const AuthCallback: React.FC = () => { const { login } = useAuth(); diff --git a/packages/client/src/pages/Home.tsx b/packages/client/src/pages/Home.tsx index baed3de8..05515dfa 100644 --- a/packages/client/src/pages/Home.tsx +++ b/packages/client/src/pages/Home.tsx @@ -1,6 +1,6 @@ import { keyframes } from 'styled-components'; import styled from 'styled-components'; -import { useAuth } from '../context/AuthContext'; +import { useAuth } from '../context/Auth.context'; export const HomePage: React.FC = () => { const { token, authenticated } = useAuth(); diff --git a/packages/client/src/pages/LoginPage.tsx b/packages/client/src/pages/LoginPage.tsx index 5068676b..33db8045 100644 --- a/packages/client/src/pages/LoginPage.tsx +++ b/packages/client/src/pages/LoginPage.tsx @@ -1,7 +1,7 @@ import LockOutlinedIcon from '@mui/icons-material/LockOutlined'; import { Avatar, Box, Container, Link, Typography } from '@mui/material'; import { FC, useEffect } from 'react'; -import { useAuth } from '../context/AuthContext'; +import { useAuth } from '../context/Auth.context'; import {useNavigate} from 'react-router-dom'; export const LoginPage: FC = () => { diff --git a/packages/client/src/pages/LogoutPage.tsx b/packages/client/src/pages/LogoutPage.tsx index 3f795a43..b052460d 100644 --- a/packages/client/src/pages/LogoutPage.tsx +++ b/packages/client/src/pages/LogoutPage.tsx @@ -1,7 +1,7 @@ import { CircularProgress, Stack } from '@mui/material'; import { FC, useEffect } from 'react'; import { useNavigate } from 'react-router-dom'; -import { useAuth } from '../context/AuthContext'; +import { useAuth } from '../context/Auth.context'; export const LogoutPage: FC = () => { const navigate = useNavigate();