From ad902b49762c1185a429cbacb6ac8cc22c08d529 Mon Sep 17 00:00:00 2001 From: Anton Mushnin Date: Thu, 28 Mar 2024 16:36:20 +0300 Subject: [PATCH] title screen update --- web/src/components/TitleScreen.module.css | 24 +++++-- web/src/components/TitleScreen.tsx | 26 ++++--- web/src/components/account/Account.module.css | 3 +- web/src/components/account/LoginForm.tsx | 62 ++++++++-------- web/src/components/account/SignUpForm.tsx | 72 +++++++++---------- web/src/components/layout/layout.tsx | 5 +- web/src/constants.ts | 1 + 7 files changed, 106 insertions(+), 87 deletions(-) diff --git a/web/src/components/TitleScreen.module.css b/web/src/components/TitleScreen.module.css index cc0307c6..c733bfe0 100644 --- a/web/src/components/TitleScreen.module.css +++ b/web/src/components/TitleScreen.module.css @@ -17,18 +17,24 @@ .content { display: flex; - padding: 20px; + padding-bottom: 20px; flex-direction: column; justify-content: center; align-items: center; - gap: 10px; - flex-grow: 1; + gap: 20px; + flex-grow: 0; width: 100%; + max-width: 400px; + border: 1px solid #262019; + height: fit-content; + background: #FCECD9; + } .footer{ display: flex; gap: 5px; + margin-top: -10px; } .footerText{ @@ -93,13 +99,15 @@ .loginContainer { display: flex; - padding-top: 20px; + padding: 34px 35px; flex-direction: column; justify-content: center; align-items: center; - background: #FCECD9; min-height: 100vh; width: 100%; + background-image: url('https://static.fullcount.xyz/web/landing/Bl-banner-background-tinted.jpeg'); + background-size: cover; + background-position: center; } .logo { @@ -107,4 +115,10 @@ width: 158px; } +.banner { + border-bottom: 1px solid #262019; +} + + + diff --git a/web/src/components/TitleScreen.tsx b/web/src/components/TitleScreen.tsx index 19a84f49..7cfb9b3e 100644 --- a/web/src/components/TitleScreen.tsx +++ b/web/src/components/TitleScreen.tsx @@ -7,11 +7,11 @@ import Playing from "./Playing"; import SignUpForm from "./account/SignUpForm"; import LoginForm from "./account/LoginForm"; -import { FULLCOUNT_ASSETS_PATH } from "../constants"; +import { FULLCOUNT_ASSETS, FULLCOUNT_ASSETS_PATH } from "../constants"; import LoadingView from "./HomePage/LoadingView"; const TitleScreen = () => { const { user, isLoading } = useUser(); - const [isLogging, setIsLogging] = useState(true); // login or signUp + const [isLogging, setIsLogging] = useState(false); // login or signUp const [isSuccess, setIsSuccess] = useState(false); const [isFirstSeconds, setIsFirstSeconds] = useState(true); @@ -29,15 +29,21 @@ const TitleScreen = () => { ) : (
- {""} + {/**/}
+ {""} + {!isLogging ? ( setIsSuccess(value)} /> ) : ( diff --git a/web/src/components/account/Account.module.css b/web/src/components/account/Account.module.css index db42d845..a775d05b 100644 --- a/web/src/components/account/Account.module.css +++ b/web/src/components/account/Account.module.css @@ -5,7 +5,8 @@ align-items: center; gap: 0; width: 100%; - max-width: 350px; + padding-left: 20px; + padding-right: 20px; } .header { diff --git a/web/src/components/account/LoginForm.tsx b/web/src/components/account/LoginForm.tsx index dcd21818..f27f4dcc 100644 --- a/web/src/components/account/LoginForm.tsx +++ b/web/src/components/account/LoginForm.tsx @@ -29,37 +29,37 @@ const LoginForm = ({ setIsSuccess }: { setIsSuccess: (isSuccess: boolean) => voi return (
-
-
Welcome back!
- - { - setShowInvalid(false); - setUsername(event.target.value); - }} - /> -
Password
- { - setShowInvalid(false); - setPassword(event.target.value); - }} - /> -
+ {/*
*/} +
Welcome back!
+ + { + setShowInvalid(false); + setUsername(event.target.value); + }} + /> +
Password
+ { + setShowInvalid(false); + setPassword(event.target.value); + }} + /> + {/*
*/} diff --git a/web/src/components/account/SignUpForm.tsx b/web/src/components/account/SignUpForm.tsx index 03fdbd73..f3599058 100644 --- a/web/src/components/account/SignUpForm.tsx +++ b/web/src/components/account/SignUpForm.tsx @@ -31,44 +31,44 @@ const SignUpForm = ({ setIsSuccess }: { setIsSuccess: (isSuccess: boolean) => vo return ( -
-
Welcome!
- - setUsername(event.target.value)} - style={{ marginBottom: "10px" }} - spellCheck={false} - /> + {/*
*/} +
Welcome!
+ + setUsername(event.target.value)} + style={{ marginBottom: "10px" }} + spellCheck={false} + /> -
Email
- setEmail(event.target.value)} - spellCheck={false} - /> +
Email
+ setEmail(event.target.value)} + spellCheck={false} + /> -
Password
- setPassword(event.target.value)} - spellCheck={false} - /> -
+
Password
+ setPassword(event.target.value)} + spellCheck={false} + /> + {/*
*/} diff --git a/web/src/components/layout/layout.tsx b/web/src/components/layout/layout.tsx index b71ca4d7..7b001b82 100644 --- a/web/src/components/layout/layout.tsx +++ b/web/src/components/layout/layout.tsx @@ -25,10 +25,7 @@ export default function Layout({ {title ?? "Fullcount"} - +