diff --git a/api/src/Kurs.Platform.DbMigrator/Seeds/ListFormsSeeder.cs b/api/src/Kurs.Platform.DbMigrator/Seeds/ListFormsSeeder.cs index 4de93f7f..b5aa5ade 100644 --- a/api/src/Kurs.Platform.DbMigrator/Seeds/ListFormsSeeder.cs +++ b/api/src/Kurs.Platform.DbMigrator/Seeds/ListFormsSeeder.cs @@ -3139,7 +3139,7 @@ public class ListFormsSeeder : IDataSeedContributor, ITransientDependency Text ="Manage", UrlTarget="_blank", AuthName=AppCodes.Listforms.Listform + ".Update", - Url="/saas/listform/edit/@ListFormCode" + Url="/admin/listform/edit/@ListFormCode" }, new() { Hint = "Göster", @@ -4632,7 +4632,7 @@ public class ListFormsSeeder : IDataSeedContributor, ITransientDependency Text ="Manage", UrlTarget="_blank", AuthName=AppCodes.Listforms.Chart + ".Update", - Url="/saas/chart/edit/@ChartCode" + Url="/admin/chart/edit/@ChartCode" }, new() { Hint = "Göster", diff --git a/api/src/Kurs.Platform.DbMigrator/Seeds/SeederData.json b/api/src/Kurs.Platform.DbMigrator/Seeds/SeederData.json index 25c0b720..18b64a2e 100644 --- a/api/src/Kurs.Platform.DbMigrator/Seeds/SeederData.json +++ b/api/src/Kurs.Platform.DbMigrator/Seeds/SeederData.json @@ -6769,7 +6769,7 @@ "Code": "App.Menus.Manager", "DisplayName": "App.Menus.Manager", "Order": 2, - "Url": "/saas/menuManager", + "Url": "/admin/menuManager", "Icon": "FaRegListAlt", "RequiredPermissionName": "App.Menus.Manager", "IsDisabled": false @@ -6799,7 +6799,7 @@ "Code": "App.Listforms.Wizard", "DisplayName": "App.Listforms.Wizard", "Order": 2, - "Url": "/saas/listform/wizard", + "Url": "/admin/listform/wizard", "Icon": "FcFlashAuto", "RequiredPermissionName": "App.Listforms.Wizard", "IsDisabled": false @@ -6919,7 +6919,7 @@ "Code": "App.ForumManagement", "DisplayName": "App.ForumManagement", "Order": 12, - "Url": "/saas/forumManagement", + "Url": "/admin/forumManagement", "Icon": "FcReading", "RequiredPermissionName": "App.ForumManagement", "IsDisabled": false @@ -21552,36 +21552,36 @@ "authority": [] }, { - "key": "saas.menuManager", - "path": "/saas/menuManager", + "key": "admin.menuManager", + "path": "/admin/menuManager", "componentPath": "@/views/menu/MenuManager", "routeType": "protected", "authority": [] }, { - "key": "saas.listFormManagement.wizard", - "path": "/saas/listform/wizard", + "key": "admin.listFormManagement.wizard", + "path": "/admin/listform/wizard", "componentPath": "@/views/admin/listForm/Wizard", "routeType": "protected", "authority": [] }, { - "key": "saas.listFormManagement.edit", - "path": "/saas/listform/edit/:listFormCode", + "key": "admin.listFormManagement.edit", + "path": "/admin/listform/edit/:listFormCode", "componentPath": "@/views/admin/listForm/edit/FormEdit", "routeType": "protected", "authority": [] }, { - "key": "saas.chartManagement.edit", - "path": "/saas/chart/edit/:chartCode", + "key": "admin.chartManagement.edit", + "path": "/admin/chart/edit/:chartCode", "componentPath": "@/views/admin/chart/ChartEdit", "routeType": "protected", "authority": [] }, { - "key": "saas.forumManagement", - "path": "/saas/forumManagement", + "key": "admin.forumManagement", + "path": "/admin/forumManagement", "componentPath": "@/views/forum/Management", "routeType": "protected", "authority": [] diff --git a/company/src/pages/NotFound.tsx b/company/src/pages/NotFound.tsx index 10f55c17..ed056a76 100644 --- a/company/src/pages/NotFound.tsx +++ b/company/src/pages/NotFound.tsx @@ -3,7 +3,7 @@ import { Frown } from 'lucide-react'; // Lucide-react kütüphanesinden Frown ik import { useLanguage } from '../context/LanguageContext'; const NotFound: React.FC = () => { - const { t, language } = useLanguage(); + const { t } = useLanguage(); return ( diff --git a/ui/src/components/template/Logo.tsx b/ui/src/components/template/Logo.tsx index f159f54c..17e416e0 100644 --- a/ui/src/components/template/Logo.tsx +++ b/ui/src/components/template/Logo.tsx @@ -3,6 +3,7 @@ import { APP_NAME } from '@/constants/app.constant' import type { CommonProps } from '@/@types/common' import { Mode } from '@/@types/theme' import { Link } from 'react-router-dom' +import { ROUTES_ENUM } from '@/routes/route.constant' interface LogoProps extends CommonProps { type?: 'full' | 'streamline' @@ -24,7 +25,7 @@ const Logo = (props: LogoProps) => { ...{ width: logoWidth }, }} > - + { ) })} - } /> + } /> {/* Public Routes */} diff --git a/ui/src/routes/route.constant.ts b/ui/src/routes/route.constant.ts index 023abe30..e4bfde45 100644 --- a/ui/src/routes/route.constant.ts +++ b/ui/src/routes/route.constant.ts @@ -9,21 +9,20 @@ export const ROUTES_ENUM = { verifyConfirmationCode: '/confirm/:userId/:token', }, protected: { - root: '/home', + home: '/admin/home', saas: { - menuManager: '/saas/menuManager', + menuManager: '/admin/menuManager', listFormManagement: { - wizard: '/saas/listform/wizard', - edit: '/saas/listform/edit/:listFormCode', + wizard: '/admin/listform/wizard', + edit: '/admin/listform/edit/:listFormCode', }, chartManagement: { - edit: '/saas/chart/edit/:chartCode', + edit: '/admin/chart/edit/:chartCode', }, - forumManagement: '/saas/forumManagement', + forumManagement: '/admin/forumManagement', }, admin: { - home: '/home', ai: '/admin/ai', profile: { general: '/admin/profile/general', diff --git a/ui/src/views/AccessDenied.tsx b/ui/src/views/AccessDenied.tsx index d170244f..b0f071e4 100644 --- a/ui/src/views/AccessDenied.tsx +++ b/ui/src/views/AccessDenied.tsx @@ -1,6 +1,7 @@ import Container from '@/components/shared/Container' import DoubleSidedImage from '@/components/shared/DoubleSidedImage' import { Button } from '@/components/ui' +import { ROUTES_ENUM } from '@/routes/route.constant' import { useLocalization } from '@/utils/hooks/useLocalization' import { MdArrowBack } from 'react-icons/md' import { useNavigate } from 'react-router-dom' @@ -21,7 +22,7 @@ const AccessDenied = () => {

{ translate('::AccessDenied')}

{ translate('::AccessDeniedMessage')}

- diff --git a/ui/src/views/Views.tsx b/ui/src/views/Views.tsx index d0c7fc78..825dd776 100644 --- a/ui/src/views/Views.tsx +++ b/ui/src/views/Views.tsx @@ -5,7 +5,7 @@ import { store, useStoreState } from '@/store' import { Suspense, useEffect } from 'react' import { ErrorBoundary } from 'react-error-boundary' import { MdArrowBack } from 'react-icons/md' -import { useLocation } from 'react-router-dom' +import { Navigate, useLocation } from 'react-router-dom' import DialogProvider from './shared/DialogContext' import DialogShowComponent from './shared/DialogContext/DialogShowComponent' import UiDialog from './shared/UiDialog' @@ -47,6 +47,9 @@ const Views = (props: ViewsProps) => { ))} )} + {errors?.some((e) => e.statusCode === '403' || e.statusCode === '401') && ( + + )} {errors?.map((e) => ( a.abpConfig) + const [isLoading, setIsLoading] = useState(false) const [permissionList, setPermissionList] = useState() const [selectedGroup, setSelectedGroup] = useState() @@ -97,6 +98,11 @@ function RolesPermission({ onDialogClose() setIsLoading(false) }, 1000) + + + setTimeout(async () => { + getConfig(true) + }, 2000) } function getPermissionsWithGroupName(groups: PermissionGroupDto[]): PermissionWithGroupName[] { diff --git a/ui/src/views/list/useFilters.tsx b/ui/src/views/list/useFilters.tsx index bcaa370c..a08fcc8f 100644 --- a/ui/src/views/list/useFilters.tsx +++ b/ui/src/views/list/useFilters.tsx @@ -168,7 +168,7 @@ const useFilters = ({ } else if (itemData.id === 'openPivotGrid') { navigate(`/pivot/${listFormCode}`) } else if (itemData.id === 'openManage') { - window.open(`/saas/listform/edit/${listFormCode}`, isPwaMode ? '_self' : '_blank') + window.open(`/admin/listform/edit/${listFormCode}`, isPwaMode ? '_self' : '_blank') } else if (itemData.id === 'clearFilter') { // gridin bütün filtrelerini temizle const grid = gridRef.current?.instance