From 679f163675f67ca68b4a05034fd044b83fe68e6c Mon Sep 17 00:00:00 2001 From: Sigrid <55406589+sigtheidiot@users.noreply.github.com> Date: Wed, 18 Oct 2023 11:13:49 +0200 Subject: [PATCH] Clean up navbar code, add logout button (#146) --- frontend/package.json | 4 - .../{variant-logo-1.svg => variant-logo.svg} | 0 frontend/src/app/layout.tsx | 5 +- frontend/src/components/AppProviders.tsx | 17 - frontend/src/components/NavBar/NavBar.tsx | 23 + .../src/components/NavBar/NavBarDropdown.tsx | 40 ++ frontend/src/components/NavBar/NavBarLink.tsx | 20 + .../src/components/NavBar/NavBarUserIcon.tsx | 23 + frontend/src/components/PageLayout.tsx | 15 - .../ThemeRegistry/ThemeRegistry.tsx | 18 - .../src/components/ThemeRegistry/theme.ts | 22 - frontend/src/components/VibesNavBar.tsx | 44 -- frontend/src/components/VibesNavBarTabs.tsx | 25 - .../components/vibes-buttons/SignInButton.tsx | 22 - .../vibes-buttons/SignInSignOutButton.tsx | 19 - .../vibes-buttons/SignOutButton.tsx | 64 --- frontend/src/types.ts | 10 - frontend/tailwind.config.js | 3 + frontend/yarn.lock | 456 +----------------- 19 files changed, 119 insertions(+), 711 deletions(-) rename frontend/public/images/{variant-logo-1.svg => variant-logo.svg} (100%) delete mode 100644 frontend/src/components/AppProviders.tsx create mode 100644 frontend/src/components/NavBar/NavBar.tsx create mode 100644 frontend/src/components/NavBar/NavBarDropdown.tsx create mode 100644 frontend/src/components/NavBar/NavBarLink.tsx create mode 100644 frontend/src/components/NavBar/NavBarUserIcon.tsx delete mode 100644 frontend/src/components/PageLayout.tsx delete mode 100644 frontend/src/components/ThemeRegistry/ThemeRegistry.tsx delete mode 100644 frontend/src/components/ThemeRegistry/theme.ts delete mode 100644 frontend/src/components/VibesNavBar.tsx delete mode 100644 frontend/src/components/VibesNavBarTabs.tsx delete mode 100644 frontend/src/components/vibes-buttons/SignInButton.tsx delete mode 100644 frontend/src/components/vibes-buttons/SignInSignOutButton.tsx delete mode 100644 frontend/src/components/vibes-buttons/SignOutButton.tsx diff --git a/frontend/package.json b/frontend/package.json index 130753be..b48dea3b 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -11,10 +11,6 @@ "prettier:ci": "prettier --check . " }, "dependencies": { - "@emotion/react": "^11.11.1", - "@emotion/styled": "^11.11.0", - "@mui/icons-material": "^5.14.9", - "@mui/material": "^5.14.10", "@types/node": "20.5.9", "@types/react": "18.2.21", "@types/react-dom": "18.2.7", diff --git a/frontend/public/images/variant-logo-1.svg b/frontend/public/images/variant-logo.svg similarity index 100% rename from frontend/public/images/variant-logo-1.svg rename to frontend/public/images/variant-logo.svg diff --git a/frontend/src/app/layout.tsx b/frontend/src/app/layout.tsx index 551f0a96..ba81500c 100644 --- a/frontend/src/app/layout.tsx +++ b/frontend/src/app/layout.tsx @@ -1,6 +1,6 @@ import "./globals.css"; import Head from "next/head"; -import AppProviders from "../components/AppProviders"; +import NavBar from "@/components/NavBar/NavBar"; export default function RootLayout({ children, @@ -17,7 +17,8 @@ export default function RootLayout({ />
-