Light refactor of navigation components

packages/fakeyou.com/src/App.tsx

@@ -8,7 +8,7 @@ import {
 } from "@storyteller/components/src/api/locale/DetectLocale";
 import { Language } from "@storyteller/components/src/i18n/Language";
 import { BrowserRouter, Route, Switch } from "react-router-dom";
-import { NewVocodesContainer } from "./v2/view/NewVocodesContainer";
+import { PageContainer } from "./v2/view/PageContainer";
 import { SessionWrapper } from "@storyteller/components/src/session/SessionWrapper";
 import { SessionSubscriptionsWrapper } from "@storyteller/components/src/session/SessionSubscriptionsWrapper";
 import {
@@ -656,7 +656,7 @@ class App extends React.Component<Props, State> {
             <div className="migrationComponentWrapper">
               <Switch>
                 <Route path="/">
-                  <NewVocodesContainer
+                  <PageContainer
                     sessionWrapper={this.state.sessionWrapper}
                     querySessionAction={this.querySession}
                     sessionSubscriptionsWrapper={this.state.sessionSubscriptionsWrapper}

packages/fakeyou.com/src/v2/nav/FooterNav.tsx

@@ -3,7 +3,7 @@ import { GitSha } from "@storyteller/components/src/elements/GitSha";
 import { SessionWrapper } from "@storyteller/components/src/session/SessionWrapper";
 import { Link } from "react-router-dom";
 
-import { ModerationIcon } from "./_icons/ModerationIcon";
+import { ModerationIcon } from "../view/_icons/ModerationIcon";
 import { FrontendUrlConfig } from "../../common/FrontendUrlConfig";
 import { t } from "i18next";
 import { Trans } from "react-i18next";
@@ -22,7 +22,7 @@ interface Props {
   sessionWrapper: SessionWrapper;
 }
 
-function NewFooterNavFc(props: Props) {
+function FooterNav(props: Props) {
   let moderationLink = <span />;
 
   if (props.sessionWrapper.canBanUsers()) {
@@ -156,4 +156,4 @@ function NewFooterNavFc(props: Props) {
   );
 }
 
-export { NewFooterNavFc };
+export { FooterNav };

packages/fakeyou.com/src/v2/nav/TopNav.tsx

@@ -46,7 +46,7 @@ interface Props {
   querySessionSubscriptionsCallback: () => void;
 }
 
-function NewTopNavFc(props: Props) {
+function TopNav(props: Props) {
   // const defaultColourView = window.localStorage.getItem("darkMode");
   const defaultLowSpecView = window.localStorage.getItem("lowSpec");
 
@@ -579,4 +579,4 @@ function NewTopNavFc(props: Props) {
   );
 }
 
-export { NewTopNavFc };
+export { TopNav };

packages/fakeyou.com/src/v2/view/PageContainer.tsx

@@ -6,8 +6,8 @@ import { LoginPage } from "./login/LoginPage";
 import { ModerationFc } from "./moderation/moderation_main/ModerationFc";
 import { ModerationIpBanListFc } from "./moderation/moderation_ip_ban_list/ModerationIpBanListFc";
 import { ModerationViewIpBanFc } from "./moderation/moderation_view_ip_ban/ModerationViewIpBanFc";
-import { NewFooterNavFc } from "./NewFooterNavFc";
-import { NewTopNavFc } from "./NewTopNavFc";
+import { FooterNav } from "../nav/FooterNav";
+import { TopNav } from "../nav/TopNav";
 import { ProfileEditFc } from "./profile/profile_edit/ProfileEditFc";
 import { ProfileFc } from "./profile/profile_view/ProfileFc";
 import { SessionWrapper } from "@storyteller/components/src/session/SessionWrapper";
@@ -127,7 +127,7 @@ interface Props {
 
 interface State {}
 
-class NewVocodesContainer extends React.Component<Props, State> {
+class PageContainer extends React.Component<Props, State> {
   constructor(props: Props) {
     super(props);
 
@@ -140,7 +140,7 @@ class NewVocodesContainer extends React.Component<Props, State> {
     return (
       <div id="main" className="mainwrap">
         <div id="viewable">
-          <NewTopNavFc
+          <TopNav
             logoutHandler={this.logout}
             sessionWrapper={this.props.sessionWrapper}
             querySessionCallback={this.props.querySessionAction}
@@ -477,11 +477,11 @@ class NewVocodesContainer extends React.Component<Props, State> {
             </Route>
           </Switch>
 
-          <NewFooterNavFc sessionWrapper={this.props.sessionWrapper} />
+          <FooterNav sessionWrapper={this.props.sessionWrapper} />
         </div>
       </div>
     );
   }
 }
 
-export { NewVocodesContainer };
+export { PageContainer };