From 708f9d81d2816e042d1cdfdc5da052c6ba66fbf1 Mon Sep 17 00:00:00 2001 From: Dede Fuji Abdul Date: Tue, 27 Feb 2024 11:07:19 +0700 Subject: [PATCH 01/11] update --- Dockerfile | 12 +++++++++--- src/components/Pages/Gangguan/Table_1.vue | 4 ++-- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 32ff3f3..9d8c259 100755 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM node:lts-alpine as build-stage WORKDIR /app -COPY package*.json ./ -RUN npm install +# COPY package*.json ./ +# RUN npm install COPY . . RUN npm run build @@ -10,4 +10,10 @@ FROM nginx:stable-alpine as production-stage COPY --from=build-stage /app/dist /usr/share/nginx/html COPY --from=build-stage /app/nginx.conf /etc/nginx/nginx.conf EXPOSE 32166 -CMD ["nginx", "-g", "daemon off;"] \ No newline at end of file +CMD ["nginx", "-g", "daemon off;"] + +# FROM nginx:stable-alpine +# COPY /dist /usr/share/nginx/html +# COPY /nginx.conf /etc/nginx/nginx.conf +# EXPOSE 32166 +# CMD ["nginx", "-g", "daemon off;"] \ No newline at end of file diff --git a/src/components/Pages/Gangguan/Table_1.vue b/src/components/Pages/Gangguan/Table_1.vue index 3783e22..dc4201d 100755 --- a/src/components/Pages/Gangguan/Table_1.vue +++ b/src/components/Pages/Gangguan/Table_1.vue @@ -268,7 +268,7 @@ const onExporting = (e: any) => { title: 'Daftar Gangguan Dialihkan Ke Posko Lain', subject: 'Daftar Gangguan Dialihkan Ke Posko Lain', }); - + pageNumber.value++; // Increment the pageNumber doc.save(`Daftar Gangguan Dialihkan Ke Posko Lain.pdf`) @@ -340,7 +340,7 @@ const filterData = (params: any) => { }) onResult((queryResult) => { if (queryResult.data != undefined) { - data.value = queryResult.data.daftarGangguanDialihkanKePoskoLain + data.value = queryResult.data.daftarGangguanDialihkanKePoskoLain } console.log(queryResult.data) console.log(queryResult.loading) From 6dfd82fa328a7265bb2600f9ce84ccc7934405cc Mon Sep 17 00:00:00 2001 From: Dede Fuji Abdul Date: Tue, 27 Feb 2024 11:52:43 +0700 Subject: [PATCH 02/11] Update environment variables --- .env.development | 4 +++- .env.production | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.env.development b/.env.development index 53f7347..37809dd 100755 --- a/.env.development +++ b/.env.development @@ -1,4 +1,6 @@ VITE_BASE_URL=http://localhost:5173 VITE_BASE_DIRECTORY=/ VITE_APP_VERSION=0.0.1 -VITE_APP_NAME='Executive Information System' \ No newline at end of file +VITE_APP_NAME='Executive Information System' +VITE_APP_GRAPHQL_ENDPOINT=http://192.168.5.213:32169/graphql +VITE_APP_REST_ENDPOINT=http://192.168.5.213:32180 \ No newline at end of file diff --git a/.env.production b/.env.production index 50bbd8a..3af203a 100755 --- a/.env.production +++ b/.env.production @@ -1,4 +1,6 @@ VITE_BASE_URL=https://api.domain.com/v1/ VITE_BASE_DIRECTORY=/ VITE_APP_VERSION=0.0.1 -VITE_APP_NAME='Executive Information System' \ No newline at end of file +VITE_APP_NAME='Executive Information System' +VITE_APP_GRAPHQL_ENDPOINT=http://10.1.50.173:32180/graphql +VITE_APP_REST_ENDPOINT=http://10.1.50.173:32181 \ No newline at end of file From 2cc0a1fbcecef1000e7f804067f0234e947f560c Mon Sep 17 00:00:00 2001 From: Dede Fuji Abdul Date: Tue, 27 Feb 2024 11:52:50 +0700 Subject: [PATCH 03/11] Update GraphQL and REST endpoints --- src/utils/graphql.ts | 6 +++--- src/utils/network.ts | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/utils/graphql.ts b/src/utils/graphql.ts index 42650f3..98c8a4e 100755 --- a/src/utils/graphql.ts +++ b/src/utils/graphql.ts @@ -2,9 +2,9 @@ import { ApolloClient, createHttpLink, InMemoryCache } from '@apollo/client/core export const apolloClient = () => { - const httpLink = createHttpLink({ - uri: 'http://10.1.50.173:32180/graphql', - credentials: 'include', // Include credentials for cross-origin requests + const httpLink = createHttpLink({ + uri: import.meta.env.VITE_APP_GRAPHQL_ENDPOINT, + credentials: 'include', }); diff --git a/src/utils/network.ts b/src/utils/network.ts index 18e1822..f6bb137 100755 --- a/src/utils/network.ts +++ b/src/utils/network.ts @@ -1,7 +1,6 @@ import axios from 'axios' -const url = 'http://10.1.50.173:32181' +const url = import.meta.env.VITE_APP_REST_ENDPOINT as string const instance = axios.create({ - // baseURL: 'http://192.168.1.84:32180' baseURL: url }) From eb9b01cf597c74945083d184c6c1edb0f9d7b00c Mon Sep 17 00:00:00 2001 From: Dede Fuji Abdul Date: Tue, 27 Feb 2024 11:53:06 +0700 Subject: [PATCH 04/11] Refactor filter update in Table components --- src/components/Pages/Anomali/Table_61.vue | 5 +- src/components/Pages/Anomali/Table_63.vue | 5 +- src/components/Pages/Anomali/Table_65.vue | 11 +- src/components/Pages/Cico/Table_60.vue | 21 ++- src/components/Pages/Material/Table_68.vue | 11 +- src/components/Pages/Material/Table_69.vue | 14 +- src/components/Pages/Monalisa/Table_36.vue | 15 +- src/components/Pages/Monalisa/Table_37.vue | 17 +-- src/components/Pages/Monalisa/Table_38.vue | 15 +- src/components/Pages/Monalisa/Table_39.vue | 5 +- src/components/Pages/Monalisa/Table_41.vue | 7 +- src/components/Pages/Monalisa/Table_42.vue | 13 +- src/components/Pages/Monalisa/Table_43.vue | 17 +-- src/components/Pages/Monalisa/Table_44.vue | 14 +- src/components/Pages/Monalisa/Table_45.vue | 30 ++-- src/components/Pages/Monalisa/Table_46.vue | 5 +- src/components/Pages/Monalisa/Table_47.vue | 20 ++- src/components/Pages/Monalisa/Table_48.vue | 86 ++++++----- src/components/Pages/Monalisa/Table_49.vue | 29 ++-- src/components/Pages/Monalisa/Table_50.vue | 20 ++- src/components/Pages/Monalisa/Table_52.vue | 5 +- src/components/Pages/Monalisa/Table_53.vue | 137 +++++++++-------- src/components/Pages/Monalisa/Table_54.vue | 119 ++++++++------- src/components/Pages/Monalisa/Table_55.vue | 123 ++++++++-------- src/components/Pages/Monalisa/Table_56.vue | 135 +++++++++-------- src/components/Pages/Monalisa/Table_57.vue | 139 +++++++++--------- src/components/Pages/Monalisa/Table_58.vue | 119 ++++++++------- src/components/Pages/Monalisa/Table_59.vue | 123 ++++++++-------- .../Pages/PencarianData/Table_71.vue | 15 +- src/components/Pages/Transaksi/Table_70.vue | 13 +- 30 files changed, 603 insertions(+), 685 deletions(-) diff --git a/src/components/Pages/Anomali/Table_61.vue b/src/components/Pages/Anomali/Table_61.vue index 0b228f8..25af569 100755 --- a/src/components/Pages/Anomali/Table_61.vue +++ b/src/components/Pages/Anomali/Table_61.vue @@ -1,9 +1,6 @@