diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 341053694..df24c2b9f 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -26,7 +26,6 @@ jobs: run: | cd ./config-schema biome ci . - echo $? echo "success=$([ $? -eq 0 ] && echo true || echo false)" >> $GITHUB_OUTPUT - name: Lint - Shared id: shared diff --git a/.gitignore b/.gitignore index d82288fbd..856e4a490 100644 --- a/.gitignore +++ b/.gitignore @@ -7,14 +7,14 @@ vite.config.mjs.timestamp-* log4js-config*.json /node_modules/* node_modules +coverage build messages.pot nbproject .metadata /out/* -/.env +.env package-lock.json -/deployment/bare_metal/.env /deployment/bare_metal/nginx/sites-available/gradido.conf /deployment/bare_metal/nginx/sites-available/update-page.conf /deployment/bare_metal/nginx/update-page/updating.html @@ -23,3 +23,6 @@ package-lock.json # Apple macOS folder attribute file .DS_Store + +# emacs +*~ diff --git a/admin/.gitignore b/admin/.gitignore index 704a34221..8aab3b4f1 100644 --- a/admin/.gitignore +++ b/admin/.gitignore @@ -1,15 +1 @@ -node_modules/ -build/ -.cache/ -.yarn/install-state.gz - -/.env -/.env.bak - -# coverage folder -coverage/ - -# emacs -*~ - components.d.ts diff --git a/backend/.gitignore b/backend/.gitignore index 5435dd5ff..a3068018e 100644 --- a/backend/.gitignore +++ b/backend/.gitignore @@ -1,9 +1 @@ -/node_modules/ -/.env -/.env.bak -/build/ -/locales/ -package-json.lock -coverage -# emacs -*~ +locales diff --git a/config-schema/.gitignore b/config-schema/.gitignore deleted file mode 100644 index ce6695205..000000000 --- a/config-schema/.gitignore +++ /dev/null @@ -1,14 +0,0 @@ -node_modules/ -build/ -.cache/ -.yarn/install-state.gz - -/.env -/.env.bak - -# coverage folder -coverage/ - -# emacs -*~ - diff --git a/database/.gitignore b/database/.gitignore deleted file mode 100644 index 9e9e01ced..000000000 --- a/database/.gitignore +++ /dev/null @@ -1,27 +0,0 @@ -.DS_Store -node_modules/ -build/ -.cache/ -npm-debug.log* -yarn-debug.log* -yarn-error.log* -test/unit/coverage - -package-lock.json -/.env -/.env.bak -.env.development.local -.env.production.local - -# Editor directories and files -.idea -*.suo -*.ntvs* -*.njsproj -*.sln - -# coverage folder - -coverage/ - -*~ diff --git a/database/migration/clear.ts b/database/migration/clear.ts index a78d35890..9c2f5b364 100644 --- a/database/migration/clear.ts +++ b/database/migration/clear.ts @@ -4,6 +4,8 @@ import { connectToDatabaseServer } from './prepare' import { MIGRATIONS_TABLE } from '../src/config/const' export async function truncateTables(connection: Connection) { + const databaseName = CONFIG.DB_DATABASE + await connection.query(`USE \`${databaseName}\``) const [tables] = await connection.query('SHOW TABLES') const tableNames = (tables as any[]).map((table) => Object.values(table)[0]) diff --git a/dht-node/.gitignore b/dht-node/.gitignore deleted file mode 100644 index 6eadcc884..000000000 --- a/dht-node/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -/node_modules/ -/.env -/.env.bak -/build/ -package-json.lock -coverage -# emacs -*~ diff --git a/docker-compose.yml b/docker-compose.yml index 4dca49225..cc0162acb 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -288,6 +288,7 @@ services: depends_on: - backend - frontend + - admin ports: - 80:80 volumes: diff --git a/e2e-tests/.gitignore b/e2e-tests/.gitignore index 405b844c5..f1d8eebc2 100644 --- a/e2e-tests/.gitignore +++ b/e2e-tests/.gitignore @@ -1,4 +1,3 @@ -node_modules/ cypress/screenshots/ cypress/videos/ cypress/reports/ diff --git a/federation/.gitignore b/federation/.gitignore deleted file mode 100644 index 6eadcc884..000000000 --- a/federation/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -/node_modules/ -/.env -/.env.bak -/build/ -package-json.lock -coverage -# emacs -*~ diff --git a/frontend/.gitignore b/frontend/.gitignore index b527252d0..8fd88a839 100644 --- a/frontend/.gitignore +++ b/frontend/.gitignore @@ -1,32 +1,3 @@ -.DS_Store -node_modules/ -build/ src/assets/css/gradido.css src/assets/css/gradido.css.map -.cache/ -.yarn/install-state.gz - -npm-debug.log* -yarn-debug.log* -yarn-error.log* - -package-lock.json -/.env -/.env.bak -.env.development.local -.env.production.local - -# Editor directories and files -.idea -*.suo -*.ntvs* -*.njsproj -*.sln - -# coverage folder - -coverage/ - -*~ - components.d.ts