diff --git a/.github/workflows/auto-merge-staging-into-main.yml b/.github/workflows/auto-merge-staging-into-main.yml
index 848cde2e..f233b3ad 100644
--- a/.github/workflows/auto-merge-staging-into-main.yml
+++ b/.github/workflows/auto-merge-staging-into-main.yml
@@ -8,8 +8,6 @@ on:
jobs:
merge:
runs-on: ubuntu-latest
- outputs:
- reason: ${{ steps.check.outputs.reason }}
steps:
- name: Checkout repository
uses: actions/checkout@v4
@@ -30,15 +28,9 @@ jobs:
id: check
run: |
git fetch origin
- COUNT=$(git rev-list --count origin/staging..origin/main)
- if [ "$COUNT" -gt 0 ]; then
- echo "reason=ok" >> $GITHUB_OUTPUT
+ if [ $(git rev-list --count origin/staging..origin/main) -gt 0 ]; then
echo "❌ Staging is behind main and requires manual merging."
exit 1
- elif [ "$COUNT" -eq 0 ]; then
- echo "reason=identical" >> $GITHUB_OUTPUT
- echo "✅ Staging and main are identical. Nothing to do."
- exit 42
fi
- name: Create PR from staging to main
@@ -61,7 +53,7 @@ jobs:
notify_failure:
needs: merge
- if: failure() && needs.merge.outputs.reason != 'identical'
+ if: failure()
runs-on: ubuntu-latest
steps:
- name: Send Discord notification on failure
@@ -69,4 +61,16 @@ jobs:
curl -H "Content-Type: application/json" \
-X POST \
-d "{\"content\": \"🚨 Auto-Merge fehlgeschlagen! Bitte manuell prüfen: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}\"}" \
+ ${{ secrets.DISCORD_WEBHOOK_URL }}
+
+ notify_success:
+ needs: merge
+ if: success()
+ runs-on: ubuntu-latest
+ steps:
+ - name: Send Discord notification on success
+ run: |
+ curl -H "Content-Type: application/json" \
+ -X POST \
+ -d "{\"content\": \"✅ Auto-Merge ausgeführt! Ergebnis jetzt auf [GitHub](https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}) und [online-energieausweis.org](https://online-energieausweis.org) einsehen.\"}" \
${{ secrets.DISCORD_WEBHOOK_URL }}
\ No newline at end of file
diff --git a/src/astro-typesafe-api-caller.ts b/src/astro-typesafe-api-caller.ts
index 4c07b62c..69727bca 100644
--- a/src/astro-typesafe-api-caller.ts
+++ b/src/astro-typesafe-api-caller.ts
@@ -12,25 +12,25 @@ export const createCaller = createCallerFactory({
"admin/nicht-ausstellen": await import("../src/pages/api/admin/nicht-ausstellen.ts"),
"admin/registriernummer": await import("../src/pages/api/admin/registriernummer.ts"),
"admin/stornieren": await import("../src/pages/api/admin/stornieren.ts"),
+ "aufnahme": await import("../src/pages/api/aufnahme/index.ts"),
+ "ausweise": await import("../src/pages/api/ausweise/index.ts"),
"auth/access-token": await import("../src/pages/api/auth/access-token.ts"),
"auth/passwort-vergessen": await import("../src/pages/api/auth/passwort-vergessen.ts"),
"auth/refresh-token": await import("../src/pages/api/auth/refresh-token.ts"),
- "ausweise": await import("../src/pages/api/ausweise/index.ts"),
"bedarfsausweis-gewerbe/[id]": await import("../src/pages/api/bedarfsausweis-gewerbe/[id].ts"),
"bedarfsausweis-gewerbe": await import("../src/pages/api/bedarfsausweis-gewerbe/index.ts"),
- "aufnahme": await import("../src/pages/api/aufnahme/index.ts"),
"bedarfsausweis-wohnen/[id]": await import("../src/pages/api/bedarfsausweis-wohnen/[id].ts"),
"bedarfsausweis-wohnen": await import("../src/pages/api/bedarfsausweis-wohnen/index.ts"),
"bilder/[id]": await import("../src/pages/api/bilder/[id].ts"),
- "geg-nachweis-wohnen/[id]": await import("../src/pages/api/geg-nachweis-wohnen/[id].ts"),
- "geg-nachweis-wohnen": await import("../src/pages/api/geg-nachweis-wohnen/index.ts"),
"geg-nachweis-gewerbe/[id]": await import("../src/pages/api/geg-nachweis-gewerbe/[id].ts"),
"geg-nachweis-gewerbe": await import("../src/pages/api/geg-nachweis-gewerbe/index.ts"),
- "objekt": await import("../src/pages/api/objekt/index.ts"),
- "ticket": await import("../src/pages/api/ticket/index.ts"),
+ "geg-nachweis-wohnen/[id]": await import("../src/pages/api/geg-nachweis-wohnen/[id].ts"),
+ "geg-nachweis-wohnen": await import("../src/pages/api/geg-nachweis-wohnen/index.ts"),
"rechnung/[id]": await import("../src/pages/api/rechnung/[id].ts"),
"rechnung/anfordern": await import("../src/pages/api/rechnung/anfordern.ts"),
"rechnung": await import("../src/pages/api/rechnung/index.ts"),
+ "objekt": await import("../src/pages/api/objekt/index.ts"),
+ "ticket": await import("../src/pages/api/ticket/index.ts"),
"user": await import("../src/pages/api/user/index.ts"),
"user/self": await import("../src/pages/api/user/self.ts"),
"verbrauchsausweis-gewerbe/[id]": await import("../src/pages/api/verbrauchsausweis-gewerbe/[id].ts"),
diff --git a/src/components/design/header/AusweisHeaderPartner.astro b/src/components/design/header/AusweisHeaderPartner.astro
index ec9328f7..f0f87051 100644
--- a/src/components/design/header/AusweisHeaderPartner.astro
+++ b/src/components/design/header/AusweisHeaderPartner.astro
@@ -39,63 +39,38 @@ const isNET = pathname.includes("immonet");
-
+
+
+
+
+
@@ -186,7 +161,7 @@ background-repeat:no-repeat; background-position:right;`}
font-family: "immo Sans";
font-weight:400;
- div{@apply w-fit bg-white/75 py-6 px-16 rounded-lg ring-2 ring-black/15 text-[1.45rem];box-shadow:8px 8px 16px rgba(0,0,0,0.5);}
+ div{@apply w-fit bg-white/75 py-6 px-4 md:px-16 rounded-lg ring-2 ring-black/15 text-[1.45rem];box-shadow:8px 8px 16px rgba(0,0,0,0.5);}
}
.header-button {