refactorings

.drone.yml.bak

@@ -1,151 +0,0 @@
-kind: pipeline
-type: docker
-name: default
-
-steps:
-    ##############################
-    # Build and deploy docs
-    ##############################
-    - name: build docs
-      image: node:18
-      pull: if-not-exists
-      environment:
-          FORCE_COLOR: "true"
-      commands:
-          - cd docs
-          - yarn install
-          - yarn docpress:build
-      when:
-          branch: [master]
-          event: [push]
-
-    - name: deploy docs
-      image: instrumentisto/rsync-ssh
-      pull: if-not-exists
-      environment:
-          RSYNC_HOST: ftp1.webmakers.de
-          RSYNC_PORT: 22222
-          RSYNC_USER: webmakers_tibi_docs_rsync_master
-          RSYNC_PASS:
-              from_secret: rsync_master
-      commands:
-          - cd docs
-          - >
-              rsync -rlcgD --perms -i -u -v --stats --progress
-              --delete
-              -e "sshpass -p $${RSYNC_PASS} ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -p $${RSYNC_PORT}"
-              _docpress/
-              $${RSYNC_USER}@$${RSYNC_HOST}:./
-      when:
-          branch: [master]
-          event: [push]
-
-    ##############################
-    # Demo project
-    ##############################
-    - name: yarn install
-      image: node:18
-      pull: if-not-exists
-      environment:
-          FORCE_COLOR: "true"
-      commands:
-          - yarn install
-
-    - name: modify config
-      image: alpine/git
-      commands:
-          - sed -i 's#\(sentryEnvironment.*\)".*"#\1"${DRONE_BRANCH}"#g' frontend/src/config.ts
-          - sed -i 's#//\( sentry\\.init.*\)#\1#g' frontend/src/config.ts
-          - export $(cat .env | xargs)
-          - echo "PROJECT_RELEASE=$${RELEASE_PROJECT_SLUG}.r`git rev-list HEAD --count`-`git describe --all --long | sed 's+/+-+'`" >> .env
-          - export $(cat .env | xargs)
-          - cat .env
-          - sed -i 's#\(const release = \).*#\1"'$${PROJECT_RELEASE}'"#g' api/hooks/config-client.js
-
-    - name: build
-      image: node:18
-      commands:
-          - yarn build
-
-    - name: build ssr
-      image: node:18
-      commands:
-          - yarn build:server
-
-    - name: build legacy
-      image: node:18
-      commands:
-          - yarn build:legacy
-
-    - name: modify html
-      image: bash
-      commands:
-          - bash scripts/preload-meta.sh frontend/spa.html
-          - bash scripts/preload-meta.sh frontend/spa.html > frontend/_spa.html
-          - cp frontend/_spa.html frontend/spa.html
-          - export stamp=`date +%s`
-          - echo $$stamp
-          - sed -i s/__TIMESTAMP__/$$stamp/g frontend/spa.html
-          #- sed -i s/__TIMESTAMP__/$$stamp/g frontend/serviceworker.js
-          #- cat frontend/serviceworker.js
-          - cp frontend/spa.html api/templates/spa.html
-          - cat frontend/spa.html
-
-    # staging
-    - name: copy api config to staging
-      image: instrumentisto/rsync-ssh
-      volumes:
-          - name: data
-            path: /data
-      commands:
-          - rsync -av api /data/
-          - mkdir -p /data/frontend/dist
-          - rsync -av frontend/dist/ /data/frontend/dist/
-      when:
-          branch: [dev]
-          event: [push]
-
-    - name: review in staging
-      image: docker/compose:1.22.0
-      commands:
-          - docker-compose -p ${DRONE_BRANCH}-${DRONE_REPO_NAME}-${DRONE_REPO_OWNER} up -d --build --remove-orphans
-      volumes:
-          - name: docker
-            path: /var/run/docker.sock
-      when:
-          branch: [dev]
-          event: [push]
-
-    # live
-    - name: deploy master
-      image: instrumentisto/rsync-ssh
-      environment:
-          RSYNC_USER: ""
-          RSYNC_PASS:
-              from_secret: rsync_master
-      # remove if user and pass is set
-      failure: ignore
-      commands:
-          - apk add --no-cache sshpass curl
-          - scripts/deploy.sh ftp1.webmakers.de $${RSYNC_USER} $${RSYNC_PASS}
-          # - curl -X POST "https://www....de/api/ssr?token=TowendQhi&clear=1"
-      when:
-          branch: [master]
-          event: [push]
-
-    # - name: upload sourcemaps for glitchtip
-    #   image: node
-    #   environment:
-    #       GLITCHTIP_TOKEN:
-    #           from_secret: glitchtip_token
-    #   commands:
-    #       - yarn upload:sourcemaps
-
-########
-volumes:
-    - name: data
-      host:
-          path: /data/${DRONE_REPO_OWNER}/${DRONE_REPO_NAME}/${DRONE_BRANCH}
-    - name: docker
-      host:
-          path: /var/run/docker.sock

.env

@@ -1,14 +1,14 @@
-PROJECT_NAME=bkdf-tibi-2024
+PROJECT_NAME=kontextwerk
-TIBI_PREFIX=bkdf_tibi_2024
+TIBI_PREFIX=kontextwerk
-TIBI_NAMESPACE=bkdf_tibi_2024
+TIBI_NAMESPACE=kontextwerk
 CODER_UID=100
 CODER_GID=101
 START_SCRIPT=:ssr
 RSYNC_HOST=ftp1.webmakers.de
 RSYNC_PORT=22222
 RSYNC_USER=BinKrassDuFass_rsync_master
