Skip to content

Commit

Permalink
Merge pull request #116 from amansinghbais/115-company-entry
Browse files Browse the repository at this point in the history
Improved: added entry for the Company app in dashboard (#115)
  • Loading branch information
ymaheshwari1 authored May 31, 2024
2 parents 27071f6 + ef07c0c commit 174dd57
Show file tree
Hide file tree
Showing 3 changed files with 32 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ VUE_APP_I18N_FALLBACK_LOCALE=en
VUE_APP_LOCALES={"en": "English", "ja": "日本語", "es": "Español"}
VUE_APP_CURRENCY_FORMATS={"en": {"currency": {"style": "currency","currency": "USD"}}, "ja": {"currency": {"style": "currency", "currency": "JPY"}}, "es": {"currency": {"style": "currency","currency": "ESP"}}}
VUE_APP_DEFAULT_ALIAS=
VUE_APP_MAARG_LOGIN=["atp", "order-routing"]
VUE_APP_MAARG_LOGIN=["atp", "company", "order-routing"]
25 changes: 25 additions & 0 deletions src/assets/images/Company.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 6 additions & 1 deletion src/views/Home.vue
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ export default defineComponent({
},
generateAppLink(app: any, appEnvironment = '') {
const oms = isMaargLogin(app.handle) ? this.authStore.getMaargOms : this.authStore.getOMS;
window.location.href = this.scheme + app.handle + appEnvironment + this.domain + (this.authStore.isAuthenticated ? `/login?oms=${oms.startsWith('http') ? isMaargLogin(app.handle) ? oms : oms.includes('/api') ? oms : `${oms}/api/` : oms}&token=${this.authStore.token.value}&expirationTime=${this.authStore.token.expiration}${isMaargLogin(this.authStore.getRedirectUrl) ? '&omsRedirectionUrl=' + this.authStore.getOMS : ''}` : '')
window.location.href = this.scheme + app.handle + appEnvironment + this.domain + (this.authStore.isAuthenticated ? `/login?oms=${oms.startsWith('http') ? isMaargLogin(app.handle) ? oms : oms.includes('/api') ? oms : `${oms}/api/` : oms}&token=${this.authStore.token.value}&expirationTime=${this.authStore.token.expiration}${isMaargLogin(app.handle) ? '&omsRedirectionUrl=' + this.authStore.getOMS : ''}` : '')
}
},
setup() {
Expand Down Expand Up @@ -202,6 +202,11 @@ export default defineComponent({
name: 'Order Routing',
resource: require('../assets/images/OrderRouting.svg'),
type: 'Workflow'
}, {
handle: 'company',
name: 'Company',
resource: require('../assets/images/Company.svg'),
type: 'Administration'
}]
const appCategory = appInfo.reduce((obj: any, app: any) => {
Expand Down

0 comments on commit 174dd57

Please sign in to comment.