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

Ott 2118 facr logo

Browse Source
keep-around/023687a6c04fec548f943a7344664691428f80e6
Макситалиев Мирлан 4 years ago
parent 368a945826
commit 023687a6c0
13 changed files with 75 additions and 93 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. 26
      Makefile
  2. 10
      public/images/powered-instat-logo.svg
  3. 15
      src/config/clients/facr.tsx
  4. 5
      src/config/clients/instat.tsx
  5. 5
      src/config/clients/types.tsx
  6. 12
      src/features/HomePage/components/Header/index.tsx
  7. 1
      src/features/Logo/index.tsx
  8. 1
      src/features/MatchSwitches/styled.tsx
  9. 10
      src/features/ProfileHeader/index.tsx
  10. 9
      src/features/ProfileHeader/styled.tsx
  11. 36
      src/features/UserAccount/components/Header/index.tsx
  12. 3
      src/features/UserAccount/index.tsx
  13. 13
      src/features/UserAccount/styled.tsx

26
Makefile
Unescape View File

@ -51,9 +51,9 @@ prod: clean
REACT_APP_STRIPE_PK=pk_live_ANI76cBhSo69DZUxPmyRVIZW \
npm run build
rsync -zavP build/ -e 'ssh -p 666' ott@de.instat.tv:/usr/local/www/ott/wwwroot/
rsync -zavP build/ -e 'ssh -p 666' ott@fr.instat.tv:/usr/local/www/ott/wwwroot/
rsync -zavP build/ -e 'ssh -p 666' ott@bkup.instat.tv:/usr/local/www/ott/wwwroot/
rsync -zavP --delete-before build/ -e 'ssh -p 666' ott@de.instat.tv:/usr/local/www/ott/wwwroot/
rsync -zavP --delete-before build/ -e 'ssh -p 666' ott@fr.instat.tv:/usr/local/www/ott/wwwroot/
rsync -zavP --delete-before build/ -e 'ssh -p 666' ott@bkup.instat.tv:/usr/local/www/ott/wwwroot/
preprod: clean
REACT_APP_TYPE=ott \
@ -62,7 +62,7 @@ preprod: clean
REACT_APP_STRIPE_PK=pk_live_ANI76cBhSo69DZUxPmyRVIZW \
npm run build
rsync -zavP build/ -e 'ssh -p 666' ott-test@test.instat.tv:/usr/local/www/ott-test/wwwroot/
rsync -zavP --delete-before build/ -e 'ssh -p 666' ott-test@test.instat.tv:/usr/local/www/ott-test/wwwroot/
facr-prod: clean
REACT_APP_TYPE=ott \
@ -71,29 +71,29 @@ facr-prod: clean
REACT_APP_CLIENT=facr \
npm run build
rsync -zavP build/ -e 'ssh -p 666' ott@de.instat.tv:/usr/local/www/ott/facr-wwwroot/
rsync -zavP build/ -e 'ssh -p 666' ott@fr.instat.tv:/usr/local/www/ott/facr-wwwroot/
rsync -zavP build/ -e 'ssh -p 666' ott@bkup.instat.tv:/usr/local/www/ott/facr-wwwroot/
rsync -zavP --delete-before build/ -e 'ssh -p 666' ott@de.instat.tv:/usr/local/www/ott/facr-wwwroot/
rsync -zavP --delete-before build/ -e 'ssh -p 666' ott@fr.instat.tv:/usr/local/www/ott/facr-wwwroot/
rsync -zavP --delete-before build/ -e 'ssh -p 666' ott@bkup.instat.tv:/usr/local/www/ott/facr-wwwroot/
deploy-all: prod preprod facr-prod
stage: build
rsync -zavP build/ -e 'ssh -p 666' ott-staging@staging.instat.tv:/usr/local/www/ott-staging/wwwroot/
rsync -zavP --delete-before build/ -e 'ssh -p 666' ott-staging@staging.instat.tv:/usr/local/www/ott-staging/wwwroot/
a-stage: build
rsync -zavP build/ -e 'ssh -p 666' ott-staging@staging.instat.tv:/usr/local/www/ott-staging/a-wwwroot/
rsync -zavP --delete-before build/ -e 'ssh -p 666' ott-staging@staging.instat.tv:/usr/local/www/ott-staging/a-wwwroot/
b-stage: build
rsync -zavP build/ -e 'ssh -p 666' ott-staging@staging.instat.tv:/usr/local/www/ott-staging/b-wwwroot/
rsync -zavP --delete-before build/ -e 'ssh -p 666' ott-staging@staging.instat.tv:/usr/local/www/ott-staging/b-wwwroot/
c-stage: build
rsync -zavP build/ -e 'ssh -p 666' ott-staging@staging.instat.tv:/usr/local/www/ott-staging/c-wwwroot/
rsync -zavP --delete-before build/ -e 'ssh -p 666' ott-staging@staging.instat.tv:/usr/local/www/ott-staging/c-wwwroot/
d-stage: build
rsync -zavP build/ -e 'ssh -p 666' ott-staging@staging.instat.tv:/usr/local/www/ott-staging/d-wwwroot/
rsync -zavP --delete-before build/ -e 'ssh -p 666' ott-staging@staging.instat.tv:/usr/local/www/ott-staging/d-wwwroot/
e-stage: build
rsync -zavP build/ -e 'ssh -p 666' ott-staging@staging.instat.tv:/usr/local/www/ott-staging/e-wwwroot/
rsync -zavP --delete-before build/ -e 'ssh -p 666' ott-staging@staging.instat.tv:/usr/local/www/ott-staging/e-wwwroot/
test:
npm test

