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

IN-564-ads #226

Merged
andrey.dekterev merged 3 commits from IN-564-ads into develop 3 years ago
Conversation 0 Commits 3 Files Changed 39
andrey.dekterev commented 3 years ago
Owner

https://insports.atlassian.net/browse/IN-564?filter=10008

https://insports.atlassian.net/browse/IN-564?filter=10008
andrey.dekterev added 2 commits 3 years ago
5172fdf560 add ads to main page
andrey.dekterev force-pushed IN-564-ads from 3c9df6e918 to e1c8ff491e 3 years ago
andrey.dekterev requested review from margarita.polyakova 3 years ago
andrey.dekterev requested review from ruslan.khairullin 3 years ago
andrey.dekterev requested review from roman.rakov 3 years ago
ruslan.khairullin reviewed 3 years ago
src/components/Ads/components/AdComponent/styled.tsx Outdated
import styled from 'styled-components'
ruslan.khairullin commented 3 years ago
Collaborator

styled-components/macro

styled-components/macro
andrey.dekterev marked this conversation as resolved
src/components/Ads/components/MobileAd/index.tsx Outdated
import { MouseEvent } from 'react'
ruslan.khairullin commented 3 years ago
Collaborator

import type

import type
andrey.dekterev marked this conversation as resolved
src/components/Ads/components/MobileAd/index.tsx Outdated
import { EventGA } from '../../types'
type MobileAdTypes = {
ad: AdType,
ruslan.khairullin commented 3 years ago
Collaborator

отступ

отступ
andrey.dekterev marked this conversation as resolved
src/components/Ads/components/MobileAd/styled.tsx Outdated
import styled from 'styled-components'
ruslan.khairullin commented 3 years ago
Collaborator

styled-components/macro

styled-components/macro
andrey.dekterev marked this conversation as resolved
src/components/Ads/helpers/calcMaxDurationAds.tsx Outdated
import { AdResponse, AdsListType } from 'requests'
ruslan.khairullin commented 3 years ago
Collaborator

import type

import type
andrey.dekterev marked this conversation as resolved
src/components/Ads/hooks.tsx
import { useLang } from 'features/LexicsStore/hooks/useLang'
import { useMemo } from 'react'
ruslan.khairullin commented 3 years ago
Collaborator

перенеси импорт на верхний уровень

перенеси импорт на верхний уровень
andrey.dekterev marked this conversation as resolved
src/components/Ads/styled.tsx Outdated
import styled, { css } from 'styled-components'
ruslan.khairullin commented 3 years ago
Collaborator

styled-components/macro

styled-components/macro
andrey.dekterev marked this conversation as resolved
src/config/userAgent.tsx Outdated
export const isMobileDevice = /iPhone|Android/.test(navigator.userAgent)
export const device = navigator.userAgent
ruslan.khairullin commented 3 years ago
Collaborator

перенеси наверх и замени navigator.userAgent на device в других выражениях

перенеси наверх и замени navigator.userAgent на device в других выражениях
👍 1
andrey.dekterev marked this conversation as resolved
src/features/MatchesGrid/index.tsx Outdated
import { readToken } from 'helpers'
import { useRecoilValue } from 'recoil'
ruslan.khairullin commented 3 years ago
Collaborator

импорт на верхний уроверь

импорт на верхний уроверь
andrey.dekterev marked this conversation as resolved
src/requests/getAds/getAds.tsx Outdated
}
export type AdType = {
'duration': number,
ruslan.khairullin commented 3 years ago
Collaborator

кавычки не нужны

кавычки не нужны
andrey.dekterev marked this conversation as resolved
src/requests/getAds/updateAdsView.tsx Outdated
}
type AdsViewResponse = {
'data': string,
ruslan.khairullin commented 3 years ago
Collaborator

кавычки не нужны

кавычки не нужны
andrey.dekterev marked this conversation as resolved
margarita.polyakova approved these changes 3 years ago
roman.rakov reviewed 3 years ago
src/components/Ads/components/AdComponent/styled.tsx
}
const chooseStyle = (type: number) => {
switch (true) {
roman.rakov commented 3 years ago
Owner

сработает ли такое?

switch (VIEW_ADS[type]) {
case VIEW_ADS.COLUMN...

сработает ли такое? switch (VIEW_ADS[type]) { case VIEW_ADS.COLUMN...
andrey.dekterev commented 3 years ago
Poster
Owner

нет, такое не работает, переделал так

const chooseStyle = (type: number) => {
  switch (true) {
    case VIEW_ADS.COLUMN === type:
      return 'grid-row: 1 / 3; img {max-height: none;}'
    case VIEW_ADS.ROW === type:
      return 'grid-column: 1 / 3'
    case VIEW_ADS.SQUARE === type:
      return 'grid-row: 1 / 3; grid-column: 1 / 3; img {max-height: none;}'
    case VIEW_ADS.SECOND_COLUMN === type:
      return 'grid-column: 2 / 3; grid-row: 1 / 1'
    case VIEW_ADS.SECOND_ROW === type:
      return 'grid-column: 1 / 2; grid-row: 2 / 3;'
    default:
      return ''
  }
}
нет, такое не работает, переделал так ``` const chooseStyle = (type: number) => { switch (true) { case VIEW_ADS.COLUMN === type: return 'grid-row: 1 / 3; img {max-height: none;}' case VIEW_ADS.ROW === type: return 'grid-column: 1 / 3' case VIEW_ADS.SQUARE === type: return 'grid-row: 1 / 3; grid-column: 1 / 3; img {max-height: none;}' case VIEW_ADS.SECOND_COLUMN === type: return 'grid-column: 2 / 3; grid-row: 1 / 1' case VIEW_ADS.SECOND_ROW === type: return 'grid-column: 1 / 2; grid-row: 2 / 3;' default: return '' } } ```
andrey.dekterev marked this conversation as resolved
andrey.dekterev added 1 commit 3 years ago
continuous-integration/drone/push Build is passing
Details
e188c32fcd fix(#564): fix styles ads ads types
ruslan.khairullin approved these changes 3 years ago
roman.rakov approved these changes 3 years ago
andrey.dekterev merged commit e188c32fcd into develop 3 years ago
andrey.dekterev deleted branch IN-564-ads 3 years ago

Reviewers

margarita.polyakova approved these changes 3 years ago
ruslan.khairullin approved these changes 3 years ago
roman.rakov approved these changes 3 years ago
continuous-integration/drone/push Build is passing
Details
The pull request has been merged as e188c32fcd.
Sign in to join this conversation.
Reviewers
Request review
No reviewers
margarita.polyakova
ruslan.khairullin
roman.rakov
Labels
Apply labels
Clear labels
No items
No Label
Milestone
Set milestone
Clear milestone
No items
No Milestone
Assignees
Assign users
Clear assignees
No Assignees
4 Participants
Notifications
Due Date

No due date set.

Dependencies

No dependencies set.

Reference: frontend/spa_instat_tv#226
Write Preview
Loading…
Cancel
Save
There is no content yet.
Delete Branch 'IN-564-ads'

Deleting a branch is permanent. It CANNOT be undone. Continue?

No
Yes