diff --git a/frontend/src/components/ErrorScreen.tsx b/frontend/src/components/ErrorScreen.tsx index c5f82ad..03ae2e0 100644 --- a/frontend/src/components/ErrorScreen.tsx +++ b/frontend/src/components/ErrorScreen.tsx @@ -31,7 +31,7 @@ export default ({ status }: Props) => { style.innerHTML = ` @font-face { - font-family: 'MyFont'; + font-family: 'Nikumaru'; src: url(${ nikumaru }) format('opentype'); }` document.head.appendChild (style) @@ -42,15 +42,15 @@ export default ({ status }: Props) => {
{status}
-{leftMsg}
-{rightMsg}
{message}
diff --git a/frontend/src/components/TopNav.tsx b/frontend/src/components/TopNav.tsx index 7ab5342..15b0c97 100644 --- a/frontend/src/components/TopNav.tsx +++ b/frontend/src/components/TopNav.tsx @@ -1,9 +1,10 @@ import axios from 'axios' import toCamel from 'camelcase-keys' import { useState, useEffect } from 'react' -import { Link, useLocation, useNavigate } from 'react-router-dom' +import { Link, useLocation } from 'react-router-dom' import Separator from '@/components/MenuSeparator' +import TopNavUser from '@/components/TopNavUser' import { API_BASE_URL } from '@/config' import { WikiIdBus } from '@/lib/eventBus/WikiIdBus' import { cn } from '@/lib/utils' @@ -15,7 +16,6 @@ type Props = { user: User | null } export default ({ user }: Props) => { const location = useLocation () - const navigate = useNavigate () const [menuOpen, setMenuOpen] = useState (false) const [openItemIdx, setOpenItemIdx] = useState (-1) @@ -57,6 +57,7 @@ export default ({ user }: Props) => { }, []) useEffect (() => { + setMenuOpen (false) setOpenItemIdx (menu.findIndex (item => ( location.pathname.startsWith (item.base || item.to)))) }, [location]) @@ -107,14 +108,7 @@ export default ({ user }: Props) => { ))}