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

Moist Dog TV #47

Merged
merged 3 commits into from
Jun 2, 2024
Merged

Moist Dog TV #47

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
3e3151c
Disable auto-"latest" push for Docker metadata.
BusterNeece May 24, 2024
aa428de
Add a MoistDogTV Tab
itsitrio Jun 1, 2024
7226099
Merge pull request #46 from itsitrio/AddMoistDogTV
BusterNeece Jun 2, 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
16 changes: 9 additions & 7 deletions .github/workflows/test-and-deploy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
36 changes: 35 additions & 1 deletion backend/templates/live.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand All @@ -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
});
}
}
});
});
Expand All @@ -53,7 +78,13 @@
<li class="nav-item">
<button class="nav-link" data-bs-toggle="tab"
data-bs-target="#twitch" type="button"
role="tab" aria-controls="twitch">Twitch Stream
role="tab" aria-controls="twitch">WaterWolf Live
</button>
</li>
<li class="nav-item">
<button class="nav-link" data-bs-toggle="tab"
data-bs-target="#moist-dog" type="button"
role="tab" aria-controls="moist-dog">MoistDogTV
</button>
</li>
</ul>
Expand All @@ -70,6 +101,9 @@
<div id="twitch" class="container tab-pane fade">
<div id="twitch-embed"></div>
</div>
<div id="moist-dog" class="container tab-pane fade">
<div id="moist-dog-embed"></div>
</div>
</div>
</div>
</div>
Expand Down