bugfix

.gitea/workflows/deploy.yaml

@@ -203,46 +203,23 @@ jobs:
             volumes:
                 - /data:/data
 
-        services:
-            mongo:
-                image: mongo:4.2
-                ports:
-                    - 27017:27017
-
-            maildev:
-                image: gitbase.de/robin/maildev:latest
-                ports:
-                    - 80:80
-                    - 25:25
-
-            tibi-server:
-                image: gitbase.de/cms/tibi-server
-                ports:
-                    - 8080:8080
-                env:
-                    DB_DIAL: mongodb://mongo
-                    API_PORT: 8080
-                    MAIL_HOST: maildev:25
-                    SECURITY_ALLOWABSOLUTEPATHS: "true"
-                    SECURITY_ALLOWUPPERPATHS: "true"
-                    SECURITY_ALLOWRELATIVEPATHS: "true"
-
-            live-server:
-                image: gitbase.de/robin/live-server:latest
-                ports:
-                    - 8081:8081
-
         steps:
             - uses: actions/checkout@v3
               with:
                   fetch-depth: 0
+                  lfs: true
+                  submodules: true
 
-            - name: setup node 18
+            - run: |
+                  git fetch --force --tags
+
+            # setup node 20
+            - name: setup node 20
               uses: actions/setup-node@v3
+              with:
+                  node-version: 20
 
             - name: install dependencies
-              env:
-                  FORCE_COLOR: "true"
               run: |
                   npm install -g yarn
                   yarn install
@@ -251,13 +228,16 @@ jobs:
               run: |
                   sed -i 's#\(sentryEnvironment.*\)".*"#\1"${GITHUB_REF_NAME}"#g' frontend/src/config.ts
                   sed -i 's#//\( sentry\\.init.*\)#\1#g' frontend/src/config.ts
-                  export $(cat .env | xargs)
+                  set -o allexport
-                  echo "PROJECT_RELEASE=${RELEASE_PROJECT_SLUG}.r`git rev-list HEAD --count`-`git describe --all --long | sed 's+/+-+'`" >> .env
+                  . ./.env
-                  export $(cat .env | xargs)
+                  echo "PROJECT_RELEASE=${SENTRY_PROJECT}.r`git rev-list HEAD --count`-`git describe --all --long | sed 's+/+-+'`" >> .env
+                  . ./.env
+                  set +o allexport
                   echo ______ .env ______
                   cat .env
                   echo
                   sed -i 's#\(const release = \).*#\1"'${PROJECT_RELEASE}'"#g' api/hooks/config-client.js
+                  sed -i 's#\(const originURL = \).*#\1"'${LIVE_URL}'"#g' api/hooks/config-client.js
 
                   # bash scripts/preload-meta.sh frontend/spa.html
                   # bash scripts/preload-meta.sh frontend/spa.html > frontend/_spa.html
@@ -267,11 +247,15 @@ jobs:
                   sed -i s/__TIMESTAMP__/$stamp/g frontend/spa.html
                   # sed -i s/__TIMESTAMP__/$stamp/g frontend/serviceworker.js
                   # cat frontend/serviceworker.js
-                  # rm api/templates/spa.html
+                  rm api/templates/spa.html
-                  # cp frontend/spa.html api/templates/spa.html
+                  cp frontend/spa.html api/templates/spa.html
                   echo ______ frontend/spa.html ______
                   cat frontend/spa.html
 
+                  # sed -i 's#\(PREVIEW_URL=\).*#\1'${LIVE_URL}/preview'#g' api/config.yml.env
+                  echo ______ api/config.yml.env ______
+                  cat api/config.yml.env
+
             - name: build
               env:
                   FORCE_COLOR: "true"

api/hooks/forms/post_return.js

@@ -68,7 +68,7 @@
     delete tempForm[undefined]
     context.smtp.sendMail({
         to: "info@allkids-erfurt.de",
-        from: "mail@webmakers.de",
+        from: "info@allkids-erfurt.de",
         subject: "AllKids " + formTitle,
         html: context.tpl.execute(context.fs.readFile("templates/form_mail.html"), {
             context: context,

esbuild.config.admin.js

@@ -0,0 +1,22 @@
+const config = require("./esbuild.config.js")
+const svelteConfig = require("./svelte.config.js")
+
+config.options.minify = false
+config.options.entryPoints = ["./frontend/src/admin.ts"]
+config.options.outfile = "./" + config.distDir + "/admin.mjs"
+delete config.options.outdir
+config.options.splitting = false
+config.options.plugins = [
+    config.sveltePlugin({
+        compilerOptions: {
+            css: false,
+            hydratable: false,
+            dev: (process.argv?.length > 2 ? process.argv[2] : "build") !== "build",
+        },
+        preprocess: svelteConfig.preprocess,
+        cache: true,
+    }),
+    config.resolvePlugin,
+]
+
+module.exports = config

frontend/src/lib/components/pagebuilder/iconInfoBoard.svelte

@@ -21,10 +21,7 @@
     >
         <div class="header">
             <div class="icon">
-                <svg
+                <img id="mySvgObject{i}" src="{`${apiBaseURL}content/${pageId}/${col.iconInfoBoard.icon?.src}`}" />
-                    id="mySvgObject{i}"
-                    fill="var(--link-font-color)"
-                    data-src="{`${apiBaseURL}content/${pageId}/${col.iconInfoBoard.icon?.src}`}"></svg>
             </div>
             <div class="title">
                 {col.iconInfoBoard.title}
@@ -49,9 +46,9 @@
             align-items: center;
             gap: 20px;
             .icon {
-                width: 64px;
+                width: 48px;
-                height: 64px;
+                height: 48px;
-                svg {
+                img {
                     width: 100%;
                     height: 100%;
                     object-fit: contain;