Fix web project build errors

web/pages/_app.tsx

@@ -21,13 +21,13 @@ import '../styles/pages.scss';
 import '../styles/offline-notice.scss';
 
 import { AppProps } from 'next/app';
-import { useRouter } from 'next/router';
+import { Router, useRouter } from 'next/router';
 
-import AdminLayout from './admin/admin-layout';
+import AdminLayout from '../components/layouts/admin-layout';
 import SimpleLayout from '../components/layouts/SimpleLayout';
 
 function App({ Component, pageProps }: AppProps) {
-  const router = useRouter();
+  const router = useRouter() as Router;
   if (router.pathname.startsWith('/admin')) {
     return <AdminLayout pageProps={pageProps} Component={Component} router={router} />;
   }

web/pages/admin/admin-layout.tsx

@@ -1,18 +0,0 @@
-import { AppProps } from 'next/app';
-import ServerStatusProvider from '../../utils/server-status-context';
-import AlertMessageProvider from '../../utils/alert-message-context';
-import MainLayout from '../../components/main-layout';
-
-function AdminLayout({ Component, pageProps }: AppProps) {
-  return (
-    <ServerStatusProvider>
-      <AlertMessageProvider>
-        <MainLayout>
-          <Component {...pageProps} />
-        </MainLayout>
-      </AlertMessageProvider>
-    </ServerStatusProvider>
-  );
-}
-
-export default AdminLayout;

web/pages/admin/config-notify.tsx

@@ -12,7 +12,7 @@ import TextFieldWithSubmit, {
 import { TEXTFIELD_PROPS_FEDERATION_INSTANCE_URL } from '../../utils/config-constants';
 import { ServerStatusContext } from '../../utils/server-status-context';
 import { UpdateArgs } from '../../types/config-section';
-import isValidUrl from '../utils/urls';
+import isValidUrl from '../../utils/urls';
 
 const { Title } = Typography;