diff --git a/frontend/src/webPages/Components/CookieBanner.tsx b/frontend/src/components/CookieBanner.tsx similarity index 95% rename from frontend/src/webPages/Components/CookieBanner.tsx rename to frontend/src/components/CookieBanner.tsx index d09a2b5a..25267eb6 100644 --- a/frontend/src/webPages/Components/CookieBanner.tsx +++ b/frontend/src/components/CookieBanner.tsx @@ -1,5 +1,5 @@ import React, { useEffect, useState } from 'react'; -import '../RoutingRenders/App.css'; // Assuming you're adding the CSS here +import '../styles/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/webPages/Components/HeaderFooter.tsx b/frontend/src/components/HeaderFooter.tsx similarity index 98% rename from frontend/src/webPages/Components/HeaderFooter.tsx rename to frontend/src/components/HeaderFooter.tsx index 8b87a1d7..1d4860fe 100644 --- a/frontend/src/webPages/Components/HeaderFooter.tsx +++ b/frontend/src/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 "../contexts/AuthContext"; +import { useAuth } from "../pages/AuthContext"; // import Modal from '@mui/material/Modal'; // import Typography from '@mui/material/Typography'; diff --git a/frontend/src/webPages/Components/Holidays.tsx b/frontend/src/components/Holidays.tsx similarity index 100% rename from frontend/src/webPages/Components/Holidays.tsx rename to frontend/src/components/Holidays.tsx diff --git a/frontend/src/webPages/Components/Modals.tsx b/frontend/src/components/Modals.tsx similarity index 99% rename from frontend/src/webPages/Components/Modals.tsx rename to frontend/src/components/Modals.tsx index 7d674dcb..5104b52b 100644 --- a/frontend/src/webPages/Components/Modals.tsx +++ b/frontend/src/components/Modals.tsx @@ -8,7 +8,7 @@ import { getReactionsByFamilyId, getReactantsByReactionIdAsync, getProductsByReactionIdAsync, -} from "../../API/API_GetMethods"; +} from "../API/API_GetMethods"; import { Family, Mechanism, @@ -18,7 +18,7 @@ import { ReactionSpecies, Species, ReactionSpeciesDto, -} from "../../API/API_Interfaces"; +} from "../API/API_Interfaces"; import { createSpecies, createReaction, @@ -27,7 +27,7 @@ import { addSpeciesToReaction, createFamily, createMechanism, -} from "../../API/API_CreateMethods"; +} from "../API/API_CreateMethods"; import { Modal, @@ -38,7 +38,7 @@ import { Select, MenuItem, } from "@mui/material"; -import { updateReaction } from "../../API/API_UpdateMethods"; +import { updateReaction } from "../API/API_UpdateMethods"; const style = { position: "absolute" as "absolute", diff --git a/frontend/src/webPages/Components/NavDropDown.tsx b/frontend/src/components/NavDropDown.tsx similarity index 94% rename from frontend/src/webPages/Components/NavDropDown.tsx rename to frontend/src/components/NavDropDown.tsx index 89cc5bd3..1bac0f8c 100644 --- a/frontend/src/webPages/Components/NavDropDown.tsx +++ b/frontend/src/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 '../contexts/AuthContext'; // Import useAuth to get the user data +import { useAuth } from '../pages/AuthContext'; // Import useAuth to get the user data const NavDropDown = () => { const navigate = useNavigate(); diff --git a/frontend/src/webPages/Components/ProtectedRoute.tsx b/frontend/src/components/ProtectedRoute.tsx similarity index 92% rename from frontend/src/webPages/Components/ProtectedRoute.tsx rename to frontend/src/components/ProtectedRoute.tsx index ef71a0b3..d32488f1 100644 --- a/frontend/src/webPages/Components/ProtectedRoute.tsx +++ b/frontend/src/components/ProtectedRoute.tsx @@ -1,5 +1,5 @@ import { Navigate } from 'react-router-dom'; -import { useAuth } from '../contexts/AuthContext'; +import { useAuth } from '../pages/AuthContext'; interface ProtectedRouteProps { children: React.ReactNode; diff --git a/frontend/src/webPages/Components/RenderFamilyTree.tsx b/frontend/src/components/RenderFamilyTree.tsx similarity index 98% rename from frontend/src/webPages/Components/RenderFamilyTree.tsx rename to frontend/src/components/RenderFamilyTree.tsx index 0fa412c6..1eb3101e 100644 --- a/frontend/src/webPages/Components/RenderFamilyTree.tsx +++ b/frontend/src/components/RenderFamilyTree.tsx @@ -1,14 +1,14 @@ import React, { useEffect, useState, useRef } from "react"; -import { Family, Mechanism } from "../../API/API_Interfaces"; +import { Family, Mechanism } from "../API/API_Interfaces"; import { downloadOAYAML, downloadOAJSON, 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/webPages/Components/RenderSpeciesReactionTable.tsx b/frontend/src/components/RenderSpeciesReactionTable.tsx similarity index 99% rename from frontend/src/webPages/Components/RenderSpeciesReactionTable.tsx rename to frontend/src/components/RenderSpeciesReactionTable.tsx index db9b7886..76d2d409 100644 --- a/frontend/src/webPages/Components/RenderSpeciesReactionTable.tsx +++ b/frontend/src/components/RenderSpeciesReactionTable.tsx @@ -1,7 +1,7 @@ import React, {useEffect, useState } from 'react'; -import { Species, Reaction} from '../../API/API_Interfaces'; -import { getReactionsByMechanismId, getSpeciesByMechanismId} from '../../API/API_GetMethods'; +import { Species, Reaction} from '../API/API_Interfaces'; +import { getReactionsByMechanismId, getSpeciesByMechanismId} from '../API/API_GetMethods'; // import { CreateReactionModal, CreateSpeciesModal, ReactionPropertiesModal, SpeciesPropertiesModal } from './Modals'; import {CreateSpeciesModal, CreateReactionModal, UpdateReactionModal} from './Modals'; diff --git a/frontend/src/main.tsx b/frontend/src/main.tsx index ba824213..7d4f590a 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 './webPages/RoutingRenders/App'; +import App from './pages/App'; import { createRoot } from 'react-dom/client'; import { BrowserRouter } from 'react-router-dom'; diff --git a/frontend/src/webPages/RoutingRenders/App.tsx b/frontend/src/pages/App.tsx similarity index 73% rename from frontend/src/webPages/RoutingRenders/App.tsx rename to frontend/src/pages/App.tsx index 73527a7e..f76f8797 100644 --- a/frontend/src/webPages/RoutingRenders/App.tsx +++ b/frontend/src/pages/App.tsx @@ -1,17 +1,17 @@ //import React from 'react'; -import './App.css'; // Assuming CSS is applied globally -import Banner from '../Components/CookieBanner'; +import '../styles/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/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 Settings from './settings.tsx'; +import LoggedIn from './loggedIn.tsx'; +import FamilyPage from './family.tsx'; +import LogIn from './logIn.tsx'; +import RoleManagement from './RoleManagement.tsx'; +import NoAccess from './Unauthorized.tsx'; import { AccessibilityWidget } from 'react-accessibility'; -import { AuthProvider } from '../contexts/AuthContext'; -import ProtectedRoute from '../Components/ProtectedRoute'; // The ProtectedRoute you created earlier +import { AuthProvider } from './AuthContext'; +import ProtectedRoute from '../components/ProtectedRoute'; // The ProtectedRoute you created earlier // const theme = createTheme({ diff --git a/frontend/src/webPages/contexts/AuthContext.tsx b/frontend/src/pages/AuthContext.tsx similarity index 96% rename from frontend/src/webPages/contexts/AuthContext.tsx rename to frontend/src/pages/AuthContext.tsx index 2a1e9add..25ae8aff 100644 --- a/frontend/src/webPages/contexts/AuthContext.tsx +++ b/frontend/src/pages/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 { diff --git a/frontend/src/webPages/Roles/RoleManagement.tsx b/frontend/src/pages/RoleManagement.tsx similarity index 95% rename from frontend/src/webPages/Roles/RoleManagement.tsx rename to frontend/src/pages/RoleManagement.tsx index 54d09fab..e3a1c3c4 100644 --- a/frontend/src/webPages/Roles/RoleManagement.tsx +++ b/frontend/src/pages/RoleManagement.tsx @@ -18,14 +18,14 @@ import { GridEventListener, } from "@mui/x-data-grid"; -import { Header, Footer } from "../Components/HeaderFooter"; +import { Header, Footer } from "../components/HeaderFooter"; -import "./roles.css"; +import "../styles/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"; +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/webPages/Roles/Unauthorized.tsx b/frontend/src/pages/Unauthorized.tsx similarity index 100% rename from frontend/src/webPages/Roles/Unauthorized.tsx rename to frontend/src/pages/Unauthorized.tsx diff --git a/frontend/src/webPages/Family/family.tsx b/frontend/src/pages/family.tsx similarity index 90% rename from frontend/src/webPages/Family/family.tsx rename to frontend/src/pages/family.tsx index c27f939f..f2bd2405 100644 --- a/frontend/src/webPages/Family/family.tsx +++ b/frontend/src/pages/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 "./family.css"; +import "../styles/family.css"; const FamilyPage = () => { const [selectedFamilyId, setSelectedFamilyId] = useState(null); diff --git a/frontend/src/webPages/Family/familyStyling.tsx b/frontend/src/pages/familyStyling.tsx similarity index 100% rename from frontend/src/webPages/Family/familyStyling.tsx rename to frontend/src/pages/familyStyling.tsx diff --git a/frontend/src/webPages/LogIn/logIn.tsx b/frontend/src/pages/logIn.tsx similarity index 95% rename from frontend/src/webPages/LogIn/logIn.tsx rename to frontend/src/pages/logIn.tsx index 409f4579..b9a146cb 100644 --- a/frontend/src/webPages/LogIn/logIn.tsx +++ b/frontend/src/pages/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 "../contexts/AuthContext"; // Import the AuthContext +import { useAuth } from "../pages/AuthContext"; // Import the AuthContext -import "./logIn.css"; +import "../styles/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/webPages/LogIn/loggedIn.tsx b/frontend/src/pages/loggedIn.tsx similarity index 92% rename from frontend/src/webPages/LogIn/loggedIn.tsx rename to frontend/src/pages/loggedIn.tsx index ee7e5ac2..5e90978a 100644 --- a/frontend/src/webPages/LogIn/loggedIn.tsx +++ b/frontend/src/pages/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 "./loggedIn.css"; +import "../styles/loggedIn.css"; const LoggedIn = () => { const navigate = useNavigate(); diff --git a/frontend/src/webPages/Settings/settings.tsx b/frontend/src/pages/settings.tsx similarity index 91% rename from frontend/src/webPages/Settings/settings.tsx rename to frontend/src/pages/settings.tsx index 3c63989b..e0ac6d57 100644 --- a/frontend/src/webPages/Settings/settings.tsx +++ b/frontend/src/pages/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 "./settings.css" +import "../styles/settings.css" const Settings = () => { const navigate = useNavigate(); diff --git a/frontend/src/webPages/RoutingRenders/App.css b/frontend/src/styles/App.css similarity index 100% rename from frontend/src/webPages/RoutingRenders/App.css rename to frontend/src/styles/App.css diff --git a/frontend/src/webPages/Family/family.css b/frontend/src/styles/family.css similarity index 100% rename from frontend/src/webPages/Family/family.css rename to frontend/src/styles/family.css diff --git a/frontend/src/webPages/LogIn/logIn.css b/frontend/src/styles/logIn.css similarity index 100% rename from frontend/src/webPages/LogIn/logIn.css rename to frontend/src/styles/logIn.css diff --git a/frontend/src/webPages/LogIn/loggedIn.css b/frontend/src/styles/loggedIn.css similarity index 100% rename from frontend/src/webPages/LogIn/loggedIn.css rename to frontend/src/styles/loggedIn.css diff --git a/frontend/src/webPages/Roles/roles.css b/frontend/src/styles/roles.css similarity index 100% rename from frontend/src/webPages/Roles/roles.css rename to frontend/src/styles/roles.css diff --git a/frontend/src/webPages/Settings/settings.css b/frontend/src/styles/settings.css similarity index 100% rename from frontend/src/webPages/Settings/settings.css rename to frontend/src/styles/settings.css diff --git a/frontend/test/App.test.tsx b/frontend/test/App.test.tsx index c921315a..497a07d5 100644 --- a/frontend/test/App.test.tsx +++ b/frontend/test/App.test.tsx @@ -2,7 +2,7 @@ import { describe, expect, it } from 'vitest'; import { render } from '@testing-library/react'; import React from 'react'; import { MemoryRouter } from 'react-router-dom'; -import App from '../src/webPages/RoutingRenders/App'; +import App from '../src/pages/App'; import { GoogleOAuthProvider } from '@react-oauth/google'; describe('App Component Test', () => { diff --git a/frontend/test/family.test.tsx b/frontend/test/family.test.tsx index a95b3b86..6516d6f6 100644 --- a/frontend/test/family.test.tsx +++ b/frontend/test/family.test.tsx @@ -1,7 +1,7 @@ import { describe, expect, it, beforeEach, afterEach, vi } from 'vitest'; import { render, screen, fireEvent, cleanup, waitFor, within } from '@testing-library/react'; import React from 'react'; -import FamilyPage from '../src/webPages/Family/family'; +import FamilyPage from '../src/pages/family'; import { MemoryRouter, useNavigate } from 'react-router-dom'; // // Partially mock react-router-dom diff --git a/frontend/test/logIn.test.tsx b/frontend/test/logIn.test.tsx index 6037990d..bef703ae 100644 --- a/frontend/test/logIn.test.tsx +++ b/frontend/test/logIn.test.tsx @@ -1,7 +1,7 @@ import { describe, expect, it, beforeEach, afterEach } from 'vitest'; import { render, screen, fireEvent, waitFor, cleanup } from '@testing-library/react'; import React from 'react'; -import LogIn from '../src/webPages/LogIn/logIn'; +import LogIn from '../src/pages/logIn'; import { GoogleOAuthProvider } from '@react-oauth/google'; import { MemoryRouter } from 'react-router-dom'; diff --git a/frontend/test/loggedIn.test.tsx b/frontend/test/loggedIn.test.tsx index 0ce9a463..1e05b506 100644 --- a/frontend/test/loggedIn.test.tsx +++ b/frontend/test/loggedIn.test.tsx @@ -1,7 +1,7 @@ import { describe, expect, it, beforeEach, afterEach, vi } from 'vitest'; import { render, screen, fireEvent, cleanup, waitFor, within } from '@testing-library/react'; import React from 'react'; -import LoggedIn from '../src/webPages/LogIn/loggedIn'; +import LoggedIn from '../src/pages/loggedIn'; import { MemoryRouter, useNavigate } from 'react-router-dom'; // // Partially mock react-router-dom diff --git a/frontend/test/main.test.tsx b/frontend/test/main.test.tsx index f7dc692d..043ffaf7 100644 --- a/frontend/test/main.test.tsx +++ b/frontend/test/main.test.tsx @@ -2,7 +2,7 @@ import React from 'react'; import { vi, describe, expect, it, beforeEach, afterEach } from 'vitest'; import { render } from '@testing-library/react'; import { GoogleOAuthProvider } from '@react-oauth/google'; -import App from '../src/webPages/RoutingRenders/App'; +import App from '../src/pages/App'; import { BrowserRouter } from 'react-router-dom'; import '@testing-library/jest-dom'; diff --git a/frontend/test/modals.test.tsx b/frontend/test/modals.test.tsx index d09a412d..a3cb7fd7 100644 --- a/frontend/test/modals.test.tsx +++ b/frontend/test/modals.test.tsx @@ -11,9 +11,9 @@ import { CreateReactionModal, CreateReactantModal, CreateProductModal -} from "../src/webPages/Components/Modals"; +} from "../src/components/Modals"; -describe("Modal Components", () => { +describe("Modal components", () => { const onCloseMock = vi.fn(); it("renders CreatePublishModal without errors", () => { diff --git a/frontend/test/renderfamilytree.test.tsx b/frontend/test/renderfamilytree.test.tsx index 9ad597af..0ce58d06 100644 --- a/frontend/test/renderfamilytree.test.tsx +++ b/frontend/test/renderfamilytree.test.tsx @@ -1,7 +1,7 @@ import { render, screen } from "@testing-library/react"; import { describe, it, vi, expect } from "vitest"; import React from "react"; -import RenderFamilyTree from "../src/webPages/Components/RenderFamilyTree"; +import RenderFamilyTree from "../src/components/RenderFamilyTree"; // Mock functions for the component props const setSelectedFamilyIdMock = vi.fn(); diff --git a/frontend/test/rolemanagement.test.tsx b/frontend/test/rolemanagement.test.tsx index 76ba15af..568f7bf4 100644 --- a/frontend/test/rolemanagement.test.tsx +++ b/frontend/test/rolemanagement.test.tsx @@ -1,8 +1,8 @@ import React from 'react'; import { describe, expect, it, beforeEach, afterEach, vi } from 'vitest'; import { render, screen, waitFor } from '@testing-library/react'; -import RoleManagement from '../src/webPages/Roles/RoleManagement'; // Updated path to RoleManagement -import { useAuth } from '../src/webPages/contexts/AuthContext'; +import RoleManagement from '../src/pages/RoleManagement'; // Updated path to RoleManagement +import { useAuth } from '../src/pages/AuthContext'; import { getUsers } from '../src/API/API_GetMethods'; import { updateUser } from '../src/API/API_UpdateMethods'; import { deleteUser } from '../src/API/API_DeleteMethods'; @@ -10,7 +10,7 @@ import '@testing-library/jest-dom'; import userEvent from '@testing-library/user-event'; // Mocking necessary modules -vi.mock('../src/webPages/contexts/AuthContext', () => ({ +vi.mock('../src/pages/AuthContext', () => ({ useAuth: vi.fn(), })); diff --git a/frontend/test/settings.test.tsx b/frontend/test/settings.test.tsx index fa8d6f89..fc004287 100644 --- a/frontend/test/settings.test.tsx +++ b/frontend/test/settings.test.tsx @@ -1,7 +1,7 @@ import { describe, expect, it } from 'vitest'; import { render, screen, fireEvent } from '@testing-library/react'; import { MemoryRouter } from 'react-router-dom'; -import Settings from '../src/webPages/Settings/settings'; +import Settings from '../src/pages/settings'; import { GoogleOAuthProvider } from '@react-oauth/google'; // if needed, depending on your setup // describe('Settings Component', () => {