luminosityleds · aematei · Dec 29, 2023 · Jan 22, 2024 · Feb 21, 2024 · Feb 22, 2024
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-# Base image for account microservice.  This image uses amd64 as the architecture 
+# Base image for console microservice.  This image uses amd64 as the architecture 
 FROM amd64/node:18-bullseye
 
 # Specifies app directory as working directory in docker image
@@ -10,7 +10,7 @@ EXPOSE 3000
 # Copy config files to app directory in docker image
 COPY package.json package-lock.json ./
 
-# Install all dependencies to run account microservice in silent mode
+# Install all dependencies to run console microservice in silent mode
 RUN npm install --silent
 
 # Copy all other files to app directory in docker image

diff --git a/dist/Logo.svg b/dist/Logo.svg
diff --git a/dist/assets/Logo-a8fafbbd.svg b/dist/assets/Logo-a8fafbbd.svg
diff --git a/dist/assets/index-701c242d.js b/dist/assets/index-701c242d.js
diff --git a/dist/assets/index-98fb2c7f.css b/dist/assets/index-98fb2c7f.css
diff --git a/dist/index.html b/dist/index.html
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+  <meta charset="UTF-8" />
+  <link rel="icon" type="image/svg+xml" href="/assets/Logo-a8fafbbd.svg"/>
+  <meta name="viewport"
+    content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no" />
+  <title>LuminosityLEDs</title>
+  <script type="module" crossorigin src="/assets/index-701c242d.js"></script>
+  <link rel="stylesheet" href="/assets/index-98fb2c7f.css">
+</head>
+
+<body>
+  <noscript>You need to enable JavaScript to run this app.</noscript>
+  <div id="root"></div>
+
+</body>
+
+</html>
diff --git a/src/App.tsx b/src/App.tsx
@@ -1,19 +0,0 @@
-import React from "react";
-import FrontPage from "./components/FrontPage";
-import Login from "./components/Login";
-import { Route, Routes } from "react-router-dom";
-
-import "./App.css";
-import Register from "./components/Register";
-
-function App() {
-  return (
-    <Routes>
-      <Route path="/" element={<FrontPage />} />
-      <Route path="/login" element={<Login />} />
-      <Route path="/register" element={<Register />} />
-    </Routes>
-  );
-}
-
-export default App;

diff --git a/src/components/AccountPage.tsx b/src/components/AccountPage.tsx
@@ -0,0 +1,19 @@
+import Header from "./Header";
+import Content from "./Content";
+import Footer from "./Footer";
+import SideBar from "./SideBar"
+import { useToggle } from "../ts/ToggleHeader";
+import React from "react";
+
+export const AccountPage = () => {
+  const lightMode = useToggle((state) => state.light);
+  return (
+    <div className={`"App" ${lightMode ? "" : "dark"}`}>
+      <Header />
+      <SideBar />
+
+    </div>
+  );
+};
+
+export default AccountPage;
diff --git a/src/components/Header.tsx b/src/components/Header.tsx
@@ -68,16 +68,27 @@ export const Header = () => {
         <ul className="flex space-x-16">
           <li>
             <Link to="/login">
+<<<<<<< HEAD
+              <button className="px-4 py-2 font-sans text-base text-black rounded hover:bg-A6EDF2 hover:text-white dark:text-white dark:hover:text-suva-grey">
+=======
               <button className="px-4 py-2 text-light rounded hover:bg-A6EDF2 hover:text-hover-light font-sans text-[32px] dark:text-dark dark:hover:text-hover-dark">
+>>>>>>> master
                 Log In
               </button>
             </Link>
           </li>
           <li>
+<<<<<<< HEAD
+            <Link to ="">
+            <button className="px-4 py-2 font-sans text-base text-black rounded hover:bg-A6EDF2 hover:text-white dark:text-white dark:hover:text-suva-grey">
+              Sign Up
+            </button>
+=======
             <Link to="/register">
             <button className="px-4 py-2 text-light rounded hover:bg-A6EDF2 hover:text-hover-light font-sans text-[32px] dark:text-dark dark:hover:text-hover-dark">
                 Sign Up
               </button>
+>>>>>>> master
             </Link>
           </li>
         </ul>

diff --git a/src/components/SideBar.tsx b/src/components/SideBar.tsx
@@ -0,0 +1,44 @@
+import React from "react";
+import { useToggle } from "../ts/ToggleHeader";
+import Header from "./Header";
+import { FontAwesomeIcon} from "@fortawesome/react-fontawesome";
+import { icon } from '@fortawesome/fontawesome-svg-core/import.macro'
+import SideBarButton from "./sideBarButton";
+
+export const Acc = () => {
+
+    const lightMode = useToggle((state) => state.light);
+return (
+
+
+
+
+        <div className={`"App" ${lightMode ? "bg-[#88dbe1]" : "dark bg-black"} h-screen flex flex-col w-[390px] `}>
+
+            <SideBarButton/>
+
+            </div>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+)
+
+}    
+
+export default Acc;