-
- {user.name}
-
-
+
+ {user.name}
+
) : (
-
-
- -
- Login
-
- -
- Register
-
-
+
+ Login
+ Register
- )}
+ )}
+
+ {burgerMenuOpen && (
+
+
Home
+ {user?.admin == 1 && (
+
Admin
+ )}
+ {user ? (
+
+ {user.name}
+
+
+ ) : (
+
+ Login
+ Register
+
+ )}
+
+ )}
+
+
+
)
}
\ No newline at end of file
diff --git a/front/src/index.css b/front/src/index.css
index 84b21df..25f6747 100644
--- a/front/src/index.css
+++ b/front/src/index.css
@@ -1,10 +1,4 @@
-@import "tailwindcss";
-@plugin "daisyui" {
- themes: light --default, autumn --prefersdark;
-}
-
-
-/*html {
+html {
background: #2a6c9b;
background: linear-gradient(167deg, rgba(42, 108, 155, 1) 0%, rgba(87, 199, 133, 1) 50%, rgba(163, 237, 83, 1) 100%);
}
@@ -85,4 +79,4 @@
align-items: center;
gap: 15px;
}
-}*/
+}
diff --git a/front/src/pages/Login.tsx b/front/src/pages/Login.tsx
index f37d3fc..cebfc8f 100644
--- a/front/src/pages/Login.tsx
+++ b/front/src/pages/Login.tsx
@@ -31,20 +31,15 @@ export default function Login () {
}
return (
-
+
-
)
diff --git a/front/src/pages/Register.tsx b/front/src/pages/Register.tsx
index b2512cc..6b8a9d2 100644
--- a/front/src/pages/Register.tsx
+++ b/front/src/pages/Register.tsx
@@ -46,19 +46,17 @@ export default function Register () {
}
return (
-
+
-
diff --git a/front/vite.config.ts b/front/vite.config.ts
index 2fbcdda..abfa313 100644
--- a/front/vite.config.ts
+++ b/front/vite.config.ts
@@ -1,10 +1,9 @@
import { defineConfig } from 'vite'
import react from '@vitejs/plugin-react'
-import tailwindcss from '@tailwindcss/vite';
// https://vite.dev/config/
export default defineConfig({
- plugins: [react(), tailwindcss()],
+ plugins: [react()],
server: {
proxy: {
'/api': {