Merge branch 'develop' into devTee

.env.production

@@ -5,6 +5,7 @@ VITE_API_PUBLISH_URL=VITE_API_PUBLISH_URL
 VITE_API_REPORT_URL=VITE_API_REPORT_URL
 VITE_MANUAL_URL=VITE_MANUAL_URL
 VITE_URL_SSO=VITE_URL_SSO
+VITE_URL_LANDING=VITE_URL_LANDING
 VITE_API_URI_CONFIG=VITE_API_URI_CONFIG
 VITE_API_URI_REPORT_CONFIG=VITE_API_URI_REPORT_CONFIG
 VITE_DASHBOARD_PANEL=VITE_DASHBOARD_PANEL

.onedev-buildspec.yml

@@ -1,4 +1,4 @@
-version: 37
+version: 38
 jobs:
 - name: CI for UAT
   steps:
@@ -40,7 +40,7 @@ jobs:
     name: build docker image
     dockerfile: ./docker/Dockerfile
     output: !RegistryOutput
-      tags: hrms-git.chin.in.th/bma-hrms/hrms-mgt:@build_version@ hrms-git.chin.in.th/bma-hrms/hrms-mgt:latest
+      tags: '@server@/bma-hrms/hrms-mgt:@build_version@ @server@/bma-hrms/hrms-mgt:latest'
     platforms: linux/amd64
     condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL
   triggers:
@@ -91,7 +91,7 @@ jobs:
     name: build docker image
     dockerfile: ./docker/Dockerfile
     output: !RegistryOutput
-      tags: hrms-git.bangkok.go.th/bma-hrms/hrms-mgt:@build_version@ hrms-git.bangkok.go.th/bma-hrms/hrms-mgt:latest
+      tags: '@server@/bma-hrms/hrms-mgt:@build_version@ @server@/bma-hrms/hrms-mgt:latest'
     condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL
   triggers:
   - !TagCreateTrigger

docker/Dockerfile

@@ -1,7 +1,7 @@
 # docker buildx build --platform=linux/amd64 -f docker/Dockerfile . -t hrms-git.chin.in.th/bma-hrms/hrms-mgt:0.1
 
 # Build Stage
-FROM node:20-alpine as build-stage
+FROM node:20-alpine AS build-stage
 WORKDIR /app
 COPY package*.json ./
 RUN npm install

docker/entrypoint.sh

@@ -15,6 +15,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
   sed -i 's|VITE_API_URI_CONFIG|'${VITE_API_URI_CONFIG}'|g' $file
   sed -i 's|VITE_API_URI_REPORT_CONFIG|'${VITE_API_URI_REPORT_CONFIG}'|g' $file
   sed -i 's|VITE_DASHBOARD_PANEL|'${VITE_DASHBOARD_PANEL}'|g' $file

src/views/MainLayout.vue

@@ -24,7 +24,7 @@ import LoginLinkage from "@/components/LoginLinkage.vue";
 
 // landing page config url
 const configParam = {
-  landingPageUrl: import.meta.env.VITE_URL_SSO,
+  landingPageUrl: import.meta.env.VITE_URL_LANDING,
 };
 const { setVerticalScrollPosition } = scroll;
 const store = useDataStore();
@@ -82,14 +82,7 @@ const options = ref<optionType[]>([
 const modalLoginLinkage = ref<boolean>(false); //เข้าสู่ระบบ Linkage Center
 
 // landing page redirect
-const landingPageUrl = ref<string>(getLandingUrl());
-function getLandingUrl() {
-  if (window.location.hostname === "bma-ehr.frappet.synology.me") {
-    return `${configParam.landingPageUrl}/e-hr`;
-  } else {
-    return configParam.landingPageUrl;
-  }
-}
+const landingPageUrl = ref<string>(configParam.landingPageUrl);
 
 async function fetchmsgNoread() {
   await http