From ed4da4feb869292f0b6bf973a1ef85295b93757d Mon Sep 17 00:00:00 2001
From: Sigrid <55406589+sigtheidiot@users.noreply.github.com>
Date: Mon, 9 Oct 2023 13:48:15 +0200
Subject: [PATCH] Update frontend project structure (#108)

Co-authored-by: Sigrid Elnan <sge@variant.no>
---
 frontend/{src/app => public}/favicon.ico            | Bin
 frontend/public/{ => images}/variant-logo-1.svg     |   0
 frontend/public/next.svg                            |   1 -
 frontend/public/vercel.svg                          |   1 -
 frontend/src/app/layout.tsx                         |   2 +-
 frontend/src/app/page.tsx                           |   2 +-
 frontend/src/{app => }/components/AppProviders.tsx  |   2 +-
 frontend/src/{app => }/components/PageLayout.tsx    |   0
 .../components/ThemeRegistry/ThemeRegistry.tsx      |   0
 .../src/{app => }/components/ThemeRegistry/theme.ts |   0
 frontend/src/{app => }/components/VibesNavBar.tsx   |   2 +-
 .../src/{app => }/components/VibesNavBarTabs.tsx    |   0
 frontend/src/{app => components}/variants.tsx       |   2 +-
 .../components/vibes-buttons/SignInButton.tsx       |   0
 .../vibes-buttons/SignInSignOutButton.tsx           |   0
 .../components/vibes-buttons/SignOutButton.tsx      |   0
 frontend/src/{app => }/hooks/useVibesApi.ts         |   0
 frontend/src/utils/ApiUtils.ts                      |   2 +-
 frontend/src/{app => utils}/msalInstance.ts         |   0
 19 files changed, 6 insertions(+), 8 deletions(-)
 rename frontend/{src/app => public}/favicon.ico (100%)
 rename frontend/public/{ => images}/variant-logo-1.svg (100%)
 delete mode 100644 frontend/public/next.svg
 delete mode 100644 frontend/public/vercel.svg
 rename frontend/src/{app => }/components/AppProviders.tsx (96%)
 rename frontend/src/{app => }/components/PageLayout.tsx (100%)
 rename frontend/src/{app => }/components/ThemeRegistry/ThemeRegistry.tsx (100%)
 rename frontend/src/{app => }/components/ThemeRegistry/theme.ts (100%)
 rename frontend/src/{app => }/components/VibesNavBar.tsx (94%)
 rename frontend/src/{app => }/components/VibesNavBarTabs.tsx (100%)
 rename frontend/src/{app => components}/variants.tsx (95%)
 rename frontend/src/{app => }/components/vibes-buttons/SignInButton.tsx (100%)
 rename frontend/src/{app => }/components/vibes-buttons/SignInSignOutButton.tsx (100%)
 rename frontend/src/{app => }/components/vibes-buttons/SignOutButton.tsx (100%)
 rename frontend/src/{app => }/hooks/useVibesApi.ts (100%)
 rename frontend/src/{app => utils}/msalInstance.ts (100%)

diff --git a/frontend/src/app/favicon.ico b/frontend/public/favicon.ico
similarity index 100%
rename from frontend/src/app/favicon.ico
rename to frontend/public/favicon.ico
diff --git a/frontend/public/variant-logo-1.svg b/frontend/public/images/variant-logo-1.svg
similarity index 100%
rename from frontend/public/variant-logo-1.svg
rename to frontend/public/images/variant-logo-1.svg
diff --git a/frontend/public/next.svg b/frontend/public/next.svg
deleted file mode 100644
index 5174b28c..00000000
--- a/frontend/public/next.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 394 80"><path fill="#000" d="M262 0h68.5v12.7h-27.2v66.6h-13.6V12.7H262V0ZM149 0v12.7H94v20.4h44.3v12.6H94v21h55v12.6H80.5V0h68.7zm34.3 0h-17.8l63.8 79.4h17.9l-32-39.7 32-39.6h-17.9l-23 28.6-23-28.6zm18.3 56.7-9-11-27.1 33.7h17.8l18.3-22.7z"/><path fill="#000" d="M81 79.3 17 0H0v79.3h13.6V17l50.2 62.3H81Zm252.6-.4c-1 0-1.8-.4-2.5-1s-1.1-1.6-1.1-2.6.3-1.8 1-2.5 1.6-1 2.6-1 1.8.3 2.5 1a3.4 3.4 0 0 1 .6 4.3 3.7 3.7 0 0 1-3 1.8zm23.2-33.5h6v23.3c0 2.1-.4 4-1.3 5.5a9.1 9.1 0 0 1-3.8 3.5c-1.6.8-3.5 1.3-5.7 1.3-2 0-3.7-.4-5.3-1s-2.8-1.8-3.7-3.2c-.9-1.3-1.4-3-1.4-5h6c.1.8.3 1.6.7 2.2s1 1.2 1.6 1.5c.7.4 1.5.5 2.4.5 1 0 1.8-.2 2.4-.6a4 4 0 0 0 1.6-1.8c.3-.8.5-1.8.5-3V45.5zm30.9 9.1a4.4 4.4 0 0 0-2-3.3 7.5 7.5 0 0 0-4.3-1.1c-1.3 0-2.4.2-3.3.5-.9.4-1.6 1-2 1.6a3.5 3.5 0 0 0-.3 4c.3.5.7.9 1.3 1.2l1.8 1 2 .5 3.2.8c1.3.3 2.5.7 3.7 1.2a13 13 0 0 1 3.2 1.8 8.1 8.1 0 0 1 3 6.5c0 2-.5 3.7-1.5 5.1a10 10 0 0 1-4.4 3.5c-1.8.8-4.1 1.2-6.8 1.2-2.6 0-4.9-.4-6.8-1.2-2-.8-3.4-2-4.5-3.5a10 10 0 0 1-1.7-5.6h6a5 5 0 0 0 3.5 4.6c1 .4 2.2.6 3.4.6 1.3 0 2.5-.2 3.5-.6 1-.4 1.8-1 2.4-1.7a4 4 0 0 0 .8-2.4c0-.9-.2-1.6-.7-2.2a11 11 0 0 0-2.1-1.4l-3.2-1-3.8-1c-2.8-.7-5-1.7-6.6-3.2a7.2 7.2 0 0 1-2.4-5.7 8 8 0 0 1 1.7-5 10 10 0 0 1 4.3-3.5c2-.8 4-1.2 6.4-1.2 2.3 0 4.4.4 6.2 1.2 1.8.8 3.2 2 4.3 3.4 1 1.4 1.5 3 1.5 5h-5.8z"/></svg>
\ No newline at end of file
diff --git a/frontend/public/vercel.svg b/frontend/public/vercel.svg
deleted file mode 100644
index d2f84222..00000000
--- a/frontend/public/vercel.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 283 64"><path fill="black" d="M141 16c-11 0-19 7-19 18s9 18 20 18c7 0 13-3 16-7l-7-5c-2 3-6 4-9 4-5 0-9-3-10-7h28v-3c0-11-8-18-19-18zm-9 15c1-4 4-7 9-7s8 3 9 7h-18zm117-15c-11 0-19 7-19 18s9 18 20 18c6 0 12-3 16-7l-8-5c-2 3-5 4-8 4-5 0-9-3-11-7h28l1-3c0-11-8-18-19-18zm-10 15c2-4 5-7 10-7s8 3 9 7h-19zm-39 3c0 6 4 10 10 10 4 0 7-2 9-5l8 5c-3 5-9 8-17 8-11 0-19-7-19-18s8-18 19-18c8 0 14 3 17 8l-8 5c-2-3-5-5-9-5-6 0-10 4-10 10zm83-29v46h-9V5h9zM37 0l37 64H0L37 0zm92 5-27 48L74 5h10l18 30 17-30h10zm59 12v10l-3-1c-6 0-10 4-10 10v15h-9V17h9v9c0-5 6-9 13-9z"/></svg>
\ No newline at end of file
diff --git a/frontend/src/app/layout.tsx b/frontend/src/app/layout.tsx
index dace5faf..8aa57de8 100644
--- a/frontend/src/app/layout.tsx
+++ b/frontend/src/app/layout.tsx
@@ -1,5 +1,5 @@
 import Head from 'next/head';
-import AppProviders from './components/AppProviders';
+import AppProviders from '../components/AppProviders';
 
 export default function RootLayout({ children }: { children: React.ReactNode }) {
     return (
diff --git a/frontend/src/app/page.tsx b/frontend/src/app/page.tsx
index 24264cbe..d6263d46 100644
--- a/frontend/src/app/page.tsx
+++ b/frontend/src/app/page.tsx
@@ -1,4 +1,4 @@
-import { VariantList } from "./variants";
+import { VariantList } from "../components/variants";
 
 export default function Page() {
 
diff --git a/frontend/src/app/components/AppProviders.tsx b/frontend/src/components/AppProviders.tsx
similarity index 96%
rename from frontend/src/app/components/AppProviders.tsx
rename to frontend/src/components/AppProviders.tsx
index 441d41da..cfee9b12 100644
--- a/frontend/src/app/components/AppProviders.tsx
+++ b/frontend/src/components/AppProviders.tsx
@@ -3,7 +3,7 @@ import { EventType } from "@azure/msal-browser";
 import { MsalProvider } from "@azure/msal-react";
 import { CssBaseline } from "@mui/material";
 import { QueryClient, QueryClientProvider } from "react-query";
-import { msalInstance } from "../msalInstance";
+import { msalInstance } from "../utils/msalInstance";
 import PageLayout from "./PageLayout";
 import ThemeRegistry from "./ThemeRegistry/ThemeRegistry";
 
diff --git a/frontend/src/app/components/PageLayout.tsx b/frontend/src/components/PageLayout.tsx
similarity index 100%
rename from frontend/src/app/components/PageLayout.tsx
rename to frontend/src/components/PageLayout.tsx
diff --git a/frontend/src/app/components/ThemeRegistry/ThemeRegistry.tsx b/frontend/src/components/ThemeRegistry/ThemeRegistry.tsx
similarity index 100%
rename from frontend/src/app/components/ThemeRegistry/ThemeRegistry.tsx
rename to frontend/src/components/ThemeRegistry/ThemeRegistry.tsx
diff --git a/frontend/src/app/components/ThemeRegistry/theme.ts b/frontend/src/components/ThemeRegistry/theme.ts
similarity index 100%
rename from frontend/src/app/components/ThemeRegistry/theme.ts
rename to frontend/src/components/ThemeRegistry/theme.ts
diff --git a/frontend/src/app/components/VibesNavBar.tsx b/frontend/src/components/VibesNavBar.tsx
similarity index 94%
rename from frontend/src/app/components/VibesNavBar.tsx
rename to frontend/src/components/VibesNavBar.tsx
index 79b86a90..7299e077 100644
--- a/frontend/src/app/components/VibesNavBar.tsx
+++ b/frontend/src/components/VibesNavBar.tsx
@@ -16,7 +16,7 @@ export default function VibesAppBar() {
                     <Tab key={"Bemanning"} value={1} label={"Bemanning"} sx={{ fontSize: "1.2rem" }} />
                 </VibesNavBarTabs>
                 <Box component="div" sx={{ flexGrow: 1 }}></Box>
-                <Image className="variant-logo" alt="Variant logo" src="./variant-logo-1.svg" width="65" height="16" />
+                <Image className="variant-logo" alt="Variant logo" src="./images/variant-logo-1.svg" width="65" height="16" />
                 <Box component="div" sx={{ flexGrow: 0, minWidth: "1px", height: "50%", backgroundColor: "grey" }} ml={2}></Box>
                 <SignInSignOutButton />
             </Toolbar>
diff --git a/frontend/src/app/components/VibesNavBarTabs.tsx b/frontend/src/components/VibesNavBarTabs.tsx
similarity index 100%
rename from frontend/src/app/components/VibesNavBarTabs.tsx
rename to frontend/src/components/VibesNavBarTabs.tsx
diff --git a/frontend/src/app/variants.tsx b/frontend/src/components/variants.tsx
similarity index 95%
rename from frontend/src/app/variants.tsx
rename to frontend/src/components/variants.tsx
index c3eb7112..893703a5 100644
--- a/frontend/src/app/variants.tsx
+++ b/frontend/src/components/variants.tsx
@@ -5,7 +5,7 @@ import {
   FormControlLabel,
   FormGroup,
 } from "@mui/material";
-import useVibesApi from "./hooks/useVibesApi";
+import useVibesApi from "../hooks/useVibesApi";
 import React, { useState } from "react";
 
 export function VariantList() {
diff --git a/frontend/src/app/components/vibes-buttons/SignInButton.tsx b/frontend/src/components/vibes-buttons/SignInButton.tsx
similarity index 100%
rename from frontend/src/app/components/vibes-buttons/SignInButton.tsx
rename to frontend/src/components/vibes-buttons/SignInButton.tsx
diff --git a/frontend/src/app/components/vibes-buttons/SignInSignOutButton.tsx b/frontend/src/components/vibes-buttons/SignInSignOutButton.tsx
similarity index 100%
rename from frontend/src/app/components/vibes-buttons/SignInSignOutButton.tsx
rename to frontend/src/components/vibes-buttons/SignInSignOutButton.tsx
diff --git a/frontend/src/app/components/vibes-buttons/SignOutButton.tsx b/frontend/src/components/vibes-buttons/SignOutButton.tsx
similarity index 100%
rename from frontend/src/app/components/vibes-buttons/SignOutButton.tsx
rename to frontend/src/components/vibes-buttons/SignOutButton.tsx
diff --git a/frontend/src/app/hooks/useVibesApi.ts b/frontend/src/hooks/useVibesApi.ts
similarity index 100%
rename from frontend/src/app/hooks/useVibesApi.ts
rename to frontend/src/hooks/useVibesApi.ts
diff --git a/frontend/src/utils/ApiUtils.ts b/frontend/src/utils/ApiUtils.ts
index c9cdbfbf..afcab0d9 100644
--- a/frontend/src/utils/ApiUtils.ts
+++ b/frontend/src/utils/ApiUtils.ts
@@ -1,4 +1,4 @@
-import { msalInstance } from "@/app/msalInstance";
+import { msalInstance } from "@/utils/msalInstance";
 import { loginRequest } from "@/authConfig";
 
 export async function fetchWithToken(path: string) {
diff --git a/frontend/src/app/msalInstance.ts b/frontend/src/utils/msalInstance.ts
similarity index 100%
rename from frontend/src/app/msalInstance.ts
rename to frontend/src/utils/msalInstance.ts