From 74a8458583817b609e55376063736fe1f6fd19db Mon Sep 17 00:00:00 2001 From: Jorai Geertsema Date: Thu, 21 Nov 2024 14:23:09 +0100 Subject: [PATCH 01/10] hotfix sofia link on staging --- app/components/menu-sidebar.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/components/menu-sidebar.js b/app/components/menu-sidebar.js index 1fb6698ff..5d4ab3268 100644 --- a/app/components/menu-sidebar.js +++ b/app/components/menu-sidebar.js @@ -13,7 +13,7 @@ export default class MenuSidebar extends Component { get sofiaUrl() { if (config.environment === 'development') { return 'http://localhost:5000'; - } else if (config.environment === 'staging') { + } else if (config.deployTarget === 'staging') { return 'https://stagingstreep.csvalpha.nl'; } else { return 'https://streep.csvalpha.nl'; From 8a4d407036ac05025f81b6d4760759531bc0590b Mon Sep 17 00:00:00 2001 From: Jorai Geertsema Date: Thu, 21 Nov 2024 14:29:34 +0100 Subject: [PATCH 02/10] intial commit --- app/components/menu-sidebar.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/components/menu-sidebar.js b/app/components/menu-sidebar.js index 5d4ab3268..1fb6698ff 100644 --- a/app/components/menu-sidebar.js +++ b/app/components/menu-sidebar.js @@ -13,7 +13,7 @@ export default class MenuSidebar extends Component { get sofiaUrl() { if (config.environment === 'development') { return 'http://localhost:5000'; - } else if (config.deployTarget === 'staging') { + } else if (config.environment === 'staging') { return 'https://stagingstreep.csvalpha.nl'; } else { return 'https://streep.csvalpha.nl'; From 6448522a03678a4c1002dc9ff7af95504fe977f6 Mon Sep 17 00:00:00 2001 From: Jorai Geertsema Date: Thu, 21 Nov 2024 14:34:19 +0100 Subject: [PATCH 03/10] Revert "intial commit" This reverts commit 8a4d407036ac05025f81b6d4760759531bc0590b. --- app/components/menu-sidebar.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/components/menu-sidebar.js b/app/components/menu-sidebar.js index 1fb6698ff..5d4ab3268 100644 --- a/app/components/menu-sidebar.js +++ b/app/components/menu-sidebar.js @@ -13,7 +13,7 @@ export default class MenuSidebar extends Component { get sofiaUrl() { if (config.environment === 'development') { return 'http://localhost:5000'; - } else if (config.environment === 'staging') { + } else if (config.deployTarget === 'staging') { return 'https://stagingstreep.csvalpha.nl'; } else { return 'https://streep.csvalpha.nl'; From 8e59b44adf264f57c65d9fd198996c50c7115563 Mon Sep 17 00:00:00 2001 From: Jorai Geertsema Date: Wed, 27 Nov 2024 22:00:16 +0100 Subject: [PATCH 04/10] rewrote sofia url logic --- app/components/menu-sidebar.hbs | 2 +- app/components/menu-sidebar.js | 10 ---------- app/controllers/users/index.js | 4 ++++ config/environment.js | 9 +++++++-- 4 files changed, 12 insertions(+), 13 deletions(-) diff --git a/app/components/menu-sidebar.hbs b/app/components/menu-sidebar.hbs index 60e40cf87..ec10c37da 100644 --- a/app/components/menu-sidebar.hbs +++ b/app/components/menu-sidebar.hbs @@ -80,7 +80,7 @@ /> {{! Link to SOFIA }} - + Date: Wed, 27 Nov 2024 22:02:05 +0100 Subject: [PATCH 05/10] removed unintended edit --- app/controllers/users/index.js | 4 ---- 1 file changed, 4 deletions(-) diff --git a/app/controllers/users/index.js b/app/controllers/users/index.js index 7b0000f48..a0c4579ee 100644 --- a/app/controllers/users/index.js +++ b/app/controllers/users/index.js @@ -20,10 +20,6 @@ export default class UsersIndexController extends FilterableAndSortableControlle value: 'last_name', label: 'Achternaam', }, - { - value: 'startDate', - label: 'Lid sinds', - }, { value: 'address', label: 'Adres', From 94fc70f715df43bd1e7c04780f2a17f3f21bc359 Mon Sep 17 00:00:00 2001 From: lodewiges <131907615+lodewiges@users.noreply.github.com> Date: Wed, 27 Nov 2024 22:02:48 +0100 Subject: [PATCH 06/10] removed empty lines --- config/environment.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/config/environment.js b/config/environment.js index 59743e285..b3ad98f41 100644 --- a/config/environment.js +++ b/config/environment.js @@ -99,8 +99,6 @@ module.exports = function (environment) { ENV.APP.flashNoticeDefaultDuration = 1; } - - ENV['@sentry/ember'] = { sentry: { dsn: 'https://invalid@sentry.io/12345', // invalid key, will be replaced when run as prod From 17369a34aab32138d85a6c3bcfc79c80830746bf Mon Sep 17 00:00:00 2001 From: lodewiges <131907615+lodewiges@users.noreply.github.com> Date: Wed, 27 Nov 2024 22:03:18 +0100 Subject: [PATCH 07/10] Update environment.js --- config/environment.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/environment.js b/config/environment.js index b3ad98f41..72d4f5a8d 100644 --- a/config/environment.js +++ b/config/environment.js @@ -107,7 +107,7 @@ module.exports = function (environment) { }, }; - if (environment === 'build') { + if (environment === 'production') { // here you can enable a production-specific feature ENV['@sentry/ember'].sentry.dsn = 'https://8936a95696f7453ab03e59264a7fede8@sentry.io/186017'; From ec5c264e695f94ed24585d7678e2f2338c94ad14 Mon Sep 17 00:00:00 2001 From: lodewiges <131907615+lodewiges@users.noreply.github.com> Date: Wed, 27 Nov 2024 22:35:10 +0100 Subject: [PATCH 08/10] fixed lint --- config/environment.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/environment.js b/config/environment.js index 72d4f5a8d..160ac26b7 100644 --- a/config/environment.js +++ b/config/environment.js @@ -73,7 +73,7 @@ module.exports = function (environment) { // ENV.APP.LOG_VIEW_LOOKUPS = true; ENV.clientId = '123456789'; - ENV.sofiaurl = 'http://localhost:5000' + ENV.sofiaurl = 'http://localhost:5000'; // Disable mirage in development ENV['ember-cli-mirage'] = { From 386fe123e9b628dca432051cc90b1a583ac53d95 Mon Sep 17 00:00:00 2001 From: Jorai Geertsema Date: Sun, 15 Dec 2024 01:51:25 +0100 Subject: [PATCH 09/10] fix --- app/components/menu-sidebar.hbs | 2 +- app/components/menu-sidebar.js | 4 ++++ config/environment.js | 1 - 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/app/components/menu-sidebar.hbs b/app/components/menu-sidebar.hbs index ec10c37da..60e40cf87 100644 --- a/app/components/menu-sidebar.hbs +++ b/app/components/menu-sidebar.hbs @@ -80,7 +80,7 @@ /> {{! Link to SOFIA }} - + Date: Sun, 15 Dec 2024 02:03:41 +0100 Subject: [PATCH 10/10] fixed lint --- app/components/menu-sidebar.js | 4 ++-- config/environment.js | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/components/menu-sidebar.js b/app/components/menu-sidebar.js index 2949da557..a28cf4267 100644 --- a/app/components/menu-sidebar.js +++ b/app/components/menu-sidebar.js @@ -28,8 +28,8 @@ export default class MenuSidebar extends Component { this.staticPages = staticPages; }); } - + get sofiaUrl() { - return config.sofiaUrl; // Access the sofiaUrl from config + return config.sofiaUrl; // Access the sofiaUrl from config } } diff --git a/config/environment.js b/config/environment.js index 294aa3750..687316b61 100644 --- a/config/environment.js +++ b/config/environment.js @@ -74,6 +74,7 @@ module.exports = function (environment) { ENV.clientId = '123456789'; ENV.sofiaurl = 'http://localhost:5000'; + // Disable mirage in development ENV['ember-cli-mirage'] = { enabled: false,