rt/wrolpi
1
0
Fork 0
mirror of https://github.com/lrnselfreliance/wrolpi.git synced 2026-10-26 19:01:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Updating code to use new version of react-router.

Browse source
This commit is contained in:
Roland 2025-12-07 11:54:20 -07:00
parent 303810476e
commit 8ea3ea8a67
No known key found for this signature in database
GPG key ID: 1BA620CE6C9A4680
28 changed files with 34 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/src/components/Apps.js
View file

@ -9,7 +9,7 @@ import {
TableCell,
TableRow
} from "semantic-ui-react";
import {Link, Route, Routes} from "react-router-dom";
import {Link, Route, Routes} from "react-router";
import {decryptOTP, encryptOTP} from "../api";
import {
APIButton,

2
app/src/components/Archive.js
View file

@ -46,7 +46,7 @@ import {
untagFileGroup
} from "../api";
import {CollectionTagModal} from "./collections/CollectionTagModal";
import {Link, Route, Routes, useLocation, useNavigate, useParams} from "react-router-dom";
import {Link, Route, Routes, useLocation, useNavigate, useParams} from "react-router";
import Message from "semantic-ui-react/dist/commonjs/collections/Message";
import {useArchive, useDomain, useDomains, useOneQuery, useSearchArchives, useSearchOrder} from "../hooks/customHooks";
import {FileCards, FileRowTagIcon, FilesView} from "./Files";

2
app/src/components/Calculators.js
View file

@ -5,7 +5,7 @@ import {useCalcQuery} from "../hooks/customHooks";
import {TemperatureCalculator} from "./calculators/TemperatureCalculator";
import {ElectricalCalculators} from "./calculators/ElectricalCalculators";
import {DipoleAntennaCalculator} from "./calculators/HamCalculators";
import {Link} from "react-router-dom";
import {Link} from "react-router";
import {RatioCalculators} from "./calculators/RatioCalculator";
import {QRCodeCalculator} from "./calculators/QRCodeCalculator";

2
app/src/components/Channels.js
View file

@ -15,7 +15,7 @@ import {
useTitle,
WROLModeMessage
} from "./Common";
import {Link, useNavigate, useParams} from "react-router-dom";
import {Link, useNavigate, useParams} from "react-router";
import Message from "semantic-ui-react/dist/commonjs/collections/Message";
import {useChannel, useChannels, useOneQuery} from "../hooks/customHooks";
import _ from "lodash";

2
app/src/components/Common.js
View file

@ -20,7 +20,7 @@ import {
Search,
Transition
} from 'semantic-ui-react';
import {Link, NavLink, useNavigate, useSearchParams} from "react-router-dom";
import {Link, NavLink, useNavigate, useSearchParams} from "react-router";
import Message from "semantic-ui-react/dist/commonjs/collections/Message";
import {useHotspot, useSearchDirectories, useSearchOrder, useThrottle, useWROLMode} from "../hooks/customHooks";
import {Media, SettingsContext, StatusContext, ThemeContext} from "../contexts/contexts";

4
app/src/components/DomainEditPage.test.js
View file

@ -4,8 +4,8 @@ import userEvent from '@testing-library/user-event';
import {DomainEditPage} from './Archive';
// Mock useParams to return domain ID
jest.mock('react-router-dom', () => ({
...jest.requireActual('react-router-dom'),
jest.mock('react-router', () => ({
...jest.requireActual('react-router'),
useParams: () => ({domainId: '1'}),
useNavigate: () => jest.fn(),
}));

2
app/src/components/Download.js
View file

@ -13,7 +13,7 @@ import Icon from "semantic-ui-react/dist/commonjs/elements/Icon";
import Message from "semantic-ui-react/dist/commonjs/collections/Message";
import {Button, Form, FormInput, Header} from "./Theme";
import {Form as SForm, FormDropdown} from "semantic-ui-react";
import {Link} from "react-router-dom";
import {Link} from "react-router";
import {TagsSelector} from "../Tags";
import Grid from "semantic-ui-react/dist/commonjs/collections/Grid";
import {

2
app/src/components/Files.js
View file

@ -41,7 +41,7 @@ import {
useStatusFlag,
useWROLMode
} from "../hooks/customHooks";
import {Route, Routes} from "react-router-dom";
import {Route, Routes} from "react-router";
import {CardPlaceholder} from "./Placeholder";
import {ArchiveCard, ArchiveRowCells} from "./Archive";
import Grid from "semantic-ui-react/dist/commonjs/collections/Grid";

2
app/src/components/Headline.js
View file

@ -3,7 +3,7 @@ import {Image, PlaceholderLine} from "semantic-ui-react";
import React from "react";
import {ThemeContext} from "../contexts/contexts";
import {encodeMediaPath, FileIcon, findPosterPath, PreviewLink} from "./Common";
import {Link} from "react-router-dom";
import {Link} from "react-router";
import _ from "lodash";
import Grid from "semantic-ui-react/dist/commonjs/collections/Grid";
import {FileRowTagIcon} from "./Files";

2
app/src/components/Inventory.js
View file

@ -23,7 +23,7 @@ import {
TableHeaderCell,
TableRow
} from "semantic-ui-react";
import {Route, Routes} from "react-router-dom";
import {Route, Routes} from "react-router";
import {arraysEqual, enumerate, PageContainer, replaceNullValues, TabLinks, useTitle} from './Common';
import _ from 'lodash';
import {ThemeContext} from "../contexts/contexts";

2
app/src/components/Map.js
View file

@ -12,7 +12,7 @@ import {
useTitle,
WROLModeMessage
} from "./Common";
import {Route, Routes} from "react-router-dom";
import {Route, Routes} from "react-router";
import {getMapImportStatus, importMapFiles} from "../api";
import {
Checkbox,

2
app/src/components/Nav.js
View file

@ -1,5 +1,5 @@
import React from "react";
import {Link, NavLink} from "react-router-dom";
import {Link, NavLink} from "react-router";
import {Dropdown, Icon as SIcon, Menu} from "semantic-ui-react";
import {Media, SettingsContext, StatusContext, ThemeContext} from "../contexts/contexts";
import {DarkModeToggle, HotspotStatusIcon, useLocalStorage} from "./Common";

2
app/src/components/Search.js
View file

@ -1,5 +1,5 @@
import React, {useState} from "react";
import {Link, Route, Routes, useNavigate} from "react-router-dom";
import {Link, Route, Routes, useNavigate} from "react-router";
import {FilesSearchView} from "./Files";
import {useLatestRequest, usePages, useSearchChannels, useSearchDate, useSearchFilter} from "../hooks/customHooks";
import {ZimSearchView} from "./Zim";

2
app/src/components/VideoPlayer.js
View file

@ -1,6 +1,6 @@
import React, {useContext} from 'react';
import {deleteVideos, downloadVideoMetadata, tagFileGroup, untagFileGroup} from "../api";
import {Link, useNavigate, useParams} from "react-router-dom";
import {Link, useNavigate, useParams} from "react-router";
import _ from "lodash";
import {
APIButton,

2
app/src/components/Videos.js
View file

@ -1,5 +1,5 @@
import React, {useContext, useEffect, useState} from 'react';
import {Link, Route, Routes, useParams} from "react-router-dom";
import {Link, Route, Routes, useParams} from "react-router";
import {
APIButton,
CardLink,

2
app/src/components/Zim.js
View file

@ -63,7 +63,7 @@ import {
import {useSearch} from "./Search";
import {TagsQuerySelector} from "./Files";
import {ThemeContext} from "../contexts/contexts";
import {Link, Route, Routes} from "react-router-dom";
import {Link, Route, Routes} from "react-router";
import {SortableTable} from "./SortableTable";
import {toast} from "react-semantic-toasts-2";
import _ from "lodash";

2
app/src/components/admin/AdminRoute.js
View file

@ -2,7 +2,7 @@ import React from 'react';
import {Container} from "semantic-ui-react";
import {getStatus, saveSettings} from "../../api";
import {PageContainer, TabLinks, Toggle} from "../Common";
import {Route, Routes} from "react-router-dom";
import {Route, Routes} from "react-router";
import {ThemeContext} from "../../contexts/contexts";
import {Header, Loader, Segment} from "../Theme";
import {DownloadsPage} from "./Downloads";

2
app/src/components/admin/Configs.js
View file

@ -3,7 +3,7 @@ import {Icon, Popup, Table} from "../Theme";
import React from "react";
import {TableBody, TableCell, TableHeader, TableHeaderCell, TableRow} from "semantic-ui-react";
import {TableRowPlaceholder} from "../Placeholder";
import {useNavigate} from "react-router-dom";
import {useNavigate} from "react-router";
function WarningIcon({ok}) {
// null is empty, true is valid, false is invalid.

2
app/src/components/admin/Downloads.js
View file

@ -7,7 +7,7 @@ import {
restartDownload,
retryOnceDownloads
} from "../../api";
import {Link} from "react-router-dom";
import {Link} from "react-router";
import {
APIButton,
DisableDownloadsToggle,

2
app/src/components/collections/CollectionTable.js
View file

@ -1,5 +1,5 @@
import React, {useContext} from 'react';
import {Link} from 'react-router-dom';
import {Link} from 'react-router';
import {Message, Placeholder, PlaceholderHeader, PlaceholderLine, Table, TableCell, TableRow} from 'semantic-ui-react';
import _ from 'lodash';
import {SortableTable} from '../SortableTable';