From 4bc39eb8eb5e45d731d6a1b69ea0807778ec9ecf Mon Sep 17 00:00:00 2001 From: popovspiridon99 Date: Tue, 7 Oct 2025 12:17:53 +0900 Subject: [PATCH] styling; Map page is now at /; enable password reset page --- client/src/constants/app.tsx | 26 +++--- client/src/layouts/MainLayout.tsx | 100 +++++++++++++++++++++++- client/src/pages/auth/PasswordReset.tsx | 3 +- client/src/pages/auth/SignIn.tsx | 3 +- client/src/pages/auth/SignUp.tsx | 3 +- 5 files changed, 119 insertions(+), 16 deletions(-) diff --git a/client/src/constants/app.tsx b/client/src/constants/app.tsx index b040bdb..bc810a4 100644 --- a/client/src/constants/app.tsx +++ b/client/src/constants/app.tsx @@ -47,7 +47,7 @@ const pages = [ component: , drawer: false, dashboard: false, - enabled: false, + enabled: true, }, { label: "Настройки", @@ -61,8 +61,10 @@ const pages = [ { label: "Главная", path: "/", - icon: , - component:
, + icon: , + component: , + // icon: , + // component:
, drawer: true, dashboard: true, enabled: true, @@ -121,15 +123,15 @@ const pages = [ dashboard: true, enabled: true, }, - { - label: "ИКС", - path: "/map-test", - icon: , - component: , - drawer: true, - dashboard: true, - enabled: true, - }, + // { + // label: "ИКС", + // path: "/map-test", + // icon: , + // component: , + // drawer: true, + // dashboard: true, + // enabled: true, + // }, { label: "Map line test", path: "/map-line-test", diff --git a/client/src/layouts/MainLayout.tsx b/client/src/layouts/MainLayout.tsx index 505ad42..f528c54 100644 --- a/client/src/layouts/MainLayout.tsx +++ b/client/src/layouts/MainLayout.tsx @@ -15,7 +15,105 @@ export default function MainLayout() { return (
- + +
+ +
) +} + +const Background = () => { + return ( + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ) } \ No newline at end of file diff --git a/client/src/pages/auth/PasswordReset.tsx b/client/src/pages/auth/PasswordReset.tsx index 36b66ba..51b44d1 100644 --- a/client/src/pages/auth/PasswordReset.tsx +++ b/client/src/pages/auth/PasswordReset.tsx @@ -41,7 +41,8 @@ function PasswordReset() { height: 'min-content', borderRadius: '1rem', border: '1px solid #00000030', - padding: '2rem' + padding: '2rem', + background: 'var(--colorNeutralBackground1)' }}> Восстановление пароля diff --git a/client/src/pages/auth/SignIn.tsx b/client/src/pages/auth/SignIn.tsx index efe7e9c..2b79dcc 100644 --- a/client/src/pages/auth/SignIn.tsx +++ b/client/src/pages/auth/SignIn.tsx @@ -61,7 +61,8 @@ const SignIn = () => { height: 'min-content', borderRadius: '1rem', border: '1px solid #00000030', - padding: '2rem' + padding: '2rem', + background: 'var(--colorNeutralBackground1)' }}> Вход diff --git a/client/src/pages/auth/SignUp.tsx b/client/src/pages/auth/SignUp.tsx index 3d18837..e4f35c4 100644 --- a/client/src/pages/auth/SignUp.tsx +++ b/client/src/pages/auth/SignUp.tsx @@ -36,7 +36,8 @@ const SignUp = () => { height: 'min-content', borderRadius: '1rem', border: '1px solid #00000030', - padding: '2rem' + padding: '2rem', + background: 'var(--colorNeutralBackground1)' }}> Регистрация