-
-
Notifications
You must be signed in to change notification settings - Fork 118
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #686 from Ignitus/develop
Mater > Develop (WIP) ☘️
- Loading branch information
Showing
111 changed files
with
1,167 additions
and
23,927 deletions.
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -4,25 +4,33 @@ import React from 'react'; | |
| import { Link } from 'react-router-dom'; | ||
| import progress from '../../../../ignitus-Shared/ignitus-DesignSystem/ignitus-Assets/ignitus-Images/img-Png/progressPage6.png'; | ||
| import newsletter from '../../../../ignitus-Shared/ignitus-DesignSystem/ignitus-Assets/ignitus-Images/img-Png/newsletterAcceptIcon.png'; | ||
| import { | ||
| Paragraph, | ||
| Heading2, | ||
| } from '../../../../ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/typography'; | ||
|
|
||
| import * as T from '../../ignitus-WelcomeFlow/Styles/style'; | ||
| import * as C from '../Styles/style'; | ||
|
|
||
| import { RoundedPrimaryButton } from '../../../../ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/buttons'; | ||
| import { withErrorBoundary } from '../../../../ignitus-Shared/ignitus-ErrorHandlingComponents/errorBoundary'; | ||
| import '../Styles/style.scss'; | ||
|
|
||
| const EmailConfirmationFlow = () => ( | ||
| <div className="emailConfirm"> | ||
| <img className="progressBarSignup" src={progress} alt="progress-bar" /> | ||
| <div className="newsletter"> | ||
| <img src={newsletter} alt="newsletter" /> | ||
| </div> | ||
| <p className="welcome">Your email has been confirmed.</p> | ||
| <p className="paragraph">Your verified email is [email protected]</p> | ||
| <div className="text-center"> | ||
| <button className="getStarted" type="button"> | ||
| <Link to="/" className="saveText"> | ||
| Get started | ||
| </Link> | ||
| </button> | ||
| </div> | ||
| </div> | ||
| <T.WelcomeContainer> | ||
| <T.TopSection> | ||
| <T.Progress src={progress} alt="progress-bar" /> | ||
| <C.NewsletterImage src={newsletter} alt="newsletter" /> | ||
| <C.TopMiddleSection> | ||
| <Heading2>Your email has been confirmed.</Heading2> | ||
| <Paragraph> Your verified email is [email protected]</Paragraph> | ||
| </C.TopMiddleSection> | ||
| </T.TopSection> | ||
| <C.BottomSection> | ||
| <RoundedPrimaryButton> | ||
| <Link to="/">Get started</Link> | ||
| </RoundedPrimaryButton> | ||
| </C.BottomSection> | ||
| </T.WelcomeContainer> | ||
| ); | ||
|
|
||
| export default withErrorBoundary(EmailConfirmationFlow); | ||
2 changes: 0 additions & 2 deletions
2
...uthentication/ignitus-StudentSignUpFlow/ignitus-EmailConfirmationFlow/Components/index.js
This file was deleted.
Oops, something went wrong.
2 changes: 2 additions & 0 deletions
2
...uthentication/ignitus-StudentSignUpFlow/ignitus-EmailConfirmationFlow/Components/index.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| /* eslint-disable import/prefer-default-export */ | ||
| export {default as EmailConfirmationFlow} from './EmailConfirmationFlow'; |
54 changes: 0 additions & 54 deletions
54
...-Authentication/ignitus-StudentSignUpFlow/ignitus-EmailConfirmationFlow/Styles/style.scss
This file was deleted.
Oops, something went wrong.
11 changes: 11 additions & 0 deletions
11
...us-Authentication/ignitus-StudentSignUpFlow/ignitus-EmailConfirmationFlow/Styles/style.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| import styled from '@emotion/styled'; | ||
|
|
||
| export const NewsletterImage = styled.img``; | ||
|
|
||
| export const BottomSection = styled.div` | ||
| margin-top: 3rem; | ||
| `; | ||
|
|
||
| export const TopMiddleSection = styled.div` | ||
| margin-top: 1rem; | ||
| `; |
48 changes: 48 additions & 0 deletions
48
...nitus-Authentication/ignitus-StudentSignUpFlow/ignitus-EmailFlow/Components/EmailFlow.jsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| /* eslint-disable jsx-a11y/click-events-have-key-events */ | ||
| /* eslint-disable jsx-a11y/no-static-element-interactions */ | ||
| import React from 'react'; | ||
| import { Link } from 'react-router-dom'; | ||
| import progress from '../../../../ignitus-Shared/ignitus-DesignSystem/ignitus-Assets/ignitus-Images/img-Png/progressPage5.png'; | ||
| import newsletter from '../../../../ignitus-Shared/ignitus-DesignSystem/ignitus-Assets/ignitus-Images/img-Png/newsletterIcon.png'; | ||
| import { withErrorBoundary } from '../../../../ignitus-Shared/ignitus-ErrorHandlingComponents/errorBoundary'; | ||
| import { | ||
| Paragraph, | ||
| Heading2, | ||
| } from '../../../../ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/typography'; | ||
| import * as T from '../../ignitus-WelcomeFlow/Styles/style'; | ||
| import * as C from '../Styles/style'; | ||
| import { | ||
| PrimaryButton, | ||
| WhiteButton, | ||
| } from '../../../../ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/buttons'; | ||
|
|
||
| const EmailFlow = () => ( | ||
| <T.WelcomeContainer> | ||
| <T.TopSection> | ||
| <T.Progress src={progress} alt="progress-bar" /> | ||
| <C.NewsletterImage src={newsletter} alt="newsletter" /> | ||
| <Heading2>Let’s confirm your email.</Heading2> | ||
| <Paragraph> | ||
| {' '} | ||
| We recommend to confirm your email address to recieve further | ||
| communication. | ||
| </Paragraph> | ||
| <Paragraph> | ||
| Click the link we sent to [email protected] to confirm you email. | ||
| </Paragraph> | ||
| </T.TopSection> | ||
| <T.BottomSection> | ||
| <C.ButtonContainer> | ||
| <PrimaryButton> | ||
| <Link to="/flow/emailConfirmationFlow">Email confirmed</Link> | ||
| </PrimaryButton> | ||
| <WhiteButton> | ||
| <Link to="/">I don’t see the email</Link> | ||
| </WhiteButton> | ||
| </C.ButtonContainer> | ||
| <Paragraph><Link to="/">I don’t want to confirm my email yet.</Link></Paragraph> | ||
| </T.BottomSection> | ||
| </T.WelcomeContainer> | ||
| ); | ||
|
|
||
| export default withErrorBoundary(EmailFlow); |
Oops, something went wrong.