Compare commits
85 Commits
master
...
a59ecde0b6
| Author | SHA1 | Date | |
|---|---|---|---|
| a59ecde0b6 | |||
| b82ab35bbe | |||
| 5af89ab258 | |||
| a756db429a | |||
| efb67be9fe | |||
| 7d8a07e8c4 | |||
| 1766b49268 | |||
| 6f3b0d1909 | |||
| 618f174aef | |||
| 4008bc8fde | |||
| 9a3361f907 | |||
| 25a2953170 | |||
| 4033c38640 | |||
| 71391b0c59 | |||
| 5d30f3a22b | |||
| e56e7d56ce | |||
| ac8b0b45e0 | |||
| fc37cefd76 | |||
|
86e0a17265
|
|||
| 94ff85fbe1 | |||
| 81d3da2a49 | |||
| e9f3db800a | |||
| 48cc9eccc7 | |||
| 6dcc70d6af | |||
| 035d4233f1 | |||
| 35d5035642 | |||
| f2c4e4bf4c | |||
| 089a41981f | |||
| 0d4e882943 | |||
| ada4815a02 | |||
| 43a1a3cc19 | |||
| d7dcbe81cd | |||
|
9ba9942de1
|
|||
|
3590afbebd
|
|||
| 39784aa919 | |||
| 0527f2f2e1 | |||
| 8c7eca8d0f | |||
| 068681ab79 | |||
| 55eff79de3 | |||
| bef4313e93 | |||
| 8b169ecb00 | |||
| 82e9ad13d9 | |||
| 8e552de79c | |||
| 3f0d2f7934 | |||
| a15071099d | |||
| 755ccea1e0 | |||
| 4b31c4142d | |||
| aa76aff103 | |||
| da1ebeced0 | |||
| 30560c859a | |||
| 3fd7abcace | |||
| c48d058da8 | |||
| 704c9c3338 | |||
| 8dc74ac26f | |||
| 7a4d07fede | |||
| 1762a9d65f | |||
| f8ff2e793c | |||
| 24c0182503 | |||
|
041e582bda
|
|||
|
05f2453e4d
|
|||
|
2b1e48c159
|
|||
|
632eaa1de8
|
|||
|
35cc5da654
|
|||
|
9657cd3a4b
|
|||
|
fd1923602a
|
|||
|
74fc1aee5d
|
|||
|
66e40c5f16
|
|||
|
e3f28d841f
|
|||
|
6571309f85
|
|||
|
0950553ca4
|
|||
|
e585c7fbc5
|
|||
|
5755a881dc
|
|||
|
e0c5a0f707
|
|||
|
d0d32d05cf
|
|||
|
afcc5e64e9
|
|||
|
4da7e741c2
|
|||
|
41f8a2864b
|
|||
|
101f9b549e
|
|||
|
7100bb7180
|
|||
|
49e12fd3e3
|
|||
|
73c3f25233
|
|||
|
2ba6ca9aa9
|
|||
|
411f80b931
|
|||
|
152dfea074
|
|||
|
62e8ff51d2
|
8
.env
8
.env
@@ -1,8 +1,8 @@
|
||||
PROJECT_NAME=tibi_starter
|
||||
PROJECT_NAME=bkdf
|
||||
TIBI_PREFIX=tibi
|
||||
TIBI_NAMESPACE=tibi_starter
|
||||
TIBI_NAMESPACE=bkdf
|
||||
UID=100
|
||||
GID=101
|
||||
RELEASE_ORG_SLUG=webmakers-gmbh
|
||||
RELEASE_PROJECT_SLUG=tibi_starter
|
||||
START_SCRIPT=:ssr
|
||||
RELEASE_PROJECT_SLUG=bkdf
|
||||
#START_SCRIPT=:ssr
|
||||
Binary file not shown.
@@ -0,0 +1 @@
|
||||
{"options":{},"indexes":[{"v":{"$numberInt":"2"},"key":{"_id":{"$numberInt":"1"}},"name":"_id_","ns":"tibi_bkdf.backups"},{"v":{"$numberInt":"2"},"key":{"insertTime":{"$numberInt":"1"}},"name":"insertTime_1","ns":"tibi_bkdf.backups"},{"v":{"$numberInt":"2"},"key":{"updateTime":{"$numberInt":"1"}},"name":"updateTime_1","ns":"tibi_bkdf.backups"}],"uuid":"a8c8692a0235422fbd827e1e0e8e8f5f"}
|
||||
@@ -0,0 +1 @@
|
||||
{"options":{},"indexes":[{"v":{"$numberInt":"2"},"key":{"_id":{"$numberInt":"1"}},"name":"_id_","ns":"tibi_bkdf.content"},{"v":{"$numberInt":"2"},"key":{"insertTime":{"$numberInt":"1"}},"name":"insertTime_1","ns":"tibi_bkdf.content"},{"v":{"$numberInt":"2"},"key":{"updateTime":{"$numberInt":"1"}},"name":"updateTime_1","ns":"tibi_bkdf.content"}],"uuid":"380552001acf4cb8bee7cad924a0c80d"}
|
||||
@@ -0,0 +1 @@
|
||||
{"options":{},"indexes":[{"v":{"$numberInt":"2"},"key":{"_id":{"$numberInt":"1"}},"name":"_id_","ns":"tibi_bkdf.forms"},{"v":{"$numberInt":"2"},"key":{"insertTime":{"$numberInt":"1"}},"name":"insertTime_1","ns":"tibi_bkdf.forms"},{"v":{"$numberInt":"2"},"key":{"updateTime":{"$numberInt":"1"}},"name":"updateTime_1","ns":"tibi_bkdf.forms"}],"uuid":"82213d7fb87640709394e7182f2ca956"}
|
||||
Binary file not shown.
@@ -0,0 +1 @@
|
||||
{"options":{},"indexes":[{"v":{"$numberInt":"2"},"key":{"_id":{"$numberInt":"1"}},"name":"_id_","ns":"tibi_bkdf.lighthouse"},{"v":{"$numberInt":"2"},"key":{"insertTime":{"$numberInt":"1"}},"name":"insertTime_1","ns":"tibi_bkdf.lighthouse"},{"v":{"$numberInt":"2"},"key":{"updateTime":{"$numberInt":"1"}},"name":"updateTime_1","ns":"tibi_bkdf.lighthouse"},{"v":{"$numberInt":"2"},"key":{"_fts":"text","_ftsx":{"$numberInt":"1"}},"name":"fulltextindex","ns":"tibi_bkdf.lighthouse","background":true,"weights":{"$**":{"$numberInt":"1"}},"default_language":"german","language_override":"language","textIndexVersion":{"$numberInt":"3"}}],"uuid":"1a20e0d9f91147439a135cd29e17998a"}
|
||||
@@ -0,0 +1 @@
|
||||
{"options":{},"indexes":[{"v":{"$numberInt":"2"},"key":{"_id":{"$numberInt":"1"}},"name":"_id_","ns":"tibi_bkdf.lighthouseSubpath"},{"v":{"$numberInt":"2"},"key":{"insertTime":{"$numberInt":"1"}},"name":"insertTime_1","ns":"tibi_bkdf.lighthouseSubpath"},{"v":{"$numberInt":"2"},"key":{"updateTime":{"$numberInt":"1"}},"name":"updateTime_1","ns":"tibi_bkdf.lighthouseSubpath"}],"uuid":"cb8e4e6fd8814cea97b0f0eb2a34bfed"}
|
||||
@@ -0,0 +1 @@
|
||||
{"options":{},"indexes":[{"v":{"$numberInt":"2"},"key":{"_id":{"$numberInt":"1"}},"name":"_id_","ns":"tibi_bkdf.medialib"},{"v":{"$numberInt":"2"},"key":{"insertTime":{"$numberInt":"1"}},"name":"insertTime_1","ns":"tibi_bkdf.medialib"},{"v":{"$numberInt":"2"},"key":{"updateTime":{"$numberInt":"1"}},"name":"updateTime_1","ns":"tibi_bkdf.medialib"}],"uuid":"1758b55a4c9f4bddaff90a1f8944be8e"}
|
||||
@@ -0,0 +1 @@
|
||||
{"options":{},"indexes":[{"v":{"$numberInt":"2"},"key":{"_id":{"$numberInt":"1"}},"name":"_id_","ns":"tibi_bkdf.module"},{"v":{"$numberInt":"2"},"key":{"insertTime":{"$numberInt":"1"}},"name":"insertTime_1","ns":"tibi_bkdf.module"},{"v":{"$numberInt":"2"},"key":{"updateTime":{"$numberInt":"1"}},"name":"updateTime_1","ns":"tibi_bkdf.module"}],"uuid":"216199e2486747ce94cd4dc696a48925"}
|
||||
@@ -0,0 +1 @@
|
||||
{"options":{},"indexes":[{"v":{"$numberInt":"2"},"key":{"_id":{"$numberInt":"1"}},"name":"_id_","ns":"tibi_bkdf.navigation"},{"v":{"$numberInt":"2"},"key":{"insertTime":{"$numberInt":"1"}},"name":"insertTime_1","ns":"tibi_bkdf.navigation"},{"v":{"$numberInt":"2"},"key":{"updateTime":{"$numberInt":"1"}},"name":"updateTime_1","ns":"tibi_bkdf.navigation"}],"uuid":"2257fa37f67d4a9d8c083f6b5c03b033"}
|
||||
@@ -0,0 +1 @@
|
||||
{"options":{},"indexes":[{"v":{"$numberInt":"2"},"key":{"_id":{"$numberInt":"1"}},"name":"_id_","ns":"tibi_bkdf.ssr"},{"v":{"$numberInt":"2"},"key":{"insertTime":{"$numberInt":"1"}},"name":"insertTime_1","ns":"tibi_bkdf.ssr"},{"v":{"$numberInt":"2"},"key":{"updateTime":{"$numberInt":"1"}},"name":"updateTime_1","ns":"tibi_bkdf.ssr"},{"v":{"$numberInt":"2"},"unique":true,"key":{"path":{"$numberInt":"1"}},"name":"path_1","ns":"tibi_bkdf.ssr"}],"uuid":"d05aaf4daaa84f5d9e78cb9956cbd699"}
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -49,7 +49,6 @@ jobs:
|
||||
- uses: actions/checkout@v3
|
||||
with:
|
||||
fetch-depth: 0
|
||||
lfs: true
|
||||
|
||||
- name: setup node 18
|
||||
uses: actions/setup-node@v3
|
||||
@@ -57,9 +56,9 @@ jobs:
|
||||
- name: Initialize database
|
||||
uses: ./.github/actions/init-db
|
||||
with:
|
||||
TIBI_API_NAMESPACE: allkids_erfurt
|
||||
TIBI_API_NAMESPACE: tibi_starter
|
||||
TIBI_API_CONFIG_PATH: /repo/api/config.yml
|
||||
PROJECT_NAME: AllKids
|
||||
PROJECT_NAME: TibiStarter
|
||||
|
||||
- name: SERVICE RESTART
|
||||
uses: docker://docker
|
||||
@@ -237,7 +236,6 @@ jobs:
|
||||
- uses: actions/checkout@v3
|
||||
with:
|
||||
fetch-depth: 0
|
||||
lfs: true
|
||||
|
||||
- name: setup node 18
|
||||
uses: actions/setup-node@v3
|
||||
@@ -280,6 +278,16 @@ jobs:
|
||||
run: |
|
||||
yarn build
|
||||
|
||||
- name: build docs
|
||||
env:
|
||||
FORCE_COLOR: "true"
|
||||
run: |
|
||||
node --version
|
||||
cd docs
|
||||
npm install -g yarn
|
||||
yarn install
|
||||
yarn docpress:build
|
||||
|
||||
- name: build ssr
|
||||
env:
|
||||
FORCE_COLOR: "true"
|
||||
@@ -292,10 +300,28 @@ jobs:
|
||||
run: |
|
||||
yarn build:legacy
|
||||
|
||||
- name: deploy
|
||||
#- name: deploy
|
||||
# if: github.ref == 'refs/heads/master'
|
||||
# env:
|
||||
# RSYNC_USER: "allkids_rsync_master"
|
||||
# RSYNC_PASS: ${{ secrets.rsync_master }}
|
||||
# run: |
|
||||
# scripts/deploy.sh ftp1.webmakers.de $RSYNC_USER $RSYNC_PASS
|
||||
|
||||
- name: deploy docs
|
||||
# only if branch is master
|
||||
if: github.ref == 'refs/heads/master'
|
||||
env:
|
||||
RSYNC_USER: "allkids_rsync_master"
|
||||
RSYNC_HOST: ftp1.webmakers.de
|
||||
RSYNC_PORT: 22222
|
||||
RSYNC_USER: webmakers_tibi_docs_rsync_master
|
||||
RSYNC_PASS: ${{ secrets.rsync_master }}
|
||||
run: |
|
||||
scripts/deploy.sh ftp1.webmakers.de $RSYNC_USER $RSYNC_PASS
|
||||
cd docs
|
||||
ls -la
|
||||
|
||||
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}:./ \
|
||||
@@ -1,58 +0,0 @@
|
||||
name: deploy to production
|
||||
|
||||
on: "push"
|
||||
# push:
|
||||
# branches:
|
||||
# - master
|
||||
|
||||
jobs:
|
||||
deploy:
|
||||
name: deploy
|
||||
runs-on: ubuntu-latest
|
||||
container:
|
||||
image: gitbase.de/actions/ubuntu:latest
|
||||
volumes:
|
||||
- /data:/data
|
||||
steps:
|
||||
- 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
|
||||
|
||||
- name: build docs
|
||||
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 }}
|
||||
run: |
|
||||
cd docs
|
||||
ls -la
|
||||
|
||||
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}:./ \
|
||||
31
.vscode/launch.json
vendored
31
.vscode/launch.json
vendored
@@ -1,31 +0,0 @@
|
||||
{
|
||||
// Verwendet IntelliSense zum Ermitteln möglicher Attribute.
|
||||
// Zeigen Sie auf vorhandene Attribute, um die zugehörigen Beschreibungen anzuzeigen.
|
||||
// Weitere Informationen finden Sie unter https://go.microsoft.com/fwlink/?linkid=830387
|
||||
"version": "0.2.0",
|
||||
"configurations": [
|
||||
{
|
||||
"name": "Launch Firefox Remote",
|
||||
"request": "launch",
|
||||
"type": "firefox",
|
||||
"url": "https://tibi_starter.code.testversion.online/",
|
||||
"webRoot": "${workspaceFolder}/frontend",
|
||||
"pathMappings": [
|
||||
{
|
||||
"url": "https://tibi_starter.code.testversion.online/",
|
||||
"path": "${workspaceFolder}/frontend/"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "Launch Edge",
|
||||
"request": "launch",
|
||||
"type": "msedge",
|
||||
"url": "https://tibi_starter.code.testversion.online/",
|
||||
"webRoot": "${workspaceFolder}/frontend",
|
||||
"sourceMapPathOverrides": {
|
||||
"../": "${webRoot}/"
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
7
.vscode/settings.json
vendored
7
.vscode/settings.json
vendored
@@ -18,14 +18,11 @@
|
||||
{
|
||||
"match": "/api/.*(\\.ya?ml|js|env)$",
|
||||
"isAsync": false,
|
||||
"cmd": "cd ${currentWorkspace} && docker compose -f docker-compose-local.yml restart tibiserver",
|
||||
"cmd": "docker compose -p tibi-docs restart tibiserver",
|
||||
"event": "onFileChange"
|
||||
}
|
||||
],
|
||||
"i18n-ally.localesPaths": ["frontend/locales"],
|
||||
"i18n-ally.sourceLanguage": "de",
|
||||
"i18n-ally.keystyle": "nested",
|
||||
"[svelte]": {
|
||||
"editor.defaultFormatter": "svelte.svelte-vscode"
|
||||
}
|
||||
"i18n-ally.keystyle": "nested"
|
||||
}
|
||||
|
||||
Binary file not shown.
BIN
.yarn/cache/@babel-cli-npm-7.23.4-deb84e3a78-5a4f296cdf.zip
vendored
Normal file
BIN
.yarn/cache/@babel-cli-npm-7.23.4-deb84e3a78-5a4f296cdf.zip
vendored
Normal file
Binary file not shown.
BIN
.yarn/cache/@babel-cli-npm-7.24.1-935fa79f6b-334b6130fd.zip
LFS
vendored
BIN
.yarn/cache/@babel-cli-npm-7.24.1-935fa79f6b-334b6130fd.zip
LFS
vendored
Binary file not shown.
Binary file not shown.
BIN
.yarn/cache/@babel-code-frame-npm-7.24.2-e104352cc7-70e867340c.zip
LFS
vendored
BIN
.yarn/cache/@babel-code-frame-npm-7.24.2-e104352cc7-70e867340c.zip
LFS
vendored
Binary file not shown.
Binary file not shown.
BIN
.yarn/cache/@babel-compat-data-npm-7.24.4-9f90706503-52ce371658.zip
LFS
vendored
BIN
.yarn/cache/@babel-compat-data-npm-7.24.4-9f90706503-52ce371658.zip
LFS
vendored
Binary file not shown.
BIN
.yarn/cache/@babel-core-npm-7.23.6-a490baf7b7-4bddd1b803.zip
vendored
Normal file
BIN
.yarn/cache/@babel-core-npm-7.23.6-a490baf7b7-4bddd1b803.zip
vendored
Normal file
Binary file not shown.
BIN
.yarn/cache/@babel-core-npm-7.24.4-5e34d46aa7-15ecad7581.zip
LFS
vendored
BIN
.yarn/cache/@babel-core-npm-7.24.4-5e34d46aa7-15ecad7581.zip
LFS
vendored
Binary file not shown.
BIN
.yarn/cache/@babel-generator-npm-7.23.6-817ef5e591-1a1a1c4eac.zip
vendored
Normal file
BIN
.yarn/cache/@babel-generator-npm-7.23.6-817ef5e591-1a1a1c4eac.zip
vendored
Normal file
Binary file not shown.
BIN
.yarn/cache/@babel-generator-npm-7.24.4-0bda5be79e-1b6146c313.zip
LFS
vendored
BIN
.yarn/cache/@babel-generator-npm-7.24.4-0bda5be79e-1b6146c313.zip
LFS
vendored
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
.yarn/cache/@babel-helper-create-class-features-plugin-npm-7.23.6-8637cc9cac-356b71b9f4.zip
vendored
Normal file
BIN
.yarn/cache/@babel-helper-create-class-features-plugin-npm-7.23.6-8637cc9cac-356b71b9f4.zip
vendored
Normal file
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
.yarn/cache/@babel-helper-define-polyfill-provider-npm-0.4.4-7dfaee32d2-2453cdd79f.zip
vendored
Normal file
BIN
.yarn/cache/@babel-helper-define-polyfill-provider-npm-0.4.4-7dfaee32d2-2453cdd79f.zip
vendored
Normal file
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
.yarn/cache/@babel-helper-replace-supers-npm-7.22.20-7e1aa74118-a0008332e2.zip
vendored
Normal file
BIN
.yarn/cache/@babel-helper-replace-supers-npm-7.22.20-7e1aa74118-a0008332e2.zip
vendored
Normal file
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
.yarn/cache/@babel-helpers-npm-7.23.6-59f35c0fd3-c5ba62497e.zip
vendored
Normal file
BIN
.yarn/cache/@babel-helpers-npm-7.23.6-59f35c0fd3-c5ba62497e.zip
vendored
Normal file
Binary file not shown.
BIN
.yarn/cache/@babel-helpers-npm-7.24.4-2ebaac1a34-ecd2dc0b3b.zip
LFS
vendored
BIN
.yarn/cache/@babel-helpers-npm-7.24.4-2ebaac1a34-ecd2dc0b3b.zip
LFS
vendored
Binary file not shown.
Binary file not shown.
BIN
.yarn/cache/@babel-highlight-npm-7.24.2-d2e9453f0c-5f17b131cc.zip
LFS
vendored
BIN
.yarn/cache/@babel-highlight-npm-7.24.2-d2e9453f0c-5f17b131cc.zip
LFS
vendored
Binary file not shown.
Binary file not shown.
BIN
.yarn/cache/@babel-parser-npm-7.24.4-f329cbb36f-94c9e3e592.zip
LFS
vendored
BIN
.yarn/cache/@babel-parser-npm-7.24.4-f329cbb36f-94c9e3e592.zip
LFS
vendored
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
.yarn/cache/@babel-plugin-syntax-import-assertions-npm-7.23.3-ccd90cbe78-883e6b35b2.zip
vendored
Normal file
BIN
.yarn/cache/@babel-plugin-syntax-import-assertions-npm-7.23.3-ccd90cbe78-883e6b35b2.zip
vendored
Normal file
Binary file not shown.
Binary file not shown.
BIN
.yarn/cache/@babel-plugin-syntax-import-attributes-npm-7.23.3-066c86a5e0-9aed7661ff.zip
vendored
Normal file
BIN
.yarn/cache/@babel-plugin-syntax-import-attributes-npm-7.23.3-066c86a5e0-9aed7661ff.zip
vendored
Normal file
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user