Merge pull request #3570 from gradido/fix_small_bugs

fix(other): removed phantom line, aligned env and compose

.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

.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
+*~

admin/.gitignore

@@ -1,15 +1 @@
-node_modules/
-build/
-.cache/
-.yarn/install-state.gz
-
-/.env
-/.env.bak
-
-# coverage folder
-coverage/
-
-# emacs
-*~
-
 components.d.ts

backend/.gitignore

@@ -1,9 +1 @@
-/node_modules/
+locales
-/.env
-/.env.bak
-/build/
-/locales/
-package-json.lock
-coverage
-# emacs
-*~

config-schema/.gitignore

@@ -1,14 +0,0 @@
-node_modules/
-build/
-.cache/
-.yarn/install-state.gz
-
-/.env
-/.env.bak
-
-# coverage folder
-coverage/
-
-# emacs
-*~
-

database/.gitignore

@@ -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/
-
-*~

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])
 

dht-node/.gitignore

@@ -1,8 +0,0 @@
-/node_modules/
-/.env
-/.env.bak
-/build/
-package-json.lock
-coverage
-# emacs
-*~

docker-compose.yml

@@ -288,6 +288,7 @@ services:
     depends_on:
       - backend
       - frontend
+      - admin
     ports:
       - 80:80
     volumes:

e2e-tests/.gitignore

@@ -1,4 +1,3 @@
-node_modules/
 cypress/screenshots/
 cypress/videos/
 cypress/reports/

federation/.gitignore

@@ -1,8 +0,0 @@
-/node_modules/
-/.env
-/.env.bak
-/build/
-package-json.lock
-coverage
-# emacs
-*~

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