diff --git a/public/media/auth/digifi_bko_home.jpg b/public/media/auth/digifi_bko_home.jpg new file mode 100644 index 0000000..cc039d4 Binary files /dev/null and b/public/media/auth/digifi_bko_home.jpg differ diff --git a/src/_digifi/helpers/crud-helper/consts.ts b/src/_digifi/helpers/crud-helper/consts.ts index 6c5badb..2815b0c 100644 --- a/src/_digifi/helpers/crud-helper/consts.ts +++ b/src/_digifi/helpers/crud-helper/consts.ts @@ -7,6 +7,7 @@ const QUERIES = { APPROVED_LIST: 'approved-list', REJECTED_LIST: 'rejected-list', CUSTOMERS_LIST: 'customers-list', + ADMIN_USERS_LIST: 'admin-users-list', EMPLOYERS_LIST: 'employers-list', SIGNATORY_LIST: 'signatory-list', } diff --git a/src/app/App.tsx b/src/app/App.tsx index c131057..f8593f7 100644 --- a/src/app/App.tsx +++ b/src/app/App.tsx @@ -1,5 +1,5 @@ -import {Suspense} from 'react' -import {Outlet} from 'react-router-dom' +import {Suspense, useEffect} from 'react' +import {Outlet, useLocation} from 'react-router-dom' import {I18nProvider} from '../_digifi/i18n/i18nProvider' import {LayoutProvider, LayoutSplashScreen} from '../_digifi/layout/core' import {MasterInit} from '../_digifi/layout/MasterInit' @@ -8,6 +8,10 @@ import {ThemeModeProvider} from '../_digifi/partials' import { CustomModalProvider } from '../context/CustomModal' const App = () => { + const {pathname}= useLocation() + useEffect(()=>{ + window.scrollTo(0,0) + },[pathname]) return ( }> diff --git a/src/app/modules/apps/user-management/users-list/core/QueryResponseProvider.tsx b/src/app/modules/apps/user-management/users-list/core/QueryResponseProvider.tsx index c05ad9d..a330558 100644 --- a/src/app/modules/apps/user-management/users-list/core/QueryResponseProvider.tsx +++ b/src/app/modules/apps/user-management/users-list/core/QueryResponseProvider.tsx @@ -11,7 +11,7 @@ import { stringifyRequestQuery, WithChildren, } from '../../../../../../_digifi/helpers' -import {getCustomerList} from './_requests' +import {getAdminUserList} from './_requests' import {User} from './_models' import {useQueryRequest} from './QueryRequestProvider' @@ -32,9 +32,9 @@ const QueryResponseProvider: FC = ({children}) => { refetch, data: response, } = useQuery( - `${QUERIES.CUSTOMERS_LIST}-${query}`, + `${QUERIES.ADMIN_USERS_LIST}-${query}`, () => { - return getCustomerList(query) + return getAdminUserList(query) }, {cacheTime: 0, keepPreviousData: true, refetchOnWindowFocus: false} ) diff --git a/src/app/modules/apps/user-management/users-list/core/_models.ts b/src/app/modules/apps/user-management/users-list/core/_models.ts index 0b3df3a..9834ed3 100644 --- a/src/app/modules/apps/user-management/users-list/core/_models.ts +++ b/src/app/modules/apps/user-management/users-list/core/_models.ts @@ -30,6 +30,7 @@ export type User = { added?: string updated?: string bvn?: string + username?: string } export type UsersQueryResponse = Response> diff --git a/src/app/modules/apps/user-management/users-list/core/_requests.ts b/src/app/modules/apps/user-management/users-list/core/_requests.ts index bb37b33..f9899e2 100644 --- a/src/app/modules/apps/user-management/users-list/core/_requests.ts +++ b/src/app/modules/apps/user-management/users-list/core/_requests.ts @@ -19,6 +19,12 @@ const getCustomerList = (query: string): Promise => { // FUN .then((d: AxiosResponse) => d.data); }; +const getAdminUserList = (query: string): Promise => { // FUNCTION TO GET USERS THAT HAVE STARTED LOAN APPLICATION + return axios + .get(`${NEW_USER_ENDPOINT}/users`) + .then((d: AxiosResponse) => d.data); +}; + const getUserById = (id: ID): Promise => { return axios .get(`${USER_URL}/${id}`) @@ -54,6 +60,7 @@ export { deleteUser, deleteSelectedUsers, getUserById, + getAdminUserList, createUser, updateUser, }; diff --git a/src/app/modules/apps/user-management/users-list/table/columns/_columns.tsx b/src/app/modules/apps/user-management/users-list/table/columns/_columns.tsx index 594d918..6f3701b 100644 --- a/src/app/modules/apps/user-management/users-list/table/columns/_columns.tsx +++ b/src/app/modules/apps/user-management/users-list/table/columns/_columns.tsx @@ -20,17 +20,6 @@ const usersColumns: ReadonlyArray> = [ id: 'firstname', Cell: ({...props}) => , }, - { - Header: (props) => , - accessor: 'bvn', - }, - // { - // Header: (props) => ( - // - // ), - // id: 'payment_month', - // Cell: ({...props}) => , - // }, { Header: (props) => ( diff --git a/src/app/modules/auth/AuthLayout.tsx b/src/app/modules/auth/AuthLayout.tsx index 526bf0a..3720104 100644 --- a/src/app/modules/auth/AuthLayout.tsx +++ b/src/app/modules/auth/AuthLayout.tsx @@ -16,70 +16,39 @@ const AuthLayout = () => { }, []); return ( -
+
{/* begin::Body */} -
+
{/* begin::Form */} -
+
{/* begin::Wrapper */} -
+
+ {/* begin::Title */} +

+ {/* begin::Logo */} + + Logo + + {/* end::Logo */} + BackOffice +

+ {/* end::Title */}
{/* end::Wrapper */}
{/* end::Form */} - - {/* begin::Footer */} -
- {/* begin::Links */} - - {/* end::Links */} -
- {/* end::Footer */}
{/* end::Body */} - - {/* begin::Aside */} -
- {/* begin::Content */} -
- {/* begin::Logo */} - - Logo - - {/* end::Logo */} - - {/* begin::Image */} - - {/* end::Image */} - - {/* begin::Title */} -

- digiFi BackOffice -

- {/* end::Title */} -
- {/* end::Content */} -
- {/* end::Aside */}
); };