Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ADDED: video support in section block #95

Merged
merged 3 commits into from
Jul 26, 2024
Merged

ADDED: video support in section block #95

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
20dc9fe
ADDED: video support in section block
sd-ditoy Jul 26, 2024
45b3bef
FIXED: image was not shown on mobile when no video was available
sd-ditoy Jul 26, 2024
d18565b
MODIFIED: further mobile optimization
sd-ditoy Jul 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
93 changes: 89 additions & 4 deletions src/components/blocks/TextTeaser.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,13 @@
<div>
<h1 v-if="setAsH1" class="h1" v-html="boxTitle" :data-slug="slugged" />
<h2 v-else class="h1" v-html="boxTitle" :data-slug="slugged" />
<VideoPlayer
v-if="mergeVideo && hasVideo"
class=""
:thumb="video.thumbnail"
:provider="video.service"
:video-id="video.id"
/>
<p v-html="boxContent"></p>
<Button class="primary" v-if="hasButton">
<router-link v-if="button.type === 'int'" :to="`/${$i18n.locale}${button.url}`">
Expand All @@ -24,8 +31,15 @@
</Button>

</div>
<div>
<MediaImage v-if="image" :asset="image" />
<div v-if="!mergeVideo && (image || hasVideo)" :class="{ video: hasVideo }">
<div v-if="hasVideo" class="video-wrapper">
<VideoPlayer
:thumb="video.thumbnail"
:provider="video.service"
:video-id="video.id"
/>
</div>
<MediaImage v-else-if="image" :asset="image" />
</div>
</div>
</div>
Expand Down Expand Up @@ -83,6 +97,10 @@ export default {
type: Array,
default: null,
},
video: {
type: Object,
default: null,
},
variation: {
type: String,
default: 'text-left',
Expand Down Expand Up @@ -139,6 +157,10 @@ export default {
}
return null;
},
hasVideo() {
const { id } = this.video || {};
return !!id;
},
hasFile() {
const { file } = this;
return file && file.id && file.text;
Expand All @@ -151,6 +173,9 @@ export default {
const title = (this.boxTitle || '').replace(/<\/?[^>]+(>|$)/g, '');
return slugify(title, { lower: true, strict: true });
},
mergeVideo() {
return (this.hasVideo && this.$d.clientWidth <= 1241);
},
},
//---------------------------------------------------
//
Expand Down Expand Up @@ -242,9 +267,39 @@ export default {
max-width: 400px;
height: auto;
}

&.video {
align-self: flex-start;
& > .video-wrapper {
position: relative;
margin-top: 25px;
width: 100%;
height: auto;
aspect-ratio: 16/9;

& > .video-container {
padding: 0;
position: absolute;
top: 0;
left: 0;
width: 25vw;
min-width: 440px;
}
}
}
}

@include breakpoint('sm') {
& > div:only-child {
display: block;
width: 100%;
margin: 0 auto;

.video-container {
padding: 5px 0;
}
}

@include breakpoint('m') {
flex-direction: column;
padding-top: 45px;
// padding-bottom: 45px;
Expand Down Expand Up @@ -336,9 +391,39 @@ export default {
max-width: 400px;
height: auto;
}

&.video {
align-self: flex-start;
& > .video-wrapper {
position: relative;
width: 100%;
height: auto;
aspect-ratio: 16/9;

& > .video-container {
position: absolute;
padding: 0;
top: 0;
left: auto;
right: 0;
width: 25vw;
min-width: 440px;
}
}
}
}

@include breakpoint('sm') {
& > div:only-child {
display: block;
width: 100%;
margin: 0 auto;

.video-container {
padding: 5px 0;
}
}

@include breakpoint('m') {
flex-direction: column;
padding-top: 45px;

Expand Down
5 changes: 3 additions & 2 deletions src/components/blocks/VideoPlayer.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,8 +258,9 @@ div[data-vimeo-initialized="true"] {
display: block;
left: 50%;
top: 50%;
width: 120px;
height: 120px;
width: 15%;
height: auto;
max-width: 120px;
z-index: 2000;
cursor: pointer;
backface-visibility: hidden;
Expand Down
1 change: 1 addition & 0 deletions src/views/PageFactory.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
:text-color="block.txtcolor"
:link-color="block.linkcolor"
:media="block.media"
:video="block.video"
:variation="block.variation"
/>
<Codeblock
Expand Down
Loading