Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix/sofialink #913

Merged
merged 10 commits into from
Jan 19, 2025
Merged

Fix/sofialink #913

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
74a8458
hotfix sofia link on staging
lodewiges Nov 21, 2024
8a4d407
intial commit
lodewiges Nov 21, 2024
6448522
Revert "intial commit"
lodewiges Nov 21, 2024
8e59b44
rewrote sofia url logic
lodewiges Nov 27, 2024
e25bb8a
removed unintended edit
lodewiges Nov 27, 2024
94fc70f
removed empty lines
lodewiges Nov 27, 2024
17369a3
Update environment.js
lodewiges Nov 27, 2024
ec5c264
fixed lint
lodewiges Nov 27, 2024
386fe12
fix
lodewiges Dec 15, 2024
24b7017
fixed lint
lodewiges Dec 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 4 additions & 10 deletions app/components/menu-sidebar.js
View file
Open in desktop
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.environment === 'staging') {
return 'https://stagingstreep.csvalpha.nl';
} else {
return 'https://streep.csvalpha.nl';
}
}

@action
invalidateSession() {
this.session.invalidate();
Expand All @@ -38,4 +28,8 @@ export default class MenuSidebar extends Component {
this.staticPages = staticPages;
});
}

get sofiaUrl() {
return config.sofiaUrl; // Access the sofiaUrl from config
}
}
3 changes: 3 additions & 0 deletions config/environment.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ module.exports = function (environment) {
// ENV.APP.LOG_VIEW_LOOKUPS = true;

ENV.clientId = '123456789';
ENV.sofiaurl = 'http://localhost:5000';

// Disable mirage in development
ENV['ember-cli-mirage'] = {
Expand Down Expand Up @@ -115,10 +116,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
Loading