From 3e3151c48fea1e387e1fa89fbc554b0aa8d1f766 Mon Sep 17 00:00:00 2001 From: Buster Neece Date: Fri, 24 May 2024 15:02:47 -0500 Subject: [PATCH 1/2] Disable auto-"latest" push for Docker metadata. --- .github/workflows/test-and-deploy.yml | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/.github/workflows/test-and-deploy.yml b/.github/workflows/test-and-deploy.yml index 006733d..6e0cf96 100644 --- a/.github/workflows/test-and-deploy.yml +++ b/.github/workflows/test-and-deploy.yml @@ -46,18 +46,20 @@ jobs: - name: Login to GitHub Container Registry uses: docker/login-action@v3 with: - registry: ghcr.io - username: ${{ github.repository_owner }} - password: ${{ secrets.GITHUB_TOKEN }} + registry: ghcr.io + username: ${{ github.repository_owner }} + password: ${{ secrets.GITHUB_TOKEN }} - name: Build Docker Metadata id: meta uses: docker/metadata-action@v5 with: - images: | - ghcr.io/waterwolfdev/waterwolf-site - tags: | - type=ref,event=branch + images: | + ghcr.io/waterwolfdev/waterwolf-site + flavor: | + latest=false + tags: | + type=ref,event=branch - name: Debug Docker Metadata run: | From aa428deccca8ce1555c4876f817765c28263856f Mon Sep 17 00:00:00 2001 From: Itrio <15737258+itsitrio@users.noreply.github.com> Date: Sat, 1 Jun 2024 16:57:04 -0700 Subject: [PATCH 2/2] Add a MoistDogTV Tab --- backend/templates/live.twig | 36 +++++++++++++++++++++++++++++++++++- 1 file changed, 35 insertions(+), 1 deletion(-) diff --git a/backend/templates/live.twig b/backend/templates/live.twig index 382d490..f334d59 100644 --- a/backend/templates/live.twig +++ b/backend/templates/live.twig @@ -16,10 +16,18 @@ if (twitchEmbed) { twitchEmbed.pause(); } + if (moistEmbed) { + moistEmbed.pause(); + } + $('#html5video')[0].play(); } else if (currentTab === '#twitch') { $('#html5video')[0].pause(); + if (moistEmbed) { + moistEmbed.pause(); + } + if (twitchEmbed) { twitchEmbed.play(); @@ -31,6 +39,23 @@ autoplay: true }); } + } else if (currentTab === '#moist-dog') { + $('#html5video')[0].pause(); + + if (twitchEmbed) { + twitchEmbed.pause(); + } + + if (moistEmbed) { + moistEmbed.play(); + } else { + moistEmbed = new Twitch.Embed("moist-dog-embed", { + width: "100%", + height: 480, + channel: "moistdogtv", + autoplay: true + }); + } } }); }); @@ -53,7 +78,13 @@ + @@ -70,6 +101,9 @@
+
+
+