diff --git a/public/images/union.svg b/public/images/union.svg new file mode 100644 index 0000000..ff70ff0 --- /dev/null +++ b/public/images/union.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/src/components/Input/inp.module.css b/src/components/Input/inp.module.css index 762ae0e..2a32748 100644 --- a/src/components/Input/inp.module.css +++ b/src/components/Input/inp.module.css @@ -1,14 +1,14 @@ .inp{ - background: #23252C; - border-radius: 14px; height: 40px; line-height: 40px; - border: 0px; padding: 0 14px; - color: #4D505B; font-size: 12px; width: 100%; max-width: 400px; + background: #11073B; + border: 2px solid #7D47BF; + border-radius: 12px; + color: rgba(255, 255, 255, 0.7); } .inp:hover{ box-shadow: -3px -3px 8px rgb(255 255 255 / 5%), 3px 3px 8px rgb(0 0 0 / 5%); diff --git a/src/components/selectSuperPower/selectSuperPower.module.css b/src/components/selectSuperPower/selectSuperPower.module.css index 985a46c..ad72f04 100644 --- a/src/components/selectSuperPower/selectSuperPower.module.css +++ b/src/components/selectSuperPower/selectSuperPower.module.css @@ -1,16 +1,20 @@ .selectSuperPower{ - height: 32px; - width: 32px; - background: #000; + border: 2px solid #7D47BF; + border-radius: 8px; + border-radius: 8px; + width: 48px; + height: 24px; cursor: pointer; } .active{ - background-color: green !important; + background: #7D47BF; } .selectWrapper{ + margin-top: 10px; display: flex; flex-direction: row; - gap:5px; - + gap:10px; + justify-content: space-between; + margin-bottom: 20px; } \ No newline at end of file diff --git a/src/pages/registration/onBoarding/1.tsx b/src/pages/registration/onBoarding/1.tsx index 0f86a11..7defb58 100644 --- a/src/pages/registration/onBoarding/1.tsx +++ b/src/pages/registration/onBoarding/1.tsx @@ -5,6 +5,7 @@ import { Input } from "../../../components/Input"; import { useDispatch, useSelector } from "react-redux"; import { getFormState, setWhyPage, whyPageIE } from "../../../app/user/onBoardingSlice"; import { AppState } from '../../../app/store' +import styles from "../../../styles/onBoarding/onBoarding.module.css" const OnBoardingPage1: NextPage = () => { let initState = useSelector((state: AppState)=>getFormState(state))[0] as whyPageIE @@ -22,23 +23,28 @@ const OnBoardingPage1: NextPage = () => { } as whyPageIE return( -
-
Прежде чем что-то сделать, спроси себя "Зачем?"
+
+
Прежде чем что-то

+ сделать,

спроси себя

"Зачем?"
Я хочу узнать:
- setWhatIwantKnown(value)}> + setWhatIwantKnown(value)}>
Я хочу получить:
- setWhatIwantGet(value)}> + setWhatIwantGet(value)}>
Я хочу научится:
- setWhatIwantLearn(value)}> + setWhatIwantLearn(value)}>
-
dispatch(setWhyPage(WhyPageState))}> - Назад - Вперед +
dispatch(setWhyPage(WhyPageState))}> +
+ Назад +
+
+ Вперед +
) diff --git a/src/pages/registration/onBoarding/2.tsx b/src/pages/registration/onBoarding/2.tsx index c26bfc3..f4a8ff0 100644 --- a/src/pages/registration/onBoarding/2.tsx +++ b/src/pages/registration/onBoarding/2.tsx @@ -6,6 +6,7 @@ import { useDispatch, useSelector } from "react-redux"; import { getFormState, setSuperPowerPage, superPowerPageIE } from "../../../app/user/onBoardingSlice"; import { AppState } from '../../../app/store' import { SelectSuperPower } from "../../../components/selectSuperPower"; +import styles from "../../../styles/onBoarding/onBoarding.module.css" const OnBoardingPage2: NextPage = () => { let initState = useSelector((state: AppState)=>getFormState(state))[1] as superPowerPageIE @@ -32,9 +33,10 @@ const OnBoardingPage2: NextPage = () => { let dispatch = useDispatch() return( -
-
Какая у тебя суперсила?
-
+
+
Какая у тебя

+ "суперсила?"
+
Коммуникация и сотрудничество
setCommunication(value)}> @@ -67,10 +69,15 @@ const OnBoardingPage2: NextPage = () => {
Лидерство, умение вести за собой
setLeaders(value)}>
-
dispatch(setSuperPowerPage(SuperPowerPageState))}> - Назад - Вперед -
+ +
+
dispatch(setSuperPowerPage(SuperPowerPageState))}> +
+ Назад +
+
+ Вперед +
) diff --git a/src/pages/registration/onBoarding/3.tsx b/src/pages/registration/onBoarding/3.tsx index 558d6e5..89c2305 100644 --- a/src/pages/registration/onBoarding/3.tsx +++ b/src/pages/registration/onBoarding/3.tsx @@ -4,6 +4,7 @@ import React, {useState} from "react"; import { useDispatch, useSelector } from "react-redux"; import { getFormState, setDrawDreamPage, drawDreamPageIE } from "../../../app/user/onBoardingSlice"; import { AppState } from '../../../app/store' +import styles from "../../../styles/onBoarding/onBoarding.module.css" const OnBoardingPage3: NextPage = () => { let initState = useSelector((state: AppState)=>getFormState(state))[2] as drawDreamPageIE @@ -12,21 +13,31 @@ const OnBoardingPage3: NextPage = () => { let dispatch = useDispatch() return( -
-
Нарисуй свои ассоциации со словом "мечта", подпиши каждый рисунок и приложи их ниже
+
+
Нарисуй свои

+ ассоциации со

+ словом "мечта" +
+
Подпиши каждый и приложи и прикрепи ниже
-
Загрузить рисунки
setFiles(e.target.files)} type="file" multiple={true} + className={styles.inpFile} />
-
dispatch(setDrawDreamPage({images:files}))}> - Назад - Вперед +
dispatch(setDrawDreamPage({images:files}))}> +
+ Назад + +
+
+ Вперед +
+
) diff --git a/src/pages/registration/onBoarding/4.tsx b/src/pages/registration/onBoarding/4.tsx index 59215cd..47c2289 100644 --- a/src/pages/registration/onBoarding/4.tsx +++ b/src/pages/registration/onBoarding/4.tsx @@ -5,6 +5,7 @@ import { useDispatch, useSelector } from "react-redux"; import { getFormState, setWhoIPage, whoIPageIE } from "../../../app/user/onBoardingSlice"; import { AppState } from '../../../app/store' import { WhoIToggle } from "../../../components/WhoIToggle"; +import styles from "../../../styles/onBoarding/onBoarding.module.css" const OnBoardingPage4: NextPage = () => { let initState = useSelector((state: AppState)=>getFormState(state))[3] as whoIPageIE @@ -70,9 +71,14 @@ const OnBoardingPage4: NextPage = () => { >
-
dispatch(setWhoIPage(state))}> - Назад - Вперед +
dispatch(setWhoIPage(state))}> +
+ Назад +
+
+ Вперед +
+
) diff --git a/src/pages/registration/onBoarding/5.tsx b/src/pages/registration/onBoarding/5.tsx index b0a3bd9..9cba31f 100644 --- a/src/pages/registration/onBoarding/5.tsx +++ b/src/pages/registration/onBoarding/5.tsx @@ -48,8 +48,12 @@ const OnBoardingPage5: NextPage = () => { {inputs}
dispatch(setWhatILikePage({things:list}))}> - Назад - Вперед +
+ Назад +
+
+ Вперед +
) diff --git a/src/pages/registration/onBoarding/index.tsx b/src/pages/registration/onBoarding/index.tsx index d041394..c749fc6 100644 --- a/src/pages/registration/onBoarding/index.tsx +++ b/src/pages/registration/onBoarding/index.tsx @@ -2,12 +2,17 @@ import { NextPage } from "next"; import Link from "next/link"; import React from "react"; import { Button } from "../../../components/Button"; +import styles from "../../../styles/onBoarding/onBoarding.module.css" const OnBoardingPage: NextPage = () => { return( -
-
Сформмируй профиль
- Дальше +
+
Сформмируйте профиль
+
Это поможет достигнуть цели!
+
+ Дальше +
+
) } diff --git a/src/pages/registration/onBoarding/lastPage.tsx b/src/pages/registration/onBoarding/lastPage.tsx index 045ecc7..89c6a78 100644 --- a/src/pages/registration/onBoarding/lastPage.tsx +++ b/src/pages/registration/onBoarding/lastPage.tsx @@ -76,7 +76,9 @@ const lastPage: NextPage = () => {
Мы уверены, все твои цели и мечты сбудуться, если следовать четкому плану
- Далее +
+ Далее +
) } diff --git a/src/styles/globals.css b/src/styles/globals.css index 7b10c79..d8a0d03 100644 --- a/src/styles/globals.css +++ b/src/styles/globals.css @@ -3,9 +3,24 @@ body { padding: 0; margin: 0; font-family: 'Jost', sans-serif; - font-size: 14px; - background-color: #14171b; - color: aliceblue; + background: #11073B; + font-weight: 500; + font-size: 13px; + line-height: 17px; + /* identical to box height, or 131% */ + + letter-spacing: -0.03em; + + /* Main/white */ + + color: #FFFFFF; + + + /* Inside auto layout */ + + flex: none; + order: 0; + flex-grow: 0; } a { diff --git a/src/styles/onBoarding/onBoarding.module.css b/src/styles/onBoarding/onBoarding.module.css index e69de29..4c12bd4 100644 --- a/src/styles/onBoarding/onBoarding.module.css +++ b/src/styles/onBoarding/onBoarding.module.css @@ -0,0 +1,141 @@ +.nextLink{ + display: flex; + flex-direction: row; + justify-content: center; + align-items: center; + padding: 10px 24px; + gap: 10px; + + width: 94px; + height: 30px; + font-weight: 500; + font-size: 12px; + line-height: 17px; + + /* Main/white */ + cursor: pointer; + color: #FFFFFF; + /* Main/fuksia */ + + background: #7D47BF; + /* Main/fuksia */ + + border: 2px solid #7D47BF; + border-radius: 12px; + z-index: 10; + +} +.backLink{ + display: flex; + flex-direction: row; + justify-content: center; + align-items: center; + padding: 10px 24px; + gap: 10px; + font-weight: 500; + font-size: 12px; + line-height: 17px; + width: 92px; + height: 30px; + + /* Main/fuksia */ + cursor: pointer; + color: #FFFFFF; + + border: 2px solid #7D47BF; + border-radius: 12px; + z-index: 10; +} +.h{ + font-weight: 600; + font-size: 34px; + line-height: 40px; + /* or 118% */ + + text-align: center; + text-transform: uppercase; + + /* Main/white */ + + color: #FFFFFF; +} +.hc{ + font-weight: 600; + font-size: 34px; + line-height: 40px; + /* or 118% */ + + text-align: center; + text-transform: uppercase; + + /* Main/fuksia */ + + color: #7D47BF; + + + /* Inside auto layout */ + + flex: none; + order: 0; + flex-grow: 0; +} + +.mainWrapper{ + display: flex; + flex-direction: column; + gap:50px; + align-items: center; + justify-content: center; + width: 100%; + height: 100vh; +} + +.union{ + width: 80%; + position: absolute; + bottom:100px; + right: 0px; + z-index: 1; + +} + +.inp1{ + margin-top: 10px; + width: 300px; +} + +.linkWrapper{ + display: flex; + flex-direction: row; + align-items: center; + justify-content: center; + gap:50px +} + +.powerWrapper{ + display: flex; + flex-direction: column; + gap:20px; + align-items: center; + justify-content: center; +} + +.inpFile{ + + + display: flex; + flex-direction: row; + justify-content: center; + align-items: center; + padding: 32px 16px; + gap: 36px; + width: 166px; + height: 30px; + left: calc(50% - 166px/2); + top: 494px; + + /* Main/fuksia */ + + background: #7D47BF; + border-radius: 12px; +} \ No newline at end of file