diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml index e79df98..affa413 100644 --- a/.gitea/workflows/build.yml +++ b/.gitea/workflows/build.yml @@ -124,10 +124,16 @@ jobs: TAGS="${TAGS} -t ${IMAGE}:${{ gitea.ref_name }}" fi + GOLD_PRICE_URL="${{ secrets.VITE_GOLD_PRICE_URL }}" + if [ -z "${GOLD_PRICE_URL}" ]; then + GOLD_PRICE_URL="https://apiujrah.erahn.com.my/api/harga_emas" + fi + echo "Building and pushing teller: ${TAGS}" docker buildx build \ --platform linux/amd64 \ --build-arg VITE_API_URL="${API_URL}" \ + --build-arg VITE_GOLD_PRICE_URL="${GOLD_PRICE_URL}" \ --cache-from type=registry,ref=${IMAGE}:buildcache,ignore-error=true \ --cache-to type=registry,ref=${IMAGE}:buildcache,mode=max \ -f fe/web/teller-app/Dockerfile \ diff --git a/be/src/main/resources/application.yml b/be/src/main/resources/application.yml index 53ae3ee..758d950 100644 --- a/be/src/main/resources/application.yml +++ b/be/src/main/resources/application.yml @@ -9,9 +9,9 @@ spring: hibernate: ddl-auto: none datasource: - url: ${SPRING_DATASOURCE_URL:jdbc:mysql://localhost:3306/qms} - username: ${SPRING_DATASOURCE_USERNAME} - password: ${SPRING_DATASOURCE_PASSWORD} + url: ${SPRING_DATASOURCE_URL:jdbc:mysql://localhost:3306/qms?allowPublicKeyRetrieval=true&useSSL=false} + username: ${SPRING_DATASOURCE_USERNAME:root} + password: ${SPRING_DATASOURCE_PASSWORD:password} servlet: multipart: max-file-size: 100MB @@ -28,7 +28,7 @@ spring: jwt: header-title: Authorization token-prefix: Bearer - secret-key: ${JWT_SECRET_KEY} + secret-key: ${JWT_SECRET_KEY:a68uiaDQ0V3iLjF4DqMuS13GAVwkut55dlFbGCLyXTF} authorities-key: USER_AUTHORITIES token-validity-time: PT30M tfa: diff --git a/fe/web/.env.example b/fe/web/.env.example index 283f8e6..c5d1903 100644 --- a/fe/web/.env.example +++ b/fe/web/.env.example @@ -5,6 +5,7 @@ CUSTOMER_HOST_PORT=3000 VITE_API_URL=https://qms-api.erahn.com.my NEXT_PUBLIC_API_URL=https://qms-api.erahn.com.my VITE_BRANCH_QR_BASE_URL=https://qms-customer.erahn.com.my +VITE_GOLD_PRICE_URL=https://apiujrah.erahn.com.my/api/harga_emas QR_TOKEN_SECRET=qms-branch-qr-v1 diff --git a/fe/web/.env.production b/fe/web/.env.production index 283f8e6..c5d1903 100644 --- a/fe/web/.env.production +++ b/fe/web/.env.production @@ -5,6 +5,7 @@ CUSTOMER_HOST_PORT=3000 VITE_API_URL=https://qms-api.erahn.com.my NEXT_PUBLIC_API_URL=https://qms-api.erahn.com.my VITE_BRANCH_QR_BASE_URL=https://qms-customer.erahn.com.my +VITE_GOLD_PRICE_URL=https://apiujrah.erahn.com.my/api/harga_emas QR_TOKEN_SECRET=qms-branch-qr-v1 diff --git a/fe/web/admin-app/.env.development b/fe/web/admin-app/.env.development new file mode 100644 index 0000000..b3deb3c --- /dev/null +++ b/fe/web/admin-app/.env.development @@ -0,0 +1,2 @@ +VITE_API_URL=http://localhost:8080 +VITE_BRANCH_QR_BASE_URL=http://localhost:3000 diff --git a/fe/web/admin-app/src/constants.js b/fe/web/admin-app/src/constants.js index e0b239f..3da8721 100644 --- a/fe/web/admin-app/src/constants.js +++ b/fe/web/admin-app/src/constants.js @@ -1,4 +1,5 @@ -export const SERVER_URL = import.meta.env.VITE_API_URL; +export const SERVER_URL = + import.meta.env.VITE_API_URL ?? 'http://localhost:8080'; /** Public base URL encoded into branch QR codes (ManageBranchesScreen only). */ export const BRANCH_QR_BASE_URL = diff --git a/fe/web/docker-compose.yml b/fe/web/docker-compose.yml index cb5ef0c..893deb5 100644 --- a/fe/web/docker-compose.yml +++ b/fe/web/docker-compose.yml @@ -19,6 +19,7 @@ services: dockerfile: Dockerfile args: VITE_API_URL: ${VITE_API_URL:-http://localhost:8080} + VITE_GOLD_PRICE_URL: ${VITE_GOLD_PRICE_URL:-https://apiujrah.erahn.com.my/api/harga_emas} container_name: qms-fe-teller restart: unless-stopped ports: diff --git a/fe/web/teller-app/Dockerfile b/fe/web/teller-app/Dockerfile index 1ee5326..6aa05c7 100644 --- a/fe/web/teller-app/Dockerfile +++ b/fe/web/teller-app/Dockerfile @@ -2,8 +2,6 @@ FROM node:20-bookworm AS build WORKDIR /app -ARG VITE_API_URL=http://localhost:8080 -ARG VITE_GOLD_PRICE_URL ENV VITE_API_URL=$VITE_API_URL ENV VITE_GOLD_PRICE_URL=$VITE_GOLD_PRICE_URL diff --git a/fe/web/teller-app/src/constants.js b/fe/web/teller-app/src/constants.js index 3826367..bbd80c4 100644 --- a/fe/web/teller-app/src/constants.js +++ b/fe/web/teller-app/src/constants.js @@ -1,9 +1,6 @@ -export const SERVER_URL = - import.meta.env.VITE_API_URL ?? 'http://localhost:8080'; +export const SERVER_URL = import.meta.env.VITE_API_URL || 'http://localhost:8080'; -export const GOLD_PRICE_URL = - import.meta.env.VITE_GOLD_PRICE_URL ?? - 'https://apiujrah.erahn.com.my/api/harga_emas'; +export const GOLD_PRICE_URL = import.meta.env.VITE_GOLD_PRICE_URL; export const ROLES = { ROLE_USER: 'ROLE_USER',