Skip to content

Commit

Permalink
chore: change files structure (#1286)
Browse files Browse the repository at this point in the history
* chore: change files structure

* chore:  rename Main.tsx to App.tsx

* chore: resotre App.tsx file

* chore:  remove scrollToTop file
  • Loading branch information
shootermv authored Jan 30, 2025
1 parent dd289b8 commit 32d9e25
Show file tree
Hide file tree
Showing 13 changed files with 30 additions and 40 deletions.
4 changes: 2 additions & 2 deletions src/App.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import WelcomePage from "./components/WelcomePage";
import QuizTemplate from "./components/QuizTemplate";
import WelcomePage from "./pages/WelcomePage";
import QuizTemplate from "./QuizTemplate";
import React from "react";
import { Route, Routes } from "react-router-dom";

Expand Down
26 changes: 13 additions & 13 deletions src/components/QuizTemplate.tsx → src/QuizTemplate.tsx
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
import React, { useState, useEffect } from "react";
import SelectQuestionsTotal from "./SelectQuestionsTotal";
import SelectCategory from "./SelectCategory";
import { ALL_CATEGORIES, QUESTION_NUMS } from "../constants";
import Results from "./Results";
import shuffle from "../shuffle-arr";

import FCCLogo from "./FCCLogo";
import Questions from "./Questions";
import "../stylesheets/App.css";
import SelectQuestionsTotal from "./pages/SelectQuestionsTotal";
import SelectCategory from "./pages/SelectCategory";
import { ALL_CATEGORIES, QUESTION_NUMS } from "./constants";
import Results from "./pages/Results";
import shuffle from "./shuffle-arr";

import FCCLogo from "./components/FCCLogo";
import Questions from "./pages/Questions";
import "./stylesheets/App.css";
import {
correctModalResponses,
incorrectModalResponses
} from "../data/modal-responses";
import ButtonLink from "./ButtonLink";
} from "./data/modal-responses";
import ButtonLink from "./components/ButtonLink";
import { Route, Routes, useNavigate } from "react-router-dom";

const QuizTemplate: React.FC = () => {
const Main: React.FC = () => {
const navigate = useNavigate();
const [quiz, setQuiz] = useState(ALL_CATEGORIES);
const [questionNumber, setQuestionNumber] = useState(1);
Expand Down Expand Up @@ -222,4 +222,4 @@ const QuizTemplate: React.FC = () => {
</>
);
};
export default QuizTemplate;
export default Main;
2 changes: 1 addition & 1 deletion src/__tests__/Results.test.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from "react";
import Results from "../components/Results";
import Results from "../pages/Results";

import { render, cleanup } from "@testing-library/react";
import { vi } from "vitest";
Expand Down
2 changes: 1 addition & 1 deletion src/__tests__/SelectCategory.test.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from "react";
import SelectCategory from "../components/SelectCategory";
import SelectCategory from "../pages/SelectCategory";
import { render, cleanup, RenderResult } from "@testing-library/react";
import { expect, afterEach, describe, it } from "vitest";

Expand Down
2 changes: 1 addition & 1 deletion src/__tests__/SelectQuestionsTotal.test.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from "react";
import SelectQuestionsTotal from "../components/SelectQuestionsTotal";
import SelectQuestionsTotal from "../pages/SelectQuestionsTotal";
import { render, cleanup } from "@testing-library/react";
import { expect, afterEach, describe, it, vi } from "vitest";

Expand Down
2 changes: 1 addition & 1 deletion src/__tests__/WelcomePage.test.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from "react";
import WelcomePage from "../components/WelcomePage";
import WelcomePage from "../pages/WelcomePage";
import { cleanup, render } from "@testing-library/react";
import { HashRouter as Router } from "react-router-dom";
import { afterEach, describe, it } from "vitest";
Expand Down
12 changes: 0 additions & 12 deletions src/components/ScrollToTop.tsx

This file was deleted.

12 changes: 7 additions & 5 deletions src/index.tsx
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
import React from "react";
import ReactDOM from "react-dom/client";
import Root from "./App";
import reportWebVitals from "./reportWebVitals";
import { createRoot } from "react-dom/client";
import { RouterProvider, createHashRouter } from "react-router-dom";

const router = createHashRouter([{ path: "*", Component: Root }]);
import reportWebVitals from "./reportWebVitals";
import App from "./App";

const router = createHashRouter([{ path: "*", Component: App }]);
const root = document.getElementById("root");

ReactDOM.createRoot(document.getElementById("root")).render(
createRoot(root || document.createElement("div")).render(
<React.StrictMode>
<RouterProvider router={router} />
</React.StrictMode>
Expand Down
2 changes: 1 addition & 1 deletion src/components/Questions.tsx → src/pages/Questions.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { useNavigate } from "react-router-dom";
import QuizModal from "./QuizModal";
import QuizModal from "../components/QuizModal";
import React, { useEffect } from "react";

import { QuizProps } from "../types";
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
6 changes: 3 additions & 3 deletions src/components/WelcomePage.tsx → src/pages/WelcomePage.tsx
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import rpgMenu from "../images/rpg-menu.webp";
import mainCharacter from "../images/main-character.webp";
import fccBackground from "../images/fcc_background.webp";
import Navbar from "./Navbar";
import HeroSection from "./HeroSection";
import Navbar from "../components/Navbar";
import HeroSection from "../components/HeroSection";
import "../stylesheets/HomepageRow.css";
import React from "react";
import { ROUNDED_QUESTION_COUNT } from "../constants";
import ButtonLink from "./ButtonLink";
import ButtonLink from "../components/ButtonLink";

const WelcomePage: React.FC = () => {
return (
Expand Down

0 comments on commit 32d9e25

Please sign in to comment.