From 855cbc414d1858015792fb6d715e9c17a88d8915 Mon Sep 17 00:00:00 2001 From: Alihaghighattalab Date: Wed, 14 Aug 2024 14:21:08 +0330 Subject: [PATCH] push for fix bug! --- src/components/installation-reports/index.tsx | 14 +++++----- .../management-bank-accounts/index.tsx | 9 +++++-- src/services/api/awards.ts | 17 ++++++++++++ src/services/api/bank-card.ts | 6 ++--- src/services/api/overview.ts | 17 ++++++++++++ src/services/api/register-device.ts | 4 +++ src/services/api/score.ts | 22 +++++++++++++++ src/services/api/transactions.ts | 3 +++ src/services/axios/index.ts | 10 +++---- src/types/index.ts | 27 +++++++++++++++++++ 10 files changed, 113 insertions(+), 16 deletions(-) create mode 100644 src/services/api/awards.ts create mode 100644 src/services/api/overview.ts create mode 100644 src/services/api/register-device.ts create mode 100644 src/services/api/score.ts create mode 100644 src/services/api/transactions.ts diff --git a/src/components/installation-reports/index.tsx b/src/components/installation-reports/index.tsx index f4e99eb..ca94058 100644 --- a/src/components/installation-reports/index.tsx +++ b/src/components/installation-reports/index.tsx @@ -2,16 +2,18 @@ import { installationReportsCol } from "../../utility/reports" import { Table } from "../common/table" import { useState } from "react" import { SortingState } from "@tanstack/react-table" +import { useQuery } from "@tanstack/react-query" +import { getRegisterDeviceList } from "../../services/api/register-device" export const InstallationReports = () => { const [sorting, setSorting] = useState([]) - // const { data, isLoading } = useQuery({ - // queryKey: ["installation-reports-list"], - // queryFn: getReportsList - // }) + const { data, isLoading } = useQuery({ + queryKey: ["register-device"], + queryFn: getRegisterDeviceList + }) - // if (isLoading) return

LODING .....

+ if (isLoading) return

LODING .....

return ( - +
) } \ No newline at end of file diff --git a/src/components/management-bank-accounts/index.tsx b/src/components/management-bank-accounts/index.tsx index 5695b89..9b24f3b 100644 --- a/src/components/management-bank-accounts/index.tsx +++ b/src/components/management-bank-accounts/index.tsx @@ -6,6 +6,7 @@ import { AddNewCardDialog } from "./add-new-cart-dialog" import { DeleteCardDialog } from "./delete-card" import { useQuery } from "@tanstack/react-query" import { getUserCardsList } from "../../services/api/bank-card" +import axios from "axios" export const ManagementBankAccounts = () => { const [selectedCard, setSelectedCard] = useState(null) @@ -21,8 +22,12 @@ export const ManagementBankAccounts = () => { const handleCloseDeleteDialog = () => setShowDeleteDialog(false) useEffect(() => { - console.log("data =>", data) - }, [data]) + axios.get("https://asan-service.com/api/gps/bank-card", { + headers: { + Authorization: `Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJfaWQiOiI2NGY0NDdlOWI2ZDM4YjJhYjc0NDIzNmQiLCJpYXQiOjE3MjM2MzIwMjIsImV4cCI6MTcyNjIyNDAyMn0.erPQMoiL2DN76CssBxlRukLe73T2o98JEB3m9bTnMY4` + } + }).then((res) => console.log("res>", res)).catch((err) => console.log(err)) + }, []) if (isLoading) return

LOADING...

