diff --git a/astro.config.mjs b/astro.config.mjs index 89289ff9..180178ec 100644 --- a/astro.config.mjs +++ b/astro.config.mjs @@ -1,6 +1,6 @@ import { defineConfig } from "astro/config"; import svelte from "@astrojs/svelte"; -import astroI18next from "astro-i18next"; +// import astroI18next from "astro-i18next"; import tailwind from "@astrojs/tailwind"; @@ -12,7 +12,7 @@ import mdx from "@astrojs/mdx"; // https://astro.build/config export default defineConfig({ - integrations: [astroI18next(),svelte(), tailwind(), mdx()], + integrations: [/*astroI18next(),*/svelte(), tailwind(), mdx()], outDir: "./dist", output: "server", adapter: node({ diff --git a/database.env b/database.env deleted file mode 100644 index bbdc8c29..00000000 --- a/database.env +++ /dev/null @@ -1,9 +0,0 @@ -POSTGRES_DB=main -POSTGRES_HOST=database -POSTGRES_PORT=5432 -POSTGRES_USER=main -POSTGRES_PASSWORD=hHMP8cd^N3SnzGRR - -DB_CONTAINER_NAME=database - -POSTGRES_DATABASE_URL="postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${POSTGRES_HOST}:${POSTGRES_PORT}/${POSTGRES_DB}" \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 0429822d..497fc3a9 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,11 +1,9 @@ version: '3' + services: - online-energieausweis: + ibcornelsen-online-energieausweis: build: ./ - container_name: online-energieausweis command: bun run dev --host - depends_on: - - database environment: PORT: 3000 NODE_ENV: "development" @@ -14,9 +12,5 @@ services: - ./:/online-energieausweis - ./node_modules/@ibcornelsen/ui:/online-energieausweis/node_modules/@ibcornelsen/ui - ./node_modules/@ibcornelsen/database:/online-energieausweis/node_modules/@ibcornelsen/database - - ./persistent:/persistent - database: - network_mode: host - build: ../database - env_file: - - ../database/.env \ No newline at end of file + - ./node_modules/@ibcornelsen/api:/online-energieausweis/node_modules/@ibcornelsen/api + - ./persistent:/persistent \ No newline at end of file diff --git a/package.json b/package.json index ad5922c0..3ebb24c6 100644 --- a/package.json +++ b/package.json @@ -28,6 +28,7 @@ "@trpc/server": "^10.45.0", "astro": "^2.5.1", "astro-i18next": "1.0.0-beta.21", + "buffer": "^6.0.3", "bun": "^1.0.2", "cookiejs": "^2.1.2", "csvtojson": "^2.0.10", diff --git a/src/components/AnsichtsausweisButton.svelte b/src/components/AnsichtsausweisButton.svelte index 204c3c2f..a6e777f8 100644 --- a/src/components/AnsichtsausweisButton.svelte +++ b/src/components/AnsichtsausweisButton.svelte @@ -1,12 +1,19 @@ - + Ausweis Ansichtsausweis diff --git a/src/components/Ausweis/AusweisPreviewContainer.svelte b/src/components/Ausweis/AusweisPreviewContainer.svelte index 0a408d77..61b2d582 100644 --- a/src/components/Ausweis/AusweisPreviewContainer.svelte +++ b/src/components/Ausweis/AusweisPreviewContainer.svelte @@ -4,9 +4,10 @@ import HelpLabel from "#components/HelpLabel.svelte"; export let ausweis: VerbrauchsausweisWohnen; + export let gebaeude: GebaeudeStammdaten; import ImageGrid from "../ImageGrid.svelte"; - import { VerbrauchsausweisWohnen } from "@ibcornelsen/database"; + import { GebaeudeStammdaten, VerbrauchsausweisWohnen } from "@ibcornelsen/database"; let images: (File & { data: string })[] = []; @@ -33,8 +34,8 @@
- - + +
diff --git a/src/components/Ausweis/BilderZusatzsysteme.svelte b/src/components/Ausweis/BilderZusatzsysteme.svelte index 39948b23..a76cafb9 100644 --- a/src/components/Ausweis/BilderZusatzsysteme.svelte +++ b/src/components/Ausweis/BilderZusatzsysteme.svelte @@ -348,4 +348,4 @@ als PDF anschauen - + diff --git a/src/components/DatenblattButton.svelte b/src/components/DatenblattButton.svelte index a42fd3ab..b9a6995b 100644 --- a/src/components/DatenblattButton.svelte +++ b/src/components/DatenblattButton.svelte @@ -1,9 +1,16 @@ diff --git a/src/components/Header.astro b/src/components/Header.astro index 021d4faf..739fa874 100644 --- a/src/components/Header.astro +++ b/src/components/Header.astro @@ -1,9 +1,9 @@ --- -import i18next from "i18next"; -import {localizeUrl} from "astro-i18next" -import { t } from "i18next"; +// import i18next from "i18next"; +// import {localizeUrl} from "astro-i18next" +// import { t } from "i18next"; import { isLoggedIn } from "../lib/UI/isLoggedIn"; -import LanguageDropdown from "./LanguageDropdown.svelte"; +// import LanguageDropdown from "./LanguageDropdown.svelte"; const loggedIn = isLoggedIn(Astro); --- @@ -38,7 +38,7 @@ const loggedIn = isLoggedIn(Astro);
- + /> --> + import { Bezahlmethoden } from "@ibcornelsen/database"; + + export let name: string; + export let icon: string; + export let paymentType: Bezahlmethoden; + export let selectedPaymentType: Bezahlmethoden; + + + diff --git a/src/components/SidebarLeft.astro b/src/components/SidebarLeft.astro index c0848d1d..93e9fdc2 100644 --- a/src/components/SidebarLeft.astro +++ b/src/components/SidebarLeft.astro @@ -1,7 +1,3 @@ ---- -import { localizePath } from "astro-i18next" ---- -