Skip to content

Commit

Permalink
rewrote sofia url logic
Browse files Browse the repository at this point in the history
  • Loading branch information
lodewiges committed Nov 27, 2024
1 parent 6448522 commit 8e59b44
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 13 deletions.
2 changes: 1 addition & 1 deletion app/components/menu-sidebar.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@
/>

{{! Link to SOFIA }}
<a class='link' href={{this.sofiaUrl}} target='_blank'>
<a class='link' href={{config.sofiaUrl}} target='_blank'>
<MenuSidebarItem
@link=''
@hasPermission={{true}}
Expand Down
10 changes: 0 additions & 10 deletions app/components/menu-sidebar.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,6 @@ export default class MenuSidebar extends Component {
@service store;
@tracked staticPages;

get sofiaUrl() {
if (config.environment === 'development') {
return 'http://localhost:5000';
} else if (config.deployTarget === 'staging') {
return 'https://stagingstreep.csvalpha.nl';
} else {
return 'https://streep.csvalpha.nl';
}
}

@action
invalidateSession() {
this.session.invalidate();
Expand Down
4 changes: 4 additions & 0 deletions app/controllers/users/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@ export default class UsersIndexController extends FilterableAndSortableControlle
value: 'last_name',
label: 'Achternaam',
},
{
value: 'startDate',
label: 'Lid sinds',
},
{
value: 'address',
label: 'Adres',
Expand Down
9 changes: 7 additions & 2 deletions config/environment.js
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,8 @@ module.exports = function (environment) {
// ENV.APP.LOG_VIEW_LOOKUPS = true;

ENV.clientId = '123456789';

ENV.sofiaurl = 'http://localhost:5000'

Check failure on line 76 in config/environment.js

View workflow job for this annotation

GitHub Actions / Lint

Insert `;`

Check failure on line 77 in config/environment.js

View workflow job for this annotation

GitHub Actions / Lint

Delete `····`
// Disable mirage in development
ENV['ember-cli-mirage'] = {
enabled: false,
Expand All @@ -98,6 +99,8 @@ module.exports = function (environment) {
ENV.APP.flashNoticeDefaultDuration = 1;
}

Check failure on line 100 in config/environment.js

View workflow job for this annotation

GitHub Actions / Lint

Delete `⏎⏎···`



ENV['@sentry/ember'] = {
sentry: {
dsn: 'https://[email protected]/12345', // invalid key, will be replaced when run as prod
Expand All @@ -106,7 +109,7 @@ module.exports = function (environment) {
},
};

if (environment === 'production') {
if (environment === 'build') {
// here you can enable a production-specific feature
ENV['@sentry/ember'].sentry.dsn =
'https://[email protected]/186017';
Expand All @@ -115,10 +118,12 @@ module.exports = function (environment) {
if (deployTarget === 'production') {
ENV.clientId = 'IIeYVVbdNhiSiSCxKP5eUgS5Vs1-9ccZEvISdCVqe5g';
ENV.googleAnalytics = { webPropertyId: 'G-8XNQMRFWPZ' };
ENV.sofiaurl = 'https://streep.csvalpha.nl';
}

if (deployTarget === 'staging') {
ENV.clientId = 'D0HhpORylbWUgOBwyR-0GGDcfsi9PG6zSNgctW--f-4';
ENV.sofiaurl = 'https://stagingstreep.csvalpha.nl';
}

return ENV;
Expand Down

0 comments on commit 8e59b44

Please sign in to comment.