From 5b53d15fa289075c790f0f460922100d9512fd68 Mon Sep 17 00:00:00 2001 From: Mononaut Date: Wed, 9 Feb 2022 00:02:23 -0600 Subject: [PATCH] Update github workflows & alerts --- .github/workflows/push.yml | 7 +- .github/workflows/tag.yml | 2 + client/public/img/citadel-logo.jpg | Bin 0 -> 9561 bytes client/public/img/umbrel-logo.jpg | Bin 0 -> 9219 bytes client/src/components/alert/Alerts.svelte | 11 +- .../components/alert/GenericAlertv2.svelte | 108 ++++++++++++++++++ 6 files changed, 120 insertions(+), 8 deletions(-) create mode 100644 client/public/img/citadel-logo.jpg create mode 100644 client/public/img/umbrel-logo.jpg create mode 100644 client/src/components/alert/GenericAlertv2.svelte diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 9010689..20e3d92 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -6,7 +6,6 @@ permissions: on: push: branches: - - main - master jobs: @@ -24,7 +23,7 @@ jobs: echo "IMAGE_NAME=${GITHUB_REPOSITORY#*/}" >> $GITHUB_ENV - name: Login to GitHub Container Registry - uses: docker/login-action@v1 + uses: docker/login-action@v1 with: registry: ghcr.io username: ${{ github.repository_owner }} @@ -42,12 +41,12 @@ jobs: run: | docker buildx build \ --platform linux/amd64,linux/arm64 \ - --tag ghcr.io/${{ github.repository_owner }}/$IMAGE_NAME-client:$BRANCH \ + --tag ghcr.io/${{ github.repository_owner }}/$IMAGE_NAME-client:alpha \ --output "type=registry" ./client/ - name: Build server images run: | docker buildx build \ --platform linux/amd64,linux/arm64 \ - --tag ghcr.io/${{ github.repository_owner }}/$IMAGE_NAME-server:$BRANCH \ + --tag ghcr.io/${{ github.repository_owner }}/$IMAGE_NAME-server:alpha \ --output "type=registry" ./server/ diff --git a/.github/workflows/tag.yml b/.github/workflows/tag.yml index e442a53..dc0a888 100644 --- a/.github/workflows/tag.yml +++ b/.github/workflows/tag.yml @@ -42,6 +42,7 @@ jobs: docker buildx build \ --platform linux/amd64,linux/arm64 \ --tag ghcr.io/${{ github.repository_owner }}/$IMAGE_NAME-client:$TAG \ + --tag ghcr.io/${{ github.repository_owner }}/$IMAGE_NAME-client:master \ --output "type=registry" ./client/ - name: Build server images @@ -49,4 +50,5 @@ jobs: docker buildx build \ --platform linux/amd64,linux/arm64 \ --tag ghcr.io/${{ github.repository_owner }}/$IMAGE_NAME-server:$TAG \ + --tag ghcr.io/${{ github.repository_owner }}/$IMAGE_NAME-server:master \ --output "type=registry" ./server/ diff --git a/client/public/img/citadel-logo.jpg b/client/public/img/citadel-logo.jpg new file mode 100644 index 0000000000000000000000000000000000000000..ad7e80a6fb2676d9de62683f195ec42a1c6dbac2 GIT binary patch literal 9561 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 literal 0 HcmV?d00001 diff --git a/client/src/components/alert/Alerts.svelte b/client/src/components/alert/Alerts.svelte index be1e445..8d577ea 100644 --- a/client/src/components/alert/Alerts.svelte +++ b/client/src/components/alert/Alerts.svelte @@ -6,6 +6,7 @@ import ByMononaut from './ByMononaut.svelte' import HeroMsg from './Hero.svelte' import SponsoredMsg from './Sponsored.svelte' import GenericAlert from './GenericAlert.svelte' +import GenericAlertv2 from './GenericAlertv2.svelte' import { fly } from 'svelte/transition' const components = { @@ -13,15 +14,17 @@ const components = { "sponsored-by": SponsoredMsg, // "be-a-hero": BeAHero, "thank-you-hero": HeroMsg, - msg: GenericAlert + msg: GenericAlert, + msg2: GenericAlertv2, } let ready $: { ready = { mononaut: true, - "sponsored-by": SponsoredMsg, + "sponsored-by": true, "thank-you-hero": $haveSupporters ? HeroMsg : null, - msg: GenericAlert + msg: true, + msg2: true, } } @@ -49,7 +52,7 @@ $: { } function processAlert (alert) { - if (alert && alert.type && components[alert.type] && ready[alert.type]) { + if (alert && alert.type && components[alert.type] && ready[alert.type] && (!alert.publicOnly || config.public)) { if (!sequences[alert.key]) sequences[alert.key] = 0 return { ...alert, diff --git a/client/src/components/alert/GenericAlertv2.svelte b/client/src/components/alert/GenericAlertv2.svelte new file mode 100644 index 0000000..d06f3b4 --- /dev/null +++ b/client/src/components/alert/GenericAlertv2.svelte @@ -0,0 +1,108 @@ + + + + +