salman/igny8
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use locat and navigate react odm router issue final fix

Browse Source
This commit is contained in:
IGNY8 VPS (Salman)
2025-12-10 13:58:13 +00:00
parent 3f49a2599e
commit c665c44aba
21 changed files with 337 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
frontend/package.json
View File

@@ -37,7 +37,6 @@
"react-dom": "^19.0.0",
"react-dropzone": "^14.3.5",
"react-helmet-async": "^2.0.5",
"react-router": "^7.1.5",
"react-router-dom": "^7.9.5",
"swiper": "^11.2.3",
"tailwind-merge": "^3.0.1",

2
frontend/src/components/common/DebugSiteSelector.tsx
View File

@@ -3,7 +3,7 @@
* Displays site switcher without sector selector - used exclusively for debug/status pages
*/
import { useState, useEffect, useRef } from 'react';
import { useNavigate } from 'react-router';
import { useNavigate } from 'react-router-dom';
import { Dropdown } from '../ui/dropdown/Dropdown';
import { DropdownItem } from '../ui/dropdown/DropdownItem';
import { fetchSites, Site, setActiveSite as apiSetActiveSite } from '../../services/api';

2
frontend/src/components/common/PageTransition.tsx
View File

@@ -1,5 +1,5 @@
import { ReactNode, useEffect, useState } from 'react';
import { useLocation } from 'react-router';
import { useLocation } from 'react-router-dom';
interface PageTransitionProps {
children: ReactNode;

2
frontend/src/components/common/SiteAndSectorSelector.tsx
View File

@@ -3,7 +3,7 @@
* Displays both site switcher and sector selector side by side with accent colors
*/
import { useState, useEffect, useRef } from 'react';
import { useNavigate } from 'react-router';
import { useNavigate } from 'react-router-dom';
import { Dropdown } from '../ui/dropdown/Dropdown';
import { DropdownItem } from '../ui/dropdown/DropdownItem';
import { fetchSites, Site, setActiveSite as apiSetActiveSite } from '../../services/api';

2
frontend/src/components/common/SiteSelector.tsx
View File

@@ -3,7 +3,7 @@
* Displays both site switcher and sector selector side by side with accent colors
*/
import { useState, useEffect, useRef } from 'react';
import { useNavigate } from 'react-router';
import { useNavigate } from 'react-router-dom';
import { Dropdown } from '../ui/dropdown/Dropdown';
import { DropdownItem } from '../ui/dropdown/DropdownItem';
import { fetchSites, Site, setActiveSite as apiSetActiveSite } from '../../services/api';

2
frontend/src/components/navigation/ModuleNavigationTabs.tsx
View File

@@ -5,7 +5,7 @@
*/
import React from 'react';
import { Link, useLocation } from 'react-router';
import { Link, useLocation } from 'react-router-dom';
import Button from '../ui/button/Button';
export interface NavigationTab {

2
frontend/src/pages/Linker/ContentList.tsx
View File

@@ -1,5 +1,5 @@
import { useState, useEffect, useCallback } from 'react';
import { useNavigate } from 'react-router';
import { useNavigate } from 'react-router-dom';
import PageMeta from '../../components/common/PageMeta';
import PageHeader from '../../components/common/PageHeader';
import ModuleNavigationTabs from '../../components/navigation/ModuleNavigationTabs';

2
frontend/src/pages/Linker/Dashboard.tsx
View File

@@ -1,5 +1,5 @@
import { useEffect, useState } from 'react';
import { Link, useNavigate } from 'react-router';
import { Link, useNavigate } from 'react-router-dom';
import PageMeta from '../../components/common/PageMeta';
import ComponentCard from '../../components/common/ComponentCard';
import EnhancedMetricCard from '../../components/dashboard/EnhancedMetricCard';

2
frontend/src/pages/Optimizer/AnalysisPreview.tsx
View File

@@ -1,5 +1,5 @@
import { useState, useEffect } from 'react';
import { useParams, useNavigate } from 'react-router';
import { useParams, useNavigate } from 'react-router-dom';
import PageMeta from '../../components/common/PageMeta';
import PageHeader from '../../components/common/PageHeader';
import { optimizerApi } from '../../api/optimizer.api';

2
frontend/src/pages/Optimizer/ContentSelector.tsx
View File

@@ -1,5 +1,5 @@
import { useState, useEffect, useCallback } from 'react';
import { useNavigate } from 'react-router';
import { useNavigate } from 'react-router-dom';
import PageMeta from '../../components/common/PageMeta';
import PageHeader from '../../components/common/PageHeader';
import ModuleNavigationTabs from '../../components/navigation/ModuleNavigationTabs';

2
frontend/src/pages/Optimizer/Dashboard.tsx
View File

@@ -1,5 +1,5 @@
import { useEffect, useState } from 'react';
import { Link, useNavigate } from 'react-router';
import { Link, useNavigate } from 'react-router-dom';
import PageMeta from '../../components/common/PageMeta';
import ComponentCard from '../../components/common/ComponentCard';
import EnhancedMetricCard from '../../components/dashboard/EnhancedMetricCard';

2
frontend/src/pages/Writer/Content.tsx
View File

@@ -14,7 +14,7 @@ import {
bulkDeleteContent,
} from '../../services/api';
import { optimizerApi } from '../../api/optimizer.api';
import { useNavigate } from 'react-router';
import { useNavigate } from 'react-router-dom';
import { useToast } from '../../components/ui/toast/ToastContainer';
import { FileIcon, TaskIcon, ImageIcon, CheckCircleIcon } from '../../icons';
import { createContentPageConfig } from '../../config/pages/content.config';

2
frontend/src/pages/Writer/ContentView.tsx
View File

@@ -4,7 +4,7 @@
*/
import { useState, useEffect } from 'react';
import { useParams, useNavigate } from 'react-router';
import { useParams, useNavigate } from 'react-router-dom';
import ContentViewTemplate from '../../templates/ContentViewTemplate';
import { fetchContentById, Content } from '../../services/api';
import { useToast } from '../../components/ui/toast/ToastContainer';

2
frontend/src/pages/Writer/Published.tsx
View File

@@ -15,7 +15,7 @@ import {
deleteContent,
bulkDeleteContent,
} from '../../services/api';
import { useNavigate } from 'react-router';
import { useNavigate } from 'react-router-dom';
import { useToast } from '../../components/ui/toast/ToastContainer';
import { FileIcon, TaskIcon, ImageIcon, CheckCircleIcon } from '../../icons';
import { createPublishedPageConfig } from '../../config/pages/published.config';

2
frontend/src/pages/Writer/Review.tsx
View File

@@ -12,7 +12,7 @@ import {
ContentFilters,
fetchAPI,
} from '../../services/api';
import { useNavigate } from 'react-router';
import { useNavigate } from 'react-router-dom';
import { useToast } from '../../components/ui/toast/ToastContainer';
import { FileIcon, TaskIcon, ImageIcon, CheckCircleIcon } from '../../icons';
import { createReviewPageConfig } from '../../config/pages/review.config';

2
frontend/src/templates/ContentViewTemplate.tsx
View File

@@ -18,7 +18,7 @@
import React, { useEffect, useMemo, useState } from 'react';
import { Content, fetchImages, ImageRecord } from '../services/api';
import { ArrowLeftIcon, CalendarIcon, TagIcon, FileTextIcon, CheckCircleIcon, XCircleIcon, ClockIcon, PencilIcon, ImageIcon, BoltIcon } from '../icons';
import { useNavigate } from 'react-router';
import { useNavigate } from 'react-router-dom';
interface ContentViewTemplateProps {
content: Content | null;

2
frontend/src/templates/TablePageTemplate.tsx
View File

@@ -14,7 +14,7 @@
*/
import React, { ReactNode, useState, useEffect, useRef, useMemo } from 'react';
import { useLocation } from 'react-router';
import { useLocation } from 'react-router-dom';
import {
Table,
TableHeader,