From f0c26591e6e3b60b6849e4abe5622ea4aee91745 Mon Sep 17 00:00:00 2001
From: amansinghbais <singh11amanbais@gmail.com>
Date: Fri, 31 May 2024 14:47:30 +0530
Subject: [PATCH 1/2] Improved: added entry for the Company app in dashboard
 (#115)

---
 .env.example                  |  2 +-
 src/assets/images/Company.svg | 25 +++++++++++++++++++++++++
 src/views/Home.vue            |  5 +++++
 3 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 src/assets/images/Company.svg

diff --git a/.env.example b/.env.example
index 3b1b90e..f212c93 100644
--- a/.env.example
+++ b/.env.example
@@ -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"]
\ No newline at end of file
+VUE_APP_MAARG_LOGIN=["atp", "company", "order-routing"]
\ No newline at end of file
diff --git a/src/assets/images/Company.svg b/src/assets/images/Company.svg
new file mode 100644
index 0000000..ba09b7e
--- /dev/null
+++ b/src/assets/images/Company.svg
@@ -0,0 +1,25 @@
+<svg width="186" height="204" viewBox="0 0 186 204" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g filter="url(#filter0_dd_29762_21454)">
+<path d="M13.5209 56.3789L92.5391 10.7577L171.557 56.3789V147.621L92.5391 193.242L13.5209 147.621V56.3789Z" stroke="#EC2227" stroke-width="2.24609"/>
+</g>
+<path d="M92.0391 56.5938C66.6869 56.5938 46.1328 77.1478 46.1328 102.5C46.1328 127.852 66.6869 148.406 92.0391 148.406C117.391 148.406 137.945 127.852 137.945 102.5C137.945 77.1478 117.391 56.5938 92.0391 56.5938Z" stroke="#D41E21" stroke-width="3" stroke-miterlimit="10"/>
+<path d="M92.0385 56.5938C79.2223 56.5938 67.1719 77.1478 67.1719 102.5C67.1719 127.852 79.2223 148.406 92.0385 148.406C104.855 148.406 116.905 127.852 116.905 102.5C116.905 77.1478 104.855 56.5938 92.0385 56.5938Z" stroke="#D41E21" stroke-width="3" stroke-miterlimit="10"/>
+<path d="M61.4336 71.8945C69.8733 77.8866 80.4979 81.4598 92.0385 81.4598C103.579 81.4598 114.204 77.8866 122.643 71.8945M122.643 133.104C114.204 127.112 103.579 123.539 92.0385 123.539C80.4979 123.539 69.8733 127.112 61.4336 133.104" stroke="#D41E21" stroke-width="3" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M137.945 102.5H46.1328M92.0391 56.5938V148.406V56.5938Z" stroke="#D41E21" stroke-width="3" stroke-miterlimit="10"/>
+<defs>
+<filter id="filter0_dd_29762_21454" x="3.41406" y="0.476562" width="178.25" height="203.047" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dx="-2.24609" dy="-2.24609"/>
+<feGaussianBlur stdDeviation="3.36914"/>
+<feColorMatrix type="matrix" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_29762_21454"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dx="2.24609" dy="2.24609"/>
+<feGaussianBlur stdDeviation="3.36914"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.682353 0 0 0 0 0.682353 0 0 0 0 0.752941 0 0 0 0.4 0"/>
+<feBlend mode="normal" in2="effect1_dropShadow_29762_21454" result="effect2_dropShadow_29762_21454"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect2_dropShadow_29762_21454" result="shape"/>
+</filter>
+</defs>
+</svg>
diff --git a/src/views/Home.vue b/src/views/Home.vue
index 27b4a1f..6025f0f 100644
--- a/src/views/Home.vue
+++ b/src/views/Home.vue
@@ -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) => {

From ef07c0c9d1a3ec3ba09795c70352def7b1fcd32b Mon Sep 17 00:00:00 2001
From: amansinghbais <singh11amanbais@gmail.com>
Date: Fri, 31 May 2024 14:53:33 +0530
Subject: [PATCH 2/2] Improved: generated app link generation url (#115)

---
 src/views/Home.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/Home.vue b/src/views/Home.vue
index 6025f0f..cd2e76a 100644
--- a/src/views/Home.vue
+++ b/src/views/Home.vue
@@ -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() {