Merge branch 'dev-defuj' of https://github.com/defuj/eis into development

src/utils/graphql.ts

@@ -2,12 +2,10 @@
 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' // Include credentials for cross-origin requests
+  })
 
   const apolloClient = new ApolloClient({
     cache: new InMemoryCache(),
@@ -17,9 +15,9 @@ export const apolloClient = () => {
       'Accept-Encoding': 'gzip, deflate',
       'Cache-Control': 'no-cache',
       Connection: 'keep-alive',
-      'Content-Type': 'application/json',
+      'Content-Type': 'application/json'
       // Add other headers as needed
-    },
-  });
-  return apolloClient;
-}
+    }
+  })
+  return apolloClient
+}

src/utils/network.ts

@@ -1,8 +1,8 @@
 //deploy vm
 import axios from 'axios'
-const url = 'http://10.1.50.173:32181'
+
+const url = import.meta.env.VITE_APP_REST_ENDPOINT
 const instance = axios.create({
-  // baseURL: 'http://192.168.1.84:32180'
   baseURL: url
 })
 
@@ -14,4 +14,13 @@ const getJenisTransaksi = async () => await instance.get('/jenisTransaksi')
 const getUp3 = async (uid: number) => await instance.get('/up3?uid=' + uid)
 const getUlp = async (up3: number) => await instance.get('/ulp?up3=' + up3)
 const getPosko = async (uppp: number) => await instance.get('/posko?up3=' + uppp)
-export { getUid, getUp3, getPosko, getUlp, getMedia, getJenisTransaksi, getUidRegional, getRegional }
+export {
+  getUid,
+  getUp3,
+  getPosko,
+  getUlp,
+  getMedia,
+  getJenisTransaksi,
+  getUidRegional,
+  getRegional
+}