diff --git a/apps/app/src/assets/images/confirm-email-slavica-desktop.png b/apps/app/src/assets/images/confirm-email-slavica-desktop.png new file mode 100644 index 00000000..e1246a3d Binary files /dev/null and b/apps/app/src/assets/images/confirm-email-slavica-desktop.png differ diff --git a/apps/app/src/assets/images/confirm-email-slavica-mobile.png b/apps/app/src/assets/images/confirm-email-slavica-mobile.png new file mode 100644 index 00000000..6bfa92e4 Binary files /dev/null and b/apps/app/src/assets/images/confirm-email-slavica-mobile.png differ diff --git a/apps/app/src/components/RegistrationForms/ConfirmEmail/ConfirmEmail.module.scss b/apps/app/src/components/RegistrationForms/ConfirmEmail/ConfirmEmail.module.scss new file mode 100644 index 00000000..88f252f5 --- /dev/null +++ b/apps/app/src/components/RegistrationForms/ConfirmEmail/ConfirmEmail.module.scss @@ -0,0 +1,28 @@ +.confirmEmail { + display: flex; + flex-direction: column; + width: 422px; + + .confirmEmailUpper { + + margin-bottom: 48px; + + h2{ + color: $primary-black; + text-align: center; + font-family: NeueMachina; + font-size: 30px; + font-weight: 500; + line-height: 30px; + margin-top: 40px; + margin-bottom: 18px; + } + + p{ + color: $primary-black; + text-align: center; + font-family: Inter; + line-height: 22px; /* 137.5% */ + } + } +} \ No newline at end of file diff --git a/apps/app/src/components/RegistrationForms/ConfirmEmail/ConfirmEmail.tsx b/apps/app/src/components/RegistrationForms/ConfirmEmail/ConfirmEmail.tsx new file mode 100644 index 00000000..66bd9854 --- /dev/null +++ b/apps/app/src/components/RegistrationForms/ConfirmEmail/ConfirmEmail.tsx @@ -0,0 +1,19 @@ +import Button from '../../Button/Button'; +import c from './ConfirmEmail.module.scss'; + +export const ConfirmEmail = () => { + return ( +
+
+

Potvrdi svoj e-mail

+

+ Poslali smo ti e-mail na mikejla@dump.hr da potvrdimo ispravnost + unesene adrese. Nakon što se e-mail pojavi u tvom sandučiću, klikni na + link kako bi registracija bila uspješna. +

+
+ +
+ ); +}; diff --git a/apps/app/src/components/RegistrationForms/ConfirmEmail/index.ts b/apps/app/src/components/RegistrationForms/ConfirmEmail/index.ts new file mode 100644 index 00000000..8616c777 --- /dev/null +++ b/apps/app/src/components/RegistrationForms/ConfirmEmail/index.ts @@ -0,0 +1,2 @@ +import { ConfirmEmail } from './ConfirmEmail'; +export { ConfirmEmail }; diff --git a/apps/app/src/components/RegistrationForms/SlavicaHeader/SlavicaHeader.module.scss b/apps/app/src/components/RegistrationForms/SlavicaHeader/SlavicaHeader.module.scss new file mode 100644 index 00000000..8f9ddd2e --- /dev/null +++ b/apps/app/src/components/RegistrationForms/SlavicaHeader/SlavicaHeader.module.scss @@ -0,0 +1,38 @@ +.slavicaHeader{ + height: 100%; + display: flex; + flex-direction: column; + width: 100%; + padding-top: 80px; + + @media (max-width: $breakpoint-tablet) { + padding-top: 64px; + } + + h1{ + color: $primary-white; + text-align: center; + font-family: NeueMachina; + font-size: 30px; + font-weight: 500; + line-height: 30px; + display: flex; + width: 100%; + justify-content: center; + + @media (max-width: $breakpoint-tablet) { + justify-content: flex-start; + padding-left: 24px; + } + } + + @media (max-width: $breakpoint-tablet) { + height: 350px; + align-items: flex-end; + } + + img { + position: relative; + overflow: hidden; + } +} \ No newline at end of file diff --git a/apps/app/src/components/RegistrationForms/SlavicaHeader/SlavicaHeader.tsx b/apps/app/src/components/RegistrationForms/SlavicaHeader/SlavicaHeader.tsx new file mode 100644 index 00000000..9e5a3f73 --- /dev/null +++ b/apps/app/src/components/RegistrationForms/SlavicaHeader/SlavicaHeader.tsx @@ -0,0 +1,18 @@ +import { useDeviceType } from '../../../hooks/UseDeviceType'; +import c from './SlavicaHeader.module.scss'; +import mobileSlavica from './../../../assets/images/confirm-email-slavica-mobile.png'; +import desktopSlavica from './../../../assets/images/confirm-email-slavica-desktop.png'; + +export const SlavicaHeader = () => { + const { isMobile } = useDeviceType({}); + return ( +
+

Registracija

+ {isMobile ? ( + + ) : ( + + )} +
+ ); +}; diff --git a/apps/app/src/components/RegistrationForms/SlavicaHeader/index.ts b/apps/app/src/components/RegistrationForms/SlavicaHeader/index.ts new file mode 100644 index 00000000..a73074bc --- /dev/null +++ b/apps/app/src/components/RegistrationForms/SlavicaHeader/index.ts @@ -0,0 +1,2 @@ +import { SlavicaHeader } from './SlavicaHeader'; +export { SlavicaHeader }; diff --git a/apps/app/src/pages/ConfirmEmailPage/ConfirmEmailPage.module.scss b/apps/app/src/pages/ConfirmEmailPage/ConfirmEmailPage.module.scss new file mode 100644 index 00000000..9285dc06 --- /dev/null +++ b/apps/app/src/pages/ConfirmEmailPage/ConfirmEmailPage.module.scss @@ -0,0 +1,30 @@ +.page { + background-color: $primary-black; + width: 100%; + height: 100vh; + display: flex; + flex-direction: column; + + .header { + // width: 100%; + // height: 300px; // Temporary + // display: flex; + // justify-content: center; + + // @media (max-width: $breakpoint-tablet) { + // height: 350px; + // justify-content: flex-end; + // } + + } + + .main { + width: 100%; + height: 100%; + background-color: $primary-background; + border-radius: 12px 12px 0px 0px; + display: flex; + justify-content: center; + } +} + \ No newline at end of file diff --git a/apps/app/src/pages/ConfirmEmailPage/ConfirmEmailPage.tsx b/apps/app/src/pages/ConfirmEmailPage/ConfirmEmailPage.tsx new file mode 100644 index 00000000..62544e86 --- /dev/null +++ b/apps/app/src/pages/ConfirmEmailPage/ConfirmEmailPage.tsx @@ -0,0 +1,20 @@ +import { ConfirmEmail } from '../../components/RegistrationForms/ConfirmEmail'; +import c from './ConfirmEmailPage.module.scss'; +import { useDeviceType } from '../../hooks/UseDeviceType'; +import { SlavicaHeader } from '../../components/RegistrationForms/SlavicaHeader'; + +export const ConfirmEmailPage = () => { + const { isMobile } = useDeviceType({}); + console.log(isMobile); + + return ( +
+
+ +
+
+ +
+
+ ); +}; diff --git a/apps/app/src/pages/ConfirmEmailPage/index.ts b/apps/app/src/pages/ConfirmEmailPage/index.ts new file mode 100644 index 00000000..e69de29b diff --git a/apps/app/src/router/Router.tsx b/apps/app/src/router/Router.tsx index d60e67c9..e43cbaab 100644 --- a/apps/app/src/router/Router.tsx +++ b/apps/app/src/router/Router.tsx @@ -18,12 +18,14 @@ import { ShoppingPage } from '../pages/ShoppingPage'; import { NavigationLayout } from '../layout'; import Home from '../pages/Home'; import TestPage from '../pages/TestPage/TestPage'; +import { ConfirmEmailPage } from '../pages/ConfirmEmailPage/ConfirmEmailPage'; const router = createBrowserRouter( createRoutesFromElements( } /> } /> + } /> } /> } errorElement={<>error}> } /> diff --git a/apps/app/src/router/routes.ts b/apps/app/src/router/routes.ts index 600724ae..67a92d14 100644 --- a/apps/app/src/router/routes.ts +++ b/apps/app/src/router/routes.ts @@ -29,6 +29,7 @@ export enum RouteNames { SCHEDULE = '/app/schedule', FLY_TALKS = '/app/flyTalks', SHOPPING = '/app/shopping', + CONFIRM_EMAIL = '/app/confirm-email', } export interface SubMenu {