Skip to content

feature: indefinitely disable blocking, version in the footer #2

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

Merged
bartekmp merged 1 commit into from
Apr 24, 2026
Merged

feature: indefinitely disable blocking, version in the footer #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions .github/workflows/publish.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,7 @@ jobs:
push: ${{ github.event_name != 'pull_request' }}
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
build-args: APP_VERSION=${{ steps.ver.outputs.tag }}
cache-from: type=gha
cache-to: type=gha,mode=max

Expand Down
3 changes: 3 additions & 0 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
FROM nginx:alpine

ARG APP_VERSION=dev
ENV APP_VERSION=${APP_VERSION}

COPY www/index.html /usr/share/nginx/html/index.html.template
COPY www/favicon.svg /usr/share/nginx/html/favicon.svg
COPY www/manifest.json /usr/share/nginx/html/manifest.json
Expand Down
2 changes: 1 addition & 1 deletion docker-entrypoint.d/40-envsubst-html.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/sh
envsubst '${PH_HOSTS} ${PH_PASSWORD}' \
envsubst '${PH_HOSTS} ${PH_PASSWORD} ${APP_VERSION}' \
< /usr/share/nginx/html/index.html.template \
> /usr/share/nginx/html/index.html
18 changes: 14 additions & 4 deletions www/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,16 @@
white-space: nowrap;
}

.instance-host a {
color: inherit;
text-decoration: none;
}

.instance-host a:hover {
text-decoration: underline;
color: var(--md-primary);
}

.instance-stats {
display: grid;
grid-template-columns: 1fr 1fr;
Expand Down Expand Up @@ -680,7 +690,7 @@ <h1>Pi-hole toggle sync</h1>

<footer>
<a href="https://github.com/bartekmp/pihole-toggle-sync" target="_blank">pihole-toggle-sync</a>
&mdash; MIT license
${APP_VERSION} &mdash; MIT license
</footer>

<script>
Expand Down Expand Up @@ -823,7 +833,7 @@ <h1>Pi-hole toggle sync</h1>
card.innerHTML = `
<div class="instance-header">
<div class="instance-dot offline"></div>
<div class="instance-host">${hostLabel(host)}</div>
<div class="instance-host"><a href="${cleanHost(host)}/admin" target="_blank" rel="noopener noreferrer">${hostLabel(host)}</a></div>
</div>
<div class="instance-error">
<span>error</span>Unable to reach instance
Expand All @@ -842,7 +852,7 @@ <h1>Pi-hole toggle sync</h1>
card.innerHTML = `
<div class="instance-header">
<div class="instance-dot online"></div>
<div class="instance-host">${hostLabel(host)}</div>
<div class="instance-host"><a href="${cleanHost(host)}/admin" target="_blank" rel="noopener noreferrer">${hostLabel(host)}</a></div>
</div>
<div class="instance-subheader">
<span class="instance-blocking-badge ${isBlocking ? 'on' : 'off'}">
Expand Down Expand Up @@ -956,7 +966,7 @@ <h1>Pi-hole toggle sync</h1>
}

async function apiCall(host, enable, timer) {
const body = enable ? { blocking: true } : { blocking: false, timer: timer || 0 };
const body = enable ? { blocking: true } : (timer ? { blocking: false, timer } : { blocking: false });
const sid = await getSid(host);
const headers = { 'Content-Type': 'application/json' };
if (sid) headers['X-FTL-SID'] = sid;
Expand Down
Loading