Merge remote-tracking branch 'upstream/main' into sync-upstream
# Conflicts: # CHANGELOG.md # package-lock.json # package.json # src/components/common/CommandPalette.tsx # src/components/common/LoadingFallback.tsx # src/components/common/Logo.tsx # src/components/forms/DynamicForm.tsx # src/components/forms/FieldWidget.tsx # src/components/layout/MainContent.tsx # src/components/layout/Sidebar.tsx # src/components/layout/TopBar.tsx # src/components/lists/DynamicList.tsx # src/components/ui/calendar.tsx # src/components/ui/command.tsx # src/components/ui/dialog.tsx # src/hooks/useDocumentTitle.ts # src/hooks/useGlobalSearch.ts # src/i18n/en.json # src/lib/lastVisited.ts # src/lib/logoCache.ts # src/pages/AdminPanel.lazy.tsx # src/pages/AdminPanel.tsx # src/pages/LoginPage.tsx # src/pages/NotFound.tsx # src/pages/OAuthCallback.tsx # src/stores/authStore.test.ts # src/stores/authStore.ts # src/stores/cacheStore.ts # vite.config.ts
This commit is contained in:
@@ -16,6 +16,7 @@ import NotFound from './pages/NotFound';
|
||||
import { AdminPanel } from './pages/AdminPanel.lazy';
|
||||
import { ProtectedRoute } from './components/layout/ProtectedRoute';
|
||||
import { getBasePath } from './lib/basePath';
|
||||
import { loadLogoOnce } from './lib/logoCache';
|
||||
|
||||
(() => {
|
||||
try {
|
||||
@@ -42,6 +43,8 @@ import { getBasePath } from './lib/basePath';
|
||||
} catch {}
|
||||
})();
|
||||
|
||||
loadLogoOnce();
|
||||
|
||||
const basePath = getBasePath();
|
||||
|
||||
const router = createBrowserRouter(
|
||||
|
||||
Reference in New Issue
Block a user