diff --git a/apps/app/pages/_app.js b/apps/app/pages/_app.js index d10b044fe..2c1703e0e 100644 --- a/apps/app/pages/_app.js +++ b/apps/app/pages/_app.js @@ -13,6 +13,7 @@ import { ThemeProvider } from 'styled-components'; import theme from '../styles/theme'; import Script from 'next/script'; import iubendaScript from '../scripts/iubendaScript'; +import { OnboardingProvider } from '../../website/src/context/OnboardingContext' const hashRedirect = (router) => { @@ -49,31 +50,33 @@ function MyApp({ Component, pageProps }) { <> -
- - + +
- + src="//cdn.iubenda.com/cs/iubenda_cs.js" + > + + + -
+
+
+ + + + {/* {props.children} */} +
- - - - {/* {props.children} */} -
-
+ diff --git a/apps/app/pages/onboarding.js b/apps/app/pages/onboarding.js index 15734fce9..112881294 100644 --- a/apps/app/pages/onboarding.js +++ b/apps/app/pages/onboarding.js @@ -1,4 +1,4 @@ -import Page from '@devlaunchers/website/src/pages/onboarding'; +import Page from '@devlaunchers/website/src/pages/userOnboardingPage.js'; import App from '@devlaunchers/website/src/pages/_app'; export { getStaticProps } from '@devlaunchers/website/src/pages/index'; diff --git a/apps/website/src/components/modules/BasicInformationPage/UserOnboarding/BasicInformationPage.js b/apps/website/src/components/modules/BasicInformationPage/UserOnboarding/BasicInformationPage.js new file mode 100644 index 000000000..d50e2ef88 --- /dev/null +++ b/apps/website/src/components/modules/BasicInformationPage/UserOnboarding/BasicInformationPage.js @@ -0,0 +1,123 @@ +import React, { useState } from 'react' +import FormField from '@devlaunchers/components/src/components/organisms/FormField' +import OpenResponse from '@devlaunchers/components/components/organisms/OpenResponse' +import { Checkbox } from '@devlaunchers/components/components/atoms' +import { Link } from '@devlaunchers/components/components/atoms' +import OnboardingForm from './OnboardingForm' +import Button from '@devlaunchers/components/components/atoms/Button' +import FormFieldMargin, { ConfirmationSection, CheckboxSpacing } from './StyledUserOnboarding' +import { useRouter } from 'next/router' + +const initialValue = { + firstName: '', + lastName: '', + bio: '' +} + +export default function BasicInformationPage() { + const [person, setPerson] = useState(initialValue) + const router = useRouter() + + const handleFirstNameChange = (e) => { + setPerson({ + ...person, + firstName: e.target.value + }) + } + + const handleLastNameChange = (e) => { + setPerson({ + ...person, + lastName: e.target.value + }) + } + + const handleBioChange = (e) => { + setPerson({ + ...person, + bio: e.target.value + }) + } + + const handleContinueClick = (e) => { + router.push('/users/profiles') + e.preventDefault() + } + + return ( + +
+ + + + + + + + + + + + + + + + + + + +
+ <>I have read and agree to the +
+ +  &  + + . * +
+ + + +
+ + +
+ + ) +} diff --git a/apps/website/src/components/modules/UserOnboardingProcess/UserOnboarding/OnboardingForm/OnboardingForm.js b/apps/website/src/components/modules/BasicInformationPage/UserOnboarding/OnboardingForm/OnboardingForm.js similarity index 100% rename from apps/website/src/components/modules/UserOnboardingProcess/UserOnboarding/OnboardingForm/OnboardingForm.js rename to apps/website/src/components/modules/BasicInformationPage/UserOnboarding/OnboardingForm/OnboardingForm.js diff --git a/apps/website/src/components/modules/UserOnboardingProcess/UserOnboarding/OnboardingForm/StyledOnboardingForm.js b/apps/website/src/components/modules/BasicInformationPage/UserOnboarding/OnboardingForm/StyledOnboardingForm.js similarity index 100% rename from apps/website/src/components/modules/UserOnboardingProcess/UserOnboarding/OnboardingForm/StyledOnboardingForm.js rename to apps/website/src/components/modules/BasicInformationPage/UserOnboarding/OnboardingForm/StyledOnboardingForm.js diff --git a/apps/website/src/components/modules/UserOnboardingProcess/UserOnboarding/OnboardingForm/index.js b/apps/website/src/components/modules/BasicInformationPage/UserOnboarding/OnboardingForm/index.js similarity index 100% rename from apps/website/src/components/modules/UserOnboardingProcess/UserOnboarding/OnboardingForm/index.js rename to apps/website/src/components/modules/BasicInformationPage/UserOnboarding/OnboardingForm/index.js diff --git a/apps/website/src/components/modules/UserOnboardingProcess/UserOnboarding/StyledUserOnboarding.js b/apps/website/src/components/modules/BasicInformationPage/UserOnboarding/StyledUserOnboarding.js similarity index 100% rename from apps/website/src/components/modules/UserOnboardingProcess/UserOnboarding/StyledUserOnboarding.js rename to apps/website/src/components/modules/BasicInformationPage/UserOnboarding/StyledUserOnboarding.js diff --git a/apps/website/src/components/modules/BasicInformationPage/UserOnboarding/index.js b/apps/website/src/components/modules/BasicInformationPage/UserOnboarding/index.js new file mode 100644 index 000000000..8065fe60b --- /dev/null +++ b/apps/website/src/components/modules/BasicInformationPage/UserOnboarding/index.js @@ -0,0 +1 @@ +export { default } from "./BasicInformationPage"; diff --git a/apps/website/src/components/modules/UserOnboardingProcess/UserOnboarding/UserOnboarding.js b/apps/website/src/components/modules/UserOnboardingProcess/UserOnboarding/UserOnboarding.js index 610e4e918..ebe9fdf02 100644 --- a/apps/website/src/components/modules/UserOnboardingProcess/UserOnboarding/UserOnboarding.js +++ b/apps/website/src/components/modules/UserOnboardingProcess/UserOnboarding/UserOnboarding.js @@ -114,5 +114,3 @@ const UserOnboarding = () => { ) } - -export default UserOnboarding \ No newline at end of file diff --git a/apps/website/src/components/modules/UserOnboardingProcess/UserOnboarding/index.js b/apps/website/src/components/modules/UserOnboardingProcess/UserOnboarding/index.js deleted file mode 100644 index 4ce4e5bd2..000000000 --- a/apps/website/src/components/modules/UserOnboardingProcess/UserOnboarding/index.js +++ /dev/null @@ -1 +0,0 @@ -export { default } from "./UserOnboarding"; diff --git a/apps/website/src/context/OnboardingContext.js b/apps/website/src/context/OnboardingContext.js new file mode 100644 index 000000000..d30de2403 --- /dev/null +++ b/apps/website/src/context/OnboardingContext.js @@ -0,0 +1,14 @@ +import { createContext, useContext, useState } from "react"; + +const OnboardingContext = createContext() + +export const OnboardingProvider = ({ children }) => { + + return ( + + {children} + + ) +} + +export const useOnboarding = () => useContext(OnboardingContext) \ No newline at end of file diff --git a/apps/website/src/pages/onboarding.js b/apps/website/src/pages/userOnboardingPage.js similarity index 61% rename from apps/website/src/pages/onboarding.js rename to apps/website/src/pages/userOnboardingPage.js index 68566d86f..4c0f0f6bd 100644 --- a/apps/website/src/pages/onboarding.js +++ b/apps/website/src/pages/userOnboardingPage.js @@ -1,5 +1,5 @@ import Head from 'next/head'; -import UserOnboarding from '../components/modules/UserOnboardingProcess/UserOnboarding'; +import BasicInformationPage from '../components/modules/BasicInformationPage/UserOnboarding/BasicInformationPage'; export default function UserOnboardingRoute() { return ( @@ -8,7 +8,7 @@ export default function UserOnboardingRoute() { User Onboarding
- +
);