diff --git a/.github/workflows/test_e2e.yml b/.github/workflows/test_e2e.yml index 43f20b70a..3fb92562c 100644 --- a/.github/workflows/test_e2e.yml +++ b/.github/workflows/test_e2e.yml @@ -22,7 +22,7 @@ jobs: cd database yarn && yarn dev_reset cd ../config - yarn && yarn build + yarn install cd ../backend yarn && yarn seed diff --git a/backend/.env.test_e2e b/backend/.env.test_e2e deleted file mode 100644 index 8b6559e97..000000000 --- a/backend/.env.test_e2e +++ /dev/null @@ -1,11 +0,0 @@ -# Server -JWT_EXPIRES_IN=2m - -GDT_ACTIVE=false - -# Email -EMAIL=true -EMAIL_TEST_MODUS=false -EMAIL_TLS=false -# for testing password reset -EMAIL_CODE_REQUEST_TIME=1 diff --git a/backend/Dockerfile b/backend/Dockerfile index de85f5db6..d8b415e47 100644 --- a/backend/Dockerfile +++ b/backend/Dockerfile @@ -56,7 +56,7 @@ FROM base as development # Run command # (for development we need to execute yarn install since the # node_modules are on another volume and need updating) -CMD /bin/sh -c "cd /config && yarn install && yarn build && cd /database && yarn install && yarn build && cd /app && yarn install && yarn run dev" +CMD /bin/sh -c "cd /database && yarn install && yarn build && cd /config && yarn build && ls ./build/ && cd /app && ls -la ../config/build && yarn install && yarn run dev" ################################################################################## # BUILD (Does contain all files and is therefore bloated) ######################## diff --git a/backend/src/config/index.ts b/backend/src/config/index.ts index 6c0b30e64..a49e882aa 100644 --- a/backend/src/config/index.ts +++ b/backend/src/config/index.ts @@ -2,10 +2,10 @@ /* eslint-disable n/no-process-env */ // eslint-disable-next-line import/no-unresolved +import { validate } from '@config/index' import { latestDbVersion } from '@dbTools/config/detectLastDBVersion' import { Decimal } from 'decimal.js-light' import dotenv from 'dotenv' -import { validate } from 'gradido-config' import { schema } from './schema' diff --git a/backend/src/config/schema.ts b/backend/src/config/schema.ts index 93c250ac0..fcdbdd439 100644 --- a/backend/src/config/schema.ts +++ b/backend/src/config/schema.ts @@ -23,7 +23,7 @@ import { NODE_ENV, PRODUCTION, TYPEORM_LOGGING_RELATIVE_PATH, -} from 'gradido-config' +} from '@config/commonSchema' import Joi from 'joi' export const schema = Joi.object({ diff --git a/backend/tsconfig.json b/backend/tsconfig.json index c61539e12..890a6408a 100644 --- a/backend/tsconfig.json +++ b/backend/tsconfig.json @@ -60,7 +60,8 @@ /* external */ "@dbTools/*": ["../database/src/*", "../../database/build/src/*"], "@entity/*": ["../database/entity/*", "../../database/build/entity/*"], - "@logging/*": ["../database/logging/*", "../../database/build/logging/*"] + "@logging/*": ["../database/logging/*", "../../database/build/logging/*"], + "@config/*": ["../config/src/*", "../../config/build/*"] }, // "rootDirs": [], /* List of root folders whose combined content represents the structure of the project at runtime. */ "typeRoots": ["@types", "node_modules/@types"], /* List of folders to include type definitions from. */ diff --git a/dht-node/Dockerfile b/dht-node/Dockerfile index 9c97f73b3..7b2aa6ad7 100644 --- a/dht-node/Dockerfile +++ b/dht-node/Dockerfile @@ -60,7 +60,7 @@ FROM base as development # Run command # (for development we need to execute yarn install since the # node_modules are on another volume and need updating) -CMD /bin/sh -c "cd /config && yarn install && yarn build && cd /database && yarn install && yarn build && cd /app && yarn install && yarn run dev" +CMD /bin/sh -c "cd /database && yarn install && yarn build && cd /config && yarn build && cd /app && yarn install && yarn run dev" ################################################################################## # BUILD (Does contain all files and is therefore bloated) ######################## diff --git a/dht-node/src/config/index.ts b/dht-node/src/config/index.ts index 731e1737f..6389a22af 100644 --- a/dht-node/src/config/index.ts +++ b/dht-node/src/config/index.ts @@ -1,7 +1,7 @@ /* eslint-disable n/no-process-env */ +import { validate } from '@config/index' import { latestDbVersion } from '@dbTools/config/detectLastDBVersion' import dotenv from 'dotenv' -import { validate } from 'gradido-config' import { schema } from './schema' diff --git a/dht-node/src/config/schema.ts b/dht-node/src/config/schema.ts index 54fe45a90..cb7618cf4 100644 --- a/dht-node/src/config/schema.ts +++ b/dht-node/src/config/schema.ts @@ -12,7 +12,7 @@ import { NODE_ENV, PRODUCTION, TYPEORM_LOGGING_RELATIVE_PATH, -} from 'gradido-config' +} from '@config/commonSchema' import Joi from 'joi' export const schema = Joi.object({ diff --git a/dht-node/tsconfig.json b/dht-node/tsconfig.json index 33362b054..0caefb6e5 100644 --- a/dht-node/tsconfig.json +++ b/dht-node/tsconfig.json @@ -53,7 +53,8 @@ "@typeorm/*": ["../backend/src/typeorm/*", "../../backend/src/typeorm/*"], "@dbTools/*": ["../database/src/*", "../../database/build/src/*"], "@entity/*": ["../database/entity/*", "../../database/build/entity/*"], - "@logging/*": ["../database/logging/*", "../../database/build/logging/*"] + "@logging/*": ["../database/logging/*", "../../database/build/logging/*"], + "@config/*": ["../config/src/*", "../../config/build/*"] }, // "rootDirs": [], /* List of root folders whose combined content represents the structure of the project at runtime. */ "typeRoots": ["src/dht_node/@types", "node_modules/@types"], /* List of folders to include type definitions from. */ diff --git a/federation/Dockerfile b/federation/Dockerfile index bd472a5cc..6cc70e2b0 100644 --- a/federation/Dockerfile +++ b/federation/Dockerfile @@ -57,7 +57,7 @@ FROM base as development # Run command # (for development we need to execute yarn install since the # node_modules are on another volume and need updating) -CMD /bin/sh -c "cd /config && yarn install && yarn build && cd /database && yarn install && yarn build && cd /app && yarn install && yarn run dev" +CMD /bin/sh -c "cd /database && yarn install && yarn build && cd /config && yarn build && cd /app && yarn install && yarn run dev" ################################################################################## # BUILD (Does contain all files and is therefore bloated) ######################## diff --git a/federation/src/config/index.ts b/federation/src/config/index.ts index 26ed37a98..6649e2ba3 100644 --- a/federation/src/config/index.ts +++ b/federation/src/config/index.ts @@ -3,7 +3,7 @@ import { Decimal } from 'decimal.js-light' import { latestDbVersion } from '@dbTools/config/detectLastDBVersion' import dotenv from 'dotenv' -import { validate } from 'gradido-config' +import { validate } from '@config/index' import { schema } from './schema' diff --git a/federation/src/config/schema.ts b/federation/src/config/schema.ts index 3d05afabd..8aa54736b 100644 --- a/federation/src/config/schema.ts +++ b/federation/src/config/schema.ts @@ -12,7 +12,7 @@ import { NODE_ENV, PRODUCTION, TYPEORM_LOGGING_RELATIVE_PATH, -} from 'gradido-config' +} from '@config/commonSchema' import Joi from 'joi' export const schema = Joi.object({ diff --git a/federation/tsconfig.json b/federation/tsconfig.json index 0f96e80e5..d9c642232 100644 --- a/federation/tsconfig.json +++ b/federation/tsconfig.json @@ -61,7 +61,8 @@ "@typeorm/*": ["../backend/src/typeorm/*", "../../backend/src/typeorm/*"], "@dbTools/*": ["../database/src/*", "../../database/build/src/*"], "@entity/*": ["../database/entity/*", "../../database/build/entity/*"], - "@logging/*": ["../database/logging/*", "../../database/build/logging/*"] + "@logging/*": ["../database/logging/*", "../../database/build/logging/*"], + "@config/*": ["../config/src/*", "../../config/build/*"] }, // "rootDirs": [], /* List of root folders whose combined content represents the structure of the project at runtime. */ "typeRoots": ["node_modules/@types"], /* List of folders to include type definitions from. */ diff --git a/frontend/vite.config.js b/frontend/vite.config.js index e4db5b2bf..39a856771 100644 --- a/frontend/vite.config.js +++ b/frontend/vite.config.js @@ -95,7 +95,6 @@ export default defineConfig(({ command }) => { autoInstall: true, }), EnvironmentPlugin({ - BUILD_COMMIT: null, GMS_ACTIVE: null, HUMHUB_ACTIVE: null, DEFAULT_PUBLISHER_ID: null, @@ -127,7 +126,7 @@ export default defineConfig(({ command }) => { extract: CONFIG.PRODUCTION === true, preprocessorOptions: { scss: { - additionalData: `@import "@/assets/scss/gradido.scss";`, + additionalData: `@use "@/assets/scss/custom/gradido-custom/color" as *;`, }, }, },