From 3db61d70fcaf358f1561cd188e468ae3a54d62f9 Mon Sep 17 00:00:00 2001 From: waruneeauy Date: Thu, 13 Feb 2025 15:20:23 +0700 Subject: [PATCH] fixing redirect landing --- .env.production | 3 ++- docker/entrypoint.sh | 1 + src/views/MainLayout.vue | 11 ++--------- 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/.env.production b/.env.production index f466c296..1630103f 100644 --- a/.env.production +++ b/.env.production @@ -1,4 +1,5 @@ VITE_API_URI_CONFIG=VITE_API_URI_CONFIG VITE_API_REPORT_URL=VITE_API_REPORT_URL VITE_MANUAL_URL=VITE_MANUAL_URL -VITE_URL_SSO=VITE_URL_SSO \ No newline at end of file +VITE_URL_SSO=VITE_URL_SSO +VITE_URL_LANDING=VITE_URL_LANDING \ No newline at end of file diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh index 2f3ac1ac..f2abffa1 100644 --- a/docker/entrypoint.sh +++ b/docker/entrypoint.sh @@ -12,6 +12,7 @@ do sed -i 's|VITE_API_REPORT_URL|'${VITE_API_REPORT_URL}'|g' $file sed -i 's|VITE_MANUAL_URL|'${VITE_MANUAL_URL}'|g' $file sed -i 's|VITE_URL_SSO|'${VITE_URL_SSO}'|g' $file + sed -i 's|VITE_URL_LANDING|'${VITE_URL_LANDING}'|g' $file done diff --git a/src/views/MainLayout.vue b/src/views/MainLayout.vue index 9ee4fd22..f22ca37c 100644 --- a/src/views/MainLayout.vue +++ b/src/views/MainLayout.vue @@ -21,7 +21,7 @@ import { menuList } from "../interface/request/main/main"; // landing page config url const configParam = { - landingPageUrl: import.meta.env.VITE_URL_SSO, + landingPageUrl: import.meta.env.VITE_URL_LANDING, }; const $q = useQuasar(); @@ -323,14 +323,7 @@ function handleButtonClick() { } // landing page redirect -const landingPageUrl = ref(getLandingUrl()); -function getLandingUrl() { - if (window.location.hostname === "bma-ehr-admin.frappet.synology.me") { - return `${configParam.landingPageUrl}/e-hr`; - } else { - return configParam.landingPageUrl; - } -} +const landingPageUrl = ref(configParam.landingPageUrl); /** ฟังก์ชันเรียกข้อมูลผู้ใช่งาน*/ async function fetchKeycloakPosition() {