Skip to content

Commit f4a5d38

Browse files
committed
Merge branch 'v2-remove-videojs' into dev
2 parents 9781e26 + 25bb533 commit f4a5d38

8 files changed

Lines changed: 18 additions & 123 deletions

File tree

‎apps/codingcatdev/package.json‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,15 +53,13 @@
5353
"dependencies": {
5454
"@cloudinary/html": "^1.11.0",
5555
"@cloudinary/url-gen": "^1.9.1",
56-
"@codingcatdev/videojs-codingcatdev-youtube": "^0.0.2",
5756
"@floating-ui/dom": "^1.2.6",
5857
"esm-env": "^1.0.0",
5958
"firebase": "^9.19.1",
6059
"mdsvex": "^0.10.6",
6160
"prism-svelte": "^0.5.0",
6261
"prism-themes": "^1.9.0",
6362
"theme-change": "^2.3.0",
64-
"video.js": "^7.21.3",
6563
"videojs-youtube": "^2.6.1"
6664
}
6765
}

‎apps/codingcatdev/src/content/course/sveltekit-firebase/index.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ excerpt: 'Learn how to use Svelte Kit and Firebase to build high-performance, sc
55
published: draft
66
slug: sveltekit-firebase
77
start: April 17, 2023
8-
title: 'Learn Svelte Kit and Firebase: The Complete Guide'
8+
title: 'Learn Svelte Kit and Firebase: The Ultimate Guide'
99
youtube:
1010
---
1111

‎apps/codingcatdev/src/content/course/sveltekit-firebase/lesson/01-intro.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ start: April 17, 2023
88
section: Intro
99
title: Introduction to Svelte Kit and Firebase
1010
weight: 1
11-
youtube:
11+
youtube: 'https://youtu.be/-3h098ROy18'
1212
---
1313

1414
Talk all about this course.
Lines changed: 13 additions & 81 deletions
Original file line numberDiff line numberDiff line change
@@ -1,85 +1,17 @@
11
<script lang="ts">
2-
import '../../../../node_modules/video.js/dist/video-js.min.css';
3-
import videojs from 'video.js';
4-
// import 'videojs-youtube';
5-
import '@codingcatdev/videojs-codingcatdev-youtube';
6-
import { onMount, onDestroy, afterUpdate, beforeUpdate } from 'svelte';
2+
export let src: string;
3+
export let title: string;
74
8-
/**
9-
* See https://videojs.com/guides/options/#sources
10-
* @type */
11-
export let sources: [
12-
{
13-
src: string;
14-
type: string;
15-
}
16-
];
17-
18-
let player: any;
19-
20-
const setPlayer = () => {
21-
player = videojs(
22-
'video-player',
23-
{
24-
controls: true,
25-
autoplay: false,
26-
preload: 'auto',
27-
fluid: true,
28-
restoreEl: true,
29-
plugins: {
30-
codingcatdevYoutube: {}
31-
},
32-
techOrder: ['youtube'],
33-
sources
34-
},
35-
undefined
36-
);
37-
player.codingcatdevYoutube();
38-
player.ready(() => {
39-
console.debug('videojs:player:ready');
40-
});
41-
};
42-
43-
onMount(() => {
44-
console.debug('onMount');
45-
setPlayer();
46-
console.debug('onMount:videojs:player', player);
47-
});
48-
onDestroy(() => {
49-
console.debug('onDestroy');
50-
51-
for (const p of videojs.getAllPlayers()) {
52-
p.dispose();
53-
}
54-
});
55-
beforeUpdate(() => {
56-
console.debug('beforeUpdate');
57-
});
58-
afterUpdate(() => {
59-
console.debug('afterUpdate');
60-
if (player && !player.isDisposed()) {
61-
player.dispose();
62-
}
63-
setPlayer();
64-
console.debug('afterUpdate:videojs:player', player);
65-
});
5+
$: finalSrc = `https://www.youtube.com/embed/${src.split('/').at(-1)}`;
666
</script>
677

68-
<svelte:head>
69-
<script>
70-
//This is a fake script tag because YT API needs one to append after.
71-
//https:\/\/www.youtube.com\/s\/player\/e5f6cbd5\/www-widgetapi.vflset\/www-widgetapi.js
72-
//This line var b = document.getElementsByTagName("script")[0];b.parentNode.insertBefore(a, b)
73-
</script>
74-
</svelte:head>
75-
76-
<!-- svelte-ignore a11y-media-has-caption -->
77-
<!-- <video bind:this={vid} /> -->
78-
<video id="video-player" class="video-js">
79-
<p class="vjs-no-js">
80-
To view this video please enable JavaScript, and consider upgrading to a web browser that
81-
<a href="https://videojs.com/html5-video-support/" target="_blank" rel="noreferrer"
82-
>supports HTML5 video</a
83-
>
84-
</p>
85-
</video>
8+
<div class="aspect-video">
9+
<iframe
10+
src={finalSrc}
11+
{title}
12+
frameborder="0"
13+
allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture"
14+
allowfullscreen
15+
class="w-full h-full"
16+
/>
17+
</div>

‎apps/codingcatdev/src/routes/(content-single)/(non-course)/Content.svelte‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,7 @@
2323
<li>{data.content.title}</li>
2424
</ol>
2525
{#if data?.content?.youtube}
26-
<Video
27-
sources={[
28-
{
29-
src: data.content.youtube,
30-
type: 'video/youtube'
31-
}
32-
]}
33-
/>
26+
<Video src={data.content.youtube} title={`${data.content.title}`} />
3427
{:else if data?.content?.cover}
3528
<CloudinaryImage src={data.content.cover} alt={data.content.title} />
3629
{/if}

‎apps/codingcatdev/src/routes/(content-single)/course/[slug]/Course.svelte‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,7 @@
1919
</ol>
2020
<div class="flex flex-col gap-2 md:gap-8">
2121
{#if data?.course?.youtube}
22-
<Video
23-
sources={[
24-
{
25-
src: data.course.youtube,
26-
type: 'video/youtube'
27-
}
28-
]}
29-
/>
22+
<Video src={data.course.youtube} title={`${data.course.title}`} />
3023
{:else if data?.course?.cover}
3124
<CloudinaryImage src={data.course.cover} alt={data.course.title} />
3225
{/if}

‎apps/codingcatdev/src/routes/(content-single)/course/[slug]/lesson/[lessonSlug]/Lesson.svelte‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,7 @@
2525
<li>{data.content.title}</li>
2626
</ol>
2727
{#if data?.content?.youtube}
28-
<Video
29-
sources={[
30-
{
31-
src: data.content.youtube,
32-
type: 'video/youtube'
33-
}
34-
]}
35-
/>
28+
<Video src={data.content.youtube} title={`${data.content.title}`} />
3629
{:else if data?.content?.cover}
3730
<CloudinaryImage src={data.content.cover} alt={data.content.title} />
3831
{/if}

‎pnpm-lock.yaml‎

Lines changed: 0 additions & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)