reihenfolge

.env

@@ -1,7 +1,8 @@
-PROJECT_NAME=tibi-docs
+PROJECT_NAME=fontis
 TIBI_PREFIX=tibi
-TIBI_NAMESPACE=tibi-docs
+TIBI_NAMESPACE=fontis_v2
 UID=100
 GID=101
 RELEASE_ORG_SLUG=webmakers-gmbh
-RELEASE_PROJECT_SLUG=tibi-docs
+RELEASE_PROJECT_SLUG=fontis
+START_SCRIPT=:ssr

.gitattributes

@@ -1 +1 @@
-.yarn/cache/* filter=lfs diff=lfs merge=lfs -text
+.yarn/cache/* filter=lfs diff=lfs merge=lfs -text

.gitea/workflows/deploy.yaml

@@ -1,10 +1,6 @@
 name: deploy to production
 
 on: "push"
-#    push:
-#        branches:
-#            - master
-
 jobs:
     deploy:
         name: deploy
@@ -17,40 +13,81 @@ jobs:
             - uses: actions/checkout@v3
               with:
                   fetch-depth: 0
-                  lfs: true
-                  submodules: true
-            - run: |
-                  git fetch --force --tags
 
-            # setup node 18
             - name: setup node 18
               uses: actions/setup-node@v3
-              with:
-                  node-version: 18
+              # with:
+              #    node-version: 18
+              #     cache: yarn
 
-            - name: build docs
+            - name: install dependencies
               env:
                   FORCE_COLOR: "true"
               run: |
-                  node --version
-                  cd docs
+                  npm install -g yarn
                   yarn install
-                  yarn docpress:build
 
-            - name: deploy docs
-              # only if branch is master
-              if: github.ref == 'refs/heads/master'
-              env:
-                  RSYNC_HOST: ftp1.webmakers.de
-                  RSYNC_PORT: 22222
-                  RSYNC_USER: webmakers_tibi_docs_rsync_master
-                  RSYNC_PASS: ${{ secrets.rsync_master }}
+            - name: modify config
               run: |
-                  cd docs
-                  ls -la
+                  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)
+                  echo "PROJECT_RELEASE=${RELEASE_PROJECT_SLUG}.r`git rev-list HEAD --count`-`git describe --all --long | sed 's+/+-+'`" >> .env
+                  export $(cat .env | xargs)
+                  echo ______ .env ______
+                  cat .env
+                  echo
+                  sed -i 's#\(const release = \).*#\1"'${PROJECT_RELEASE}'"#g' api/hooks/config-client.js
 
-                  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}:./ \
+                  # 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`
+                  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
+                  # cp frontend/spa.html api/templates/spa.html
+                  echo ______ frontend/spa.html ______
+                  cat frontend/spa.html
+
+            - name: build
+              env:
+                  FORCE_COLOR: "true"
+              run: |
+                  yarn build
+
+            - name: build ssr
+              env:
+                  FORCE_COLOR: "true"
+              run: |
+                  yarn build:server
+
+            - name: build legacy
+              env:
+                  FORCE_COLOR: "true"
+              run: |
+                  yarn build:legacy
+
+            #- name: staging api test
+            #  if: github.ref == 'refs/heads/dev'
+            #  run: |
+            #      targetDir=/data/${GITHUB_REPOSITORY}/${GITHUB_REF_NAME}
+            #      mkdir -p targetDir
+            #      rsync -av api $targetDir/
+            #      mkdir -p $targetDir/frontend/dist
+            #      rsync -av frontend/dist/ $targetDir/frontend/dist/
+
+            #- name: staging frontend te
+            #  if: github.ref == 'refs/heads/dev'
+            #  run: |
+            #      docker compose -p ${GITHUB_REF_NAME}-${GITHUB_REPOSITORY_NAME}-${GITHUB_REPOSITORY_OWNER} up -d --build --remove-orphans
+
+            - name: deploy
+              if: github.ref == 'refs/heads/tibi-restructure'
+              env:
+                  RSYNC_USER: "fontis_rsync_restructure"
+                  RSYNC_PASS: ${{ secrets.RSYNC_RESTRUCTURE }}
+              run: |
+                  scripts/deploy.sh ftp1.webmakers.de $RSYNC_USER $RSYNC_PASS

.gitignore

@@ -8,7 +8,7 @@ docs/.yarn/*
 !docs/.yarn/versions
 api/hooks/lib/app.server*
 node_modules
-media
+/media
 tmp
 _temp
 frontend/dist

.vscode/settings.json

@@ -18,7 +18,7 @@
         {
             "match": "/api/.*(\\.ya?ml|js|env)$",
             "isAsync": false,
-            "cmd": "docker compose -p tibi-docs restart tibiserver",
+            "cmd": "docker compose -f ${workspaceRoot}/docker-compose-local.yml restart tibiserver",
             "event": "onFileChange"
         }
     ],