From f2ec81e2b242afac35301ed261fcc6700e987cdd Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Tue, 12 Oct 2021 21:28:29 +0200 Subject: [PATCH 1/2] feat: In Production only Show one Community --- backend/.env.dist | 1 + backend/src/config/index.ts | 1 + .../src/graphql/resolver/CommunityResolver.ts | 17 ++++++++++++----- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/backend/.env.dist b/backend/.env.dist index 3ac50ac9b..359b41d3c 100644 --- a/backend/.env.dist +++ b/backend/.env.dist @@ -1,3 +1,4 @@ +PRODUCTION= PORT=4000 JWT_SECRET=secret123 JWT_EXPIRES_IN=10m diff --git a/backend/src/config/index.ts b/backend/src/config/index.ts index 76ba597ad..6142ae3ba 100644 --- a/backend/src/config/index.ts +++ b/backend/src/config/index.ts @@ -11,6 +11,7 @@ const server = { LOGIN_API_URL: process.env.LOGIN_API_URL || 'http://login-server:1201/', COMMUNITY_API_URL: process.env.COMMUNITY_API_URL || 'http://nginx/api/', GDT_API_URL: process.env.GDT_API_URL || 'https://gdt.gradido.net', + PRODUCTION: process.env.PRODUCTION === 'true' || false, } const database = { diff --git a/backend/src/graphql/resolver/CommunityResolver.ts b/backend/src/graphql/resolver/CommunityResolver.ts index 563c73d24..84d252064 100644 --- a/backend/src/graphql/resolver/CommunityResolver.ts +++ b/backend/src/graphql/resolver/CommunityResolver.ts @@ -19,9 +19,17 @@ export class CommunityResolver { @Query(() => [Community]) async communities(): Promise { - const communities: Community[] = [] - - communities.push( + if (CONFIG.PRODUCTION) + return [ + new Community({ + id: 3, + name: 'Gradido-Akademie', + description: 'Freies Institut für Wirtschaftsbionik.', + url: 'https://gradido.net', + registerUrl: 'https://gdd1.gradido.com/vue/register-community', + }), + ] + return [ new Community({ id: 1, name: 'Gradido Entwicklung', @@ -43,7 +51,6 @@ export class CommunityResolver { url: 'https://gradido.net', registerUrl: 'https://gdd1.gradido.com/vue/register-community', }), - ) - return communities + ] } } From 481bd637941494e0888aa6d89aacfb10522724b5 Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Wed, 13 Oct 2021 12:08:22 +0200 Subject: [PATCH 2/2] production from NODE_ENV, please test --- backend/.env.dist | 1 - backend/src/config/index.ts | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/backend/.env.dist b/backend/.env.dist index 359b41d3c..3ac50ac9b 100644 --- a/backend/.env.dist +++ b/backend/.env.dist @@ -1,4 +1,3 @@ -PRODUCTION= PORT=4000 JWT_SECRET=secret123 JWT_EXPIRES_IN=10m diff --git a/backend/src/config/index.ts b/backend/src/config/index.ts index 6142ae3ba..7de498f85 100644 --- a/backend/src/config/index.ts +++ b/backend/src/config/index.ts @@ -11,7 +11,7 @@ const server = { LOGIN_API_URL: process.env.LOGIN_API_URL || 'http://login-server:1201/', COMMUNITY_API_URL: process.env.COMMUNITY_API_URL || 'http://nginx/api/', GDT_API_URL: process.env.GDT_API_URL || 'https://gdt.gradido.net', - PRODUCTION: process.env.PRODUCTION === 'true' || false, + PRODUCTION: process.env.NODE_ENV === 'production' || false, } const database = {