return ( diff --git a/src/services/api/awards.ts b/src/services/api/awards.ts new file mode 100644 index 0000000..9eba7cb --- /dev/null +++ b/src/services/api/awards.ts @@ -0,0 +1,17 @@ +import axiosInstance from "../axios"; + + +export interface AwardsResponse { + _id: string, + score: number, + title: string, + desc: string, + expireDate: string, + created_at: string, + updated_at: string, + __v: number, + id: string +} + +export const getAwardsList = () => axiosInstance.get("/gps/award") + diff --git a/src/services/api/bank-card.ts b/src/services/api/bank-card.ts index 62a91d2..48c4829 100644 --- a/src/services/api/bank-card.ts +++ b/src/services/api/bank-card.ts @@ -10,6 +10,6 @@ type DeleteCard = { id: string | number | null } -export const createNewCardMutation = (payload: CreateNewCard) => axiosInstance.post("/gps/bank-card", payload) -export const deleteCardMutation = (payload: DeleteCard) => axiosInstance.delete(`/gps/bank-card/:${payload?.id}`) -export const getUserCardsList = () => axiosInstance.get("/gps/bank-card") \ No newline at end of file +export const createNewCardMutation = (payload: CreateNewCard) => axiosInstance.post("gps/bank-card", payload) +export const deleteCardMutation = (payload: DeleteCard) => axiosInstance.delete(`gps/bank-card/:${payload?.id}`) +export const getUserCardsList = () => axiosInstance.get("gps/bank-card") \ No newline at end of file diff --git a/src/services/api/overview.ts b/src/services/api/overview.ts new file mode 100644 index 0000000..483005c --- /dev/null +++ b/src/services/api/overview.ts @@ -0,0 +1,17 @@ +import axiosInstance from "../axios"; + +export type OverviewUser = { + walletBalance: number, + dollarBalance: number, + score: number, + _id: string, + id: string +} + +export interface OverviewResponse { + installedDevice: number, + user: OverviewUser +} + +export const getOverviewDetails = () => axiosInstance.get("/gps/overview/main") + diff --git a/src/services/api/register-device.ts b/src/services/api/register-device.ts new file mode 100644 index 0000000..00fab33 --- /dev/null +++ b/src/services/api/register-device.ts @@ -0,0 +1,4 @@ +import { RegisterDeviceResponse } from "../../types"; +import axiosInstance from "../axios"; + +export const getRegisterDeviceList = () => axiosInstance.get("/gps/register-device") \ No newline at end of file diff --git a/src/services/api/score.ts b/src/services/api/score.ts new file mode 100644 index 0000000..22fe2ef --- /dev/null +++ b/src/services/api/score.ts @@ -0,0 +1,22 @@ +import axiosInstance from "../axios"; + +export type ScoreDataResponse = { + _id: string, + deviceId: string, + score: number, + created_at: string, + updated_at: string, + __v: number, + userId: string, + id: string +} + + +export interface ScoreResponse { + data: ScoreDataResponse[] | [] + score: number, + total: number +} + +export const getScoresList = () => axiosInstance.get("/gps/score") + diff --git a/src/services/api/transactions.ts b/src/services/api/transactions.ts new file mode 100644 index 0000000..df00f1a --- /dev/null +++ b/src/services/api/transactions.ts @@ -0,0 +1,3 @@ +import axiosInstance from "../axios"; + +export const getTransactionsList = () => axiosInstance.get("/gps/transactions") \ No newline at end of file diff --git a/src/services/axios/index.ts b/src/services/axios/index.ts index 90e7413..836f9dc 100644 --- a/src/services/axios/index.ts +++ b/src/services/axios/index.ts @@ -5,12 +5,12 @@ const axiosInstance = axios.create({ }); axiosInstance.interceptors.request.use(async function (config) { - const search = window.location.search; - const params = new URLSearchParams(search) - const token = localStorage.getItem("token") ? localStorage.getItem("token") : params.get('token') - + // const search = window.location.search; + // const params = new URLSearchParams(search) + const token = localStorage.getItem("token") && localStorage.getItem("token") config.headers.Authorization = 'Bearer ' + token - return config; + // config.params = params && params + return await config; }); export default axiosInstance; \ No newline at end of file diff --git a/src/types/index.ts b/src/types/index.ts index a88cfba..47cadf3 100644 --- a/src/types/index.ts +++ b/src/types/index.ts @@ -142,4 +142,31 @@ export interface SubscriptionReportInterface { amount: string contribution: string, percentage: string +} + +export interface DeviceId { + tomanPrice: number, + dollarProfit: number, + profit: number, + status: number, + _id: string, + IMEI: string, + model: string, + score: number, + renewalProfit: number, + created_at: string, + updated_at: string, + __v: number, + id: string +} +export interface RegisterDeviceResponse { + status: number, + _id: string, + deviceId: DeviceId + registerDate: string, + userId: string, + created_at: string, + updated_at: string, + __v: number, + id: string } \ No newline at end of file