Benature/omnivore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1057 from omnivore-app/feat/enable-email-login

Browse Source 
Enable email login on web
This commit is contained in:
Jackson Harper
2022-08-10 14:58:13 +08:00
committed by GitHub
parent 7b3eb56d33 4ba54222a8
commit 6b4f577117
4 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
packages/web/components/elements/StyledText.tsx
View File

@ -100,6 +100,18 @@ const textVariants = {
lineHeight: '1.5',
cursor: 'pointer',
},
action: {
fontSize: '16px',
fontWeight: '500',
lineHeight: '1.5',
},
actionLink: {
fontSize: '16px',
fontWeight: '500',
lineHeight: '1.5',
textDecoration: 'underline',
cursor: 'pointer',
},
highlightTitleAndAuthor: {
fontSize: '18px',
fontStyle: 'italic',

5
packages/web/components/templates/LoginForm.tsx
View File

@ -106,6 +106,11 @@ export function LoginForm(props: LoginFormProps): JSX.Element {
/>
</Box>
)}
<Link href="/auth/email-login" passHref>
<StyledTextSpan style="actionLink" css={{ color: '$omnivoreGray', pt: '12px' }}>
Continue with Email
</StyledTextSpan>
</Link>
</VStack>
<TermAndConditionsFooter />
</VStack>

8
packages/web/components/templates/auth/EmailLogin.tsx
View File

@ -101,7 +101,7 @@ export function EmailLogin(): JSX.Element {
<Button type="submit" style={'ctaDarkYellow'}>Login</Button>
</HStack>
<StyledText
style="caption"
style="action"
css={{
m: '0px',
pt: '16px',
@ -112,11 +112,11 @@ export function EmailLogin(): JSX.Element {
>
Don&apos;t have an account? {' '}
<Link href="/auth/email-signup" passHref>
<StyledTextSpan style="captionLink" css={{ color: '$omnivoreGray' }}>Sign up</StyledTextSpan>
<StyledTextSpan style="actionLink" css={{ color: '$omnivoreGray' }}>Sign up</StyledTextSpan>
</Link>
</StyledText>
<StyledText
style="caption"
style="action"
css={{
mt: '0px',
pt: '4px',
@ -127,7 +127,7 @@ export function EmailLogin(): JSX.Element {
>
Forgot your password? {' '}
<Link href="/auth/forgot-password" passHref>
<StyledTextSpan style="captionLink" css={{ color: '$omnivoreGray' }}>Click here</StyledTextSpan>
<StyledTextSpan style="actionLink" css={{ color: '$omnivoreGray' }}>Click here</StyledTextSpan>
</Link>
</StyledText>
</VStack>

4
packages/web/components/templates/auth/EmailSignup.tsx
View File

@ -165,7 +165,7 @@ export function EmailSignup(): JSX.Element {
</HStack>
<StyledText
style="caption"
style="action"
css={{
pt: '16px',
color: '$omnivoreLightGray',
@ -174,7 +174,7 @@ export function EmailSignup(): JSX.Element {
>
Already have an account? {' '}
<Link href="/auth/email-login" passHref>
<StyledTextSpan style="captionLink" css={{ color: '$omnivoreGray' }}>Login instead</StyledTextSpan>
<StyledTextSpan style="actionLink" css={{ color: '$omnivoreGray' }}>Login instead</StyledTextSpan>
</Link>
</StyledText>
<TermAndConditionsFooter />