Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "@jsonms/demo",
"private": true,
"type": "module",
"version": "0.1.12",
"version": "0.1.13",
"scripts": {
"dev": "vite",
"build": "run-p type-check \"build-only {@}\" --",
Expand All @@ -13,12 +13,12 @@
"setup-hooks": "cp .pre-commit .git/hooks/pre-commit && chmod +x .git/hooks/pre-commit"
},
"dependencies": {
"@mdi/font": "7.4.47",
"@jsonms/vue3": "^1.0.7",
"@mdi/font": "7.4.47",
"core-js": "^3.37.1",
"roboto-fontface": "*",
"vue": "^3.4.31",
"vuetify": "^3.6.14"
"vuetify": "^3.10.7"
},
"devDependencies": {
"@eslint/js": "^9.14.0",
Expand Down
103 changes: 98 additions & 5 deletions src/components/Carousels.vue
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,42 @@
v-for="(presentation, presentationIdx) in data.home.presentation"
:key="presentation.hash"
>
<div v-if="data.home.presentation[slide].type === 'youtube'" class="youtube-responsive">
<div
v-if="presentation.type === 'media'"
class="media-responsive"
@mousemove="onMouseMoveVideo"
>
<video
ref="video"
controlsList="nodownload"
disablepictureinpicture
preload="auto"
@play="onVideoPlay"
@pause="onVideoPause"
@end="onVideoEnd"
@loadedmetadata="onLoadedMetadata"
>
<source
:src="getFilePath(presentation.media)"
:type="presentation.media?.meta.type"
>
Your browser does not support the video tag.
</video>
<div class="video-btn">
<v-fade-transition>
<v-btn v-if="hoveringVideo" :variant="videoPlaying ? 'tonal' : 'elevated'" color="primary" icon size="x-large" @click="toggleVideo">
<v-icon v-if="!videoPlaying" icon="mdi-play" />
<v-icon v-else icon="mdi-pause" />
</v-btn>
</v-fade-transition>
</div>
</div>
<div v-if="presentation.type === 'youtube'" class="youtube-responsive">
<iframe
:src="getYoutubeUrl(presentation)"
title="YouTube video player"
frameborder="0"
allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; web-share"
allow="accelerometer; clipboard-write; encrypted-media; gyroscope; web-share"
referrerpolicy="strict-origin-when-cross-origin"
allowfullscreen
/>
Expand Down Expand Up @@ -55,10 +85,13 @@

<script setup lang="ts">
import {useJsonMs} from "@/plugins/jsonms";
import type {JmsHomePresentationItems} from "@/jms/typings";
import type {JmsHomePresentationItem} from "@/jms/typings";

const slide = ref(0);
const { data, locale } = useJsonMs();
const hoveringVideo = ref(true);
const video = ref<HTMLVideoElement[]>([])
const videoPlaying = ref(false);
const { data, locale, getFilePath } = useJsonMs();

const onCtaClick = () => {
slide.value++;
Expand All @@ -74,7 +107,48 @@ const slideColor = computed((): string => {
return data.value.home.presentation[slide.value].color || 'primary';
})

function getYoutubeUrl(presentation: JmsHomePresentationItems) {
function toggleVideo() {
if (video.value.length > 0) {
videoPlaying.value = !videoPlaying.value;
const player = video.value[video.value.length - 1];
videoPlaying.value ? player.play() : player.pause();
}
}

let mouseMoveVideoTimeout: any = null;
function onMouseMoveVideo() {
hoveringVideo.value = true;
clearTimeout(mouseMoveVideoTimeout);
mouseMoveVideoTimeout = setTimeout(() => {
if (videoPlaying.value) {
hoveringVideo.value = false;
}
}, 2000);
}

const onLoadedMetadata = () => {
if (!video.value) return
const player = video.value[video.value.length - 1];
player.currentTime = 0.01
}

function onVideoPlay() {
videoPlaying.value = true;
hoveringVideo.value = false;
}

function onVideoPause() {
videoPlaying.value = false;
}

function onVideoEnd() {
videoPlaying.value = false;
if (video.value.length > 0) {
video.value[video.value.length - 1].currentTime = 0;
}
}

function getYoutubeUrl(presentation: JmsHomePresentationItem) {
if (presentation.youtube) {
const code = getYoutubeCode(presentation.youtube);
return 'https://www.youtube.com/embed/' + code + '?controls=0&rel=0';
Expand Down Expand Up @@ -105,6 +179,25 @@ watch(() => slide.value, () => {
</script>

<style lang="scss" scoped>
.media-responsive {
width: 100%;
height: 100%;
overflow: hidden;
}
.media-responsive video {
height: 100vh;
min-width: 100%;
float: left;
}
.media-responsive {
.video-btn {
z-index: 2;
position: absolute;
top: 50%;
left: 50%;
transform: translate(-50%, -50%);
}
}
.youtube-responsive iframe {
position: absolute;
inset: 0;
Expand Down
3 changes: 2 additions & 1 deletion src/jms/typings.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,9 @@ export interface JmsFile {
}

export interface JmsHomePresentationItem {
type: 'text' | 'youtube'
type: 'text' | 'media' | 'youtube'
title: JmsLocaleSet<string> | null
media: JmsFile | null
youtube: string | null
body: JmsLocaleSet<string | null> | null
cta: JmsLocaleSet<string> | null
Expand Down
4 changes: 4 additions & 0 deletions src/plugins/vuetify.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,16 @@
// Styles
import '@mdi/font/css/materialdesignicons.css'
import 'vuetify/styles'
// import { VVideo } from 'vuetify/labs/VVideo'

// Composables
import { createVuetify } from 'vuetify'

// https://vuetifyjs.com/en/introduction/why-vuetify/#feature-guides
export default createVuetify({
// components: {
// VVideo,
// },
theme: {
defaultTheme: 'light',
},
Expand Down
Loading