Elgato_dark/bunkerweb
1
0
Fork 0
mirror of https://github.com/bunkerity/bunkerweb synced 2026-05-24 09:28:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'dev' into staging

Browse source
This commit is contained in:
florian 2024-03-17 20:31:00 +01:00
commit 7d67168888
No known key found for this signature in database
GPG key ID: 93EE47CC3D061500
8 changed files with 26 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/autoconf/Dockerfile
View file

@ -1,7 +1,7 @@
FROM python:3.12.2-alpine3.19@sha256:1a0501213b470de000d8432b3caab9d8de5489e9443c2cc7ccaa6b0aa5c3148e as builder
# Install python dependencies
RUN apk add --no-cache build-base postgresql-dev
RUN apk add --no-cache build-base libffi-dev postgresql-dev
# Copy python requirements
COPY src/deps/requirements.txt /tmp/requirements-deps.txt

2
src/scheduler/Dockerfile
View file

@ -1,7 +1,7 @@
FROM python:3.12.2-alpine3.19@sha256:1a0501213b470de000d8432b3caab9d8de5489e9443c2cc7ccaa6b0aa5c3148e as builder
# Install python dependencies
RUN apk add --no-cache build-base postgresql-dev
RUN apk add --no-cache build-base libffi-dev postgresql-dev
# Copy python requirements
COPY src/deps/requirements.txt /tmp/requirements-deps.txt

2
src/ui/Dockerfile
View file

@ -1,7 +1,7 @@
FROM python:3.12.2-alpine3.19@sha256:1a0501213b470de000d8432b3caab9d8de5489e9443c2cc7ccaa6b0aa5c3148e as builder
# Install python dependencies
RUN apk add --no-cache build-base postgresql-dev
RUN apk add --no-cache build-base libffi-dev postgresql-dev
# Copy python requirements
COPY src/deps/requirements.txt /tmp/requirements-deps.txt

16
src/ui/static/js/global.js
View file

@ -104,11 +104,16 @@ class News {
news.tags,
news.date,
);
const BASE_URL = this.BASE_URL;
let cleanHTML = DOMPurify.sanitize(cardHTML);
//add to DOM
document
.querySelector("[data-news-container]")
.insertAdjacentHTML("afterbegin", cleanHTML);
document.querySelector(`.blog-click-${news.slug}`).addEventListener("click", function () { window.open(`${BASE_URL}/blog/post/${news.slug}`, '_blank') });
document.querySelectorAll(".blog-click-tag").forEach((tag) => {
tag.target = "_blank";
});
});
}
@ -118,7 +123,7 @@ class News {
tags.forEach((tag) => {
tagList += ` <a
href="${this.BASE_URL}/blog/tag/${tag.slug}"
class="my-0 mr-1 rounded bg-secondary hover:brightness-90 hover:-translate-y-0.4 text-white py-1 px-2 text-sm"
class="blog-click-tag my-0 mr-1 rounded bg-secondary hover:brightness-90 hover:-translate-y-0.4 text-white py-1 px-2 text-sm"
>
${tag.name}
</a>`;
@ -130,19 +135,16 @@ class News {
>
<div>
<img role="link"
onclick="window.location.href='${this.BASE_URL}/blog/post/${slug}'"
class="cursor-pointer rounded w-full h-40 m-0 object-cover"
class="blog-click-${slug} cursor-pointer rounded w-full h-40 m-0 object-cover"
src="${img}"
alt="image"
/>
<span role="link"
onclick="window.location.href='${this.BASE_URL}/blog/post/${slug}'"
class="block cursor-pointer mt-3 mb-1 text-xl font-semibold text-primary dark:text-white tracking-wide">${title}</span>
class="blog-click-${slug} block cursor-pointer mt-3 mb-1 text-xl font-semibold text-primary dark:text-white tracking-wide">${title}</span>
</div>
<div>
<div role="link"
onclick="window.location.href='${this.BASE_URL}/blog/post/${slug}'"
class="cursor-pointer min-h-[100px] mb-3 dark:text-gray-300 text-gray-600 pt-3">
class="blog-click-${slug} cursor-pointer min-h-[100px] mb-3 dark:text-gray-300 text-gray-600 pt-3">
${excerpt}
</div>
<div class="min-h-[75px] mt-2 flex flex-wrap justify-start items-end align-bottom">

1
src/ui/static/js/utils/purify/purify.min.js vendored
View file

File diff suppressed because one or more lines are too long

1
src/ui/templates/account.html vendored
View file

@ -94,6 +94,7 @@
{% if pro_info['link_message'] %}
<div class="flex justify-center mt-2">
<a class="text-center font-semibold text-yellow-500 underline"
target="_blank"
href="https://panel.bunkerweb.io/?utm_campaign=self&utm_source=ui#pro">{{ pro_info['link_message'] }}</a>
</div>
{% endif %}

6
src/ui/templates/banner.html vendored
View file

@ -12,6 +12,7 @@
<p class="dark:brightness-125 mb-0 text-center text-xs xs:text-sm text-white">
Get the most of BunkerWeb by upgrading to the PRO version. More info and free trial
<a class="dark:brightness-125 font-medium underline text-gray-100 dark:text-gray-50 hover:no-underline"
target="_blank"
href="https://panel.bunkerweb.io/?utm_campaign=self&utm_source=banner#pro">here</a>.
</p>
</div>
@ -22,6 +23,7 @@
<p class="dark:brightness-125 mb-0 text-center text-xs xs:text-sm text-white">
Need premium support or tailored consulting around BunkerWeb ? Check out our
<a class="dark:brightness-125 font-medium underline text-gray-100 dark:text-gray-50 hover:no-underline"
target="_blank"
href="https://panel.bunkerweb.io/?utm_campaign=self&utm_source=banner#services">professional services</a>.
</p>
</div>
@ -32,9 +34,11 @@
<p class="dark:brightness-125 mb-0 text-center text-xs xs:text-sm text-white">
Be part of the Bunker community by joining the
<a class="dark:brightness-125 font-medium underline text-gray-100 dark:text-gray-50 hover:no-underline"
href="https://discord.bunkerweb.io">Discord chat</a>
target="_blank"
href="https://discord.bunkerweb.io">Discord chat</a>
and following us on
<a class="dark:brightness-125 font-medium underline text-gray-100 dark:text-gray-50 hover:no-underline"
target="_blank"
href="https://www.linkedin.com/company/bunkerity/">LinkedIn</a>.
</p>
</div>

8
tests/SwarmTest.py
View file

@ -74,6 +74,14 @@ class SwarmTest(Test):
sleep(1)
i += 1
if not healthy:
proc = run(
'docker stack ps --no-trunc bunkerweb',
cwd="/tmp/swarm",
shell=True,
capture_output=True,
)
log("SWARM", "❌", f"stdout logs = {proc.stdout.decode()}")
log("SWARM", "❌", f"stderr logs = {proc.stderr.decode()}")
proc = run(
"docker service logs bunkerweb_bunkerweb ;"
+ " docker service logs bunkerweb_bw-autoconf ;"