merge: enstrpenrue issuees
This commit is contained in:
@@ -1,7 +1,11 @@
|
||||
import { type AxiosError, type AxiosResponse } from "axios";
|
||||
import Project from "@/ApiClasses/Project";
|
||||
import Report from "@/ApiClasses/Repport";
|
||||
import { axiosInstance, defaultApiErrorHandler, defaultApiSuccessHandler } from "@/services/api"
|
||||
import {
|
||||
axiosInstance,
|
||||
defaultApiErrorHandler,
|
||||
defaultApiSuccessHandler,
|
||||
} from "@/services/api";
|
||||
|
||||
// Admin API
|
||||
function getPendingAccounts(
|
||||
|
@@ -35,7 +35,7 @@ function addSectionCell(
|
||||
onErrorHandler?: (error: AxiosError) => void
|
||||
): void {
|
||||
axiosInstance
|
||||
.post("/entrepreneur/sectionCells", sectionCellDetails)
|
||||
.post("/entrepreneur/sectionCells", sectionCellDetails.toPlainObject())
|
||||
.then((response) => {
|
||||
if (onSuccessHandler) {
|
||||
onSuccessHandler(response);
|
||||
|
@@ -1,7 +1,10 @@
|
||||
import { type AxiosError, type AxiosResponse } from "axios";
|
||||
import Appointment from "@/ApiClasses/Appointment";
|
||||
import { axiosInstance, defaultApiErrorHandler, defaultApiSuccessHandler } from "@/services/api"
|
||||
|
||||
import {
|
||||
axiosInstance,
|
||||
defaultApiErrorHandler,
|
||||
defaultApiSuccessHandler,
|
||||
} from "@/services/api";
|
||||
|
||||
// Shared API
|
||||
function getSectionCellsByDate(
|
||||
|
@@ -1,7 +1,10 @@
|
||||
import { type AxiosError, type AxiosResponse } from "axios";
|
||||
|
||||
import { axiosInstance, defaultApiErrorHandler, defaultApiSuccessHandler } from "@/services/api"
|
||||
|
||||
import {
|
||||
axiosInstance,
|
||||
defaultApiErrorHandler,
|
||||
defaultApiSuccessHandler,
|
||||
} from "@/services/api";
|
||||
|
||||
// Unauth API
|
||||
function finalizeAccount(
|
||||
@@ -49,8 +52,7 @@ function finalizeAccount(
|
||||
// });
|
||||
// }
|
||||
|
||||
|
||||
export {
|
||||
export {
|
||||
finalizeAccount,
|
||||
// requestJoinProject, // Not yet implemented [cite: 4]
|
||||
};
|
||||
|
@@ -1,7 +1,7 @@
|
||||
import axios, { type AxiosError, type AxiosResponse } from "axios";
|
||||
import { store } from "@/main.ts";
|
||||
import { addNewMessage, color } from "@/services/popupDisplayer.ts";
|
||||
import router from "@/router/router";
|
||||
import router from "@/router/router";
|
||||
|
||||
const axiosInstance = axios.create({
|
||||
baseURL: import.meta.env.VITE_BACKEND_URL,
|
||||
@@ -43,8 +43,7 @@ axiosInstance.interceptors.response.use(
|
||||
// TODO: spawn a error modal
|
||||
function defaultApiErrorHandler(err: AxiosError) {
|
||||
const errorMessage =
|
||||
(err.response?.data as { message?: string })?.message ??
|
||||
err.message;
|
||||
(err.response?.data as { message?: string })?.message ?? err.message;
|
||||
addNewMessage(errorMessage, color.Red);
|
||||
}
|
||||
|
||||
@@ -94,4 +93,11 @@ function deleteApi(
|
||||
|
||||
//export { axiosInstance, callApi, postApi, deleteApi };
|
||||
|
||||
export{ axiosInstance, defaultApiErrorHandler, defaultApiSuccessHandler, callApi, postApi, deleteApi }
|
||||
export {
|
||||
axiosInstance,
|
||||
defaultApiErrorHandler,
|
||||
defaultApiSuccessHandler,
|
||||
callApi,
|
||||
postApi,
|
||||
deleteApi,
|
||||
};
|
||||
|
Reference in New Issue
Block a user