From 397a2ced4e555b9432b5d26591cba92d3c2747d3 Mon Sep 17 00:00:00 2001 From: Jens Cornelsen <79703163+IB-Cornelsen@users.noreply.github.com> Date: Tue, 8 Jul 2025 16:44:43 +0200 Subject: [PATCH 1/3] =?UTF-8?q?Fernw=C3=A4rme=20Hamburg=20hinzugef=C3=BCgt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Ausweis/brennstoffListe.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/components/Ausweis/brennstoffListe.ts b/src/components/Ausweis/brennstoffListe.ts index f5c0435d..0bbae001 100644 --- a/src/components/Ausweis/brennstoffListe.ts +++ b/src/components/Ausweis/brennstoffListe.ts @@ -41,6 +41,7 @@ const brennstoffe: [ ["Fernwärme KWK EB", "kWh", 1.0, 0.0, 0.04], ["Fernwärme HKW FB", "kWh", 1.0, 1.3, 0.4], ["Fernwärme HKW EB", "kWh", 1.0, 0.1, 0.06], + ["Fernwärme Hamburg", "kWh", 1.0, 0.33, 0.064], ["Erdgas", "kWh", 1.0, 1.1, 0.24], ["Heizöl", "kWh", 1.0, 1.1, 0.31], ["Heizöl", "l", 10.0, 1.1, 0.31], -- 2.49.1 From 67a44f8bdbf168494e2ef903dd3c83faa43066e2 Mon Sep 17 00:00:00 2001 From: Moritz Utcke Date: Wed, 30 Jul 2025 12:52:27 -0500 Subject: [PATCH 2/3] Disable Auto Merge --- .../auto-merge-staging-into-main.yml | 76 ------------------- 1 file changed, 76 deletions(-) delete mode 100644 .github/workflows/auto-merge-staging-into-main.yml diff --git a/.github/workflows/auto-merge-staging-into-main.yml b/.github/workflows/auto-merge-staging-into-main.yml deleted file mode 100644 index f233b3ad..00000000 --- a/.github/workflows/auto-merge-staging-into-main.yml +++ /dev/null @@ -1,76 +0,0 @@ -name: Auto Merge Staging into Main - -on: - schedule: - - cron: '0 2 * * *' # 2:00 UTC = 4:00 Europäische Zeit - workflow_dispatch: - -jobs: - merge: - runs-on: ubuntu-latest - steps: - - name: Checkout repository - uses: actions/checkout@v4 - with: - fetch-depth: 0 - - - name: Set Git user - run: | - git config user.name "github-actions[bot]" - git config user.email "github-actions[bot]@users.noreply.github.com" - - - name: Fetch all branches - run: | - git fetch origin main - git fetch origin staging - - - name: Check if main has commits not in staging - id: check - run: | - git fetch origin - if [ $(git rev-list --count origin/staging..origin/main) -gt 0 ]; then - echo "❌ Staging is behind main and requires manual merging." - exit 1 - fi - - - name: Create PR from staging to main - id: create_pr - run: | - PR_URL=$(gh pr create --base main --head staging --title "Auto-merge staging into main" --body "This PR was created automatically by GitHub Actions. It merges the latest \`staging\` into \`main\`.") - echo "PR_URL=$PR_URL" >> $GITHUB_OUTPUT - PR_NUMBER=$(echo $PR_URL | awk -F'/' '{print $NF}') - echo "PR_NUMBER=$PR_NUMBER" >> $GITHUB_OUTPUT - env: - GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - - name: Enable auto-merge on PR - if: steps.create_pr.outputs.PR_NUMBER != '' - run: | - gh pr merge ${{ steps.create_pr.outputs.PR_NUMBER }} --merge --auto - env: - GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - - notify_failure: - needs: merge - if: failure() - runs-on: ubuntu-latest - steps: - - name: Send Discord notification on failure - run: | - 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 -- 2.49.1 From ac502169a9e416922af5aa6bc1cddbc5328558e2 Mon Sep 17 00:00:00 2001 From: Robert Jagtiani Date: Sun, 3 Aug 2025 22:34:40 +0200 Subject: [PATCH 3/3] landingpage partner header menu und Titel fix --- src/astro-typesafe-api-caller.ts | 12 +-- .../design/header/AusweisHeaderPartner.astro | 79 +++++++------------ 2 files changed, 33 insertions(+), 58 deletions(-) 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 { -- 2.49.1