10
public/images/powered-instat-logo.svg
View File

File diff suppressed because one or more lines are too long
Side by Side

Before

Width:  |  Height:  |  Size: 15 KiB

15
src/config/clients/facr.tsx
Unescape View File

@ -32,7 +32,6 @@ export const facr: ClientConfig = {
[PROCEDURES.get_player_matches]: params,
[PROCEDURES.get_tournament_matches]: params,
},
showPoweredByLogo: true,
showSearch: false,
styles: {
background: '',
@ -44,13 +43,13 @@ export const facr: ClientConfig = {
#000000;
`,
logo: 'facr-logo.svg',
logoHeight: 5,
logoWidth: 6.45,
matchLogoHeight: 3.7,
matchLogoTopMargin: 0.6,
matchLogoWidth: 3.5,
userAccountLogoHeight: 3,
userAccountLogoWidth: 3.5,
logoHeight: 4.76,
logoLeft: 1.17,
logoTop: 1.74,
logoWidth: 6.22,
matchLogoHeight: 2.6,
matchLogoTopMargin: 0.9,
matchLogoWidth: 3.4,
},
title: 'FACR.TV - The home of Czech football streaming',
}

5
src/config/clients/instat.tsx
Unescape View File

@ -16,12 +16,11 @@ export const instat: ClientConfig = {
background: 'background-image: url(/images/Checker.png);',
logo: 'logo.svg',
logoHeight: 1.465,
logoLeft: 1.7,
logoTop: 1.5,
logoWidth: 6.37,
matchLogoHeight: 1.465,
matchLogoTopMargin: 1.14,
matchLogoWidth: 6.37,
userAccountLogoHeight: 1.465,
userAccountLogoWidth: 6.37,
},
title: 'InStat TV - The Home of Sports Streaming',
}

5
src/config/clients/types.tsx
Unescape View File

@ -27,19 +27,18 @@ export type ClientConfig = {
name: ClientNames,
privacyLink: string,
requests?: Record<ProcedureName, RequestParameters>,
showPoweredByLogo?: boolean,
showSearch?: boolean,
styles: {
background?: string,
homePageHeader?: StyledCss,
logo: string,
logoHeight?: number,
logoLeft?: number,
logoTop?: number,
logoWidth?: number,
matchLogoHeight?: number,
matchLogoTopMargin?: number,
matchLogoWidth?: number,
userAccountLogoHeight?: number,
userAccountLogoWidth?: number,
},
title: string,
}

12
src/features/HomePage/components/Header/index.tsx
Unescape View File

@ -1,6 +1,7 @@
import { Link } from 'react-router-dom'
import { PAGES } from 'config'
import { PAGES } from 'config/pages'
import { client } from 'config/clients'
import { Menu } from 'features/Menu'
import { ScoreSwitch } from 'features/MatchSwitches'
@ -16,8 +17,11 @@ import {
export const Header = () => (
<HeaderStyled>
<Position left={1.7}>
<HeaderGroup marginTop={0.19}>
<Position
top={client.styles.logoTop}
left={client.styles.logoLeft}
>
<HeaderGroup>
<Link to={PAGES.home}>
<HeaderLogo />
</Link>
@ -26,7 +30,7 @@ export const Header = () => (
</Position>
<DateFilter />
<Position right={0.71}>
<HeaderGroup height={2.28}>
<HeaderGroup>
<ScoreSwitch />
<Menu />
</HeaderGroup>

1
src/features/Logo/index.tsx
Unescape View File

@ -14,6 +14,7 @@ export const Logo = styled.div<Props>`
background-size: contain;
background-repeat: no-repeat;
background-image: url(/images/${client.styles.logo});
background-position: center;
width: ${client.styles.logoWidth}rem;
height: ${client.styles.logoHeight}rem;

1
src/features/MatchSwitches/styled.tsx
Unescape View File

@ -45,7 +45,6 @@ export const Icon = styled.div<IconProps>`
width: ${({ width = 1.7 }) => width}rem;
height: ${({ height = 2.28 }) => height}rem;
position: relative;
top: 3px;
color: white;
background-size: contain;
background-repeat: no-repeat;

10
src/features/ProfileHeader/index.tsx
Unescape View File

@ -44,8 +44,12 @@ export const ProfileHeader = ({
color={headerColor || color}
height={height}
>
<Position isMatchPage={isMatchPage()} left={1.7}>
<HeaderGroup marginTop={0.19}>
<Position
isMatchPage={isMatchPage()}
top={client.styles.logoTop}
left={client.styles.logoLeft}
>
<HeaderGroup>
<Link to={PAGES.home}>
<HeaderLogo isMatchPage={isMatchPage()} />
</Link>
@ -57,7 +61,7 @@ export const ProfileHeader = ({
{children}
<Position right={0.71}>
<HeaderGroup height={2.28}>
<HeaderGroup>
<ScoreSwitch />
<Menu />
</HeaderGroup>

9
src/features/ProfileHeader/styled.tsx
Unescape View File

@ -67,8 +67,6 @@ export const HeaderGroup = styled.div<Props>`
`
export const HeaderLogo = styled(Logo)`
margin-top: ${({ isMatchPage }) => (isMatchPage ? '4px' : '10px')};
${({ isMatchPage }) => (isMatchPage ? css`
width: ${client.styles.matchLogoWidth}rem;
height: ${client.styles.matchLogoHeight}rem;
@ -93,13 +91,16 @@ type PositionProps = {
isMatchPage?: boolean,
left?: number,
right?: number,
top?: number,
}
export const Position = styled.div<PositionProps>`
position: absolute;
top: ${({ isMatchPage }) => (
isMatchPage ? client.styles.matchLogoTopMargin : '1.14'
top: ${({ isMatchPage, top = 1.14 }) => (
isMatchPage
? client.styles.matchLogoTopMargin ?? top
: top
)}rem;
${({ left }) => (isUndefined(left) ? '' : `left: ${left}rem`)};

36
src/features/UserAccount/components/Header/index.tsx
Unescape View File

@ -6,14 +6,15 @@ import { devices, PAGES } from 'config'
import { isMobileDevice } from 'config/userAgent'
import { client } from 'config/clients'
import { HeaderGroup } from 'features/ProfileHeader/styled'
import { Logo } from 'features/Logo'
const HeaderStyled = styled.header`
display: flex;
align-items: center;
margin-bottom: 65px;
width: 100%;
height: ${client.styles.logoHeight}rem;
justify-content: space-between;
@media ${devices.tablet} {
margin-bottom: 0;
@ -21,7 +22,6 @@ const HeaderStyled = styled.header`
${isMobileDevice
? css`
justify-content: center;
@media (max-width: 650px){
margin-bottom: 20px;
}
@ -31,10 +31,6 @@ const HeaderStyled = styled.header`
`
: ''};
`
const CustomHeaderGroup = styled(HeaderGroup)`
width: 100%;
justify-content: space-between;
`
const HomeIcon = styled.div`
display: block;
@ -46,19 +42,25 @@ const HomeIcon = styled.div`
`
export const HeaderLogo = styled(Logo)`
width: ${client.styles.userAccountLogoWidth}rem;
height: ${client.styles.userAccountLogoHeight}rem;
position: absolute;
top: ${client.styles.logoTop}rem;
left: ${client.styles.logoLeft}rem;
${isMobileDevice
? css`
left: 50%;
transform: translateX(-50%);
`
: ''}
`
export const Header = () => (
<HeaderStyled>
<CustomHeaderGroup>
<Link to={PAGES.home}>
<HeaderLogo />
</Link>
<Link to={PAGES.home}>
<HomeIcon />
</Link>
</CustomHeaderGroup>
<Link to={PAGES.home}>
<HeaderLogo />
</Link>
<Link to={PAGES.home}>
<HomeIcon />
</Link>
</HeaderStyled>
)

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

@ -2,7 +2,6 @@ import { Route } from 'react-router-dom'
import { PAGES } from 'config'
import { isProduction } from 'config/env'
import { client } from 'config/clients'
import { userAccountLexics } from 'config/lexics/userAccount'
import { usePageLogger } from 'hooks/usePageLogger'
@ -21,7 +20,6 @@ import {
Aside,
Body,
ContentWrapper,
Logo,
Navigations,
StyledLink,
UserAccountWrapper,
@ -71,7 +69,6 @@ const UserAccount = () => {
<PagePaymentsHistory />
</Route>
</ContentWrapper>
{client.showPoweredByLogo && <Logo />}
</Body>
</UserAccountWrapper>
)

13
src/features/UserAccount/styled.tsx
Unescape View File

@ -248,16 +248,3 @@ export const InlineButton = styled.button<InlineButtonProps>`
opacity: 0.5;
}
`
export const Logo = styled.div`
display: block;
background-size: contain;
background-repeat: no-repeat;
background-image: url(/images/powered-instat-logo.svg);
position: absolute;
bottom: 4rem;
right: 0;
margin-right: 2.7rem;
width: 4rem;
height: 2.5rem;
`

Write Preview
Loading…
Cancel
Save