frontend
/
spa_instat_tv
1
0
Fork 0
Code Pull Requests 1 Releases Wiki Activity

feat(#2415): added link to the site about company

Browse Source
keep-around/0ae2022e2873abf7c918f7349525eb4dd543e942
Rakov Roman 4 years ago
parent 588bf66375
commit 0ae2022e28
7 changed files with 115 additions and 89 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 1
      src/config/lexics/userAccount.tsx
  2. 1
      src/config/pages.tsx
  3. 167
      src/features/AuthServiceApp/components/Registration/index.tsx
  4. 1
      src/features/CompanyInfo/config.tsx
  5. 15
      src/features/CompanyInfo/index.tsx
  6. 12
      src/features/CompanyInfo/styled.tsx
  7. 7
      src/features/UserAccount/index.tsx

1
src/config/lexics/userAccount.tsx
Unescape View File

@ -2,6 +2,7 @@ import { publicLexics } from './public'
import { paymentLexics } from './payment' import { paymentLexics } from './payment'
const navigations = { const navigations = {
about_the_project: 18170,
bank_card: 14205, bank_card: 14205,
logout: 15058, logout: 15058,
my_devices: 15052, my_devices: 15052,

1
src/config/pages.tsx
Unescape View File

@ -1,4 +1,5 @@
export const PAGES = { export const PAGES = {
about_the_project: 'https://instatsport.com/InStatTV/ott_platform',
home: '/', home: '/',
match: '/matches', match: '/matches',
player: '/players', player: '/players',

167
src/features/AuthServiceApp/components/Registration/index.tsx
Unescape View File

@ -20,6 +20,7 @@ import {
ButtonSolid, ButtonSolid,
Error, Error,
LanguageSelectWrapper, LanguageSelectWrapper,
Wrapper,
} from '../../styled' } from '../../styled'
import { import {
Label, Label,
@ -27,6 +28,7 @@ import {
ButtonOutline, ButtonOutline,
CheckboxWrapper, CheckboxWrapper,
} from './styled' } from './styled'
import { CompanyInfo } from '../../../CompanyInfo'
const Registration = () => { const Registration = () => {
const history = useHistory() const history = useHistory()
@ -51,90 +53,93 @@ const Registration = () => {
} = useRegistrationForm() } = useRegistrationForm()
return ( return (
<CenterBlock> <Wrapper>
<Logo /> <CenterBlock>
<Form onSubmit={handleSubmit}> <Logo />
<BlockTitle t='step_title_registration' /> <Form onSubmit={handleSubmit}>
<BlockTitle t='step_title_registration' />
<InputGroup> <InputGroup>
<Input <Input
type='email' type='email'
name='email' name='email'
autoComplete='email' autoComplete='email'
placeholderLexic='form_email' placeholderLexic='form_email'
value={email} value={email}
onChange={onEmailChange} onChange={onEmailChange}
onBlur={onEmailBlur} onBlur={onEmailBlur}
/> />
<PasswordInput <PasswordInput
type='password' type='password'
name='password' name='password'
autoComplete='current-password' autoComplete='current-password'
placeholderLexic='form_password' placeholderLexic='form_password'
value={password} value={password}
onChange={onPasswordChange} onChange={onPasswordChange}
onBlur={onPasswordBlur} onBlur={onPasswordBlur}
/> />
</InputGroup> </InputGroup>
<Error> <Error>
{formError {formError
? <T9n t={formError} /> ? <T9n t={formError} />
: <T9n t={authError} />} : <T9n t={authError} />}
</Error> </Error>
<CheckboxWrapper> <CheckboxWrapper>
<Checkbox <Checkbox
checked={termsAccepted} checked={termsAccepted}
onChange={onTermsChange} onChange={onTermsChange}
label={( label={(
<Label> <Label>
<T9n t='accept_privacy' /> <T9n t='accept_privacy' />
<Link href={client.termsLink} target='_blank'> <Link href={client.termsLink} target='_blank'>
<T9n t='terms_and_conditions' /> <T9n t='terms_and_conditions' />
</Link>&nbsp; </Link>&nbsp;
<T9n t='and' /> <T9n t='and' />
<Link href={client.privacyLink} target='_blank'> <Link href={client.privacyLink} target='_blank'>
<T9n t='privacy_policy_and_statement' /> <T9n t='privacy_policy_and_statement' />
</Link> </Link>
</Label> </Label>
)} )}
/> />
<Checkbox <Checkbox
checked={cookiesAccepted} checked={cookiesAccepted}
onChange={onCookiesChange} onChange={onCookiesChange}
label={( label={(
<Label> <Label>
<T9n t='accept_cookies' /> <T9n t='accept_cookies' />
</Label> </Label>
)} )}
/> />
</CheckboxWrapper> </CheckboxWrapper>
<ButtonsBlock> <ButtonsBlock>
<ButtonSolid disabled={isSubmitDisabled} type='submit'> <ButtonSolid disabled={isSubmitDisabled} type='submit'>
{ {
isFetching isFetching
? <ArrowLoader /> ? <ArrowLoader />
: <T9n t='sign_up' /> : <T9n t='sign_up' />
} }
</ButtonSolid> </ButtonSolid>
<ButtonOutline <ButtonOutline
type='button' type='button'
onClick={history.goBack} onClick={history.goBack}
> >
<T9n t='go_back' /> <T9n t='go_back' />
</ButtonOutline> </ButtonOutline>
</ButtonsBlock> </ButtonsBlock>
<LanguageSelectWrapper> <LanguageSelectWrapper>
<LanguageSelect /> <LanguageSelect />
</LanguageSelectWrapper> </LanguageSelectWrapper>
<RegisterPopup <RegisterPopup
email={email} email={email}
isModalOpen={isModalOpen} isModalOpen={isModalOpen}
handleModalClose={handleModalClose} handleModalClose={handleModalClose}
/> />
</Form> </Form>
</CenterBlock> </CenterBlock>
<CompanyInfo textAlign='center' width='450px' />
</Wrapper>
) )
} }

1
src/features/CompanyInfo/config.tsx
Unescape View File

@ -3,4 +3,5 @@ export const lexics = [
18082, 18082,
18083, 18083,
18084, 18084,
18170,
] ]

15
src/features/CompanyInfo/index.tsx
Unescape View File

@ -1,10 +1,11 @@
import { T9n } from 'features/T9n' import { T9n } from 'features/T9n'
import { useLexicsConfig } from 'features/LexicsStore' import { useLexicsConfig } from 'features/LexicsStore'
import { PAGES } from 'config'
import { import {
CompanyInfoLink,
CompanyInfoText, CompanyInfoText,
CompanyInfoWrapper, CompanyInfoWrapper,
CompanyName,
} from './styled' } from './styled'
import { lexics } from './config' import { lexics } from './config'
@ -21,9 +22,15 @@ export const CompanyInfo = ({
return ( return (
<CompanyInfoWrapper style={{ maxWidth: width, textAlign }}> <CompanyInfoWrapper style={{ maxWidth: width, textAlign }}>
<CompanyName> <CompanyInfoText>
<T9n t='18081' /> <T9n t='18081' />{' | '}
</CompanyName> <CompanyInfoLink
to={{ pathname: PAGES.about_the_project }}
target='_blank'
>
<T9n t='18170' />
</CompanyInfoLink>
</CompanyInfoText>
<CompanyInfoText> <CompanyInfoText>
<T9n t='18082' /> <T9n t='18082' />
</CompanyInfoText> </CompanyInfoText>

12
src/features/CompanyInfo/styled.tsx
Unescape View File

@ -1,3 +1,5 @@
import { Link } from 'react-router-dom'
import styled, { css } from 'styled-components/macro' import styled, { css } from 'styled-components/macro'
import { isMobileDevice } from 'config/userAgent' import { isMobileDevice } from 'config/userAgent'
@ -8,14 +10,16 @@ export const CompanyInfoWrapper = styled.div`
font-weight: 400; font-weight: 400;
font-size: 12px; font-size: 12px;
line-height: 15px; line-height: 15px;
color: rgba(255, 255, 255, 0.6); color: rgba(255, 255, 255, 0.5);
${isMobileDevice ? css` ${isMobileDevice ? css`
margin-top: 20px; margin-top: 20px;
` : ''} ` : ''}
` `
export const CompanyName = styled.div`
color: rgba(255, 255, 255, 0.8);
`
export const CompanyInfoText = styled.div`` export const CompanyInfoText = styled.div``
export const CompanyInfoLink = styled(Link)`
color: rgba(255, 255, 255, 0.7);
text-decoration: underline;
`

7
src/features/UserAccount/index.tsx
Unescape View File

@ -52,6 +52,13 @@ const UserAccount = () => {
<StyledLink disabled={isProduction} to={`${PAGES.useraccount}/devices`}> <StyledLink disabled={isProduction} to={`${PAGES.useraccount}/devices`}>
<T9n t='my_devices' /> <T9n t='my_devices' />
</StyledLink> </StyledLink>
<StyledLink
disabled={isProduction}
target='_blank'
to={{ pathname: PAGES.about_the_project }}
>
<T9n t='about_the_project' />
</StyledLink>
<ScoreSwitch /> <ScoreSwitch />
<UnsubscribePrompt /> <UnsubscribePrompt />

Write Preview
Loading…
Cancel
Save