diff --git a/.env b/.env index f8c51a5..053bf82 100644 --- a/.env +++ b/.env @@ -1,4 +1,4 @@ -VITE_APP_NAME=brillian-bri-tl +VITE_APP_NAME=tpay-dashboard-tl VITE_APP_VERSION=1=9.1.1 GENERATE_SOURCEMAP=false diff --git a/.env.development b/.env.development index a7c9706..a5fc900 100644 --- a/.env.development +++ b/.env.development @@ -1,7 +1,6 @@ -VITE_APP_NAME=brillian-bri-tl +VITE_APP_NAME=tpay-dashboard-tl VITE_APP_VERSION=1=9.1.1 GENERATE_SOURCEMAP=false VITE_APP_API_URL=https://tpay.shiblysolution.id/api -VITE_BASE_URL=/dashboard/ VITE_ENV=development diff --git a/.env.production b/.env.production index b069a14..52981df 100644 --- a/.env.production +++ b/.env.production @@ -1,4 +1,4 @@ -VITE_APP_NAME=brillian-bri-tl +VITE_APP_NAME=tpay-dashboard-tl VITE_APP_VERSION=1=9.1.1 GENERATE_SOURCEMAP=false diff --git a/.env.staging b/.env.staging index 3e7f382..ab61fd8 100644 --- a/.env.staging +++ b/.env.staging @@ -2,6 +2,6 @@ VITE_APP_NAME=brillian-bri-tl VITE_APP_VERSION=1=9.1.1 GENERATE_SOURCEMAP=false -VITE_APP_API_URL=https://brilianapps.shiblysolution.id/api -VITE_BASE_URL=/credit/ +VITE_APP_API_URL=https://tpay.shiblysolution.id/api +VITE_BASE_URL=/dashboard/ VITE_ENV=staging \ No newline at end of file diff --git a/index.html b/index.html index f4e56e6..5943e1e 100644 --- a/index.html +++ b/index.html @@ -1,26 +1,30 @@ + + + + + + + + + + + + + - - - - - - - - - - - - - - - -
- - - - \ No newline at end of file + +
+ + + diff --git a/package-lock.json b/package-lock.json index 9ac038f..4757023 100644 --- a/package-lock.json +++ b/package-lock.json @@ -43,6 +43,7 @@ "cmdk": "^1.0.4", "date-fns": "^3.0.0", "formik": "^2.4.6", + "https": "^1.0.0", "leaflet": "^1.9.4", "lucide-react": "^0.456.0", "mini-svg-data-uri": "^1.4.4", @@ -6014,6 +6015,11 @@ "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz", "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==" }, + "node_modules/https": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/https/-/https-1.0.0.tgz", + "integrity": "sha512-4EC57ddXrkaF0x83Oj8sM6SLQHAWXw90Skqu2M4AEWENZ3F02dFJE/GARA8igO79tcgYqGrD7ae4f5L3um2lgg==" + }, "node_modules/idb": { "version": "7.1.1", "resolved": "https://registry.npmjs.org/idb/-/idb-7.1.1.tgz", diff --git a/package.json b/package.json index b45db2d..29c3f8b 100644 --- a/package.json +++ b/package.json @@ -50,6 +50,7 @@ "cmdk": "^1.0.4", "date-fns": "^3.0.0", "formik": "^2.4.6", + "https": "^1.0.0", "leaflet": "^1.9.4", "lucide-react": "^0.456.0", "mini-svg-data-uri": "^1.4.4", diff --git a/public/media/app/app-logo.png b/public/media/app/app-logo.png new file mode 100644 index 0000000..6f6c436 Binary files /dev/null and b/public/media/app/app-logo.png differ diff --git a/public/media/app/bri_tl_logo.png b/public/media/app/bri_tl_logo.png deleted file mode 100644 index fbe2c41..0000000 Binary files a/public/media/app/bri_tl_logo.png and /dev/null differ diff --git a/public/media/app/favicon-16x16.png b/public/media/app/favicon-16x16.png index 051bdcd..53115b5 100644 Binary files a/public/media/app/favicon-16x16.png and b/public/media/app/favicon-16x16.png differ diff --git a/public/media/app/favicon-32x32.png b/public/media/app/favicon-32x32.png index 28d8701..646f049 100644 Binary files a/public/media/app/favicon-32x32.png and b/public/media/app/favicon-32x32.png differ diff --git a/public/media/app/favicon.ico b/public/media/app/favicon.ico index 75a02d6..10cb4b9 100644 Binary files a/public/media/app/favicon.ico and b/public/media/app/favicon.ico differ diff --git a/public/media/images/2600x1600/7.png b/public/media/images/2600x1600/7.png new file mode 100644 index 0000000..5c55e66 Binary files /dev/null and b/public/media/images/2600x1600/7.png differ diff --git a/public/media/images/2600x1600/bg-7.png b/public/media/images/2600x1600/bg-7.png new file mode 100644 index 0000000..5c55e66 Binary files /dev/null and b/public/media/images/2600x1600/bg-7.png differ diff --git a/src/actions/GlobalActions.ts b/src/actions/GlobalActions.ts index 4c1224e..2c84ab2 100644 --- a/src/actions/GlobalActions.ts +++ b/src/actions/GlobalActions.ts @@ -9,7 +9,7 @@ interface SaveLogsParams { action: string; } -const API_URL = apiConfig.service_user; +const API_URL = apiConfig.service_dashboard; const getCurrentTimeJakarta = () => { const jakartaTime = new Date().toLocaleString('id-ID', { @@ -38,7 +38,6 @@ export async function doSaveLogActivity(payload: SaveLogsParams): Promise { try { @@ -12,7 +12,7 @@ export async function doGetNavbarMenu(): Promise { throw new Error('No authentication token found'); } - const response = await axios.put(`${API_URL}/renew_token/${token.refresh_token}/credit`); + const response = await axios.put(`${API_URL}/renew_token/${token.refresh_token}`); if (response.status !== 200 || !response.data.status) { throw new Error(response.data.message ?? 'Failed to fetch navbar menu'); } diff --git a/src/auth/_helpers.ts b/src/auth/_helpers.ts index 8b450c5..a5b8980 100644 --- a/src/auth/_helpers.ts +++ b/src/auth/_helpers.ts @@ -1,11 +1,10 @@ import { User as Auth0UserModel } from '@auth0/auth0-spa-js'; - import { getData, setData } from '@/utils'; import { type AuthModel } from './_models'; +// import https from 'https' -const AUTH_LOCAL_STORAGE_KEY = `${import.meta.env.VITE_APP_NAME}-auth-v${ - import.meta.env.VITE_APP_VERSION -}`; +const AUTH_LOCAL_STORAGE_KEY = `${import.meta.env.VITE_APP_NAME}-auth-v${import.meta.env.VITE_APP_VERSION + }`; const getAuth = (): AuthModel | undefined => { try { @@ -40,25 +39,12 @@ const removeAuth = () => { export function setupAxios(axios: any) { axios.defaults.headers.Accept = 'application/json'; axios.interceptors.request.use( - (config: { headers: { Authorization: string }; params?: any; url?: any }) => { + (config: { headers: { Authorization: string }; params?: any; url?: any; httpsAgent: any }) => { const auth = getAuth(); if (auth?.access_token) { config.headers.Authorization = `Bearer ${auth.access_token}`; - - if ( - config.url && - !config.url.includes('api/b/') && - !config.url.includes('api/bg/') && - !config.url.includes('api/c/') - ) { - config.params = { - ...config.params, - token: auth.access_token || '' - }; - } } - return config; }, async (err: any) => await Promise.reject(err) diff --git a/src/auth/pages/jwt/Login.tsx b/src/auth/pages/jwt/Login.tsx index 6f22832..df76465 100644 --- a/src/auth/pages/jwt/Login.tsx +++ b/src/auth/pages/jwt/Login.tsx @@ -22,7 +22,6 @@ const loginSchema = Yup.object().shape({ const initialValues = { username: '', password: '', - application: 'credit', remember: false }; @@ -46,8 +45,8 @@ const Login = () => { throw new Error('JWTProvider is required for this form.'); } - await login(values.username, values.password, values.application); - console.log(login); + await login(values.username, values.password); + // console.log(login); if (values.remember) { localStorage.setItem('username', values.username); @@ -75,28 +74,14 @@ const Login = () => { }; return ( -
-
-
- -
-
-
-
- -
-

