Skip to content

Commit

Permalink
Frontend file structure refactor (#231)
Browse files Browse the repository at this point in the history
* chore(frontend): rearranged file structure for better consistency

* chore: remove unused packages

* chore(frontend): rearranged file structure for better consistency
  • Loading branch information
harbassan authored Sep 16, 2024
1 parent d4a573d commit a00f548
Show file tree
Hide file tree
Showing 185 changed files with 301 additions and 5,385 deletions.
5 changes: 0 additions & 5 deletions frontend/example.csv

This file was deleted.

2 changes: 0 additions & 2 deletions frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,9 @@
"papaparse": "^5.4.1",
"react": "^17.0.2",
"react-audio-player": "^0.17.0",
"react-dnd": "^16.0.1",
"react-dom": "^17.0.2",
"react-firebase-hooks": "^3.0.4",
"react-flow-renderer": "^10.3.16",
"react-loading-skeleton": "^2.2.0",
"react-moveable": "0.29.0",
"react-router-dom": "^5.2.0",
"typescript": "^4.3.5",
Expand Down
24 changes: 12 additions & 12 deletions frontend/src/containers/App.jsx → frontend/src/App.jsx
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
import { ThemeProvider } from "@material-ui/core";
import "normalize.css";
import { BrowserRouter, Route, Switch } from "react-router-dom";
import AuthenticationContextProvider from "../context/AuthenticationContextProvider";
import ScenarioContextProvider from "../context/ScenarioContextProvider";
import SceneContextProvider from "../context/SceneContextProvider";
import AccessLevel from "../enums/route.access.level";
import ProtectedRoute from "../firebase/ProtectedRoute";
import "../styling/style.scss";
import DashboardPage from "./pages/Dashboard/DashboardPage";
import LoginPage from "./pages/LoginPage";
import ManageGroupsPage from "./pages/ManageGroups/ManageGroupsPage";
import PlayScenarioResolver from "./pages/PlayScenarioPage/PlayScenarioResolver";
import ScenarioSelectionPage from "./pages/ScenarioSelectionPage";
import { ScenePage } from "./pages/SceneSelectionPage";
import AuthenticationContextProvider from "./context/AuthenticationContextProvider";
import ScenarioContextProvider from "./context/ScenarioContextProvider";
import SceneContextProvider from "./context/SceneContextProvider";
import AccessLevel from "./enums/route.access.level";
import ProtectedRoute from "./firebase/ProtectedRoute";
import "./styles/style.scss";
import DashboardPage from "./features/dashboard/DashboardPage";
import LoginPage from "./features/login/LoginPage/LoginPage";
import ManageGroupsPage from "./features/groups/ManageGroupsPage";
import PlayScenarioResolver from "./features/playScenario/PlayScenarioResolver";
import ScenarioSelectionPage from "./features/scenarioSelection/ScenarioSelectionPage";
import { ScenePage } from "./features/sceneSelection/SceneSelectionPage";
import theme from "./theme/App.theme";

export default function App() {
Expand Down
Empty file removed frontend/src/components/.gitkeep
Empty file.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { useState } from "react";
import Button from "@material-ui/core/Button";
import styles from "../styling/CreateScenarioCard.module.scss";
import styles from "./CreateScenarioCard.module.scss";

export default function CreateScenarioCard({ onCreate, onClose }) {
const [name, setName] = useState("default name");
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/DashedCard.jsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Box } from "@material-ui/core";
import styles from "../styling/ListContainer.module.scss";
import styles from "./ListContainer/ListContainer.module.scss";

/**
* Component used to represent a card with a dashed border, used to indicate that a new card can be created.
Expand Down
24 changes: 0 additions & 24 deletions frontend/src/components/DraggableScene.jsx

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ import { Box } from "@material-ui/core";
import ImageList from "@material-ui/core/ImageList";
import ImageListItem from "@material-ui/core/ImageListItem";

import Thumbnail from "containers/pages/AuthoringTool/Components/Thumbnail";
import DashedCard from "./DashedCard";
import Thumbnail from "features/authoring/components/Thumbnail";
import DashedCard from "../DashedCard";

import styles from "../styling/ListContainer.module.scss";
import styles from "./ListContainer.module.scss";
import useStyles from "./component.styles";

/**
Expand Down
File renamed without changes.
142 changes: 0 additions & 142 deletions frontend/src/components/ResourceObjects.jsx

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import styles from "../styling/ScreenContainer.module.scss";
import styles from "./ScreenContainer.module.scss";

/**
* Component used to encapsulate the entire application.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ import Button from "@material-ui/core/Button";
import Dialog from "@material-ui/core/Dialog";
import Typography from "@material-ui/core/Typography";
import { useContext, useState } from "react";
import ScenarioContext from "../context/ScenarioContext";
import styles from "../styling/ShareModal.module.scss";
import ScenarioContext from "../../context/ScenarioContext";
import styles from "./ShareModal.module.scss";

/**
* Component used to a display a share model on the screen, conisting of a copiable link and a button.
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import Button from "@material-ui/core/Button";
import { useContext, useState } from "react";
import { Link, useHistory } from "react-router-dom";
import AuthenticationContext from "../context/AuthenticationContext";
import ScenarioContext from "../context/ScenarioContext";
import AccessLevel from "../enums/route.access.level";
import { useDelete, usePost } from "../hooks/crudHooks";
import styles from "../styling/SideBar.module.scss";
import HelpButton from "./HelpButton";
import CreateScenerioCard from "./CreateScenarioCard";
import DeleteModal from "./DeleteModal";
import AuthenticationContext from "../../context/AuthenticationContext";
import ScenarioContext from "../../context/ScenarioContext";
import AccessLevel from "../../enums/route.access.level";
import { useDelete, usePost } from "../../hooks/crudHooks";
import styles from "./SideBar.module.scss";
import HelpButton from "../HelpButton";
import CreateScenerioCard from "../CreateScenarioCard/CreateScenarioCard";
import DeleteModal from "../DeleteModal";

/**
* Component used for navigation and executing actions located at the left side of the screen.
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Triangle from "components/Triangle";
import Triangle from "components/SpeechboxArrow/Triangle";
import React, { useEffect } from "react";

const SpeechTextboxArrow = React.memo(
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ import Button from "@material-ui/core/Button";
import { useContext, useState } from "react";
import { Link, useHistory } from "react-router-dom";

import BackModal from "../containers/pages/AuthoringTool/BackModal";
import AuthoringToolContext from "../context/AuthoringToolContext";
import ScenarioContext from "../context/ScenarioContext";
import SceneContext from "../context/SceneContext";
import styles from "../styling/TopBar.module.scss";
import BackModal from "../../features/authoring/components/BackModal/BackModal";
import AuthoringToolContext from "../../context/AuthoringToolContext";
import ScenarioContext from "../../context/ScenarioContext";
import SceneContext from "../../context/SceneContext";
import styles from "./TopBar.module.scss";

/**
* Component used for navigation and executing actions located at the top of the screen.
Expand Down
File renamed without changes.
30 changes: 0 additions & 30 deletions frontend/src/components/TryAccessScenarioButton.jsx

This file was deleted.

14 changes: 0 additions & 14 deletions frontend/src/components/__tests__/DashedCard.test.js

This file was deleted.

24 changes: 0 additions & 24 deletions frontend/src/components/__tests__/ImageListContainer.test.js

This file was deleted.

Loading

0 comments on commit a00f548

Please sign in to comment.