@@ -452,7 +470,9 @@ const MigrationManager: React.FC = () => {
- {translate('::App.DeveloperKit.Migration.NoSQLScript')}
+
+ {translate('::App.DeveloperKit.Migration.NoSQLScript')}
+
{translate('::App.DeveloperKit.Migration.NoSQLScriptDesc')}
@@ -468,7 +488,9 @@ const MigrationManager: React.FC = () => {
- {translate('::App.DeveloperKit.Migration.MigrationFailed')}
+
+ {translate('::App.DeveloperKit.Migration.MigrationFailed')}
+
{migration.errorMessage}
@@ -486,7 +508,9 @@ const MigrationManager: React.FC = () => {
- {searchTerm || filterStatus !== 'all' ? translate('::App.DeveloperKit.Migration.NoMigrationsFound') : translate('::App.DeveloperKit.Migration.NoMigrationsYet')}
+ {searchTerm || filterStatus !== 'all'
+ ? translate('::App.DeveloperKit.Migration.NoMigrationsFound')
+ : translate('::App.DeveloperKit.Migration.NoMigrationsYet')}
{searchTerm || filterStatus !== 'all'
diff --git a/ui/src/components/layouts/DeveloperLayout.tsx b/ui/src/components/layouts/DeveloperLayout.tsx
index 7e0e54ec..b54e1f79 100644
--- a/ui/src/components/layouts/DeveloperLayout.tsx
+++ b/ui/src/components/layouts/DeveloperLayout.tsx
@@ -19,31 +19,31 @@ const DeveloperLayout: React.FC = ({ children }) => {
id: 'dashboard',
label: translate('::App.DeveloperKit.Dashboard'),
icon: FaTachometerAlt,
- path: ROUTES_ENUM.protected.saas.developerKit,
+ path: ROUTES_ENUM.protected.saas.developerKit.dashboard,
},
{
id: 'entities',
label: translate('::App.DeveloperKit.Entity'),
icon: FaDatabase,
- path: ROUTES_ENUM.protected.saas.developerKitEntities,
+ path: ROUTES_ENUM.protected.saas.developerKit.entities,
},
{
id: 'migrations',
label: translate('::App.DeveloperKit.Migrations'),
icon: FaBolt,
- path: ROUTES_ENUM.protected.saas.developerKitMigrations,
+ path: ROUTES_ENUM.protected.saas.developerKit.migrations,
},
{
id: 'endpoints',
label: translate('::App.DeveloperKit.Endpoints'),
icon: FaServer,
- path: ROUTES_ENUM.protected.saas.developerKitEndpoints,
+ path: ROUTES_ENUM.protected.saas.developerKit.endpoints,
},
{
id: 'components',
label: translate('::App.DeveloperKit.Components'),
icon: FaPuzzlePiece,
- path: ROUTES_ENUM.protected.saas.developerKitComponents,
+ path: ROUTES_ENUM.protected.saas.developerKit.components,
},
]
diff --git a/ui/src/components/reports/ReportGenerator.tsx b/ui/src/components/reports/ReportGenerator.tsx
index f88c3095..2903aa0a 100644
--- a/ui/src/components/reports/ReportGenerator.tsx
+++ b/ui/src/components/reports/ReportGenerator.tsx
@@ -3,6 +3,7 @@ import { Button, Input, Dialog } from '../ui'
import { FaFileAlt } from 'react-icons/fa'
import { ReportTemplateDto } from '@/proxy/reports/models'
import { useLocalization } from '@/utils/hooks/useLocalization'
+import { ROUTES_ENUM } from '@/routes/route.constant'
interface ReportGeneratorProps {
isOpen: boolean
@@ -50,7 +51,7 @@ export const ReportGenerator: React.FC = ({
if (reportId) {
// Yeni sekmede rapor URL'sini aç
- const reportUrl = `/admin/reports/${reportId}`
+ const reportUrl = ROUTES_ENUM.protected.saas.reports.view.replace(':id', reportId)
window.open(reportUrl, '_blank')
onClose() // Modal'ı kapat
}
diff --git a/ui/src/routes/route.constant.ts b/ui/src/routes/route.constant.ts
index ce83b089..5293bf2e 100644
--- a/ui/src/routes/route.constant.ts
+++ b/ui/src/routes/route.constant.ts
@@ -4,11 +4,12 @@ export const ROUTES_ENUM = {
about: '/about',
products: '/products',
checkout: '/checkout',
- success: '/success',
payment: '/payment',
+ success: '/success',
services: '/services',
- demo: '/demo',
blog: '/blog',
+ blogDetail: '/blog/:id',
+ demo: '/demo',
contact: '/contact',
accessDenied: '/access-denied',
},
@@ -33,17 +34,23 @@ export const ROUTES_ENUM = {
edit: '/admin/chart/edit/:chartCode',
},
forumManagement: '/admin/forumManagement',
- developerKit: '/admin/developerkit',
- developerKitEntities: '/admin/developerkit/entities',
- developerKitEntitiesNew: '/admin/developerkit/entities/new',
- developerKitEntitiesEdit: '/admin/developerkit/entities/edit/:id',
- developerKitMigrations: '/admin/developerkit/migrations',
- developerKitEndpoints: '/admin/developerkit/endpoints',
- developerKitEndpointsNew: '/admin/developerkit/endpoints/new',
- developerKitComponents: '/admin/developerkit/components',
- developerKitComponentsNew: '/admin/developerkit/components/new',
- developerKitComponentsView: '/admin/developerkit/components/view/:id',
- developerKitComponentsEdit: '/admin/developerkit/components/edit/:id',
+ developerKit: {
+ dashboard: '/admin/developerkit',
+ entities: '/admin/developerkit/entities',
+ entitiesNew: '/admin/developerkit/entities/new',
+ entitiesEdit: '/admin/developerkit/entities/edit/:id',
+ migrations: '/admin/developerkit/migrations',
+ endpoints: '/admin/developerkit/endpoints',
+ endpointsNew: '/admin/developerkit/endpoints/new',
+ components: '/admin/developerkit/components',
+ componentsNew: '/admin/developerkit/components/new',
+ componentsView: '/admin/developerkit/components/view/:id',
+ componentsEdit: '/admin/developerkit/components/edit/:id',
+ },
+ reports: {
+ generator: '/admin/reports/generator',
+ view: '/admin/reports/:id',
+ },
},
admin: {
ai: '/admin/ai',
@@ -54,7 +61,6 @@ export const ROUTES_ENUM = {
},
activityLog: '/admin/activityLog',
changeLog: '/admin/changeLog',
-
settings: '/admin/settings',
identity: {
user: {
diff --git a/ui/src/views/admin/listForm/edit/FormEdit.tsx b/ui/src/views/admin/listForm/edit/FormEdit.tsx
index 8485cacc..67bf60a1 100644
--- a/ui/src/views/admin/listForm/edit/FormEdit.tsx
+++ b/ui/src/views/admin/listForm/edit/FormEdit.tsx
@@ -31,6 +31,7 @@ import { GridOptionsEditDto, ListFormCustomizationDto } from '@/proxy/form/model
import { IdentityRoleDto, IdentityUserDto } from '@/proxy/admin/models'
import { getListFormCustomizations } from '@/services/admin/list-form-customization.service'
import { Container } from '@/components/shared'
+import { ROUTES_ENUM } from '@/routes/route.constant'
export interface FormEditProps {
onSubmit: (
@@ -153,7 +154,7 @@ const FormEdit = () => {
-
+
🔙 {listFormCode} - {translate(`::${listFormValues.title}`)}
diff --git a/ui/src/views/admin/organization-unit/OrganizationUnits.tsx b/ui/src/views/admin/organization-unit/OrganizationUnits.tsx
index 8711304e..d12dbd59 100644
--- a/ui/src/views/admin/organization-unit/OrganizationUnits.tsx
+++ b/ui/src/views/admin/organization-unit/OrganizationUnits.tsx
@@ -68,6 +68,7 @@ import {
FaUserShield,
} from 'react-icons/fa'
import { object, string } from 'yup'
+import { ROUTES_ENUM } from '@/routes/route.constant'
const schema = object().shape({
id: string(),
@@ -587,7 +588,10 @@ const OrganizationUnits = () => {
diff --git a/ui/src/views/admin/user-management/Users.tsx b/ui/src/views/admin/user-management/Users.tsx
index f2fcabc7..190f221c 100644
--- a/ui/src/views/admin/user-management/Users.tsx
+++ b/ui/src/views/admin/user-management/Users.tsx
@@ -21,6 +21,7 @@ import {
PermissionWithStyle,
UpdatePermissionDto,
} from '@/proxy/admin/models'
+import { ROUTES_ENUM } from '@/routes/route.constant'
const { Tr, Th, Td, THead, TBody } = Table
@@ -249,7 +250,10 @@ const Users = () => {
|
{user.name} {user.surname}
diff --git a/ui/src/views/auth/VerifyConfirmationCode.tsx b/ui/src/views/auth/VerifyConfirmationCode.tsx
index 14627074..d6a19dfd 100644
--- a/ui/src/views/auth/VerifyConfirmationCode.tsx
+++ b/ui/src/views/auth/VerifyConfirmationCode.tsx
@@ -4,6 +4,7 @@ import { useNavigate, useParams } from 'react-router-dom'
import useAccount from '@/utils/hooks/useAccount'
import { useLocalization } from '@/utils/hooks/useLocalization'
import { Helmet } from 'react-helmet'
+import { ROUTES_ENUM } from '@/routes/route.constant'
const VerifyConfirmationCode = () => {
const { userId, token } = useParams()
@@ -37,7 +38,11 @@ const VerifyConfirmationCode = () => {
{error}
- |