removal of redundant pages

src/app/modules/process/user-approved/components/header/UsersListGrouping.tsx

@@ -2,7 +2,7 @@ import { useQueryClient, useMutation } from "react-query";
 import { QUERIES } from "../../../../../../_digifi/helpers";
 import { useListView } from "../../core/ListViewProvider";
 import { useQueryResponse } from "../../core/QueryResponseProvider";
-import { deleteSelectedUsers } from "../../core/_requests";
+import { deleteSelectedUsers } from "../../../core/_requests";
 
 const UsersListGrouping = () => {
   const { selected, clearSelected } = useListView();

src/app/modules/process/user-approved/core/_models.ts

@@ -1,42 +0,0 @@
-import { ID, Response } from "../../../../../_digifi/helpers";
-export type User = {
-  id?: ID;
-  name?: string;
-  avatar?: string;
-  // email?: string
-  position?: string;
-  role?: string;
-  last_login?: string;
-  two_steps?: boolean;
-  joined_day?: string;
-  online?: boolean;
-  initials?: {
-    label: string;
-    state: string;
-  };
-  firstname?: string;
-  lastname?: string;
-  uid?: string;
-  loan_amount?: string;
-  payment_month?: string;
-  sales_agent?: string;
-  gender?: string | null;
-  marital_status?: string;
-  email?: string;
-  address?: string;
-  state?: string;
-  country?: string;
-  status?: string;
-  added?: string;
-  updated?: string;
-};
-
-export type UsersQueryResponse = Response<Array<User>>;
-
-export const initialUser: User = {
-  avatar: "avatars/300-6.jpg",
-  position: "Art Director",
-  role: "Administrator",
-  name: "",
-  email: "",
-};

src/app/modules/process/user-approved/core/_requests.ts

@@ -1,60 +0,0 @@
-import axios, { AxiosResponse } from "axios";
-import { ID, Response } from "../../../../../_digifi/helpers";
-import { User, UsersQueryResponse } from "./_models";
-
-const API_URL = import.meta.env.VITE_APP_THEME_API_URL;
-const USER_URL = `${API_URL}/user`;
-// const GET_USERS_URL = `${API_URL}/users/query`;
-
-const NEW_USER_ENDPOINT = import.meta.env.VITE_APP_USER_ENDPOINT;
-
-// const getStartedUsers = (query: string): Promise<UsersQueryResponse> => {
-//   return axios
-//     .get(`${GET_USERS_URL}?${query}`)
-//     .then((d: AxiosResponse<UsersQueryResponse>) => d.data);
-// };
-const getStartedUsers = (query: string): Promise<UsersQueryResponse> => {
-  // FUNCTION TO GET USERS THAT HAVE STARTED LOAN APPLICATION
-  return axios
-    .get(`${NEW_USER_ENDPOINT}/loan/started`)
-    .then((d: AxiosResponse<UsersQueryResponse>) => d.data);
-};
-
-const getUserById = (id: ID): Promise<User | undefined> => {
-  return axios
-    .get(`${USER_URL}/${id}`)
-    .then((response: AxiosResponse<Response<User>>) => response.data)
-    .then((response: Response<User>) => response.data);
-};
-
-const createUser = (user: User): Promise<User | undefined> => {
-  return axios
-    .put(USER_URL, user)
-    .then((response: AxiosResponse<Response<User>>) => response.data)
-    .then((response: Response<User>) => response.data);
-};
-
-const updateUser = (user: User): Promise<User | undefined> => {
-  return axios
-    .post(`${USER_URL}/${user.id}`, user)
-    .then((response: AxiosResponse<Response<User>>) => response.data)
-    .then((response: Response<User>) => response.data);
-};
-
-const deleteUser = (userId: ID): Promise<void> => {
-  return axios.delete(`${USER_URL}/${userId}`).then(() => {});
-};
-
-const deleteSelectedUsers = (userIds: Array<ID>): Promise<void> => {
-  const requests = userIds.map((id) => axios.delete(`${USER_URL}/${id}`));
-  return axios.all(requests).then(() => {});
-};
-
-export {
-  getStartedUsers,
-  deleteUser,
-  deleteSelectedUsers,
-  getUserById,
-  createUser,
-  updateUser,
-};

src/app/modules/process/user-approved/table/columns/CustomHeaderColumn.tsx

@@ -1,6 +1,6 @@
 import {FC} from 'react'
 import {ColumnInstance} from 'react-table'
-import {User} from '../../core/_models'
+import {User} from '../../../core/_models'
 
 type Props = {
   column: ColumnInstance<User>

src/app/modules/process/user-approved/table/columns/CustomRow.tsx

@@ -1,7 +1,7 @@
 import clsx from 'clsx'
 import {FC} from 'react'
 import {Row} from 'react-table'
-import {User} from '../../core/_models'
+import {User} from '../../../core/_models'
 
 type Props = {
   row: Row<User>

src/app/modules/process/user-approved/table/columns/UserActionsCell.tsx

@@ -4,7 +4,7 @@ import { MenuComponent } from "../../../../../../_digifi/assets/ts/components";
 import { ID, KTIcon, QUERIES } from "../../../../../../_digifi/helpers";
 import { useListView } from "../../core/ListViewProvider";
 import { useQueryResponse } from "../../core/QueryResponseProvider";
-import { deleteUser } from "../../core/_requests";
+import { deleteUser } from "../../../core/_requests";
 
 type Props = {
   id: ID;

src/app/modules/process/user-approved/table/columns/UserCustomHeader.tsx

@@ -3,7 +3,7 @@ import { FC, PropsWithChildren, useMemo } from "react";
 import { HeaderProps } from "react-table";
 import { initialQueryState } from "../../../../../../_digifi/helpers";
 import { useQueryRequest } from "../../core/QueryRequestProvider";
-import { User } from "../../core/_models";
+import { User } from "../../../core/_models";
 
 type Props = {
   className?: string;

src/app/modules/process/user-approved/table/columns/UserInfoCell.tsx

@@ -1,7 +1,7 @@
 import clsx from "clsx";
 import { FC } from "react";
 import { toAbsoluteUrl } from "../../../../../../_digifi/helpers";
-import { User } from "../../core/_models";
+import { User } from "../../../core/_models";
 
 type Props = {
   user: User;

src/app/modules/process/user-approved/table/columns/UserSelectionHeader.tsx

@@ -1,7 +1,7 @@
 import {FC, PropsWithChildren} from 'react'
 import {HeaderProps} from 'react-table'
 import {useListView} from '../../core/ListViewProvider'
-import {User} from '../../core/_models'
+import {User} from '../../../core/_models'
 
 type Props = {
   tableProps: PropsWithChildren<HeaderProps<User>>

src/app/modules/process/user-approved/table/columns/_columns.tsx

@@ -6,7 +6,7 @@ import {UserActionsCell} from './UserActionsCell'
 import {UserSelectionCell} from './UserSelectionCell'
 import {UserCustomHeader} from './UserCustomHeader'
 import {UserSelectionHeader} from './UserSelectionHeader'
-import {User} from '../../core/_models'
+import {User} from '../../../core/_models'
 import { AddedCell } from './AddedCell'
 
 const usersColumns: ReadonlyArray<Column<User>> = [

src/app/modules/process/user-approved/user-edit-modal/UserEditModalForm.tsx

@@ -2,11 +2,11 @@ import { FC, useState } from "react";
 import * as Yup from "yup";
 import { useFormik } from "formik";
 import { isNotEmpty, toAbsoluteUrl } from "../../../../../_digifi/helpers";
-import { initialUser, User } from "../core/_models";
+import { initialUser, User } from "../../core/_models";
 import clsx from "clsx";
 import { useListView } from "../core/ListViewProvider";
 import { UsersListLoading } from "../components/loading/UsersListLoading";
-import { createUser, updateUser } from "../core/_requests";
+import { createUser, updateUser } from "../../core/_requests";
 import { useQueryResponse } from "../core/QueryResponseProvider";
 
 type Props = {

src/app/modules/process/user-approved/user-edit-modal/UserEditModalFormWrapper.tsx

@@ -2,7 +2,7 @@ import { useQuery } from "react-query";
 import { UserEditModalForm } from "./UserEditModalForm";
 import { isNotEmpty, QUERIES } from "../../../../../_digifi/helpers";
 import { useListView } from "../core/ListViewProvider";
-import { getUserById } from "../core/_requests";
+import { getUserById } from "../../core/_requests";
 
 const UserEditModalFormWrapper = () => {
   const { itemIdForUpdate, setItemIdForUpdate } = useListView();

src/app/modules/process/user-pending/components/header/UsersListGrouping.tsx

@@ -2,7 +2,7 @@ import { useQueryClient, useMutation } from "react-query";
 import { QUERIES } from "../../../../../../_digifi/helpers";
 import { useListView } from "../../core/ListViewProvider";
 import { useQueryResponse } from "../../core/QueryResponseProvider";
-import { deleteSelectedUsers } from "../../core/_requests";
+import { deleteSelectedUsers } from "../../../core/_requests";
 
 const UsersListGrouping = () => {
   const { selected, clearSelected } = useListView();

src/app/modules/process/user-pending/core/_models.ts

@@ -1,42 +0,0 @@
-import { ID, Response } from "../../../../../_digifi/helpers";
-export type User = {
-  id?: ID;
-  name?: string;
-  avatar?: string;
-  // email?: string
-  position?: string;
-  role?: string;
-  last_login?: string;
-  two_steps?: boolean;
-  joined_day?: string;
-  online?: boolean;
-  initials?: {
-    label: string;
-    state: string;
-  };
-  firstname?: string;
-  lastname?: string;
-  uid?: string;
-  loan_amount?: string;
-  payment_month?: string;
-  sales_agent?: string;
-  gender?: string | null;
-  marital_status?: string;
-  email?: string;
-  address?: string;
-  state?: string;
-  country?: string;
-  status?: string;
-  added?: string;
-  updated?: string;
-};
-
-export type UsersQueryResponse = Response<Array<User>>;
-
-export const initialUser: User = {
-  avatar: "avatars/300-6.jpg",
-  position: "Art Director",
-  role: "Administrator",
-  name: "",
-  email: "",
-};

src/app/modules/process/user-pending/core/_requests.ts

@@ -1,60 +0,0 @@
-import axios, { AxiosResponse } from "axios";
-import { ID, Response } from "../../../../../_digifi/helpers";
-import { User, UsersQueryResponse } from "./_models";
-
-const API_URL = import.meta.env.VITE_APP_THEME_API_URL;
-const USER_URL = `${API_URL}/user`;
-// const GET_USERS_URL = `${API_URL}/users/query`;
-
-const NEW_USER_ENDPOINT = import.meta.env.VITE_APP_USER_ENDPOINT;
-
-// const getStartedUsers = (query: string): Promise<UsersQueryResponse> => {
-//   return axios
-//     .get(`${GET_USERS_URL}?${query}`)
-//     .then((d: AxiosResponse<UsersQueryResponse>) => d.data);
-// };
-const getStartedUsers = (query: string): Promise<UsersQueryResponse> => {
-  // FUNCTION TO GET USERS THAT HAVE STARTED LOAN APPLICATION
-  return axios
-    .get(`${NEW_USER_ENDPOINT}/loan/started`)
-    .then((d: AxiosResponse<UsersQueryResponse>) => d.data);
-};
-
-const getUserById = (id: ID): Promise<User | undefined> => {
-  return axios
-    .get(`${USER_URL}/${id}`)
-    .then((response: AxiosResponse<Response<User>>) => response.data)
-    .then((response: Response<User>) => response.data);
-};
-
-const createUser = (user: User): Promise<User | undefined> => {
-  return axios
-    .put(USER_URL, user)
-    .then((response: AxiosResponse<Response<User>>) => response.data)
-    .then((response: Response<User>) => response.data);
-};
-
-const updateUser = (user: User): Promise<User | undefined> => {
-  return axios
-    .post(`${USER_URL}/${user.id}`, user)
-    .then((response: AxiosResponse<Response<User>>) => response.data)
-    .then((response: Response<User>) => response.data);
-};
-
-const deleteUser = (userId: ID): Promise<void> => {
-  return axios.delete(`${USER_URL}/${userId}`).then(() => {});
-};
-
-const deleteSelectedUsers = (userIds: Array<ID>): Promise<void> => {
-  const requests = userIds.map((id) => axios.delete(`${USER_URL}/${id}`));
-  return axios.all(requests).then(() => {});
-};
-
-export {
-  getStartedUsers,
-  deleteUser,
-  deleteSelectedUsers,
-  getUserById,
-  createUser,
-  updateUser,
-};

src/app/modules/process/user-pending/table/columns/CustomHeaderColumn.tsx

@@ -1,6 +1,6 @@
 import {FC} from 'react'
 import {ColumnInstance} from 'react-table'
-import {User} from '../../core/_models'
+import {User} from '../../../core/_models'
 
 type Props = {
   column: ColumnInstance<User>

src/app/modules/process/user-pending/table/columns/CustomRow.tsx

@@ -1,7 +1,7 @@
 import clsx from 'clsx'
 import {FC} from 'react'
 import {Row} from 'react-table'
-import {User} from '../../core/_models'
+import {User} from '../../../core/_models'
 
 type Props = {
   row: Row<User>

src/app/modules/process/user-pending/table/columns/UserActionsCell.tsx

@@ -4,7 +4,8 @@ import { MenuComponent } from "../../../../../../_digifi/assets/ts/components";
 import { ID, KTIcon, QUERIES } from "../../../../../../_digifi/helpers";
 import { useListView } from "../../core/ListViewProvider";
 import { useQueryResponse } from "../../core/QueryResponseProvider";
-import { deleteUser } from "../../core/_requests";
+import { deleteUser } from "../../../core/_requests";
+
 
 type Props = {
   id: ID;

src/app/modules/process/user-pending/table/columns/UserCustomHeader.tsx

@@ -3,7 +3,7 @@ import { FC, PropsWithChildren, useMemo } from "react";
 import { HeaderProps } from "react-table";
 import { initialQueryState } from "../../../../../../_digifi/helpers";
 import { useQueryRequest } from "../../core/QueryRequestProvider";
-import { User } from "../../core/_models";
+import { User } from "../../../core/_models";
 
 type Props = {
   className?: string;

src/app/modules/process/user-pending/table/columns/UserInfoCell.tsx

@@ -1,7 +1,7 @@
 import clsx from "clsx";
 import { FC } from "react";
 import { toAbsoluteUrl } from "../../../../../../_digifi/helpers";
-import { User } from "../../core/_models";
+import { User } from "../../../core/_models";
 
 type Props = {
   user: User;

src/app/modules/process/user-pending/table/columns/UserSelectionHeader.tsx

@@ -1,7 +1,7 @@
 import {FC, PropsWithChildren} from 'react'
 import {HeaderProps} from 'react-table'
 import {useListView} from '../../core/ListViewProvider'
-import {User} from '../../core/_models'
+import {User} from '../../../core/_models'
 
 type Props = {
   tableProps: PropsWithChildren<HeaderProps<User>>

src/app/modules/process/user-pending/table/columns/_columns.tsx

@@ -6,7 +6,7 @@ import {UserActionsCell} from './UserActionsCell'
 import {UserSelectionCell} from './UserSelectionCell'
 import {UserCustomHeader} from './UserCustomHeader'
 import {UserSelectionHeader} from './UserSelectionHeader'
-import {User} from '../../core/_models'
+import {User} from '../../../core/_models'
 import { AddedCell } from './AddedCell'
 
 const usersColumns: ReadonlyArray<Column<User>> = [

src/app/modules/process/user-pending/user-edit-modal/UserEditModalForm.tsx

@@ -2,11 +2,11 @@ import { FC, useState } from "react";
 import * as Yup from "yup";
 import { useFormik } from "formik";
 import { isNotEmpty, toAbsoluteUrl } from "../../../../../_digifi/helpers";
-import { initialUser, User } from "../core/_models";
+import { initialUser, User } from "../../core/_models";
 import clsx from "clsx";
 import { useListView } from "../core/ListViewProvider";
 import { UsersListLoading } from "../components/loading/UsersListLoading";
-import { createUser, updateUser } from "../core/_requests";
+import { createUser, updateUser } from "../../core/_requests";
 import { useQueryResponse } from "../core/QueryResponseProvider";
 
 type Props = {

src/app/modules/process/user-pending/user-edit-modal/UserEditModalFormWrapper.tsx

@@ -2,7 +2,7 @@ import { useQuery } from "react-query";
 import { UserEditModalForm } from "./UserEditModalForm";
 import { isNotEmpty, QUERIES } from "../../../../../_digifi/helpers";
 import { useListView } from "../core/ListViewProvider";
-import { getUserById } from "../core/_requests";
+import { getUserById } from "../../core/_requests";
 
 const UserEditModalFormWrapper = () => {
   const { itemIdForUpdate, setItemIdForUpdate } = useListView();

src/app/modules/process/user-ready/components/header/UsersListGrouping.tsx

@@ -2,7 +2,7 @@ import { useQueryClient, useMutation } from "react-query";
 import { QUERIES } from "../../../../../../_digifi/helpers";
 import { useListView } from "../../core/ListViewProvider";
 import { useQueryResponse } from "../../core/QueryResponseProvider";
-import { deleteSelectedUsers } from "../../core/_requests";
+import { deleteSelectedUsers } from "../../../core/_requests";
 
 const UsersListGrouping = () => {
   const { selected, clearSelected } = useListView();

src/app/modules/process/user-ready/core/_models.ts

@@ -1,42 +0,0 @@
-import { ID, Response } from "../../../../../_digifi/helpers";
-export type User = {
-  id?: ID;
-  name?: string;
-  avatar?: string;
-  // email?: string
-  position?: string;
-  role?: string;
-  last_login?: string;
-  two_steps?: boolean;
-  joined_day?: string;
-  online?: boolean;
-  initials?: {
-    label: string;
-    state: string;
-  };
-  firstname?: string;
-  lastname?: string;
-  uid?: string;
-  loan_amount?: string;
-  payment_month?: string;
-  sales_agent?: string;
-  gender?: string | null;
-  marital_status?: string;
-  email?: string;
-  address?: string;
-  state?: string;
-  country?: string;
-  status?: string;
-  added?: string;
-  updated?: string;
-};
-
-export type UsersQueryResponse = Response<Array<User>>;
-
-export const initialUser: User = {
-  avatar: "avatars/300-6.jpg",
-  position: "Art Director",
-  role: "Administrator",
-  name: "",
-  email: "",
-};

src/app/modules/process/user-ready/core/_requests.ts

@@ -1,60 +0,0 @@
-import axios, { AxiosResponse } from "axios";
-import { ID, Response } from "../../../../../_digifi/helpers";
-import { User, UsersQueryResponse } from "./_models";
-
-const API_URL = import.meta.env.VITE_APP_THEME_API_URL;
-const USER_URL = `${API_URL}/user`;
-// const GET_USERS_URL = `${API_URL}/users/query`;
-
-const NEW_USER_ENDPOINT = import.meta.env.VITE_APP_USER_ENDPOINT;
-
-// const getStartedUsers = (query: string): Promise<UsersQueryResponse> => {
-//   return axios
-//     .get(`${GET_USERS_URL}?${query}`)
-//     .then((d: AxiosResponse<UsersQueryResponse>) => d.data);
-// };
-const getStartedUsers = (query: string): Promise<UsersQueryResponse> => {
-  // FUNCTION TO GET USERS THAT HAVE STARTED LOAN APPLICATION
-  return axios
-    .get(`${NEW_USER_ENDPOINT}/loan/started`)
-    .then((d: AxiosResponse<UsersQueryResponse>) => d.data);
-};
-
-const getUserById = (id: ID): Promise<User | undefined> => {
-  return axios
-    .get(`${USER_URL}/${id}`)
-    .then((response: AxiosResponse<Response<User>>) => response.data)
-    .then((response: Response<User>) => response.data);
-};
-
-const createUser = (user: User): Promise<User | undefined> => {
-  return axios
-    .put(USER_URL, user)
-    .then((response: AxiosResponse<Response<User>>) => response.data)
-    .then((response: Response<User>) => response.data);
-};
-
-const updateUser = (user: User): Promise<User | undefined> => {
-  return axios
-    .post(`${USER_URL}/${user.id}`, user)
-    .then((response: AxiosResponse<Response<User>>) => response.data)
-    .then((response: Response<User>) => response.data);
-};
-
-const deleteUser = (userId: ID): Promise<void> => {
-  return axios.delete(`${USER_URL}/${userId}`).then(() => {});
-};
-
-const deleteSelectedUsers = (userIds: Array<ID>): Promise<void> => {
-  const requests = userIds.map((id) => axios.delete(`${USER_URL}/${id}`));
-  return axios.all(requests).then(() => {});
-};
-
-export {
-  getStartedUsers,
-  deleteUser,
-  deleteSelectedUsers,
-  getUserById,
-  createUser,
-  updateUser,
-};

src/app/modules/process/user-ready/table/columns/CustomHeaderColumn.tsx

@@ -1,6 +1,6 @@
 import {FC} from 'react'
 import {ColumnInstance} from 'react-table'
-import {User} from '../../core/_models'
+import {User} from '../../../core/_models'
 
 type Props = {
   column: ColumnInstance<User>

src/app/modules/process/user-ready/table/columns/CustomRow.tsx

@@ -1,7 +1,7 @@
 import clsx from 'clsx'
 import {FC} from 'react'
 import {Row} from 'react-table'
-import {User} from '../../core/_models'
+import {User} from '../../../core/_models'
 
 type Props = {
   row: Row<User>

src/app/modules/process/user-ready/table/columns/UserActionsCell.tsx

@@ -4,7 +4,7 @@ import { MenuComponent } from "../../../../../../_digifi/assets/ts/components";
 import { ID, KTIcon, QUERIES } from "../../../../../../_digifi/helpers";
 import { useListView } from "../../core/ListViewProvider";
 import { useQueryResponse } from "../../core/QueryResponseProvider";
-import { deleteUser } from "../../core/_requests";
+import { deleteUser } from "../../../core/_requests";
 
 type Props = {
   id: ID;

src/app/modules/process/user-ready/table/columns/UserCustomHeader.tsx

@@ -3,7 +3,7 @@ import { FC, PropsWithChildren, useMemo } from "react";
 import { HeaderProps } from "react-table";
 import { initialQueryState } from "../../../../../../_digifi/helpers";
 import { useQueryRequest } from "../../core/QueryRequestProvider";
-import { User } from "../../core/_models";
+import { User } from "../../../core/_models";
 
 type Props = {
   className?: string;

src/app/modules/process/user-ready/table/columns/UserInfoCell.tsx

@@ -1,7 +1,7 @@
 import clsx from "clsx";
 import { FC } from "react";
 import { toAbsoluteUrl } from "../../../../../../_digifi/helpers";
-import { User } from "../../core/_models";
+import { User } from "../../../core/_models";
 
 type Props = {
   user: User;

src/app/modules/process/user-ready/table/columns/UserSelectionHeader.tsx

@@ -1,7 +1,7 @@
 import {FC, PropsWithChildren} from 'react'
 import {HeaderProps} from 'react-table'
 import {useListView} from '../../core/ListViewProvider'
-import {User} from '../../core/_models'
+import {User} from '../../../core/_models'
 
 type Props = {
   tableProps: PropsWithChildren<HeaderProps<User>>

src/app/modules/process/user-ready/table/columns/_columns.tsx

@@ -6,7 +6,7 @@ import {UserActionsCell} from './UserActionsCell'
 import {UserSelectionCell} from './UserSelectionCell'
 import {UserCustomHeader} from './UserCustomHeader'
 import {UserSelectionHeader} from './UserSelectionHeader'
-import {User} from '../../core/_models'
+import {User} from '../../../core/_models'
 import { AddedCell } from './AddedCell'
 
 const usersColumns: ReadonlyArray<Column<User>> = [

src/app/modules/process/user-ready/user-edit-modal/UserEditModalForm.tsx

@@ -2,11 +2,11 @@ import { FC, useState } from "react";
 import * as Yup from "yup";
 import { useFormik } from "formik";
 import { isNotEmpty, toAbsoluteUrl } from "../../../../../_digifi/helpers";
-import { initialUser, User } from "../core/_models";
+import { initialUser, User } from "../../core/_models";
 import clsx from "clsx";
 import { useListView } from "../core/ListViewProvider";
 import { UsersListLoading } from "../components/loading/UsersListLoading";
-import { createUser, updateUser } from "../core/_requests";
+import { createUser, updateUser } from "../../core/_requests";
 import { useQueryResponse } from "../core/QueryResponseProvider";
 
 type Props = {

src/app/modules/process/user-ready/user-edit-modal/UserEditModalFormWrapper.tsx

@@ -2,7 +2,7 @@ import { useQuery } from "react-query";
 import { UserEditModalForm } from "./UserEditModalForm";
 import { isNotEmpty, QUERIES } from "../../../../../_digifi/helpers";
 import { useListView } from "../core/ListViewProvider";
-import { getUserById } from "../core/_requests";
+import { getUserById } from "../../core/_requests";
 
 const UserEditModalFormWrapper = () => {
   const { itemIdForUpdate, setItemIdForUpdate } = useListView();

src/app/modules/process/user-rejected/components/header/UsersListGrouping.tsx

@@ -2,7 +2,7 @@ import {useQueryClient, useMutation} from 'react-query'
 import {QUERIES} from '../../../../../../_digifi/helpers'
 import {useListView} from '../../core/ListViewProvider'
 import {useQueryResponse} from '../../core/QueryResponseProvider'
-import {deleteSelectedUsers} from '../../core/_requests'
+import {deleteSelectedUsers} from '../../../core/_requests'
 
 const UsersListGrouping = () => {
   const {selected, clearSelected} = useListView()

src/app/modules/process/user-rejected/core/_models.ts

@@ -1,42 +0,0 @@
-import {ID, Response} from '../../../../../../_digifi/helpers'
-export type User = {
-  id?: ID
-  name?: string
-  avatar?: string
-  // email?: string
-  position?: string
-  role?: string
-  last_login?: string
-  two_steps?: boolean
-  joined_day?: string
-  online?: boolean
-  initials?: {
-    label: string
-    state: string
-  }
-  firstname?: string,
-  lastname?: string
-  uid?: string
-  loan_amount?: string
-  payment_month?: string
-  sales_agent?: string
-  gender?: string | null
-  marital_status?: string
-  email?: string
-  address?: string
-  state?: string
-  country?: string
-  status?: string
-  added?: string
-  updated?: string
-}
-
-export type UsersQueryResponse = Response<Array<User>>
-
-export const initialUser: User = {
-  avatar: 'avatars/300-6.jpg',
-  position: 'Art Director',
-  role: 'Administrator',
-  name: '',
-  email: '',
-}

src/app/modules/process/user-rejected/core/_requests.ts

@@ -1,59 +0,0 @@
-import axios, { AxiosResponse } from "axios";
-import { ID, Response } from "../../../../../../_digifi/helpers";
-import { User, UsersQueryResponse } from "./_models";
-
-const API_URL = import.meta.env.VITE_APP_THEME_API_URL;
-const USER_URL = `${API_URL}/user`;
-// const GET_USERS_URL = `${API_URL}/users/query`;
-
-const NEW_USER_ENDPOINT = import.meta.env.VITE_APP_USER_ENDPOINT
-
-// const getStartedUsers = (query: string): Promise<UsersQueryResponse> => {
-//   return axios
-//     .get(`${GET_USERS_URL}?${query}`)
-//     .then((d: AxiosResponse<UsersQueryResponse>) => d.data);
-// };
-const getStartedUsers = (query: string): Promise<UsersQueryResponse> => { // FUNCTION TO GET USERS THAT HAVE STARTED LOAN APPLICATION
-  return axios
-    .get(`${NEW_USER_ENDPOINT}/loan/started`)
-    .then((d: AxiosResponse<UsersQueryResponse>) => d.data);
-};
-
-const getUserById = (id: ID): Promise<User | undefined> => {
-  return axios
-    .get(`${USER_URL}/${id}`)
-    .then((response: AxiosResponse<Response<User>>) => response.data)
-    .then((response: Response<User>) => response.data);
-};
-
-const createUser = (user: User): Promise<User | undefined> => {
-  return axios
-    .put(USER_URL, user)
-    .then((response: AxiosResponse<Response<User>>) => response.data)
-    .then((response: Response<User>) => response.data);
-};
-
-const updateUser = (user: User): Promise<User | undefined> => {
-  return axios
-    .post(`${USER_URL}/${user.id}`, user)
-    .then((response: AxiosResponse<Response<User>>) => response.data)
-    .then((response: Response<User>) => response.data);
-};
-
-const deleteUser = (userId: ID): Promise<void> => {
-  return axios.delete(`${USER_URL}/${userId}`).then(() => {});
-};
-
-const deleteSelectedUsers = (userIds: Array<ID>): Promise<void> => {
-  const requests = userIds.map((id) => axios.delete(`${USER_URL}/${id}`));
-  return axios.all(requests).then(() => {});
-};
-
-export {
-  getStartedUsers,
-  deleteUser,
-  deleteSelectedUsers,
-  getUserById,
-  createUser,
-  updateUser,
-};

src/app/modules/process/user-rejected/table/columns/CustomHeaderColumn.tsx

@@ -1,6 +1,6 @@
 import {FC} from 'react'
 import {ColumnInstance} from 'react-table'
-import {User} from '../../core/_models'
+import {User} from '../../../core/_models'
 
 type Props = {
   column: ColumnInstance<User>

src/app/modules/process/user-rejected/table/columns/CustomRow.tsx

@@ -1,7 +1,7 @@
 import clsx from 'clsx'
 import {FC} from 'react'
 import {Row} from 'react-table'
-import {User} from '../../core/_models'
+import {User} from '../../../core/_models'
 
 type Props = {
   row: Row<User>

src/app/modules/process/user-rejected/table/columns/UserActionsCell.tsx

@@ -5,7 +5,7 @@ import {MenuComponent} from '../../../../../../_digifi/assets/ts/components'
 import {ID, KTIcon, QUERIES} from '../../../../../../_digifi/helpers'
 import {useListView} from '../../core/ListViewProvider'
 import {useQueryResponse} from '../../core/QueryResponseProvider'
-import {deleteUser} from '../../core/_requests'
+import {deleteUser} from '../../../core/_requests'
 
 type Props = {
   id: ID

src/app/modules/process/user-rejected/table/columns/UserCustomHeader.tsx

@@ -3,7 +3,7 @@ import {FC, PropsWithChildren, useMemo} from 'react'
 import {HeaderProps} from 'react-table'
 import {initialQueryState} from '../../../../../../_digifi/helpers'
 import {useQueryRequest} from '../../core/QueryRequestProvider'
-import {User} from '../../core/_models'
+import {User} from '../../../core/_models'
 
 type Props = {
   className?: string

src/app/modules/process/user-rejected/table/columns/UserInfoCell.tsx

@@ -2,7 +2,7 @@
 import clsx from 'clsx'
 import {FC} from 'react'
 import {toAbsoluteUrl} from '../../../../../../_digifi/helpers'
-import {User} from '../../core/_models'
+import {User} from '../../../core/_models'
 
 type Props = {
   user: User

src/app/modules/process/user-rejected/table/columns/UserSelectionHeader.tsx

@@ -1,7 +1,7 @@
 import {FC, PropsWithChildren} from 'react'
 import {HeaderProps} from 'react-table'
 import {useListView} from '../../core/ListViewProvider'
-import {User} from '../../core/_models'
+import {User} from '../../../core/_models'
 
 type Props = {
   tableProps: PropsWithChildren<HeaderProps<User>>

src/app/modules/process/user-rejected/table/columns/_columns.tsx

@@ -6,7 +6,7 @@ import {UserActionsCell} from './UserActionsCell'
 import {UserSelectionCell} from './UserSelectionCell'
 import {UserCustomHeader} from './UserCustomHeader'
 import {UserSelectionHeader} from './UserSelectionHeader'
-import {User} from '../../core/_models'
+import {User} from '../../../core/_models'
 import { AddedCell } from './AddedCell'
 
 const usersColumns: ReadonlyArray<Column<User>> = [

src/app/modules/process/user-rejected/user-edit-modal/UserEditModalForm.tsx

@@ -2,11 +2,11 @@ import {FC, useState} from 'react'
 import * as Yup from 'yup'
 import {useFormik} from 'formik'
 import {isNotEmpty, toAbsoluteUrl} from '../../../../../_digifi/helpers'
-import {initialUser, User} from '../core/_models'
+import {initialUser, User} from '../../core/_models'
 import clsx from 'clsx'
 import {useListView} from '../core/ListViewProvider'
 import {UsersListLoading} from '../components/loading/UsersListLoading'
-import {createUser, updateUser} from '../core/_requests'
+import {createUser, updateUser} from '../../core/_requests'
 import {useQueryResponse} from '../core/QueryResponseProvider'
 
 type Props = {

src/app/modules/process/user-rejected/user-edit-modal/UserEditModalFormWrapper.tsx

@@ -2,7 +2,7 @@ import {useQuery} from 'react-query'
 import {UserEditModalForm} from './UserEditModalForm'
 import {isNotEmpty, QUERIES} from '../../../../../_digifi/helpers'
 import {useListView} from '../core/ListViewProvider'
-import {getUserById} from '../core/_requests'
+import {getUserById} from '../../core/_requests'
 
 const UserEditModalFormWrapper = () => {
   const {itemIdForUpdate, setItemIdForUpdate} = useListView()

src/app/modules/process/user-started/components/header/UsersListGrouping.tsx

@@ -2,7 +2,7 @@ import { useQueryClient, useMutation } from "react-query";
 import { QUERIES } from "../../../../../../_digifi/helpers";
 import { useListView } from "../../core/ListViewProvider";
 import { useQueryResponse } from "../../core/QueryResponseProvider";
-import { deleteSelectedUsers } from "../../core/_requests";
+import { deleteSelectedUsers } from "../../../core/_requests";
 
 const UsersListGrouping = () => {
   const { selected, clearSelected } = useListView();

src/app/modules/process/user-started/core/_models.ts

@@ -1,42 +0,0 @@
-import { ID, Response } from "../../../../../_digifi/helpers";
-export type User = {
-  id?: ID;
-  name?: string;
-  avatar?: string;
-  // email?: string
-  position?: string;
-  role?: string;
-  last_login?: string;
-  two_steps?: boolean;
-  joined_day?: string;
-  online?: boolean;
-  initials?: {
-    label: string;
-    state: string;
-  };
-  firstname?: string;
-  lastname?: string;
-  uid?: string;
-  loan_amount?: string;
-  payment_month?: string;
-  sales_agent?: string;
-  gender?: string | null;
-  marital_status?: string;
-  email?: string;
-  address?: string;
-  state?: string;
-  country?: string;
-  status?: string;
-  added?: string;
-  updated?: string;
-};
-
-export type UsersQueryResponse = Response<Array<User>>;
-
-export const initialUser: User = {
-  avatar: "avatars/300-6.jpg",
-  position: "Art Director",
-  role: "Administrator",
-  name: "",
-  email: "",
-};

src/app/modules/process/user-started/core/_requests.ts

@@ -1,60 +0,0 @@
-import axios, { AxiosResponse } from "axios";
-import { ID, Response } from "../../../../../_digifi/helpers";
-import { User, UsersQueryResponse } from "./_models";
-
-const API_URL = import.meta.env.VITE_APP_THEME_API_URL;
-const USER_URL = `${API_URL}/user`;
-// const GET_USERS_URL = `${API_URL}/users/query`;
-
-const NEW_USER_ENDPOINT = import.meta.env.VITE_APP_USER_ENDPOINT;
-
-// const getStartedUsers = (query: string): Promise<UsersQueryResponse> => {
-//   return axios
-//     .get(`${GET_USERS_URL}?${query}`)
-//     .then((d: AxiosResponse<UsersQueryResponse>) => d.data);
-// };
-const getStartedUsers = (query: string): Promise<UsersQueryResponse> => {
-  // FUNCTION TO GET USERS THAT HAVE STARTED LOAN APPLICATION
-  return axios
-    .get(`${NEW_USER_ENDPOINT}/loan/started`)
-    .then((d: AxiosResponse<UsersQueryResponse>) => d.data);
-};
-
-const getUserById = (id: ID): Promise<User | undefined> => {
-  return axios
-    .get(`${USER_URL}/${id}`)
-    .then((response: AxiosResponse<Response<User>>) => response.data)
-    .then((response: Response<User>) => response.data);
-};
-
-const createUser = (user: User): Promise<User | undefined> => {
-  return axios
-    .put(USER_URL, user)
-    .then((response: AxiosResponse<Response<User>>) => response.data)
-    .then((response: Response<User>) => response.data);
-};
-
-const updateUser = (user: User): Promise<User | undefined> => {
-  return axios
-    .post(`${USER_URL}/${user.id}`, user)
-    .then((response: AxiosResponse<Response<User>>) => response.data)
-    .then((response: Response<User>) => response.data);
-};
-
-const deleteUser = (userId: ID): Promise<void> => {
-  return axios.delete(`${USER_URL}/${userId}`).then(() => {});
-};
-
-const deleteSelectedUsers = (userIds: Array<ID>): Promise<void> => {
-  const requests = userIds.map((id) => axios.delete(`${USER_URL}/${id}`));
-  return axios.all(requests).then(() => {});
-};
-
-export {
-  getStartedUsers,
-  deleteUser,
-  deleteSelectedUsers,
-  getUserById,
-  createUser,
-  updateUser,
-};

src/app/modules/process/user-started/table/columns/CustomHeaderColumn.tsx

@@ -1,6 +1,6 @@
 import {FC} from 'react'
 import {ColumnInstance} from 'react-table'
-import {User} from '../../core/_models'
+import {User} from '../../../core/_models'
 
 type Props = {
   column: ColumnInstance<User>

src/app/modules/process/user-started/table/columns/CustomRow.tsx

@@ -1,7 +1,7 @@
 import clsx from 'clsx'
 import {FC} from 'react'
 import {Row} from 'react-table'
-import {User} from '../../core/_models'
+import {User} from '../../../core/_models'
 
 type Props = {
   row: Row<User>

src/app/modules/process/user-started/table/columns/UserActionsCell.tsx

@@ -4,7 +4,7 @@ import { MenuComponent } from "../../../../../../_digifi/assets/ts/components";
 import { ID, KTIcon, QUERIES } from "../../../../../../_digifi/helpers";
 import { useListView } from "../../core/ListViewProvider";
 import { useQueryResponse } from "../../core/QueryResponseProvider";
-import { deleteUser } from "../../core/_requests";
+import { deleteUser } from "../../../core/_requests";
 
 type Props = {
   id: ID;

src/app/modules/process/user-started/table/columns/UserCustomHeader.tsx

@@ -3,7 +3,7 @@ import { FC, PropsWithChildren, useMemo } from "react";
 import { HeaderProps } from "react-table";
 import { initialQueryState } from "../../../../../../_digifi/helpers";
 import { useQueryRequest } from "../../core/QueryRequestProvider";
-import { User } from "../../core/_models";
+import { User } from "../../../core/_models";
 
 type Props = {
   className?: string;

src/app/modules/process/user-started/table/columns/UserInfoCell.tsx

@@ -1,7 +1,7 @@
 import clsx from "clsx";
 import { FC } from "react";
 import { toAbsoluteUrl } from "../../../../../../_digifi/helpers";
-import { User } from "../../core/_models";
+import { User } from "../../../core/_models";
 
 type Props = {
   user: User;

src/app/modules/process/user-started/table/columns/UserSelectionHeader.tsx

@@ -1,7 +1,7 @@
 import {FC, PropsWithChildren} from 'react'
 import {HeaderProps} from 'react-table'
 import {useListView} from '../../core/ListViewProvider'
-import {User} from '../../core/_models'
+import {User} from '../../../core/_models'
 
 type Props = {
   tableProps: PropsWithChildren<HeaderProps<User>>

src/app/modules/process/user-started/table/columns/_columns.tsx

@@ -6,7 +6,7 @@ import {UserActionsCell} from './UserActionsCell'
 import {UserSelectionCell} from './UserSelectionCell'
 import {UserCustomHeader} from './UserCustomHeader'
 import {UserSelectionHeader} from './UserSelectionHeader'
-import {User} from '../../core/_models'
+import {User} from '../../../core/_models'
 import { AddedCell } from './AddedCell'
 
 const usersColumns: ReadonlyArray<Column<User>> = [

src/app/modules/process/user-started/user-edit-modal/UserEditModalForm.tsx

@@ -2,11 +2,11 @@ import { FC, useState } from "react";
 import * as Yup from "yup";
 import { useFormik } from "formik";
 import { isNotEmpty, toAbsoluteUrl } from "../../../../../_digifi/helpers";
-import { initialUser, User } from "../core/_models";
+import { initialUser, User } from "../../core/_models";
 import clsx from "clsx";
 import { useListView } from "../core/ListViewProvider";
 import { UsersListLoading } from "../components/loading/UsersListLoading";
-import { createUser, updateUser } from "../core/_requests";
+import { createUser, updateUser } from "../../core/_requests";
 import { useQueryResponse } from "../core/QueryResponseProvider";
 
 type Props = {

src/app/modules/process/user-started/user-edit-modal/UserEditModalFormWrapper.tsx

@@ -2,7 +2,7 @@ import { useQuery } from "react-query";
 import { UserEditModalForm } from "./UserEditModalForm";
 import { isNotEmpty, QUERIES } from "../../../../../_digifi/helpers";
 import { useListView } from "../core/ListViewProvider";
-import { getUserById } from "../core/_requests";
+import { getUserById } from "../../core/_requests";
 
 const UserEditModalFormWrapper = () => {
   const { itemIdForUpdate, setItemIdForUpdate } = useListView();