- / Pengajuan Kredit -

-
+
+ +
+

Sign in

{formik.status && {formik.status}}
@@ -176,9 +161,8 @@ const Login = () => { {loading ? 'Please wait...' : 'Sign In'}
-

- Copyright {moment().year()} © Bank Rakyat Indonesia Timor Leste.
All rights - reserved. +

+ Copyright {moment().year()} © Telkomcel All rights reserved.

diff --git a/src/auth/providers/JWTProvider.tsx b/src/auth/providers/JWTProvider.tsx index dae5723..79e7153 100644 --- a/src/auth/providers/JWTProvider.tsx +++ b/src/auth/providers/JWTProvider.tsx @@ -14,7 +14,7 @@ import { type AuthModel, type UserModel } from '@/auth'; import { apiConfig } from '@/config/api.config'; import { doSaveLogActivity } from '@/actions/GlobalActions'; -const API_URL = apiConfig.service_user; +const API_URL = apiConfig.service_dashboard; export const LOGIN_URL = `${API_URL}/login`; export const FORGOT_PASSWORD_URL = `${API_URL}/reset_password`; @@ -28,7 +28,7 @@ interface AuthContextProps { saveAuth: (auth: AuthModel | undefined) => void; currentUser: UserModel | undefined; setCurrentUser: Dispatch>; - login: (email: string, password: string, application: string) => Promise; + login: (email: string, password: string) => Promise; requestPasswordResetLink: (email: string) => Promise; changePassword: (token: string, password: string, password_confirmation: string) => Promise; getUser: () => Promise | {}>; @@ -70,13 +70,12 @@ const AuthProvider = ({ children }: PropsWithChildren) => { } }; - const login = async (username: string, password: string, application: string) => { + const login = async (username: string, password: string) => { try { const { data: auth } = await axios - .post(LOGIN_URL, { username, password, application }) + .post(LOGIN_URL, { username, password }) .then((response) => response.data); - // console.log('auth :', auth); saveAuth({ ...auth.token, id: auth.user.id, role_name: auth.role_name, user: auth.user }); setCurrentUser(auth.user); const createActivity = { diff --git a/src/components/loaders/ScreenLoader.tsx b/src/components/loaders/ScreenLoader.tsx index 500e933..1d47726 100644 --- a/src/components/loaders/ScreenLoader.tsx +++ b/src/components/loaders/ScreenLoader.tsx @@ -5,7 +5,7 @@ const ScreenLoader = () => {
logo
Loading...
diff --git a/src/config/api.config.ts b/src/config/api.config.ts index 1aadaaa..c882d64 100644 --- a/src/config/api.config.ts +++ b/src/config/api.config.ts @@ -1,18 +1,12 @@ interface apiConfigProps { - service_user: string; + service_dashboard: string; service_master_data: string; - service_bank: string; - service_bg: string; - service_credit: string; } const API_URL = import.meta.env.VITE_APP_API_URL; const apiConfig: apiConfigProps = { - service_user: `${API_URL}/u`, + service_dashboard: `${API_URL}/d`, service_master_data: `${API_URL}/m`, - service_bank: `${API_URL}/b`, - service_bg: `${API_URL}/bg`, - service_credit: `${API_URL}/c` }; export { apiConfig }; diff --git a/src/config/menu.config.tsx b/src/config/menu.config.tsx index 5fbed3b..9c4ddd3 100644 --- a/src/config/menu.config.tsx +++ b/src/config/menu.config.tsx @@ -7,50 +7,6 @@ export const MENU_SIDEBAR: TMenuConfig = [ { title: 'Dashboard', path: '/' - }, - { - title: 'Pengajuan Kredit', - children: [ - { - title: 'Chart', - path: '/pengajuan_kredit/chart' - }, - { - title: 'Summary', - path: '/pengajuan_kredit/summary' - }, - { - title: 'List', - path: '/pengajuan_kredit/list' - } - ] - }, - { - title: 'Instansi', - path: '/instansi' - }, - { - title: 'Configuration', - children: [ - { - title: 'User Management', - children: [ - { - title: 'Manage Position', - path: '/configuration/user-management/manage-position' - }, - { - title: 'Manage User', - path: '/configuration/user-management/manage-user' - }, - - { - title: 'Log Activity', - path: '/configuration/user-management/log-activity' - } - ] - } - ] } ] }, @@ -67,7 +23,7 @@ export const MENU_SIDEBAR: TMenuConfig = [ export const MENU_ROOT: TMenuConfig = [ { - title: 'Pengajuan Kredit', + title: 'Dashboard', icon: 'setting-2', rootPath: '/', path: '/', diff --git a/src/layouts/auth-branded/AuthBrandedLayout.tsx b/src/layouts/auth-branded/AuthBrandedLayout.tsx index e24f8a1..e6b7e15 100644 --- a/src/layouts/auth-branded/AuthBrandedLayout.tsx +++ b/src/layouts/auth-branded/AuthBrandedLayout.tsx @@ -1,71 +1,59 @@ import { Link, Outlet } from 'react-router-dom'; -import { Fragment, useState, useEffect } from 'react'; +import { Fragment } from 'react'; import { toAbsoluteUrl } from '@/utils'; import useBodyClasses from '@/hooks/useBodyClasses'; import { AuthBrandedLayoutProvider } from './AuthBrandedLayoutProvider'; const Layout = () => { - const backgroundImages = [ - '/media/login-image/img_01.jpg', - '/media/login-image/img_02.jpg', - '/media/login-image/img_03.jpg' - ]; - - const [currentImageIndex, setCurrentImageIndex] = useState(0); - const [nextImageIndex, setNextImageIndex] = useState(1); - const [isTransitioning, setIsTransitioning] = useState(false); + // Applying body classes to manage the background color in dark mode useBodyClasses('dark:bg-coal-500'); - useEffect(() => { - const interval = setInterval(() => { - const nextIndex = (currentImageIndex + 1) % backgroundImages.length; - setNextImageIndex(nextIndex); - setIsTransitioning(true); - - setTimeout(() => { - setCurrentImageIndex(nextIndex); - setIsTransitioning(false); - }, 3000); - }, 5000); - - return () => clearInterval(interval); - }, [currentImageIndex, backgroundImages.length]); return ( -
-
-
- {`Background + - {/* Next Image */} - {`Background -
-
-
+
+
+ +
+
+ + + + +
+

TPAY Dashboard Portal

+
+ A user-friendly interface providing seamless access to TPAY’s + +
+ transaction management, reporting tools, and configuration settings. + +
+
+
+
); }; +// AuthBrandedLayout component that wraps the Layout component with AuthBrandedLayoutProvider const AuthBrandedLayout = () => ( diff --git a/src/layouts/demo2/header/HeaderLogo.tsx b/src/layouts/demo2/header/HeaderLogo.tsx index 14bc05a..02993f8 100644 --- a/src/layouts/demo2/header/HeaderLogo.tsx +++ b/src/layouts/demo2/header/HeaderLogo.tsx @@ -43,59 +43,19 @@ const HeaderLogo = () => { alt="logo" /> */} logo logo
-

Brillian Apps

- / - - - - - {selectedMenuItem.title} - - - - - - {MENU_ROOT.map((item, index) => ( - - - {item.icon && ( - - - - )} - {item.title} - - - ))} - - - +

TPAY Dashboard Portal

); diff --git a/src/pages/account/home/user-profile/blocks/BasicSettings.tsx b/src/pages/account/home/user-profile/blocks/BasicSettings.tsx index aac2305..c5d9249 100644 --- a/src/pages/account/home/user-profile/blocks/BasicSettings.tsx +++ b/src/pages/account/home/user-profile/blocks/BasicSettings.tsx @@ -14,6 +14,7 @@ const BasicSettings = () => { // const user = localStorage.getItem('user'); // const parsedUser = user ? JSON.parse(user) : null; const parsedUser = getAuth()?.user; + console.log('parsedUser :', parsedUser); const [newUsername, setNewUsername] = useState(parsedUser?.username || ''); const [newEmail, setNewEmail] = useState(parsedUser?.email || ''); const [newName, setNewName] = useState(parsedUser?.name || ''); diff --git a/src/pages/account/home/user-profile/hooks/AccountUserProfileContext.tsx b/src/pages/account/home/user-profile/hooks/AccountUserProfileContext.tsx index 9e0e234..0b174b9 100644 --- a/src/pages/account/home/user-profile/hooks/AccountUserProfileContext.tsx +++ b/src/pages/account/home/user-profile/hooks/AccountUserProfileContext.tsx @@ -34,7 +34,7 @@ const initialProps: ContextProps = { const AccountUserProfileContext = createContext(initialProps); -const API_URL = apiConfig.service_user; +const API_URL = apiConfig.service_dashboard; const AccountUserProfileContextProvider = ({ children }: { children: React.ReactNode }) => { /* state */ @@ -60,8 +60,7 @@ const AccountUserProfileContextProvider = ({ children }: { children: React.React try { const validate = await PostData(`${API_URL}/login`, { password: newPassword.current_password, - username: newPassword.username, - application: 'credit' + username: newPassword.username }); if (!validate || !validate.status) { diff --git a/src/pages/configuration/user/log-activity/LogActivityPage.tsx b/src/pages/settings/user/log-activity/LogActivityPage.tsx similarity index 100% rename from src/pages/configuration/user/log-activity/LogActivityPage.tsx rename to src/pages/settings/user/log-activity/LogActivityPage.tsx diff --git a/src/pages/configuration/user/log-activity/blocks/DatePicker.tsx b/src/pages/settings/user/log-activity/blocks/DatePicker.tsx similarity index 100% rename from src/pages/configuration/user/log-activity/blocks/DatePicker.tsx rename to src/pages/settings/user/log-activity/blocks/DatePicker.tsx diff --git a/src/pages/configuration/user/log-activity/blocks/DateRangePicker.tsx b/src/pages/settings/user/log-activity/blocks/DateRangePicker.tsx similarity index 100% rename from src/pages/configuration/user/log-activity/blocks/DateRangePicker.tsx rename to src/pages/settings/user/log-activity/blocks/DateRangePicker.tsx diff --git a/src/pages/configuration/user/log-activity/blocks/ListToolBar.tsx b/src/pages/settings/user/log-activity/blocks/ListToolBar.tsx similarity index 100% rename from src/pages/configuration/user/log-activity/blocks/ListToolBar.tsx rename to src/pages/settings/user/log-activity/blocks/ListToolBar.tsx diff --git a/src/pages/configuration/user/log-activity/blocks/index.ts b/src/pages/settings/user/log-activity/blocks/index.ts similarity index 100% rename from src/pages/configuration/user/log-activity/blocks/index.ts rename to src/pages/settings/user/log-activity/blocks/index.ts diff --git a/src/pages/configuration/user/log-activity/hooks/LogActivityContext.tsx b/src/pages/settings/user/log-activity/hooks/LogActivityContext.tsx similarity index 97% rename from src/pages/configuration/user/log-activity/hooks/LogActivityContext.tsx rename to src/pages/settings/user/log-activity/hooks/LogActivityContext.tsx index 6245590..66b58d2 100644 --- a/src/pages/configuration/user/log-activity/hooks/LogActivityContext.tsx +++ b/src/pages/settings/user/log-activity/hooks/LogActivityContext.tsx @@ -26,7 +26,7 @@ const initialProps: ContextProps = { const LogActivityContext = createContext(initialProps); -const API_URL = apiConfig.service_user; +const API_URL = apiConfig.service_dashboard; const LogActivityContextProvider = ({ children }: { children: React.ReactNode }) => { /* state */ @@ -122,9 +122,7 @@ const LogActivityContextProvider = ({ children }: { children: React.ReactNode }) sorting = [{ id: 'user_activity.created_at', desc }]; - let dataFilter: any = { - application: 'credit' - }; + let dataFilter: any = {}; if (filter && filter.length > 0) { filter.forEach((f: any) => { @@ -153,7 +151,6 @@ const LogActivityContextProvider = ({ children }: { children: React.ReactNode }) order_field: sorting[0].id, order_direction: sorting[0].desc === false ? 'ASC' : 'DESC', filter: JSON.stringify(dataFilter), - token: parsedUser?.access_token, all_user: all_user }); @@ -172,9 +169,7 @@ const LogActivityContextProvider = ({ children }: { children: React.ReactNode }) if (auth) { all_user = auth.role_name === 'Super Admin'; } - let dataFilter: any = { - application: 'credit' - }; + let dataFilter: any = {}; if (filter && filter.length > 0) { filter.forEach((f: any) => { diff --git a/src/pages/configuration/user/log-activity/hooks/index.ts b/src/pages/settings/user/log-activity/hooks/index.ts similarity index 100% rename from src/pages/configuration/user/log-activity/hooks/index.ts rename to src/pages/settings/user/log-activity/hooks/index.ts diff --git a/src/pages/configuration/user/log-activity/hooks/useLogActivityContext.tsx b/src/pages/settings/user/log-activity/hooks/useLogActivityContext.tsx similarity index 100% rename from src/pages/configuration/user/log-activity/hooks/useLogActivityContext.tsx rename to src/pages/settings/user/log-activity/hooks/useLogActivityContext.tsx diff --git a/src/pages/configuration/user/log-activity/index.ts b/src/pages/settings/user/log-activity/index.ts similarity index 100% rename from src/pages/configuration/user/log-activity/index.ts rename to src/pages/settings/user/log-activity/index.ts diff --git a/src/pages/configuration/user/manage-position/ManagePositionPage.tsx b/src/pages/settings/user/manage-position/ManagePositionPage.tsx similarity index 100% rename from src/pages/configuration/user/manage-position/ManagePositionPage.tsx rename to src/pages/settings/user/manage-position/ManagePositionPage.tsx diff --git a/src/pages/configuration/user/manage-position/blocks/AddDialog.tsx b/src/pages/settings/user/manage-position/blocks/AddDialog.tsx similarity index 82% rename from src/pages/configuration/user/manage-position/blocks/AddDialog.tsx rename to src/pages/settings/user/manage-position/blocks/AddDialog.tsx index 4e5120c..6a953f2 100644 --- a/src/pages/configuration/user/manage-position/blocks/AddDialog.tsx +++ b/src/pages/settings/user/manage-position/blocks/AddDialog.tsx @@ -8,18 +8,17 @@ import { DialogHeader, DialogTitle } from '@/components/ui/dialog'; - import { useManagePositionContext } from '../hooks'; import { Input } from '@/components/ui/input'; import { Button } from '@/components/ui/button'; import { apiConfig } from '@/config/api.config'; -import { Alert, KeenIcon, useDataGrid } from '@/components'; +import { Alert, useDataGrid } from '@/components'; import { toast } from 'sonner'; import { useCallApi } from '@/hooks'; import { Checkbox } from '@/components/ui/checkbox'; import { doSaveLogActivity } from '@/actions/GlobalActions'; -const API_URL = apiConfig.service_user; +const API_URL = apiConfig.service_dashboard; interface MenuItem { id: string; @@ -88,7 +87,7 @@ const AddDialog = () => { name: formField.name, roles: selectMenus, status: 'Y', - application: 'credit' + application: 'ukln' }); if (response?.status) { @@ -112,35 +111,36 @@ const AddDialog = () => { return ( handleAddDialog(open)}> - + -
-
+
+

Positions - Create

+
-
{ - handleAddDialog(false); - }} +
+ Close +
- -
+ +
{alert.show && ( - +

{alert.message}

 )}
-
+
@@ -157,8 +157,8 @@ const AddDialog = () => {
{menus.map((menu) => ( -
-
+
+
{ ))}
-
+
diff --git a/src/pages/configuration/user/manage-position/blocks/DeleteDialog.tsx b/src/pages/settings/user/manage-position/blocks/DeleteDialog.tsx similarity index 98% rename from src/pages/configuration/user/manage-position/blocks/DeleteDialog.tsx rename to src/pages/settings/user/manage-position/blocks/DeleteDialog.tsx index 0532b20..2a15a2f 100644 --- a/src/pages/configuration/user/manage-position/blocks/DeleteDialog.tsx +++ b/src/pages/settings/user/manage-position/blocks/DeleteDialog.tsx @@ -15,7 +15,7 @@ import { useCallApi } from '@/hooks'; import { doSaveLogActivity } from '@/actions/GlobalActions'; import { EnforceSwitch } from '@/components/switch'; -const API_URL = apiConfig.service_user; +const API_URL = apiConfig.service_dashboard; const DeleteDialog = () => { const { showDeleteDialog, handleDeleteDialog, selectedPosition } = useManagePositionContext(); diff --git a/src/pages/configuration/user/manage-position/blocks/EditDialog.tsx b/src/pages/settings/user/manage-position/blocks/EditDialog.tsx similarity index 98% rename from src/pages/configuration/user/manage-position/blocks/EditDialog.tsx rename to src/pages/settings/user/manage-position/blocks/EditDialog.tsx index 91607d2..4209f2e 100644 --- a/src/pages/configuration/user/manage-position/blocks/EditDialog.tsx +++ b/src/pages/settings/user/manage-position/blocks/EditDialog.tsx @@ -25,7 +25,7 @@ import { } from '@/components/ui/select'; import { doSaveLogActivity } from '@/actions/GlobalActions'; -const API_URL = apiConfig.service_user; +const API_URL = apiConfig.service_dashboard; interface MenuItem { id: string; @@ -99,8 +99,7 @@ const EditDialog = () => { const response = await PutData(`${API_URL}/user_role/update/${selectedPosition.id}`, { name: formField.name, roles: selectMenus, - status: formField.status, - application: 'credit' + status: formField.status }); if (response?.status) { diff --git a/src/pages/configuration/user/manage-position/blocks/ListToolBar.tsx b/src/pages/settings/user/manage-position/blocks/ListToolBar.tsx similarity index 100% rename from src/pages/configuration/user/manage-position/blocks/ListToolBar.tsx rename to src/pages/settings/user/manage-position/blocks/ListToolBar.tsx diff --git a/src/pages/configuration/user/manage-position/blocks/index.ts b/src/pages/settings/user/manage-position/blocks/index.ts similarity index 100% rename from src/pages/configuration/user/manage-position/blocks/index.ts rename to src/pages/settings/user/manage-position/blocks/index.ts diff --git a/src/pages/configuration/user/manage-position/hooks/ManagePositionContext.tsx b/src/pages/settings/user/manage-position/hooks/ManagePositionContext.tsx similarity index 96% rename from src/pages/configuration/user/manage-position/hooks/ManagePositionContext.tsx rename to src/pages/settings/user/manage-position/hooks/ManagePositionContext.tsx index f256952..ee3f565 100644 --- a/src/pages/configuration/user/manage-position/hooks/ManagePositionContext.tsx +++ b/src/pages/settings/user/manage-position/hooks/ManagePositionContext.tsx @@ -38,7 +38,7 @@ const initialProps: ContextProps = { const ManagePositionContext = createContext(initialProps); -const API_URL = apiConfig.service_user; +const API_URL = apiConfig.service_dashboard; const API_URL_MD = apiConfig.service_master_data; const ManagePositionContextProvider = ({ children }: { children: React.ReactNode }) => { @@ -141,7 +141,7 @@ const ManagePositionContextProvider = ({ children }: { children: React.ReactNode with_deleted: false, order_field: sorting[0].id, order_direction: sorting[0].desc == false ? 'ASC' : 'DESC', - filter: JSON.stringify({ ...filter, application: 'credit' }) + filter: JSON.stringify({ ...filter }) }); return { data: response?.data.list, totalCount: response?.data.total_count }; @@ -154,9 +154,9 @@ const ManagePositionContextProvider = ({ children }: { children: React.ReactNode with_deleted: false, order_field: 'order_number', order_direction: 'ASC', - filter: JSON.stringify({ application: 'credit' }) + filter: JSON.stringify({}) }; - const response = await GetData(`${API_URL_MD}/menu/list`, params); + const response = await GetData(`${API_URL}/menus/list`, params); if (response?.status) { setMenus(() => [...response.data.list]); } else { diff --git a/src/pages/configuration/user/manage-position/hooks/index.ts b/src/pages/settings/user/manage-position/hooks/index.ts similarity index 100% rename from src/pages/configuration/user/manage-position/hooks/index.ts rename to src/pages/settings/user/manage-position/hooks/index.ts diff --git a/src/pages/configuration/user/manage-position/hooks/useManagePositionContext.tsx b/src/pages/settings/user/manage-position/hooks/useManagePositionContext.tsx similarity index 100% rename from src/pages/configuration/user/manage-position/hooks/useManagePositionContext.tsx rename to src/pages/settings/user/manage-position/hooks/useManagePositionContext.tsx diff --git a/src/pages/configuration/user/manage-position/index.ts b/src/pages/settings/user/manage-position/index.ts similarity index 100% rename from src/pages/configuration/user/manage-position/index.ts rename to src/pages/settings/user/manage-position/index.ts diff --git a/src/pages/configuration/user/user/ConfigUserPage.tsx b/src/pages/settings/user/user/ConfigUserPage.tsx similarity index 100% rename from src/pages/configuration/user/user/ConfigUserPage.tsx rename to src/pages/settings/user/user/ConfigUserPage.tsx diff --git a/src/pages/configuration/user/user/blocks/AddDialog.tsx b/src/pages/settings/user/user/blocks/AddDialog.tsx similarity index 99% rename from src/pages/configuration/user/user/blocks/AddDialog.tsx rename to src/pages/settings/user/user/blocks/AddDialog.tsx index f56f829..2b4ee68 100644 --- a/src/pages/configuration/user/user/blocks/AddDialog.tsx +++ b/src/pages/settings/user/user/blocks/AddDialog.tsx @@ -35,7 +35,7 @@ interface CreateUserParams { status: string; } -const API_URL = apiConfig.service_user; +const API_URL = apiConfig.service_dashboard; type PasswordType = 'password' | 'retype_password'; const AddDialog = () => { diff --git a/src/pages/configuration/user/user/blocks/DeleteDialog.tsx b/src/pages/settings/user/user/blocks/DeleteDialog.tsx similarity index 98% rename from src/pages/configuration/user/user/blocks/DeleteDialog.tsx rename to src/pages/settings/user/user/blocks/DeleteDialog.tsx index a76cdc6..0dce581 100644 --- a/src/pages/configuration/user/user/blocks/DeleteDialog.tsx +++ b/src/pages/settings/user/user/blocks/DeleteDialog.tsx @@ -9,7 +9,7 @@ import { useCallApi } from '@/hooks'; import { doSaveLogActivity } from '@/actions/GlobalActions'; import { EnforceSwitch } from '@/components/switch'; -const API_URL = apiConfig.service_user; +const API_URL = apiConfig.service_dashboard; const DeleteDialog = () => { const { showDeleteDialog, handleDeleteDialog, selectedUser } = useUserContext(); diff --git a/src/pages/configuration/user/user/blocks/EditDialog.tsx b/src/pages/settings/user/user/blocks/EditDialog.tsx similarity index 98% rename from src/pages/configuration/user/user/blocks/EditDialog.tsx rename to src/pages/settings/user/user/blocks/EditDialog.tsx index 5498072..43eab31 100644 --- a/src/pages/configuration/user/user/blocks/EditDialog.tsx +++ b/src/pages/settings/user/user/blocks/EditDialog.tsx @@ -24,7 +24,7 @@ import { toast } from 'sonner'; import { useCallApi } from '@/hooks'; import { doSaveLogActivity } from '@/actions/GlobalActions'; -const API_URL = apiConfig.service_user; +const API_URL = apiConfig.service_dashboard; const EditDialog = () => { const parentRef = useRef(null); @@ -86,7 +86,7 @@ const EditDialog = () => { const doFetchUserData = useCallback(async (id: string) => { const response = await GetData(`${API_URL}/user/detail/${id}`, { id }); if (response?.status) { - let id_role = response.data.roles.filter((item: any) => item.application.id == 'credit'); + let id_role = response.data.roles; setFormField((prev) => ({ ...prev, diff --git a/src/pages/configuration/user/user/blocks/ListToolBar.tsx b/src/pages/settings/user/user/blocks/ListToolBar.tsx similarity index 100% rename from src/pages/configuration/user/user/blocks/ListToolBar.tsx rename to src/pages/settings/user/user/blocks/ListToolBar.tsx diff --git a/src/pages/configuration/user/user/blocks/index.ts b/src/pages/settings/user/user/blocks/index.ts similarity index 100% rename from src/pages/configuration/user/user/blocks/index.ts rename to src/pages/settings/user/user/blocks/index.ts diff --git a/src/pages/configuration/user/user/hooks/ConfigUserContext.tsx b/src/pages/settings/user/user/hooks/ConfigUserContext.tsx similarity index 97% rename from src/pages/configuration/user/user/hooks/ConfigUserContext.tsx rename to src/pages/settings/user/user/hooks/ConfigUserContext.tsx index 154057c..7b2782f 100644 --- a/src/pages/configuration/user/user/hooks/ConfigUserContext.tsx +++ b/src/pages/settings/user/user/hooks/ConfigUserContext.tsx @@ -47,7 +47,7 @@ const initialProps: ContextProps = { const ConfigUserContext = createContext(initialProps); -const API_URL = apiConfig.service_user; +const API_URL = apiConfig.service_dashboard; const ConfigUserContextProvider = ({ children }: { children: React.ReactNode }) => { /* state */ @@ -114,9 +114,7 @@ const ConfigUserContextProvider = ({ children }: { children: React.ReactNode }) let html =

Unassigned

; for (let _role of roles) { - if (_role.application.id == 'credit') { - html = _role.name; - } + html = _role.name; } return html; }, @@ -200,8 +198,7 @@ const ConfigUserContextProvider = ({ children }: { children: React.ReactNode }) order_field: 'name', order_direction: 'ASC', filter: JSON.stringify({ - status: 'Y', - application: 'credit' + status: 'Y' }) }; const response = await GetData(`${API_URL}/user_role/list`, params); diff --git a/src/pages/configuration/user/user/hooks/index.ts b/src/pages/settings/user/user/hooks/index.ts similarity index 100% rename from src/pages/configuration/user/user/hooks/index.ts rename to src/pages/settings/user/user/hooks/index.ts diff --git a/src/pages/configuration/user/user/hooks/useUserContext.tsx b/src/pages/settings/user/user/hooks/useUserContext.tsx similarity index 100% rename from src/pages/configuration/user/user/hooks/useUserContext.tsx rename to src/pages/settings/user/user/hooks/useUserContext.tsx diff --git a/src/pages/configuration/user/user/index.ts b/src/pages/settings/user/user/index.ts similarity index 100% rename from src/pages/configuration/user/user/index.ts rename to src/pages/settings/user/user/index.ts diff --git a/src/routing/AppRoutingSetup.tsx b/src/routing/AppRoutingSetup.tsx index 082eea2..2b5a385 100644 --- a/src/routing/AppRoutingSetup.tsx +++ b/src/routing/AppRoutingSetup.tsx @@ -7,7 +7,7 @@ import { Demo2Layout } from '@/layouts/demo2'; import { ErrorsRouting } from '@/errors'; import DashboardHomePage from '@/pages/dashboards/home/DashboardHomePage'; -import ConfigUserPage from '@/pages/configuration/user/user/ConfigUserPage'; +import ConfigUserPage from '@/pages/settings/user/user/ConfigUserPage'; import CreditChartPage from '@/pages/pengajuan_kredit/chart/CreditChartPage'; import CreditSummaryPage from '@/pages/pengajuan_kredit/summary/CreditSummaryPage'; @@ -15,8 +15,8 @@ import CreditListPage from '@/pages/pengajuan_kredit/list/CreditListPage'; import CreditDetailPage from '@/pages/pengajuan_kredit/list/CreditDetailPage'; import CreditAddPage from '@/pages/pengajuan_kredit/list/CreditAddPage'; -import LogActivityPage from '@/pages/configuration/user/log-activity/LogActivityPage'; -import ManagePositionPage from '@/pages/configuration/user/manage-position/ManagePositionPage'; +import LogActivityPage from '@/pages/settings/user/log-activity/LogActivityPage'; +import ManagePositionPage from '@/pages/settings/user/manage-position/ManagePositionPage'; import InstansiPage from '@/pages/instansi/InstansiPage'; @@ -28,18 +28,10 @@ const AppRoutingSetup = (): ReactElement => { } /> } /> - } /> - } /> - } /> - } /> - } /> - - } /> - - } /> - } /> + } /> + } /> } /> diff --git a/yarn.lock b/yarn.lock index 9fb3031..a0396a9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2764,6 +2764,11 @@ hoist-non-react-statics@^3.3.0, hoist-non-react-statics@^3.3.1, hoist-non-react- dependencies: react-is "^16.7.0" +https@^1.0.0: + version "1.0.0" + resolved "https://registry.npmjs.org/https/-/https-1.0.0.tgz" + integrity sha512-4EC57ddXrkaF0x83Oj8sM6SLQHAWXw90Skqu2M4AEWENZ3F02dFJE/GARA8igO79tcgYqGrD7ae4f5L3um2lgg== + idb@7.1.1: version "7.1.1" resolved "https://registry.npmjs.org/idb/-/idb-7.1.1.tgz"