hrms-bangkok/hrms-checkin
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'main' into niceDev

Browse source
This commit is contained in:
DESKTOP-1R2VSQH\Lenovo ThinkPad E490 2023-11-29 14:02:03 +07:00
commit 7dfc17dcbb
3 changed files with 13 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.env.production
View file

@ -1,7 +1,9 @@
VITE_REALM_KEYCLOAK=VITE_REALM_KEYCLOAK VITE_REALM_KEYCLOAK=VITE_REALM_KEYCLOAK
VITE_CLIENTID_KEYCLOAK=VITE_CLIENTID_KEYCLOAK VITE_CLIENTID_KEYCLOAK=VITE_CLIENTID_KEYCLOAK
VITE_URL_KEYCLOAK=VITE_URL_KEYCLOAK VITE_URL_KEYCLOAK=VITE_URL_KEYCLOAK
VITE_API_URI_CONFIG=VITE_API_URI_CONFIG
# VITE_REALM_KEYCLOAK: "bma-ehr" # VITE_REALM_KEYCLOAK: "bma-ehr"
# VITE_CLIENTID_KEYCLOAK: "bma-ehr-exam-vue3" # VITE_CLIENTID_KEYCLOAK: "bma-ehr-exam-vue3"
# VITE_URL_KEYCLOAK: "https://id.frappet.synology.me/" # VITE_URL_KEYCLOAK: "https://id.frappet.synology.me/"
# VITE_API_URI_CONFIG: "https://bma-ehr.frappet.synology.me/api/v1"

1
entrypoint.sh
View file

@ -11,6 +11,7 @@ do
sed -i 's|VITE_REALM_KEYCLOAK|'${VITE_REALM_KEYCLOAK}'|g' $file sed -i 's|VITE_REALM_KEYCLOAK|'${VITE_REALM_KEYCLOAK}'|g' $file
sed -i 's|VITE_CLIENTID_KEYCLOAK|'${VITE_CLIENTID_KEYCLOAK}'|g' $file sed -i 's|VITE_CLIENTID_KEYCLOAK|'${VITE_CLIENTID_KEYCLOAK}'|g' $file
sed -i 's|VITE_URL_KEYCLOAK|'${VITE_URL_KEYCLOAK}'|g' $file sed -i 's|VITE_URL_KEYCLOAK|'${VITE_URL_KEYCLOAK}'|g' $file
sed -i 's|VITE_API_URI_CONFIG|'${VITE_API_URI_CONFIG}'|g' $file
done done

17
src/api/index.ts
View file

@ -1,7 +1,8 @@
/**config api */ /**config api */
import { ref } from "vue"; import { ref } from 'vue'
const env = ref<string>(process.env.NODE_ENV || "development"); const env = ref<string>(process.env.NODE_ENV || 'development')
export const apiUrlConfig = import.meta.env.VITE_API_URI_CONFIG
// if (process.env.VUE_APP_TEST) { // if (process.env.VUE_APP_TEST) {
// env = "test"; // env = "test";
// } // }
@ -9,21 +10,21 @@ const env = ref<string>(process.env.NODE_ENV || "development");
const config = ref<any>({ const config = ref<any>({
development: { development: {
// API_URI: "https://localhost:7260/api", // API_URI: "https://localhost:7260/api",
API_URI: "https://bma-ehr.frappet.synology.me/api/v1", API_URI: 'https://bma-ehr.frappet.synology.me/api/v1',
}, },
test: { test: {
API_URI: "http://localhost:5010/api/v1", API_URI: 'http://localhost:5010/api/v1',
}, },
production: { production: {
// API_URI: "https://localhost:5010", // API_URI: "https://localhost:5010",
API_URI: `${window.location.protocol}//${window.location.host}/api/v1`, API_URI: apiUrlConfig,
}, },
}); })
const API_URI = ref<string>(config.value[env.value].API_URI); const API_URI = ref<string>(config.value[env.value].API_URI)
export default { export default {
env: env.value, env: env.value,
config: config.value, config: config.value,
API_URI: API_URI.value, API_URI: API_URI.value,
}; }