From 0f8e50de0936151a4d3ebd4c07a1bf44fece8fc3 Mon Sep 17 00:00:00 2001 From: SydZero <63630743+SydZero@users.noreply.github.com> Date: Sun, 10 Nov 2024 16:56:33 -0600 Subject: [PATCH] Revert "New structure for front end files" --- frontend/src/main.tsx | 2 +- .../Components}/CookieBanner.tsx | 2 +- .../Components}/HeaderFooter.tsx | 2 +- .../Components}/Holidays.tsx | 0 .../Components}/Modals.tsx | 4 ++-- .../Components}/NavDropDown.tsx | 2 +- .../Components}/ProtectedRoute.tsx | 2 +- .../Components}/RenderFamilyTree.tsx | 4 ++-- .../RenderSpeciesReactionTable.tsx | 2 +- .../{styles => webPages/Family}/family.css | 0 .../src/{pages => webPages/Family}/family.tsx | 10 ++++---- .../Family}/familyStyling.tsx | 0 .../src/{styles => webPages/LogIn}/logIn.css | 0 .../src/{pages => webPages/LogIn}/logIn.tsx | 12 +++++----- .../{styles => webPages/LogIn}/loggedIn.css | 0 .../{pages => webPages/LogIn}/loggedIn.tsx | 4 ++-- .../Roles}/RoleManagement.tsx | 16 ++++++------- .../Roles}/Unauthorized.tsx | 0 .../src/{styles => webPages/Roles}/roles.css | 0 .../RoutingRenders}/App.css | 0 .../RoutingRenders}/App.tsx | 24 +++++++++---------- .../Settings}/settings.css | 0 .../{pages => webPages/Settings}/settings.tsx | 4 ++-- .../contexts}/AuthContext.tsx | 2 +- 24 files changed, 46 insertions(+), 46 deletions(-) rename frontend/src/{components => webPages/Components}/CookieBanner.tsx (95%) rename frontend/src/{components => webPages/Components}/HeaderFooter.tsx (98%) rename frontend/src/{components => webPages/Components}/Holidays.tsx (100%) rename frontend/src/{components => webPages/Components}/Modals.tsx (99%) rename frontend/src/{components => webPages/Components}/NavDropDown.tsx (94%) rename frontend/src/{components => webPages/Components}/ProtectedRoute.tsx (92%) rename frontend/src/{components => webPages/Components}/RenderFamilyTree.tsx (99%) rename frontend/src/{components => webPages/Components}/RenderSpeciesReactionTable.tsx (99%) rename frontend/src/{styles => webPages/Family}/family.css (100%) rename frontend/src/{pages => webPages/Family}/family.tsx (89%) rename frontend/src/{pages => webPages/Family}/familyStyling.tsx (100%) rename frontend/src/{styles => webPages/LogIn}/logIn.css (100%) rename frontend/src/{pages => webPages/LogIn}/logIn.tsx (95%) rename frontend/src/{styles => webPages/LogIn}/loggedIn.css (100%) rename frontend/src/{pages => webPages/LogIn}/loggedIn.tsx (92%) rename frontend/src/{pages => webPages/Roles}/RoleManagement.tsx (94%) rename frontend/src/{pages => webPages/Roles}/Unauthorized.tsx (100%) rename frontend/src/{styles => webPages/Roles}/roles.css (100%) rename frontend/src/{styles => webPages/RoutingRenders}/App.css (100%) rename frontend/src/{pages => webPages/RoutingRenders}/App.tsx (68%) rename frontend/src/{styles => webPages/Settings}/settings.css (100%) rename frontend/src/{pages => webPages/Settings}/settings.tsx (91%) rename frontend/src/{pages => webPages/contexts}/AuthContext.tsx (96%) diff --git a/frontend/src/main.tsx b/frontend/src/main.tsx index 7d4f590a..ba824213 100644 --- a/frontend/src/main.tsx +++ b/frontend/src/main.tsx @@ -1,6 +1,6 @@ import React from 'react'; import { GoogleOAuthProvider } from '@react-oauth/google'; -import App from './pages/App'; +import App from './webPages/RoutingRenders/App'; import { createRoot } from 'react-dom/client'; import { BrowserRouter } from 'react-router-dom'; diff --git a/frontend/src/components/CookieBanner.tsx b/frontend/src/webPages/Components/CookieBanner.tsx similarity index 95% rename from frontend/src/components/CookieBanner.tsx rename to frontend/src/webPages/Components/CookieBanner.tsx index 9a8fd3c1..d09a2b5a 100644 --- a/frontend/src/components/CookieBanner.tsx +++ b/frontend/src/webPages/Components/CookieBanner.tsx @@ -1,5 +1,5 @@ import React, { useEffect, useState } from 'react'; -import '../pages/App'; +import '../RoutingRenders/App.css'; // Assuming you're adding the CSS here const CookieBanner: React.FC = () => { // State to manage whether the banner is visible diff --git a/frontend/src/components/HeaderFooter.tsx b/frontend/src/webPages/Components/HeaderFooter.tsx similarity index 98% rename from frontend/src/components/HeaderFooter.tsx rename to frontend/src/webPages/Components/HeaderFooter.tsx index 1d4860fe..8b87a1d7 100644 --- a/frontend/src/components/HeaderFooter.tsx +++ b/frontend/src/webPages/Components/HeaderFooter.tsx @@ -6,7 +6,7 @@ import { Drawer } from "@mui/material"; import Paper from "@mui/material/Paper"; import Container from "@mui/material/Container"; import DensitySmallSharpIcon from "@mui/icons-material/DensitySmallSharp"; -import { useAuth } from "../pages/AuthContext"; +import { useAuth } from "../contexts/AuthContext"; // import Modal from '@mui/material/Modal'; // import Typography from '@mui/material/Typography'; diff --git a/frontend/src/components/Holidays.tsx b/frontend/src/webPages/Components/Holidays.tsx similarity index 100% rename from frontend/src/components/Holidays.tsx rename to frontend/src/webPages/Components/Holidays.tsx diff --git a/frontend/src/components/Modals.tsx b/frontend/src/webPages/Components/Modals.tsx similarity index 99% rename from frontend/src/components/Modals.tsx rename to frontend/src/webPages/Components/Modals.tsx index 87697040..801e816b 100644 --- a/frontend/src/components/Modals.tsx +++ b/frontend/src/webPages/Components/Modals.tsx @@ -8,7 +8,7 @@ import { getReactionsByFamilyId, getReactantsByReactionIdAsync, getProductsByReactionIdAsync, -} from "../API/API_GetMethods"; +} from "../../API/API_GetMethods"; import { Family, Mechanism, @@ -27,7 +27,7 @@ import { addSpeciesToReaction, createFamily, createMechanism, -} from "../API/API_CreateMethods"; +} from "../../API/API_CreateMethods"; import { Modal, diff --git a/frontend/src/components/NavDropDown.tsx b/frontend/src/webPages/Components/NavDropDown.tsx similarity index 94% rename from frontend/src/components/NavDropDown.tsx rename to frontend/src/webPages/Components/NavDropDown.tsx index 1bac0f8c..89cc5bd3 100644 --- a/frontend/src/components/NavDropDown.tsx +++ b/frontend/src/webPages/Components/NavDropDown.tsx @@ -4,7 +4,7 @@ import List from '@mui/material/List'; import ListItem from '@mui/material/ListItem'; import ListItemText from '@mui/material/ListItemText'; import ListItemButton from '@mui/material/ListItemButton'; -import { useAuth } from '../pages/AuthContext'; // Import useAuth to get the user data +import { useAuth } from '../contexts/AuthContext'; // Import useAuth to get the user data const NavDropDown = () => { const navigate = useNavigate(); diff --git a/frontend/src/components/ProtectedRoute.tsx b/frontend/src/webPages/Components/ProtectedRoute.tsx similarity index 92% rename from frontend/src/components/ProtectedRoute.tsx rename to frontend/src/webPages/Components/ProtectedRoute.tsx index d32488f1..ef71a0b3 100644 --- a/frontend/src/components/ProtectedRoute.tsx +++ b/frontend/src/webPages/Components/ProtectedRoute.tsx @@ -1,5 +1,5 @@ import { Navigate } from 'react-router-dom'; -import { useAuth } from '../pages/AuthContext'; +import { useAuth } from '../contexts/AuthContext'; interface ProtectedRouteProps { children: React.ReactNode; diff --git a/frontend/src/components/RenderFamilyTree.tsx b/frontend/src/webPages/Components/RenderFamilyTree.tsx similarity index 99% rename from frontend/src/components/RenderFamilyTree.tsx rename to frontend/src/webPages/Components/RenderFamilyTree.tsx index d5538871..75a4e6b3 100644 --- a/frontend/src/components/RenderFamilyTree.tsx +++ b/frontend/src/webPages/Components/RenderFamilyTree.tsx @@ -7,8 +7,8 @@ import { downloadOAMusicbox, getFamilies, getMechanismsByFamilyId, -} from "../API/API_GetMethods"; -import { deleteFamily, deleteMechanism } from "../API/API_DeleteMethods"; +} from "../../API/API_GetMethods"; +import { deleteFamily, deleteMechanism } from "../../API/API_DeleteMethods"; import { SimpleTreeView } from "@mui/x-tree-view/SimpleTreeView"; import { TreeItem } from "@mui/x-tree-view/TreeItem"; diff --git a/frontend/src/components/RenderSpeciesReactionTable.tsx b/frontend/src/webPages/Components/RenderSpeciesReactionTable.tsx similarity index 99% rename from frontend/src/components/RenderSpeciesReactionTable.tsx rename to frontend/src/webPages/Components/RenderSpeciesReactionTable.tsx index 383d6110..0ef72fd6 100644 --- a/frontend/src/components/RenderSpeciesReactionTable.tsx +++ b/frontend/src/webPages/Components/RenderSpeciesReactionTable.tsx @@ -22,7 +22,7 @@ import Tab from "@mui/material/Tab"; import { getReactionsByMechanismId, getSpeciesByMechanismId, -} from "../API/API_GetMethods"; +} from "../../API/API_GetMethods"; const tabsHeaderStyle: React.CSSProperties = { backgroundColor: "#f0f0f0", diff --git a/frontend/src/styles/family.css b/frontend/src/webPages/Family/family.css similarity index 100% rename from frontend/src/styles/family.css rename to frontend/src/webPages/Family/family.css diff --git a/frontend/src/pages/family.tsx b/frontend/src/webPages/Family/family.tsx similarity index 89% rename from frontend/src/pages/family.tsx rename to frontend/src/webPages/Family/family.tsx index d8e8394a..a3fdba04 100644 --- a/frontend/src/pages/family.tsx +++ b/frontend/src/webPages/Family/family.tsx @@ -1,14 +1,14 @@ import React, { useState } from "react"; -import RenderFamilyTree from "../components/RenderFamilyTree"; -import RenderSpeciesReactionTable from "../components/RenderSpeciesReactionTable"; -import { CreateFamilyModal, CreateMechanismModal } from "../components/Modals"; +import RenderFamilyTree from "../Components/RenderFamilyTree"; +import RenderSpeciesReactionTable from "../Components/RenderSpeciesReactionTable"; +import { CreateFamilyModal, CreateMechanismModal } from "../Components/Modals"; import { StyledDetailBox } from "./familyStyling"; -import { Header, Footer } from "../components/HeaderFooter"; +import { Header, Footer } from "../Components/HeaderFooter"; -import "../styles/family.css"; +import "./family.css"; const FamilyPage = () => { const [selectedFamilyId, setSelectedFamilyId] = useState(null); diff --git a/frontend/src/pages/familyStyling.tsx b/frontend/src/webPages/Family/familyStyling.tsx similarity index 100% rename from frontend/src/pages/familyStyling.tsx rename to frontend/src/webPages/Family/familyStyling.tsx diff --git a/frontend/src/styles/logIn.css b/frontend/src/webPages/LogIn/logIn.css similarity index 100% rename from frontend/src/styles/logIn.css rename to frontend/src/webPages/LogIn/logIn.css diff --git a/frontend/src/pages/logIn.tsx b/frontend/src/webPages/LogIn/logIn.tsx similarity index 95% rename from frontend/src/pages/logIn.tsx rename to frontend/src/webPages/LogIn/logIn.tsx index f4d3ba4d..409f4579 100644 --- a/frontend/src/pages/logIn.tsx +++ b/frontend/src/webPages/LogIn/logIn.tsx @@ -2,19 +2,19 @@ import { useNavigate } from "react-router-dom"; import { useState, useEffect } from "react"; import { googleLogout, useGoogleLogin } from "@react-oauth/google"; import axios from "axios"; -import { useAuth } from "./AuthContext"; // Import the AuthContext +import { useAuth } from "../contexts/AuthContext"; // Import the AuthContext -import "../styles/logIn.css"; +import "./logIn.css"; import Button from "@mui/material/Button"; import Box from "@mui/material/Box"; import Modal from "@mui/material/Modal"; import Typography from "@mui/material/Typography"; import GoogleIcon from "@mui/icons-material/Google"; import NoAccountsIcon from "@mui/icons-material/NoAccounts"; -import { Footer } from "../components/HeaderFooter"; -import Holidays from "../components/Holidays"; // Import the Holidays component -import { getUserByEmail } from "../API/API_GetMethods"; -import { createUser } from "../API/API_CreateMethods"; +import { Footer } from "../Components/HeaderFooter"; +import Holidays from "../Components/Holidays"; // Import the Holidays component +import { getUserByEmail } from "../../API/API_GetMethods"; +import { createUser } from "../../API/API_CreateMethods"; interface AuthUser { access_token: string; diff --git a/frontend/src/styles/loggedIn.css b/frontend/src/webPages/LogIn/loggedIn.css similarity index 100% rename from frontend/src/styles/loggedIn.css rename to frontend/src/webPages/LogIn/loggedIn.css diff --git a/frontend/src/pages/loggedIn.tsx b/frontend/src/webPages/LogIn/loggedIn.tsx similarity index 92% rename from frontend/src/pages/loggedIn.tsx rename to frontend/src/webPages/LogIn/loggedIn.tsx index 5e90978a..ee7e5ac2 100644 --- a/frontend/src/pages/loggedIn.tsx +++ b/frontend/src/webPages/LogIn/loggedIn.tsx @@ -2,9 +2,9 @@ import { useNavigate } from 'react-router-dom'; import Button from "@mui/material/Button"; import ButtonGroup from '@mui/material/ButtonGroup'; -import { Header, Footer } from '../components/HeaderFooter'; +import { Header, Footer } from '../Components/HeaderFooter'; -import "../styles/loggedIn.css"; +import "./loggedIn.css"; const LoggedIn = () => { const navigate = useNavigate(); diff --git a/frontend/src/pages/RoleManagement.tsx b/frontend/src/webPages/Roles/RoleManagement.tsx similarity index 94% rename from frontend/src/pages/RoleManagement.tsx rename to frontend/src/webPages/Roles/RoleManagement.tsx index 9851e5a5..54d09fab 100644 --- a/frontend/src/pages/RoleManagement.tsx +++ b/frontend/src/webPages/Roles/RoleManagement.tsx @@ -18,14 +18,14 @@ import { GridEventListener, } from "@mui/x-data-grid"; -import { Header, Footer } from "../components/HeaderFooter"; - -import "../styles/roles.css"; -//import { useAuth } from "./AuthContext"; // Import the AuthContext -import { getUsers } from "../API/API_GetMethods"; -import { User } from "../API/API_Interfaces"; -import { updateUser } from "../API/API_UpdateMethods"; -import { deleteUser } from "../API/API_DeleteMethods"; +import { Header, Footer } from "../Components/HeaderFooter"; + +import "./roles.css"; +//import { useAuth } from "../contexts/AuthContext"; // Import the AuthContext +import { getUsers } from "../../API/API_GetMethods"; +import { User } from "../../API/API_Interfaces"; +import { updateUser } from "../../API/API_UpdateMethods"; +import { deleteUser } from "../../API/API_DeleteMethods"; function RolesToolbar() { return ( diff --git a/frontend/src/pages/Unauthorized.tsx b/frontend/src/webPages/Roles/Unauthorized.tsx similarity index 100% rename from frontend/src/pages/Unauthorized.tsx rename to frontend/src/webPages/Roles/Unauthorized.tsx diff --git a/frontend/src/styles/roles.css b/frontend/src/webPages/Roles/roles.css similarity index 100% rename from frontend/src/styles/roles.css rename to frontend/src/webPages/Roles/roles.css diff --git a/frontend/src/styles/App.css b/frontend/src/webPages/RoutingRenders/App.css similarity index 100% rename from frontend/src/styles/App.css rename to frontend/src/webPages/RoutingRenders/App.css diff --git a/frontend/src/pages/App.tsx b/frontend/src/webPages/RoutingRenders/App.tsx similarity index 68% rename from frontend/src/pages/App.tsx rename to frontend/src/webPages/RoutingRenders/App.tsx index 243736aa..73527a7e 100644 --- a/frontend/src/pages/App.tsx +++ b/frontend/src/webPages/RoutingRenders/App.tsx @@ -1,17 +1,17 @@ -import React from 'react'; -import '../styles/App.css'; // Assuming CSS is applied globally -import Banner from '../components/CookieBanner'; -import { createTheme, ThemeProvider } from '@mui/material/styles'; +//import React from 'react'; +import './App.css'; // Assuming CSS is applied globally +import Banner from '../Components/CookieBanner'; +//import { createTheme/*, ThemeProvider*/ } from '@mui/material/styles'; import { Route, Routes } from 'react-router-dom'; -import Settings from './settings'; -import LoggedIn from './loggedIn'; -import FamilyPage from './family'; -import LogIn from './logIn'; -import RoleManagement from './RoleManagement'; -import NoAccess from './Unauthorized.tsx'; +import Settings from '../Settings/settings'; +import LoggedIn from '../LogIn/loggedIn'; +import FamilyPage from '../Family/family'; +import LogIn from '../LogIn/logIn'; +import RoleManagement from '../Roles/RoleManagement'; +import NoAccess from '../Roles/Unauthorized.tsx'; import { AccessibilityWidget } from 'react-accessibility'; -import { AuthProvider } from './AuthContext'; -import ProtectedRoute from '../components/ProtectedRoute'; // The ProtectedRoute you created earlier +import { AuthProvider } from '../contexts/AuthContext'; +import ProtectedRoute from '../Components/ProtectedRoute'; // The ProtectedRoute you created earlier // const theme = createTheme({ diff --git a/frontend/src/styles/settings.css b/frontend/src/webPages/Settings/settings.css similarity index 100% rename from frontend/src/styles/settings.css rename to frontend/src/webPages/Settings/settings.css diff --git a/frontend/src/pages/settings.tsx b/frontend/src/webPages/Settings/settings.tsx similarity index 91% rename from frontend/src/pages/settings.tsx rename to frontend/src/webPages/Settings/settings.tsx index e0ac6d57..3c63989b 100644 --- a/frontend/src/pages/settings.tsx +++ b/frontend/src/webPages/Settings/settings.tsx @@ -1,9 +1,9 @@ import { useNavigate } from 'react-router-dom'; import Button from "@mui/material/Button"; import ButtonGroup from '@mui/material/ButtonGroup'; -import { Header, Footer } from '../components/HeaderFooter'; +import { Header, Footer } from '../Components/HeaderFooter'; -import "../styles/settings.css" +import "./settings.css" const Settings = () => { const navigate = useNavigate(); diff --git a/frontend/src/pages/AuthContext.tsx b/frontend/src/webPages/contexts/AuthContext.tsx similarity index 96% rename from frontend/src/pages/AuthContext.tsx rename to frontend/src/webPages/contexts/AuthContext.tsx index 25ae8aff..2a1e9add 100644 --- a/frontend/src/pages/AuthContext.tsx +++ b/frontend/src/webPages/contexts/AuthContext.tsx @@ -5,7 +5,7 @@ import { ReactNode, useEffect, } from "react"; -import { User } from "../API/API_Interfaces"; +import { User } from "../../API/API_Interfaces"; // Define the shape of the AuthContext interface AuthContextProps {