-LIVE_URL=https://www.binkrassdufass.de
+LIVE_URL=https://www.kontextwerk.de
 SENTRY_URL=https://sentry.basehosts.de
 SENTRY_ORG=webmakers
-SENTRY_PROJECT=binkrassdufass-tibi-2024
+SENTRY_PROJECT=kontextwerk-tibi-2024
 

.gitignore

@@ -15,6 +15,7 @@ _temp
 frontend/dist
 yarn-error.log
 .yarn/*
+.yarn
 !.yarn/cache
 !.yarn/patches
 !.yarn/plugins

.vscode/settings.json

@@ -4,9 +4,6 @@
     "editor.formatOnSave": true,
     "editor.formatOnPaste": true,
     "editor.defaultFormatter": "esbenp.prettier-vscode",
-    "[javascript]": {
-        "editor.defaultFormatter": "esbenp.prettier-vscode"
-    },
     "[markdown]": {
         "editor.wordWrap": "on",
         "editor.defaultFormatter": "vscode.markdown-language-features"
@@ -16,11 +13,12 @@
     },
     "liveServer.settings.root": "/dist",
     "liveServer.settings.file": "spa.html",
-    "liveServer.settings.port": 5502,
+    "liveServer.settings.port": 5501,
     "liveServer.settings.proxy": {
         "enable": true,
         "baseUri": "/api",
-        "proxyUri": "https://login.tibicms.de/api/v1"
+        "proxyUri": "http://localhost:8080/api/v1/_/renz_shop_2024"
+        //"proxyUri": "https://dev.renzshop.testversion.online/api"
     },
     "extensions.ignoreRecommendations": true,
     "files.autoSave": "off",
@@ -28,6 +26,21 @@
     "npm.autoDetect": "off",
     "debug.allowBreakpointsEverywhere": true,
     "html.autoClosingTags": false,
+    "[django-html]": {
+        "editor.formatOnSave": true,
+        "editor.defaultFormatter": "batisteo.vscode-django"
+    },
+    "saveAndRun": {
+        "commands": [
+            {
+                "match": "/api/.*(\\.ya?ml|js|env)$",
+                "cmd": "echo \"\" > ../../cms/tibi-server/tmp.html",
+                "silent": true
+            }
+        ]
+    },
+    "i18n-ally.sourceLanguage": "de",
+    "i18n-ally.keystyle": "nested",
     "yaml.schemas": {
         "./../../cms/tibi-types/schemas/api-config/config.json": "api/config.y*ml",
         "./../../cms/tibi-types/schemas/api-config/collection.json": "api/collections/*.y*ml",
@@ -43,27 +56,35 @@
         }
     ],
     "workbench.colorCustomizations": {
-        "activityBar.activeBorder": "#00879f",
+        "activityBar.activeBackground": "#ec1b3c",
-        "activityBar.activeBackground": "#43546e",
+        "activityBar.background": "#ec1b3c",
-        "activityBar.background": "#43546e",
         "activityBar.foreground": "#e7e7e7",
         "activityBar.inactiveForeground": "#e7e7e799",
-        "activityBarBadge.background": "#ab748a",
+        "activityBarBadge.background": "#2fce11",
         "activityBarBadge.foreground": "#15202b",
         "commandCenter.border": "#e7e7e799",
-        "sash.hoverBorder": "#43546e",
+        "sash.hoverBorder": "#ec1b3c",
-        "statusBar.background": "#303c4e",
+        "statusBar.background": "#c4102d",
         "statusBar.foreground": "#e7e7e7",
-        "statusBarItem.hoverBackground": "#43546e",
+        "statusBarItem.hoverBackground": "#ec1b3c",
-        "statusBarItem.remoteBackground": "#303c4e",
+        "statusBarItem.remoteBackground": "#c4102d",
         "statusBarItem.remoteForeground": "#e7e7e7",
-        "titleBar.activeBackground": "#303c4e",
+        "titleBar.activeBackground": "#c4102d",
         "titleBar.activeForeground": "#e7e7e7",
-        "titleBar.inactiveBackground": "#303c4e99",
+        "titleBar.inactiveBackground": "#c4102d99",
-        "titleBar.inactiveForeground": "#e7e7e799"
+        "titleBar.inactiveForeground": "#e7e7e799",
+        "editorGroup.border": "#ec1b3c",
+        "panel.border": "#ec1b3c",
+        "sideBar.border": "#ec1b3c",
+        "statusBar.border": "#c4102d",
+        "tab.activeBorder": "#ec1b3c",
+        "titleBar.border": "#c4102d"
     },
-    "peacock.remoteColor": "#303C4E",
+    "peacock.remoteColor": "#C4102D",
     "editor.tabCompletion": "on",
     "diffEditor.codeLens": true,
-    "i18n-ally.localesPaths": ["public/ContentBuilder/public/contentbuilder/lang"]
+    "i18n-ally.localesPaths": ["frontend/locales"],
+    "[svelte]": {
+        "editor.defaultFormatter": "svelte.svelte-vscode"
+    }
 }