Skip to content

Commit 49760ae

Browse files
committed
[BUGFIX] trial video and cover video
1 parent 3c048c4 commit 49760ae

File tree

6 files changed

+40
-28
lines changed

6 files changed

+40
-28
lines changed

src/components/blog/PostCover.tsx

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ import { Button, Icon as AntdIcon } from 'antd'
33
import { useApp } from 'lodestar-app-element/src/contexts/AppContext'
44
import React, { useCallback, useEffect, useRef, useState } from 'react'
55
import { defineMessages, useIntl } from 'react-intl'
6-
import ReactPlayer from 'react-player'
76
import styled, { css } from 'styled-components'
87
import { desktopViewMixin } from '../../helpers'
98
import { ReactComponent as ArrowUpCircleIcon } from '../../images/arrow-up-circle.svg'
109
import EmptyCover from '../../images/empty-cover.png'
1110
import { ReactComponent as ShopOIcon } from '../../images/shop-o.svg'
1211
import { MerchandiseProps } from '../../types/merchandise'
12+
import { StyledPlayer } from '../program/ProgramBanner'
1313
import MerchandiseModal from './MerchandiseModal'
1414

1515
const messages = defineMessages({
@@ -169,19 +169,19 @@ const PostCover: React.VFC<{
169169
<Icon as={ArrowUpCircleIcon} className="cursor-pointer" onClick={() => backToTop()} />
170170
<AntdIcon type="close" className="cursor-pointer" onClick={() => setIsClosed(true)} />
171171
</StyledHeader>
172-
<StyledVideoWrapper>
173-
<ReactPlayer
174-
url={coverUrl || undefined}
175-
width="100%"
176-
height="100%"
177-
style={{
178-
position: 'absolute',
179-
top: '0',
180-
left: '0',
181-
}}
182-
controls
183-
/>
184-
</StyledVideoWrapper>
172+
{coverUrl && (
173+
<StyledVideoWrapper>
174+
<StyledPlayer>
175+
<video
176+
className="smartvideo"
177+
src={coverUrl}
178+
controls
179+
autoPlay
180+
style={{ width: '100%', height: '100%' }}
181+
/>
182+
</StyledPlayer>
183+
</StyledVideoWrapper>
184+
)}
185185
</StyledVideoBlock>
186186
</div>
187187

src/components/common/VideoPlayer.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ const VideoPlayer: React.VFC<{ videoId: string; animated?: boolean } & Partial<S
2121
error: Error | null
2222
}>()
2323
useEffect(() => {
24-
if (!initialized && authToken && videoId) {
24+
if (!initialized && videoId) {
2525
setInitialized(true)
2626
axios
2727
.post(

src/components/program/ProgramBanner/PerpetualProgramBanner.tsx

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import React from 'react'
22
import { Link } from 'react-router-dom'
33
import styled from 'styled-components'
4-
import { StyledReactPlayer, StyledTags, StyledTitle, StyledVideoWrapper } from '.'
4+
import { StyledPlayer, StyledTags, StyledTitle, StyledVideoWrapper } from '.'
55
import { ProgramProps } from '../../../types/program'
66
import BlurredBanner from '../../common/BlurredBanner'
77
import { BREAK_POINT } from '../../common/Responsive'
@@ -47,7 +47,15 @@ const PerpetualProgramBanner: React.VFC<{
4747
<StyledVideoBlock>
4848
<div className="container">
4949
<StyledVideoWrapper>
50-
<StyledReactPlayer controls url={program.coverVideoUrl} width="100%" height="100%" />
50+
<StyledPlayer>
51+
<video
52+
className="smartvideo"
53+
src={program.coverVideoUrl}
54+
controls
55+
autoPlay
56+
style={{ width: '100%', height: '100%' }}
57+
/>
58+
</StyledPlayer>
5159
</StyledVideoWrapper>
5260
</div>
5361
</StyledVideoBlock>

src/components/program/ProgramBanner/SubscriptionProgramBanner.tsx

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import React from 'react'
22
import { useIntl } from 'react-intl'
33
import { Link } from 'react-router-dom'
44
import styled from 'styled-components'
5-
import { StyledReactPlayer, StyledTags, StyledTitle, StyledVideoWrapper } from '.'
5+
import { StyledPlayer, StyledTags, StyledTitle, StyledVideoWrapper } from '.'
66
import { productMessages } from '../../../helpers/translation'
77
import { ProgramProps, ProgramRoleProps } from '../../../types/program'
88
import MemberAvatar from '../../common/MemberAvatar'
@@ -64,7 +64,15 @@ const SubscriptionProgramBanner: React.VFC<{
6464
<StyledMediaBlock>
6565
<StyledVideoWrapper backgroundImage={program.coverUrl || ''}>
6666
{program.coverVideoUrl && (
67-
<StyledReactPlayer controls url={program.coverVideoUrl} width="100%" height="100%" />
67+
<StyledPlayer>
68+
<video
69+
className="smartvideo"
70+
src={program.coverVideoUrl}
71+
controls
72+
autoPlay
73+
style={{ width: '100%', height: '100%' }}
74+
/>
75+
</StyledPlayer>
6876
)}
6977
</StyledVideoWrapper>
7078
</StyledMediaBlock>

src/components/program/ProgramBanner/index.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import ReactPlayer from 'react-player'
21
import styled from 'styled-components'
32
import { BREAK_POINT } from '../../common/Responsive'
43

@@ -25,7 +24,7 @@ export const StyledVideoWrapper = styled.div<{ backgroundImage?: string }>`
2524
background-size: cover;
2625
background-position: center;
2726
`
28-
export const StyledReactPlayer = styled(ReactPlayer)`
27+
export const StyledPlayer = styled.div`
2928
position: absolute;
3029
top: 0;
3130
right: 0;

src/components/project/FundingCoverBlock.tsx

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React from 'react'
2-
import ReactPlayer from 'react-player'
32
import styled from 'styled-components'
3+
import { StyledPlayer } from '../program/ProgramBanner'
44

55
const StyledWrapper = styled.div<{ coverType: string; coverUrl: string }>`
66
position: relative;
@@ -18,12 +18,9 @@ const FundingCoverBlock: React.VFC<{
1818
return (
1919
<StyledWrapper coverType={coverType} coverUrl={coverUrl}>
2020
{coverType === 'video' && (
21-
<ReactPlayer
22-
url={coverUrl}
23-
width="100%"
24-
height="100%"
25-
style={{ position: 'absolute', top: 0, right: 0, bottom: 0, left: 0 }}
26-
/>
21+
<StyledPlayer>
22+
<video className="smartvideo" src={coverUrl} controls autoPlay style={{ width: '100%', height: '100%' }} />
23+
</StyledPlayer>
2724
)}
2825
</StyledWrapper>
2926
)

0 commit comments

Comments
 (0)