Compare commits
5 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 7d43300724 | |||
| e05d465c2f | |||
| 75a7496164 | |||
| 25b48416b7 | |||
| 996eee612d |
|
Before Width: | Height: | Size: 15 KiB After Width: | Height: | Size: 15 KiB |
|
Before Width: | Height: | Size: 18 KiB After Width: | Height: | Size: 6.9 KiB |
|
Before Width: | Height: | Size: 84 KiB After Width: | Height: | Size: 22 KiB |
|
Before Width: | Height: | Size: 16 KiB After Width: | Height: | Size: 6.1 KiB |
|
Before Width: | Height: | Size: 713 B After Width: | Height: | Size: 490 B |
|
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 950 B |
|
Before Width: | Height: | Size: 15 KiB After Width: | Height: | Size: 15 KiB |
@@ -21,7 +21,7 @@ const HeaderUserMenu: FC = () => {
|
|||||||
<div className='d-flex flex-column'>
|
<div className='d-flex flex-column'>
|
||||||
<div className='fw-bolder d-flex align-items-center fs-5'>
|
<div className='fw-bolder d-flex align-items-center fs-5'>
|
||||||
{currentUser?.first_name} {currentUser?.first_name}
|
{currentUser?.first_name} {currentUser?.first_name}
|
||||||
<span className='badge badge-light-success fw-bolder fs-8 px-2 py-1 ms-2'>Pro</span>
|
{/*<span className='badge badge-light-success fw-bolder fs-8 px-2 py-1 ms-2'>Pro</span>*/}
|
||||||
</div>
|
</div>
|
||||||
<a href='#' className='fw-bold text-muted text-hover-primary fs-7'>
|
<a href='#' className='fw-bold text-muted text-hover-primary fs-7'>
|
||||||
{currentUser?.email}
|
{currentUser?.email}
|
||||||
|
|||||||
@@ -0,0 +1,50 @@
|
|||||||
|
import axios from "axios";
|
||||||
|
|
||||||
|
export function postAuxEnd(uri:string, reqData:any):Promise<any> {
|
||||||
|
// const endPoint = process.env.REACT_APP_USERS_ENDPOINT + uri;
|
||||||
|
const formData = new FormData();
|
||||||
|
for (let value in reqData) {
|
||||||
|
formData.append(value, reqData[value]);
|
||||||
|
}
|
||||||
|
return axios.post(uri, reqData)
|
||||||
|
.then((response) => {
|
||||||
|
console.log(response);
|
||||||
|
// if (response.data.internal_return == "-9999") {
|
||||||
|
// localStorage.clear();
|
||||||
|
// window.location.href = `/login?sessionExpired=true`;
|
||||||
|
// }
|
||||||
|
return response;
|
||||||
|
})
|
||||||
|
.catch((error) => {
|
||||||
|
if (error.response) {
|
||||||
|
//response status is an error code
|
||||||
|
console.log(
|
||||||
|
"ERROR-------------------------------------------------------"
|
||||||
|
);
|
||||||
|
console.log(error.response.status);
|
||||||
|
console.log(
|
||||||
|
"ERROR-------------------------------------------------------"
|
||||||
|
);
|
||||||
|
} else if (error.request) {
|
||||||
|
//response not received though the request was sent
|
||||||
|
console.log(
|
||||||
|
"ERROR2-------------------------------------------------------"
|
||||||
|
);
|
||||||
|
console.log(error?.request);
|
||||||
|
console.log(
|
||||||
|
"ERROR2-------------------------------------------------------"
|
||||||
|
);
|
||||||
|
} else {
|
||||||
|
//an error occurred when setting up the request
|
||||||
|
console.log(
|
||||||
|
"ERROR3-------------------------------------------------------"
|
||||||
|
);
|
||||||
|
console.log(error);
|
||||||
|
console.log(
|
||||||
|
"ERROR3-------------------------------------------------------"
|
||||||
|
);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -1,19 +1,29 @@
|
|||||||
import axios from "axios";
|
import axios from "axios";
|
||||||
import { AuthModel, UserModel } from "./_models";
|
import { AuthModel, UserModel } from "./_models";
|
||||||
|
|
||||||
|
import { postAuxEnd } from "./AxiosCallHelper";
|
||||||
|
|
||||||
const API_URL = import.meta.env.VITE_APP_API_URL;
|
const API_URL = import.meta.env.VITE_APP_API_URL;
|
||||||
|
|
||||||
export const GET_USER_BY_ACCESSTOKEN_URL = `${API_URL}/verify_token`;
|
export const GET_USER_BY_ACCESSTOKEN_URL = `${API_URL}/verify_token`;
|
||||||
export const LOGIN_URL = `${API_URL}/login`;
|
export const LOGIN_URL = `${API_URL}/login`;
|
||||||
|
// export const LOGIN_URL = 'https://digifi-apidev.chiefsoft.net/digibko/v1/identity/token'
|
||||||
export const REGISTER_URL = `${API_URL}/register`;
|
export const REGISTER_URL = `${API_URL}/register`;
|
||||||
export const REQUEST_PASSWORD_URL = `${API_URL}/forgot_password`;
|
export const REQUEST_PASSWORD_URL = `${API_URL}/forgot_password`;
|
||||||
|
|
||||||
// Server should return AuthModel
|
//Function to login user in // Server should return AuthModel
|
||||||
export function login(email: string, password: string) {
|
export function login(email: string, password: string) {
|
||||||
return axios.post<AuthModel>(LOGIN_URL, {
|
// return axios.post<AuthModel>(LOGIN_URL, {
|
||||||
email,
|
// email,
|
||||||
password,
|
// password,
|
||||||
});
|
// });
|
||||||
|
|
||||||
|
// let formData = new FormData()
|
||||||
|
// formData.append('username', email)
|
||||||
|
// formData.append('pass', password)
|
||||||
|
// return axios.post<AuthModel>(LOGIN_URL, formData);
|
||||||
|
|
||||||
|
return postAuxEnd(LOGIN_URL, {email, password})
|
||||||
}
|
}
|
||||||
|
|
||||||
// Server should return AuthModel
|
// Server should return AuthModel
|
||||||
|
|||||||
@@ -1,11 +1,12 @@
|
|||||||
import {Navigate, Routes, Route, Outlet} from 'react-router-dom'
|
import {Navigate, Routes, Route, Outlet} from 'react-router-dom'
|
||||||
import {PageLink, PageTitle} from '../../../_digifi/layout/core'
|
import {PageLink, PageTitle} from '../../../_digifi/layout/core'
|
||||||
import {Overview} from './components/Overview'
|
// import {Overview} from './components/Overview'
|
||||||
import {Projects} from './components/Projects'
|
// import {Projects} from './components/Projects'
|
||||||
import {Campaigns} from './components/Campaigns'
|
// import {Campaigns} from './components/Campaigns'
|
||||||
import {Documents} from './components/Documents'
|
// import {Documents} from './components/Documents'
|
||||||
import {Connections} from './components/Connections'
|
// import {Connections} from './components/Connections'
|
||||||
import {ProcessHeader} from './ProcessHeader'
|
// import {ProcessHeader} from './ProcessHeader'
|
||||||
|
import { StartedUserList } from './components/StartedUserList'
|
||||||
|
|
||||||
const processBreadCrumbs: Array<PageLink> = [
|
const processBreadCrumbs: Array<PageLink> = [
|
||||||
{
|
{
|
||||||
@@ -27,7 +28,7 @@ const ProcessPage = () => (
|
|||||||
<Route
|
<Route
|
||||||
element={
|
element={
|
||||||
<>
|
<>
|
||||||
<ProcessHeader />
|
{/* <ProcessHeader /> */}
|
||||||
<Outlet />
|
<Outlet />
|
||||||
</>
|
</>
|
||||||
}
|
}
|
||||||
@@ -37,7 +38,7 @@ const ProcessPage = () => (
|
|||||||
element={
|
element={
|
||||||
<>
|
<>
|
||||||
<PageTitle breadcrumbs={processBreadCrumbs}>Started</PageTitle>
|
<PageTitle breadcrumbs={processBreadCrumbs}>Started</PageTitle>
|
||||||
<Overview />
|
<StartedUserList />
|
||||||
</>
|
</>
|
||||||
}
|
}
|
||||||
/>
|
/>
|
||||||
@@ -46,7 +47,7 @@ const ProcessPage = () => (
|
|||||||
element={
|
element={
|
||||||
<>
|
<>
|
||||||
<PageTitle breadcrumbs={processBreadCrumbs}>Pending</PageTitle>
|
<PageTitle breadcrumbs={processBreadCrumbs}>Pending</PageTitle>
|
||||||
<Projects />
|
<StartedUserList />
|
||||||
</>
|
</>
|
||||||
}
|
}
|
||||||
/>
|
/>
|
||||||
@@ -55,7 +56,7 @@ const ProcessPage = () => (
|
|||||||
element={
|
element={
|
||||||
<>
|
<>
|
||||||
<PageTitle breadcrumbs={processBreadCrumbs}>Ready</PageTitle>
|
<PageTitle breadcrumbs={processBreadCrumbs}>Ready</PageTitle>
|
||||||
<Campaigns />
|
<StartedUserList />
|
||||||
</>
|
</>
|
||||||
}
|
}
|
||||||
/>
|
/>
|
||||||
@@ -64,7 +65,7 @@ const ProcessPage = () => (
|
|||||||
element={
|
element={
|
||||||
<>
|
<>
|
||||||
<PageTitle breadcrumbs={processBreadCrumbs}>Approved</PageTitle>
|
<PageTitle breadcrumbs={processBreadCrumbs}>Approved</PageTitle>
|
||||||
<Documents />
|
<StartedUserList />
|
||||||
</>
|
</>
|
||||||
}
|
}
|
||||||
/>
|
/>
|
||||||
@@ -73,7 +74,7 @@ const ProcessPage = () => (
|
|||||||
element={
|
element={
|
||||||
<>
|
<>
|
||||||
<PageTitle breadcrumbs={processBreadCrumbs}>Rejected</PageTitle>
|
<PageTitle breadcrumbs={processBreadCrumbs}>Rejected</PageTitle>
|
||||||
<Connections />
|
<StartedUserList />
|
||||||
</>
|
</>
|
||||||
}
|
}
|
||||||
/>
|
/>
|
||||||
|
|||||||
@@ -0,0 +1,37 @@
|
|||||||
|
import { KTCard } from "../../../../_digifi/helpers"
|
||||||
|
import { Content } from "../../../../_digifi/layout/components/content"
|
||||||
|
import { ToolbarWrapper } from "../../../../_digifi/layout/components/toolbar"
|
||||||
|
import { UsersListHeader } from "../../apps/user-management/users-list/components/header/UsersListHeader"
|
||||||
|
import { ListViewProvider, useListView } from "../../apps/user-management/users-list/core/ListViewProvider"
|
||||||
|
import { QueryRequestProvider } from "../../apps/user-management/users-list/core/QueryRequestProvider"
|
||||||
|
import { QueryResponseProvider } from "../../apps/user-management/users-list/core/QueryResponseProvider"
|
||||||
|
import { UsersTable } from "../../apps/user-management/users-list/table/UsersTable"
|
||||||
|
import { UserEditModal } from "../../apps/user-management/users-list/user-edit-modal/UserEditModal"
|
||||||
|
|
||||||
|
const UsersList = () => {
|
||||||
|
const {itemIdForUpdate} = useListView()
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
<KTCard>
|
||||||
|
<UsersListHeader />
|
||||||
|
<UsersTable />
|
||||||
|
</KTCard>
|
||||||
|
{itemIdForUpdate !== undefined && <UserEditModal />}
|
||||||
|
</>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
const StartedUserList = () => (
|
||||||
|
<QueryRequestProvider>
|
||||||
|
<QueryResponseProvider>
|
||||||
|
<ListViewProvider>
|
||||||
|
<ToolbarWrapper />
|
||||||
|
<Content>
|
||||||
|
<UsersList />
|
||||||
|
</Content>
|
||||||
|
</ListViewProvider>
|
||||||
|
</QueryResponseProvider>
|
||||||
|
</QueryRequestProvider>
|
||||||
|
)
|
||||||
|
|
||||||
|
export {StartedUserList}
|
||||||