From 985cd0dc14c5dd2223c13d9a27ab3ee1ed61968d Mon Sep 17 00:00:00 2001 From: hanif salafi Date: Thu, 2 Jan 2025 06:29:50 +0700 Subject: [PATCH] feat: fixing some error and remove axios instance in config --- .../visualization/content-production.tsx | 6 +- components/visualization/dashboard-viz.tsx | 6 +- .../visualization/pattern-relation-viz.tsx | 8 +- config/api.ts | 240 ------------------ config/axiosInstance.ts | 14 - config/axiosInstanceJson.ts | 13 - service/http-config/http-base-service.ts | 1 - 7 files changed, 10 insertions(+), 278 deletions(-) delete mode 100644 config/api.ts delete mode 100644 config/axiosInstance.ts delete mode 100644 config/axiosInstanceJson.ts diff --git a/components/visualization/content-production.tsx b/components/visualization/content-production.tsx index 486bb1e9..a745afff 100644 --- a/components/visualization/content-production.tsx +++ b/components/visualization/content-production.tsx @@ -47,13 +47,13 @@ export default function ContentProductionVisualization() { useEffect(() => { async function initState() { const response1 = await generateTicket(); - setTicket1(response1.data?.data); + setTicket1(response1?.data?.data); const response2 = await generateTicket(); - setTicket2(response2.data?.data); + setTicket2(response2?.data?.data); const response3 = await generateTicket(); - setTicket3(response3.data?.data); + setTicket3(response3?.data?.data); } initState(); diff --git a/components/visualization/dashboard-viz.tsx b/components/visualization/dashboard-viz.tsx index 730377e5..97721ee6 100644 --- a/components/visualization/dashboard-viz.tsx +++ b/components/visualization/dashboard-viz.tsx @@ -44,13 +44,13 @@ export default function DashboardVisualization() { useEffect(() => { async function initState() { const response1 = await generateTicket(); - setTicket1(response1.data?.data); + setTicket1(response1?.data?.data); console.log("response", response1); const response2 = await generateTicket(); - setTicket2(response2.data?.data); + setTicket2(response2?.data?.data); const response3 = await generateTicket(); - setTicket3(response3.data?.data); + setTicket3(response3?.data?.data); } initState(); diff --git a/components/visualization/pattern-relation-viz.tsx b/components/visualization/pattern-relation-viz.tsx index c038792d..382d83bc 100644 --- a/components/visualization/pattern-relation-viz.tsx +++ b/components/visualization/pattern-relation-viz.tsx @@ -55,16 +55,16 @@ export default function PatternRelationVisualization() { useEffect(() => { async function initState() { const response1 = await generateTicket(); - setTicket1(response1.data?.data); + setTicket1(response1?.data?.data); const response2 = await generateTicket(); - setTicket2(response2.data?.data); + setTicket2(response2?.data?.data); const response3 = await generateTicket(); - setTicket3(response3.data?.data); + setTicket3(response3?.data?.data); const response4 = await generateTicket(); - setTicket4(response4.data?.data); + setTicket4(response4?.data?.data); } initState(); diff --git a/config/api.ts b/config/api.ts deleted file mode 100644 index b92a3181..00000000 --- a/config/api.ts +++ /dev/null @@ -1,240 +0,0 @@ -"use client"; -import axios from "axios"; -import Cookies from "js-cookie"; -import qs from "qs"; - -import axiosInstance from "./axiosInstance"; -import axiosInstanceJson from "./axiosInstanceJson"; -import { data } from "@/app/[locale]/(protected)/charts/rechart/charts-rechart-bar/data"; -import { url } from "inspector"; - -const baseURL = "https://netidhub.com/api/"; -const tokenAuth = Cookies.get("access_token") - ? Cookies.get("access_token") - : null; - -export async function postAPI(url: any, data: any) { - const headers = { - Authorization: `Bearer ${tokenAuth}`, - }; - const response = await axiosInstance - .post(url, qs.stringify(data), { headers }) - .catch((error) => error.response); - if (response?.status > 300) { - return { - error: true, - message: response?.data.error_description, - data: null, - }; - } - return { - error: false, - message: "success", - data: response?.data, - }; -} - -export async function getAPI(url: any, token: any) { - const headers = { - Authorization: `Bearer ${token || tokenAuth}`, - }; - const response = await axios - .get(baseURL + url, { headers }) - .catch((error) => error.response); - if (response?.status > 300) { - return { - error: true, - message: response?.data?.error_description, - data: null, - }; - } - return { - error: false, - message: "success", - data: response?.data, - }; -} - -export async function postAPIWithJson(url: any, data: any, token: any) { - const headers = { - Authorization: `Bearer ${token || tokenAuth}`, - }; - const response = await axiosInstanceJson - .post(url, data, { headers }) - .catch((error) => error.response); - if (response?.status > 300) { - return { - error: true, - message: response?.data?.message, - data: null, - }; - } - return { - error: false, - message: "success", - data: response?.data, - }; -} - -export async function deleteAPIWithJson(url: any) { - const response = await axiosInstanceJson - .delete(url) - .catch((error) => error.response); - if (response?.status > 300) { - return { - error: true, - message: response?.data?.message, - data: null, - }; - } - return { - error: false, - message: "success", - data: response?.data, - }; -} - -export async function getAPIInterceptor(url: any) { - const response = await axiosInterceptor - .get(url) - .catch((error) => error.response); - if (response?.status == 401) { - Object.keys(Cookies.get()).forEach((cookieName) => { - Cookies.remove(cookieName); - }); - // window.location.href = "/in/auth"; - } else if (response?.status > 300 && response?.status != 401) { - return { - error: true, - message: response?.data?.message, - data: null, - }; - } else if (response?.data.success) { - return { - error: false, - message: "success", - data: response?.data, - }; - } - return { - error: true, - message: response?.data?.message || null, - data: null, - }; -} -// Fungsi postAPIInterceptor -export async function postAPIInterceptor(url: string, data: any) { - const response = await axiosInterceptor - .post(url, data) - .catch((error) => error.response); - - if (response?.status === 401) { - Object.keys(Cookies.get()).forEach((cookieName) => { - Cookies.remove(cookieName); - }); - // window.location.href = "/"; - } else if (response?.status > 300 && response?.status !== 401) { - return { - error: true, - message: response?.data?.message, - data: null, - }; - } else if (response?.data?.success) { - return { - error: false, - message: "success", - data: response?.data, - }; - } - - return { - error: true, - message: response?.data?.message, - data: null, - }; -} - -// Fungsi createTask -export async function createTask(data: any) { - const url = "assignment"; - return postAPIInterceptor(url, data); // Perbaikan: Memisahkan parameter url dan data -} - -export async function deleteAPIInterceptor(url: any, data: any) { - const response = await axiosInterceptor - .delete(url, { data }) - .catch((error) => error.response); - if (response?.status == 401) { - Object.keys(Cookies.get()).forEach((cookieName) => { - Cookies.remove(cookieName); - }); - // window.location.href = "/"; - } else if (response?.status > 300 && response?.status != 401) { - return { - error: true, - message: response?.data?.message, - data: null, - }; - } else if (response?.data.success) { - return { - error: false, - message: "success", - data: response?.data, - }; - } - return { - error: true, - message: response?.data?.message, - data: null, - }; -} - -export async function getAPIInterceptorProfile(url: any) { - const response = await axiosInterceptor - .get(url) - .catch((error) => error.response); - if (response?.status > 300) { - return { - error: true, - message: response?.data?.message, - data: null, - }; - } - return { - error: false, - message: response?.data?.message, - data: response?.data, - }; -} - -// export async function postFileApiInterceptor(url: any, data: any) { -// const response = await axiosInterceptor -// .post(url, data, { -// onUploadProgress: (progressEvent) => { -// const percentage = Math.round( -// (progressEvent.loaded * 100) / progressEvent.total -// ); -// console.log(percentage); -// }, -// }) -// .catch((error) => error.response); -// if (response?.status > 300) { -// return { -// error: true, -// message: response?.data?.message, -// data: null, -// }; -// } -// if (response?.data.success) { -// return { -// error: false, -// message: "success", -// data: response?.data, -// }; -// } -// return { -// error: true, -// message: response?.data.message, -// data: null, -// }; -// } diff --git a/config/axiosInstance.ts b/config/axiosInstance.ts deleted file mode 100644 index 7b83d1ab..00000000 --- a/config/axiosInstance.ts +++ /dev/null @@ -1,14 +0,0 @@ -"use client"; -import axios from "axios"; - -const baseURL = "https://netidhub.com/api/"; - -const axiosInstance = axios.create({ - baseURL, - headers: { - "content-type": "application/x-www-form-urlencoded", - }, - withCredentials: false, -}); - -export default axiosInstance; diff --git a/config/axiosInstanceJson.ts b/config/axiosInstanceJson.ts deleted file mode 100644 index 7c11cf06..00000000 --- a/config/axiosInstanceJson.ts +++ /dev/null @@ -1,13 +0,0 @@ -"use client"; -import axios from "axios"; - -const baseURL = "https://netidhub.com/api/"; - -const axiosInstanceJson = axios.create({ - baseURL, - headers: { - "content-type": "application/json", - }, -}); - -export default axiosInstanceJson; diff --git a/service/http-config/http-base-service.ts b/service/http-config/http-base-service.ts index 3fb234c7..2fe098c2 100644 --- a/service/http-config/http-base-service.ts +++ b/service/http-config/http-base-service.ts @@ -1,4 +1,3 @@ -import axiosInstance from "@/config/axiosInstance"; import axiosBaseInstance from "./axios-base-instance"; import axios from "axios"; import Cookies from "js-cookie";