From a11d551a998c3a62f729f164d8d02c724d7acd60 Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Fri, 23 Jan 2026 17:38:30 +0000
Subject: [PATCH 1/2] add SWR hook and API client

---
 client/src/Hooks/UseApi.ts    | 41 ++++++++++++++++++++++++
 client/src/Utils/ApiClient.ts | 59 +++++++++++++++++++++++++++++++++++
 2 files changed, 100 insertions(+)
 create mode 100644 client/src/Hooks/UseApi.ts
 create mode 100644 client/src/Utils/ApiClient.ts

diff --git a/client/src/Hooks/UseApi.ts b/client/src/Hooks/UseApi.ts
new file mode 100644
index 000000000..58580e4f3
--- /dev/null
+++ b/client/src/Hooks/UseApi.ts
@@ -0,0 +1,41 @@
+import useSWR from "swr";
+import type { SWRConfiguration } from "swr";
+import type { AxiosRequestConfig } from "axios";
+import { get, post, patch, deleteOp } from "@/Utils/ApiClient";
+
+interface ApiResponse<T> {
+	success: boolean;
+	msg: string;
+	data: T;
+}
+
+interface UseGetReturn<T> {
+	data: T | undefined;
+	isLoading: boolean;
+	error: Error | undefined;
+	refetch: () => Promise<ApiResponse<T> | undefined>;
+}
+
+const fetcher = async <T>(url: string, config?: AxiosRequestConfig) => {
+	const res = await get<T>(url, config);
+	return res.data;
+};
+
+export const useGet = <T>(
+	url: string | null,
+	axiosConfig?: AxiosRequestConfig,
+	swrConfig?: SWRConfiguration
+): UseGetReturn<T> => {
+	const { data, error, isLoading, mutate } = useSWR<ApiResponse<T>>(
+		url,
+		(url: string) => fetcher<T>(url, axiosConfig),
+		swrConfig
+	);
+
+	return {
+		data: data?.data,
+		isLoading,
+		error,
+		refetch: mutate,
+	};
+};
diff --git a/client/src/Utils/ApiClient.ts b/client/src/Utils/ApiClient.ts
new file mode 100644
index 000000000..e375b07e7
--- /dev/null
+++ b/client/src/Utils/ApiClient.ts
@@ -0,0 +1,59 @@
+import axios from "axios";
+import type { AxiosError } from "axios";
+import type { AxiosRequestConfig, AxiosResponse } from "axios";
+import { store } from "@/store";
+const BASE_URL = import.meta.env.VITE_APP_API_BASE_URL;
+
+const api = axios.create({
+	baseURL: BASE_URL,
+});
+
+api.interceptors.request.use(
+	(config) => {
+		const authToken = store.getState().auth?.authToken ?? "";
+
+		config.headers.set("Authorization", `Bearer ${authToken}`);
+		if (!config.headers.has("Accept-Language")) {
+			config.headers.set("Accept-Language", "en");
+		}
+
+		return config;
+	},
+	(error) => {
+		return Promise.reject(error);
+	}
+);
+
+const onSuccess = (response: AxiosResponse) => response;
+const onError = (error: AxiosError) => {
+	if (error.response?.status === 401) {
+		window.location.href = "/login";
+	}
+	return Promise.reject(error);
+};
+
+api.interceptors.response.use(onSuccess, onError);
+
+export const get = <T>(
+	url: string,
+	config: AxiosRequestConfig = {}
+): Promise<AxiosResponse<T>> => api.get<T>(url, config);
+
+export const post = <T>(
+	url: string,
+	data: unknown,
+	config: AxiosRequestConfig = {}
+): Promise<AxiosResponse<T>> => api.post<T>(url, data, config);
+
+export const patch = <T>(
+	url: string,
+	data: unknown,
+	config: AxiosRequestConfig = {}
+): Promise<AxiosResponse<T>> => api.patch<T>(url, data, config);
+
+export const deleteOp = <T>(
+	url: string,
+	config: AxiosRequestConfig = {}
+): Promise<AxiosResponse<T>> => api.delete<T>(url, config);
+
+export default api;

From 00cf0b65217d1da559486d6ee06ebaf48d41eca9 Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Fri, 23 Jan 2026 18:14:16 +0000
Subject: [PATCH 2/2] fix get return type

---
 client/package.json         |  2 +-
 client/src/Hooks/UseApi.ts  | 15 ++++-----------
 client/src/Types/Monitor.ts |  2 +-
 3 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/client/package.json b/client/package.json
index 50fafb35c..7c5acb441 100644
--- a/client/package.json
+++ b/client/package.json
@@ -43,7 +43,7 @@
 		"react-toastify": "^10.0.5",
 		"recharts": "2.15.2",
 		"redux-persist": "6.0.0",
-		"swr": "2.3.6",
+		"swr": "^2.3.6",
 		"vite-plugin-svgr": "^4.2.0",
 		"zod": "4.1.11"
 	},
diff --git a/client/src/Hooks/UseApi.ts b/client/src/Hooks/UseApi.ts
index 58580e4f3..06845d6c1 100644
--- a/client/src/Hooks/UseApi.ts
+++ b/client/src/Hooks/UseApi.ts
@@ -1,7 +1,7 @@
 import useSWR from "swr";
 import type { SWRConfiguration } from "swr";
 import type { AxiosRequestConfig } from "axios";
-import { get, post, patch, deleteOp } from "@/Utils/ApiClient";
+import { get } from "@/Utils/ApiClient";
 
 interface ApiResponse<T> {
 	success: boolean;
@@ -9,15 +9,8 @@ interface ApiResponse<T> {
 	data: T;
 }
 
-interface UseGetReturn<T> {
-	data: T | undefined;
-	isLoading: boolean;
-	error: Error | undefined;
-	refetch: () => Promise<ApiResponse<T> | undefined>;
-}
-
 const fetcher = async <T>(url: string, config?: AxiosRequestConfig) => {
-	const res = await get<T>(url, config);
+	const res = await get<ApiResponse<T>>(url, config);
 	return res.data;
 };
 
@@ -25,7 +18,7 @@ export const useGet = <T>(
 	url: string | null,
 	axiosConfig?: AxiosRequestConfig,
 	swrConfig?: SWRConfiguration
-): UseGetReturn<T> => {
+) => {
 	const { data, error, isLoading, mutate } = useSWR<ApiResponse<T>>(
 		url,
 		(url: string) => fetcher<T>(url, axiosConfig),
@@ -33,7 +26,7 @@ export const useGet = <T>(
 	);
 
 	return {
-		data: data?.data,
+		data: data?.data ?? null,
 		isLoading,
 		error,
 		refetch: mutate,
diff --git a/client/src/Types/Monitor.ts b/client/src/Types/Monitor.ts
index 05f7d7d6f..e01c9f844 100644
--- a/client/src/Types/Monitor.ts
+++ b/client/src/Types/Monitor.ts
@@ -1,7 +1,7 @@
 import type { Check } from "@/Types/Check";
 export type MonitorStatus = "up" | "down" | "initializing";
 
-export interface IMonitor {
+export interface Monitor {
 	checks: Check[];
 	createdAt: string;
 	createdBy: string;