X-Git-Url: http://these/git/?a=blobdiff_plain;f=src%2Fshared%2Fcomponents%2Fapp%2Fapp.tsx;h=3452f9627c3159d672b676b98b75e3a8c0d166f8;hb=b1292b958af008763028df9591f5778be9d117f5;hp=a788636193bbb5f2c56dd064e0e546bfb1e7c807;hpb=62139df0c322101e805bde7f13399b86562e7c44;p=lemmy-ui.git

diff --git a/src/shared/components/app/app.tsx b/src/shared/components/app/app.tsx
index a788636..3452f96 100644
--- a/src/shared/components/app/app.tsx
+++ b/src/shared/components/app/app.tsx
@@ -1,56 +1,93 @@
-import { Component } from "inferno";
-import { Helmet } from "inferno-helmet";
+import { isAuthPath, setIsoData } from "@utils/app";
+import { dataBsTheme } from "@utils/browser";
+import { Component, RefObject, createRef, linkEvent } from "inferno";
 import { Provider } from "inferno-i18next-dess";
 import { Route, Switch } from "inferno-router";
-import { i18n } from "../../i18next";
+import { IsoDataOptionalSite } from "../../interfaces";
 import { routes } from "../../routes";
-import { favIconPngUrl, favIconUrl, setIsoData } from "../../utils";
+import { FirstLoadService, I18NextService, UserService } from "../../services";
+import AuthGuard from "../common/auth-guard";
+import ErrorGuard from "../common/error-guard";
+import { ErrorPage } from "./error-page";
 import { Footer } from "./footer";
 import { Navbar } from "./navbar";
-import { NoMatch } from "./no-match";
 import "./styles.scss";
 import { Theme } from "./theme";
 
 export class App extends Component<any, any> {
-  private isoData = setIsoData(this.context);
+  private isoData: IsoDataOptionalSite = setIsoData(this.context);
+  private readonly mainContentRef: RefObject<HTMLElement>;
   constructor(props: any, context: any) {
     super(props, context);
+    this.mainContentRef = createRef();
   }
+
+  handleJumpToContent(event) {
+    event.preventDefault();
+    this.mainContentRef.current?.focus();
+  }
+
+  user = UserService.Instance.myUserInfo;
+
+  componentDidMount() {
+    this.setState({ bsTheme: dataBsTheme(this.user) });
+  }
+
   render() {
-    let siteRes = this.isoData.site_res;
-    let siteView = siteRes.site_view;
+    const siteRes = this.isoData.site_res;
+    const siteView = siteRes?.site_view;
 
     return (
       <>
-        <Provider i18next={i18n}>
-          <div id="app">
-            <Theme defaultTheme={siteView.local_site.default_theme} />
-            {siteView.site.icon.match({
-              some: icon => (
-                <Helmet>
-                  <link
-                    id="favicon"
-                    rel="shortcut icon"
-                    type="image/x-icon"
-                    href={icon || favIconUrl}
-                  />
-                  <link rel="apple-touch-icon" href={icon || favIconPngUrl} />
-                </Helmet>
-              ),
-              none: <></>,
-            })}
+        <Provider i18next={I18NextService.i18n}>
+          <div
+            id="app"
+            className="lemmy-site"
+            data-bs-theme={this.state?.bsTheme}
+          >
+            <button
+              type="button"
+              className="btn skip-link bg-light position-absolute start-0 z-3"
+              onClick={linkEvent(this, this.handleJumpToContent)}
+            >
+              {I18NextService.i18n.t("jump_to_content", "Jump to content")}
+            </button>
+            {siteView && (
+              <Theme defaultTheme={siteView.local_site.default_theme} />
+            )}
             <Navbar siteRes={siteRes} />
             <div className="mt-4 p-0 fl-1">
               <Switch>
-                {routes.map(({ path, exact, component: C, ...rest }) => (
-                  <Route
-                    key={path}
-                    path={path}
-                    exact={exact}
-                    render={props => <C {...props} {...rest} />}
-                  />
-                ))}
-                <Route render={props => <NoMatch {...props} />} />
+                {routes.map(
+                  ({ path, component: RouteComponent, fetchInitialData }) => (
+                    <Route
+                      key={path}
+                      path={path}
+                      exact
+                      component={routeProps => {
+                        if (!fetchInitialData) {
+                          FirstLoadService.falsify();
+                        }
+
+                        return (
+                          <ErrorGuard>
+                            <div tabIndex={-1}>
+                              {RouteComponent &&
+                                (isAuthPath(path ?? "") ? (
+                                  <AuthGuard>
+                                    <RouteComponent {...routeProps} />
+                                  </AuthGuard>
+                                ) : (
+                                  <RouteComponent {...routeProps} />
+                                ))}
+                            </div>
+                          </ErrorGuard>
+                        );
+                      }}
+                    />
+                  )
+                )}
+                <Route component={ErrorPage} />
               </Switch>
             </div>
             <Footer site={siteRes} />