Merge pull request #17 from quizer-app/develop

Restructure project & Fix quiz images & date
quizer-app · Jan 9, 2024 · 746cdf3 · 746cdf3
2 parents 03e014d + 7a392c2
commit 746cdf3
Show file tree

Hide file tree

Showing 40 changed files with 159 additions and 162 deletions.
diff --git a/src/api/axios.ts b/src/api/axios.ts
@@ -1,6 +1,6 @@
 import axios from "axios";
 
-const baseURL =
+export const baseURL =
   (import.meta.env.VITE_API_URL as string) ?? "https://api.local.elotoja.com";
 
 export const api = axios.create({

diff --git a/src/api/types/quiz.ts b/src/api/types/quiz.ts
@@ -1,3 +1,13 @@
+export type PaginatedQuizResponse = {
+  items: QuizResponse[];
+  pageNumber: number;
+  pageSize: number;
+  totalCount: number;
+  totalPages: number;
+  hasNextPage: boolean;
+  hasPreviousPage: boolean;
+};
+
 export type QuizResponse = {
   id: string;
   userId: string;

diff --git a/src/components/HydrateAtoms.tsx → src/atoms/HydrateAtoms.tsx b/src/components/HydrateAtoms.tsx → src/atoms/HydrateAtoms.tsx
diff --git a/src/components/App.tsx b/src/components/App.tsx
@@ -1,18 +1,16 @@
 import { Route, Routes } from "react-router-dom";
 import Layout from "./layout/Layout";
-import Flashcards from "./layout/Quiz/Flashcards";
-import Quiz from "./layout/Quiz/Quiz";
-import Test from "./layout/Quiz/Test";
-import ForgotPassword from "./page/ForgotPassword";
-import Home from "./page/Home";
-import PasswordReset from "./page/PasswordReset";
-import SignIn from "./page/SignIn";
-import SignUp from "./page/SignUp";
-import Users from "./page/Users";
-import Verification from "./page/Verification";
-import Verified from "./page/Verified";
+import ForgotPassword from "./pages/Auth/ForgotPassword";
+import PasswordReset from "./pages/Auth/PasswordReset";
+import SignIn from "./pages/Auth/SignIn";
+import SignUp from "./pages/Auth/SignUp";
+import Verification from "./pages/Auth/Verification";
+import Verified from "./pages/Auth/Verified";
+import Home from "./pages/Home/Home";
+import Flashcards from "./pages/Quiz/Flashcards";
+import Quiz from "./pages/Quiz/Quiz";
+import Test from "./pages/Quiz/Test";
 import PersistLogin from "./router/PersistLogin";
-import RequireAuth from "./router/RequireAuth";
 import NotFound from "./status/NotFound";
 
 export default function App() {
@@ -28,10 +26,9 @@ export default function App() {
           <Route path="/password_reset" element={<PasswordReset />} />
           <Route path="/forgot_password" element={<ForgotPassword />} />
 
-          {/* <Route path="/flashcards" element={<Flashcards />} /> */}
-          <Route element={<RequireAuth />}>
+          {/* <Route element={<RequireAuth />}>
             <Route path="/users" element={<Users />} />
-          </Route>
+          </Route> */}
 
           <Route path="/:userName/:quizSlug" element={<Quiz />} />
 

diff --git a/...out/ContentBox/SvgIcons/CheckmarkIcon.tsx → ...layout/ContentBox/Icons/CheckmarkIcon.tsx b/...out/ContentBox/SvgIcons/CheckmarkIcon.tsx → ...layout/ContentBox/Icons/CheckmarkIcon.tsx
diff --git a/.../layout/ContentBox/SvgIcons/EmailIcon.tsx → ...nts/layout/ContentBox/Icons/EmailIcon.tsx b/.../layout/ContentBox/SvgIcons/EmailIcon.tsx → ...nts/layout/ContentBox/Icons/EmailIcon.tsx
diff --git a/...s/layout/ContentBox/SvgIcons/LockIcon.tsx → ...ents/layout/ContentBox/Icons/LockIcon.tsx b/...s/layout/ContentBox/SvgIcons/LockIcon.tsx → ...ents/layout/ContentBox/Icons/LockIcon.tsx
diff --git a/...ayout/ContentBox/SvgIcons/WarningIcon.tsx → ...s/layout/ContentBox/Icons/WarningIcon.tsx b/...ayout/ContentBox/SvgIcons/WarningIcon.tsx → ...s/layout/ContentBox/Icons/WarningIcon.tsx
diff --git a/...ponents/layout/Sections/Footer/Footer.tsx → src/components/layout/Footer/Footer.tsx b/...ponents/layout/Sections/Footer/Footer.tsx → src/components/layout/Footer/Footer.tsx
diff --git a/src/components/layout/Quiz/QuizHeader.tsx → src/components/layout/Header/QuizHeader.tsx b/src/components/layout/Quiz/QuizHeader.tsx → src/components/layout/Header/QuizHeader.tsx
@@ -1,8 +1,8 @@
 import MainLogo from "@/assets/images/light.png";
 import { X } from "lucide-react";
 import { Link } from "react-router-dom";
-import DarkModeButton from "../Header/DarkModeButton";
-import Logo from "../Header/Logo";
+import DarkModeButton from "./DarkModeButton";
+import Logo from "./Logo";
 
 interface QuizHeaderProps {
   name: string;

diff --git a/src/components/layout/Layout.tsx b/src/components/layout/Layout.tsx
@@ -1,7 +1,7 @@
 import { Outlet } from "react-router-dom";
 import { Header } from "./Header/Header";
 import { Toaster } from "react-hot-toast";
-import Footer from "./Sections/Footer/Footer";
+import Footer from "./Footer/Footer";
 
 export default function Layout() {
   return (

diff --git a/src/components/layout/QuizLayout.tsx b/src/components/layout/QuizLayout.tsx
@@ -1,6 +1,6 @@
 import { Toaster } from "react-hot-toast";
 import { Outlet } from "react-router-dom";
-import QuizHeader from "./Quiz/QuizHeader";
+import QuizHeader from "./Header/QuizHeader";
 
 export default function QuizLayout() {
   return (

diff --git a/src/components/page/Home.tsx b/src/components/page/Home.tsx
diff --git a/src/components/page/Users.tsx b/src/components/page/Users.tsx
diff --git a/src/components/page/ForgotPassword.tsx → src/components/pages/Auth/ForgotPassword.tsx b/src/components/page/ForgotPassword.tsx → src/components/pages/Auth/ForgotPassword.tsx
@@ -1,10 +1,10 @@
 import { Link } from "react-router-dom";
-import { Button } from "../layout/ContentBox/Button";
-import ContentBox from "../layout/ContentBox/ContentBox";
-import WarningIcon from "../layout/ContentBox/SvgIcons/WarningIcon";
-import Text from "../layout/ContentBox/Text";
-import Title from "../layout/ContentBox/Title";
-import FillHeight from "../layout/Other/FillHeight";
+import { Button } from "../../layout/ContentBox/Button";
+import ContentBox from "../../layout/ContentBox/ContentBox";
+import WarningIcon from "../../layout/ContentBox/Icons/WarningIcon";
+import Text from "../../layout/ContentBox/Text";
+import Title from "../../layout/ContentBox/Title";
+import FillHeight from "../../layout/Other/FillHeight";
 
 export default function ForgotPassword() {
   return (

diff --git a/src/components/page/PasswordReset.tsx → src/components/pages/Auth/PasswordReset.tsx b/src/components/page/PasswordReset.tsx → src/components/pages/Auth/PasswordReset.tsx
@@ -1,9 +1,9 @@
-import { Button } from "../layout/ContentBox/Button";
-import ContentBox from "../layout/ContentBox/ContentBox";
-import LockIcon from "../layout/ContentBox/SvgIcons/LockIcon";
-import Text from "../layout/ContentBox/Text";
-import Title from "../layout/ContentBox/Title";
-import FillHeight from "../layout/Other/FillHeight";
+import { Button } from "../../layout/ContentBox/Button";
+import ContentBox from "../../layout/ContentBox/ContentBox";
+import LockIcon from "../../layout/ContentBox/Icons/LockIcon";
+import Text from "../../layout/ContentBox/Text";
+import Title from "../../layout/ContentBox/Title";
+import FillHeight from "../../layout/Other/FillHeight";
 
 export default function PasswordReset() {
   return (

diff --git a/src/components/page/SignIn.tsx → src/components/pages/Auth/SignIn.tsx b/src/components/page/SignIn.tsx → src/components/pages/Auth/SignIn.tsx
@@ -13,15 +13,15 @@ import {
   accessTokenAtom,
   isAuthenticatedAtom,
   persistAtom,
-} from "../../atoms/auth";
-import { Button } from "../layout/ContentBox/Button";
-import ContentBox from "../layout/ContentBox/ContentBox";
-import { FormInput } from "../layout/ContentBox/FormInput";
-import GoogleButton from "../layout/ContentBox/GoogleButton";
-import Text from "../layout/ContentBox/Text";
-import TextWithLines from "../layout/ContentBox/TextWithLines";
-import TextWithLink from "../layout/ContentBox/TextWithLink";
-import Title from "../layout/ContentBox/Title";
+} from "../../../atoms/auth";
+import { Button } from "../../layout/ContentBox/Button";
+import ContentBox from "../../layout/ContentBox/ContentBox";
+import { FormInput } from "../../layout/ContentBox/FormInput";
+import GoogleButton from "../../layout/ContentBox/GoogleButton";
+import Text from "../../layout/ContentBox/Text";
+import TextWithLines from "../../layout/ContentBox/TextWithLines";
+import TextWithLink from "../../layout/ContentBox/TextWithLink";
+import Title from "../../layout/ContentBox/Title";
 
 const schema = z.object({
   usernameOrEmail: z.string().min(1),

diff --git a/src/components/page/SignUp.tsx → src/components/pages/Auth/SignUp.tsx b/src/components/page/SignUp.tsx → src/components/pages/Auth/SignUp.tsx
@@ -10,14 +10,14 @@ import { useForm } from "react-hook-form";
 import { toast } from "react-hot-toast/headless";
 import { useNavigate } from "react-router-dom";
 import { z } from "zod";
-import { Button } from "../layout/ContentBox/Button";
-import ContentBox from "../layout/ContentBox/ContentBox";
-import { FormInput } from "../layout/ContentBox/FormInput";
-import GoogleButton from "../layout/ContentBox/GoogleButton";
-import Text from "../layout/ContentBox/Text";
-import TextWithLines from "../layout/ContentBox/TextWithLines";
-import TextWithLink from "../layout/ContentBox/TextWithLink";
-import Title from "../layout/ContentBox/Title";
+import { Button } from "../../layout/ContentBox/Button";
+import ContentBox from "../../layout/ContentBox/ContentBox";
+import { FormInput } from "../../layout/ContentBox/FormInput";
+import GoogleButton from "../../layout/ContentBox/GoogleButton";
+import Text from "../../layout/ContentBox/Text";
+import TextWithLines from "../../layout/ContentBox/TextWithLines";
+import TextWithLink from "../../layout/ContentBox/TextWithLink";
+import Title from "../../layout/ContentBox/Title";
 
 const schema = z.object({
   username: z.string().min(3).max(32),

diff --git a/src/components/page/Verification.tsx → src/components/pages/Auth/Verification.tsx b/src/components/page/Verification.tsx → src/components/pages/Auth/Verification.tsx
@@ -1,9 +1,9 @@
-import { Button } from "../layout/ContentBox/Button";
-import ContentBox from "../layout/ContentBox/ContentBox";
-import EmailIcon from "../layout/ContentBox/SvgIcons/EmailIcon";
-import Text from "../layout/ContentBox/Text";
-import Title from "../layout/ContentBox/Title";
-import FillHeight from "../layout/Other/FillHeight";
+import { Button } from "../../layout/ContentBox/Button";
+import ContentBox from "../../layout/ContentBox/ContentBox";
+import EmailIcon from "../../layout/ContentBox/Icons/EmailIcon";
+import Text from "../../layout/ContentBox/Text";
+import Title from "../../layout/ContentBox/Title";
+import FillHeight from "../../layout/Other/FillHeight";
 
 export default function Verification() {
   // const { token } = useParams();

diff --git a/src/components/page/Verified.tsx → src/components/pages/Auth/Verified.tsx b/src/components/page/Verified.tsx → src/components/pages/Auth/Verified.tsx
@@ -1,10 +1,10 @@
-import ContentBox from "../layout/ContentBox/ContentBox";
-import Title from "../layout/ContentBox/Title";
-import Text from "../layout/ContentBox/Text";
-import { Button } from "../layout/ContentBox/Button";
-import FillHeight from "../layout/Other/FillHeight";
+import ContentBox from "../../layout/ContentBox/ContentBox";
+import Title from "../../layout/ContentBox/Title";
+import Text from "../../layout/ContentBox/Text";
+import { Button } from "../../layout/ContentBox/Button";
+import FillHeight from "../../layout/Other/FillHeight";
 import { Link } from "react-router-dom";
-import CheckmarkIcon from "../layout/ContentBox/SvgIcons/CheckmarkIcon";
+import CheckmarkIcon from "../../layout/ContentBox/Icons/CheckmarkIcon";
 
 export default function Verified() {
   return (

diff --git a/...layout/Sections/Features/FeatureBlock.tsx → ...ents/pages/Home/Features/FeatureBlock.tsx b/...layout/Sections/Features/FeatureBlock.tsx → ...ents/pages/Home/Features/FeatureBlock.tsx
diff --git a/...nts/layout/Sections/Features/Features.tsx → ...mponents/pages/Home/Features/Features.tsx b/...nts/layout/Sections/Features/Features.tsx → ...mponents/pages/Home/Features/Features.tsx
diff --git a/src/components/pages/Home/Home.tsx b/src/components/pages/Home/Home.tsx
@@ -0,0 +1,13 @@
+import Features from "./Features/Features";
+import Intro from "./Intro/Intro";
+import TileGrid from "./TileGrid/TileGrid";
+
+export default function Home() {
+  return (
+    <>
+      <Intro />
+      <Features />
+      <TileGrid />
+    </>
+  );
+}
diff --git a/src/components/svg/main/Bottom.tsx → src/components/pages/Home/Intro/Bottom.tsx b/src/components/svg/main/Bottom.tsx → src/components/pages/Home/Intro/Bottom.tsx
@@ -47,8 +47,8 @@ export default function Bottom() {
           y2="212.24"
           gradientUnits="userSpaceOnUse"
         >
-          <stop stop-color="#4A6CF7" stop-opacity="0"></stop>
-          <stop offset="1" stop-color="#4A6CF7"></stop>
+          <stop stopColor="#4A6CF7" stopOpacity="0"></stop>
+          <stop offset="1" stopColor="#4A6CF7"></stop>
         </linearGradient>
         <linearGradient
           id="paint1_linear_25:218"
@@ -58,8 +58,8 @@ export default function Bottom() {
           y2="212.24"
           gradientUnits="userSpaceOnUse"
         >
-          <stop stop-color="#4A6CF7" stop-opacity="0"></stop>
-          <stop offset="1" stop-color="#4A6CF7"></stop>
+          <stop stopColor="#4A6CF7" stopOpacity="0"></stop>
+          <stop offset="1" stopColor="#4A6CF7"></stop>
         </linearGradient>
         <linearGradient
           id="paint2_linear_25:218"
@@ -69,8 +69,8 @@ export default function Bottom() {
           y2="212.24"
           gradientUnits="userSpaceOnUse"
         >
-          <stop stop-color="#4A6CF7" stop-opacity="0"></stop>
-          <stop offset="1" stop-color="#4A6CF7"></stop>
+          <stop stopColor="#4A6CF7" stopOpacity="0"></stop>
+          <stop offset="1" stopColor="#4A6CF7"></stop>
         </linearGradient>
         <linearGradient
           id="paint3_linear_25:218"
@@ -80,8 +80,8 @@ export default function Bottom() {
           y2="210.214"
           gradientUnits="userSpaceOnUse"
         >
-          <stop stop-color="#4A6CF7" stop-opacity="0"></stop>
-          <stop offset="1" stop-color="#4A6CF7"></stop>
+          <stop stopColor="#4A6CF7" stopOpacity="0"></stop>
+          <stop offset="1" stopColor="#4A6CF7"></stop>
         </linearGradient>
         <linearGradient
           id="paint4_linear_25:218"
@@ -91,8 +91,8 @@ export default function Bottom() {
           y2="99.5816"
           gradientUnits="userSpaceOnUse"
         >
-          <stop stop-color="#4A6CF7"></stop>
-          <stop offset="1" stop-color="#4A6CF7" stop-opacity="0"></stop>
+          <stop stopColor="#4A6CF7"></stop>
+          <stop offset="1" stopColor="#4A6CF7" stopOpacity="0"></stop>
         </linearGradient>
         <radialGradient
           id="paint5_radial_25:218"
@@ -102,8 +102,8 @@ export default function Bottom() {
           gradientUnits="userSpaceOnUse"
           gradientTransform="translate(220 63) rotate(90) scale(43)"
         >
-          <stop offset="0.145833" stop-color="white" stop-opacity="0"></stop>
-          <stop offset="1" stop-color="white" stop-opacity="0.08"></stop>
+          <stop offset="0.145833" stopColor="white" stopOpacity="0"></stop>
+          <stop offset="1" stopColor="white" stopOpacity="0.08"></stop>
         </radialGradient>
       </defs>
     </svg>

diff --git a/...omponents/layout/Sections/Intro/Intro.tsx → src/components/pages/Home/Intro/Intro.tsx b/...omponents/layout/Sections/Intro/Intro.tsx → src/components/pages/Home/Intro/Intro.tsx
@@ -1,5 +1,5 @@
-import Bottom from "@/components/svg/main/Bottom";
-import Top from "@/components/svg/main/Top";
+import Bottom from "@/components/pages/Home/Intro/Bottom";
+import Top from "@/components/pages/Home/Intro/Top";
 
 export default function Intro() {
   return (