Merge remote-tracking branch 'origin/march-2023-03-21' into feat/cv2-network-limits

DorkNet.Server/admin-ui/src/App.tsx

@@ -1,4 +1,4 @@
-import { Routes, Route, Navigate } from 'react-router-dom';
+import { Routes, Route, Navigate } from 'react-router';
 import { Layout } from './components/Layout';
 import { RequireAuth } from './components/RequireAuth';
 import { ToastProvider } from './components/Toast';

DorkNet.Server/admin-ui/src/components/Layout.tsx

@@ -1,4 +1,4 @@
-import { Outlet, useLocation, useNavigate } from 'react-router-dom';
+import { Outlet, useLocation, useNavigate } from 'react-router';
 import { useEffect, useState, useSyncExternalStore } from 'react';
 import { Sidebar } from './Sidebar';
 import { LogOut, Menu } from './Icons';

DorkNet.Server/admin-ui/src/components/RequireAuth.tsx

@@ -1,5 +1,5 @@
 import { useSyncExternalStore } from 'react';
-import { Navigate, useLocation } from 'react-router-dom';
+import { Navigate, useLocation } from 'react-router';
 import { getToken, subscribeAuth } from '../lib/auth';
 
 // Gate every authenticated route. We re-render on any auth state

DorkNet.Server/admin-ui/src/components/Sidebar.tsx

@@ -1,5 +1,5 @@
 import { useEffect } from 'react';
-import { NavLink } from 'react-router-dom';
+import { NavLink } from 'react-router';
 import {
   LayoutDashboard, Users, Building2, Activity,
   Megaphone, MessageSquare, Settings, X,

DorkNet.Server/admin-ui/src/components/Tabs.tsx

@@ -1,4 +1,4 @@
-import { useSearchParams } from 'react-router-dom';
+import { useSearchParams } from 'react-router';
 
 // Shared horizontal tab strip — the same underlined-button style the
 // per-player modal and the old Bans page already used inline, pulled

DorkNet.Server/admin-ui/src/main.tsx

@@ -1,6 +1,6 @@
 import React from 'react';
 import { createRoot } from 'react-dom/client';
-import { BrowserRouter } from 'react-router-dom';
+import { BrowserRouter } from 'react-router';
 import App from './App';
 import './index.css';
 

DorkNet.Server/admin-ui/src/pages/Dashboard.tsx

@@ -1,5 +1,5 @@
 import { useEffect, useState } from 'react';
-import { Link } from 'react-router-dom';
+import { Link } from 'react-router';
 import { api, get } from '../lib/api';
 import type { Stats } from '../lib/types';
 import { absoluteTime, num, relativeTime } from '../lib/format';

DorkNet.Server/admin-ui/src/pages/Login.tsx

@@ -1,5 +1,5 @@
 import { useState } from 'react';
-import { useNavigate, useLocation } from 'react-router-dom';
+import { useNavigate, useLocation } from 'react-router';
 import { api, ApiError } from '../lib/api';
 import { notifyAuthChange, setSession } from '../lib/auth';
 import { BrandMark } from '../components/BrandMark';

DorkNet.Server/admin-ui/src/pages/Players.tsx

@@ -1,5 +1,5 @@
 import { useEffect, useMemo, useState } from 'react';
-import { useSearchParams } from 'react-router-dom';
+import { useSearchParams } from 'react-router';
 import { api, get } from '../lib/api';
 import type { Player, PlayerDetail } from '../lib/types';
 import { absoluteTime, currencyName, num, relativeTime } from '../lib/format';

DorkNet.Server/admin-ui/src/pages/Room.tsx

@@ -1,5 +1,5 @@
 import { useEffect, useMemo, useState } from 'react';
-import { Link, useNavigate, useParams } from 'react-router-dom';
+import { Link, useNavigate, useParams } from 'react-router';
 import { api } from '../lib/api';
 import type { Player, RoomDetail, RoomInstance, RoomRoleGrant } from '../lib/types';
 import { profileImageUrl } from '../lib/types';

DorkNet.Server/admin-ui/src/pages/Rooms.tsx

@@ -1,5 +1,5 @@
 import { useEffect, useState } from 'react';
-import { Link } from 'react-router-dom';
+import { Link } from 'react-router';
 import { api } from '../lib/api';
 import { imageCdnUrl, type Room } from '../lib/types';
 import { useApi } from '../lib/useApi';