added redirects to old routes

Author: hotzenklotz

frontend/javascripts/admin/auth/account_settings_view.tsx

@@ -47,29 +47,27 @@ function AccountSettingsView() {
 
   return (
     <Layout style={{ minHeight: "calc(100vh - 64px)" }} className="container">
-      <Layout>
-        <Sider width={200}>
-          <Menu
-            mode="inline"
-            selectedKeys={[selectedKey]}
-            style={{ height: "100%" }}
-            items={menuItems}
-            onClick={({ key }) => history.push(`/account/${key}`)}
-          />
-        </Sider>
-        <Content style={{ padding: "24px", paddingTop: 0, minHeight: 280, maxWidth: 1000 }}>
-          <Breadcrumb style={{ marginBottom: "16px", padding: "8px 0" }}>
-            <Breadcrumb.Item>Account Settings</Breadcrumb.Item>
-            <Breadcrumb.Item>{subPageBreadcrumb}</Breadcrumb.Item>
-          </Breadcrumb>
-          <Switch>
-            <Route path="/account/profile" component={ProfileView} />
-            <Route path="/account/password" component={ChangePasswordView} />
-            <Route path="/account/token" component={AuthTokenView} />
-            <Route path="/account" component={ProfileView} />
-          </Switch>
-        </Content>
-      </Layout>
+      <Sider width={200}>
+        <Menu
+          mode="inline"
+          selectedKeys={[selectedKey]}
+          style={{ height: "100%" }}
+          items={menuItems}
+          onClick={({ key }) => history.push(`/account/${key}`)}
+        />
+      </Sider>
+      <Content style={{ padding: "24px", paddingTop: 0, minHeight: 280, maxWidth: 1000 }}>
+        <Breadcrumb style={{ marginBottom: "16px", padding: "8px 0" }}>
+          <Breadcrumb.Item>Account Settings</Breadcrumb.Item>
+          <Breadcrumb.Item>{subPageBreadcrumb}</Breadcrumb.Item>
+        </Breadcrumb>
+        <Switch>
+          <Route path="/account/profile" component={ProfileView} />
+          <Route path="/account/password" component={ChangePasswordView} />
+          <Route path="/account/token" component={AuthTokenView} />
+          <Route path="/account" component={ProfileView} />
+        </Switch>
+      </Content>
     </Layout>
   );
 }

frontend/javascripts/navbar.tsx

@@ -1,7 +1,6 @@
 import {
   BarChartOutlined,
   BellOutlined,
-  CheckOutlined,
   HomeOutlined,
   QuestionCircleOutlined,
   SwapOutlined,
@@ -36,7 +35,6 @@ import {
   sendAnalyticsEvent,
   switchToOrganization,
   updateNovelUserExperienceInfos,
-  updateSelectedThemeOfUser,
 } from "admin/rest_api";
 import type { ItemType, MenuItemType, SubMenuType } from "antd/es/menu/interface";
 import { MaintenanceBanner, UpgradeVersionBanner } from "banners";
@@ -50,20 +48,14 @@ import * as Utils from "libs/utils";
 import window, { location } from "libs/window";
 import messages from "messages";
 import type { MenuClickEventHandler } from "rc-menu/lib/interface";
-import { getAntdTheme, getSystemColorTheme } from "theme";
-import type {
-  APIOrganizationCompact,
-  APIUser,
-  APIUserCompact,
-  APIUserTheme,
-} from "types/api_types";
+import { getAntdTheme } from "theme";
+import type { APIOrganizationCompact, APIUser, APIUserCompact } from "types/api_types";
 import constants from "viewer/constants";
 import {
   isAnnotationFromDifferentOrganization,
   isAnnotationOwner as isAnnotationOwnerAccessor,
 } from "viewer/model/accessors/annotation_accessor";
 import { formatUserName } from "viewer/model/accessors/user_accessor";
-import { setThemeAction } from "viewer/model/actions/ui_actions";
 import { logoutUserAction, setActiveUserAction } from "viewer/model/actions/user_actions";
 import type { WebknossosState } from "viewer/store";
 import Store from "viewer/store";
@@ -573,7 +565,7 @@ function LoggedInAvatar({
   handleLogout: (event: React.SyntheticEvent) => void;
   navbarHeight: number;
 } & SubMenuProps) {
-  const { firstName, lastName, organization: organizationId, selectedTheme } = activeUser;
+  const { firstName, lastName, organization: organizationId } = activeUser;
   const usersOrganizations = useFetch(getUsersOrganizations, [], []);
   const activeOrganization = usersOrganizations.find((org) => org.id === organizationId);
   const switchableOrganizations = usersOrganizations.filter((org) => org.id !== organizationId);
@@ -593,16 +585,6 @@ function LoggedInAvatar({
     }
   };
 
-  const setSelectedTheme = async (newTheme: APIUserTheme) => {
-    if (newTheme === "auto") newTheme = getSystemColorTheme();
-
-    if (selectedTheme !== newTheme) {
-      const newUser = await updateSelectedThemeOfUser(activeUser.id, newTheme);
-      Store.dispatch(setThemeAction(newTheme));
-      Store.dispatch(setActiveUserAction(newUser));
-    }
-  };
-
   const maybeOrganizationFilterInput =
     switchableOrganizations.length > ORGANIZATION_COUNT_THRESHOLD_FOR_SEARCH_INPUT
       ? [
@@ -673,34 +655,10 @@ function LoggedInAvatar({
                   ],
                 }
               : null,
-            {
-              key: "resetpassword",
-              label: <Link to="/account/password">Change Password</Link>,
-            },
-            { key: "token", label: <Link to="/account/token">Auth Token</Link> },
             {
               key: "account",
               label: <Link to="/account">Account Settings</Link>,
             },
-            {
-              key: "theme",
-              label: "Theme",
-              children: [
-                ["auto", "System-default"],
-                ["light", "Light"],
-                ["dark", "Dark"],
-              ].map(([key, label]) => {
-                return {
-                  key,
-                  label: label,
-                  icon: selectedTheme === key ? <CheckOutlined /> : null,
-                  onClick: () => {
-                    // @ts-expect-error ts-migrate(2345) FIXME: Argument of type 'string' is not assignable to par... Remove this comment to see the full error message
-                    setSelectedTheme(key);
-                  },
-                };
-              }),
-            },
             {
               key: "logout",
               label: (

frontend/javascripts/router.tsx

@@ -1,6 +1,4 @@
 import AcceptInviteView from "admin/auth/accept_invite_view";
-import AuthTokenView from "admin/auth/auth_token_view";
-import ChangePasswordView from "admin/auth/change_password_view";
 import FinishResetPasswordView from "admin/auth/finish_reset_password_view";
 import LoginView from "admin/auth/login_view";
 import RegistrationView from "admin/auth/registration_view";
@@ -643,12 +641,12 @@ class ReactRouter extends React.Component<Props> {
               <SecuredRouteWithErrorBoundary
                 isAuthenticated={isAuthenticated}
                 path="/auth/token"
-                component={AuthTokenView}
+                render={() => <Redirect to="/account/login" />}
               />
               <SecuredRouteWithErrorBoundary
                 isAuthenticated={isAuthenticated}
                 path="/auth/changePassword"
-                component={ChangePasswordView}
+                render={() => <Redirect to="/account/password" />}
               />
               <RouteWithErrorBoundary path="/login" render={() => <Redirect to="/auth/login" />} />