Move Reset Password into the UI

src/containers/soapbox.tsx

@@ -104,7 +104,6 @@ const SoapboxMount = () => {
         <Route exact path='/' component={PublicLayout} />
       )}
 
-      <Route path='/reset-password' component={AuthLayout} />
       <Route path='/edit-password' component={AuthLayout} />
       <Route path='/invite/:token' component={AuthLayout} />
 

src/features/auth-layout/index.tsx

@@ -8,7 +8,6 @@ import { useOwnAccount, useInstance, useRegistrationStatus } from 'soapbox/hooks
 
 import { Button, Card, CardBody } from '../../components/ui';
 import LoginPage from '../auth-login/components/login-page';
-import PasswordReset from '../auth-login/components/password-reset';
 import PasswordResetConfirm from '../auth-login/components/password-reset-confirm';
 import ExternalLoginForm from '../external-login/components/external-login-form';
 import Footer from '../public-layout/components/footer';
@@ -64,7 +63,6 @@ const AuthLayout = () => {
 
                     <Route exact path='/login/external' component={ExternalLoginForm} />
                     <Route exact path='/login/add' component={LoginPage} />
-                    <Route exact path='/reset-password' component={PasswordReset} />
                     <Route exact path='/edit-password' component={PasswordResetConfirm} />
                     <Route path='/invite/:token' component={RegisterInvite} />
 

src/features/ui/index.tsx

@@ -135,6 +135,7 @@ import {
   AboutPage,
   RegistrationPage,
   LoginPage,
+  PasswordReset,
 } from './util/async-components';
 import GlobalHotkeys from './util/global-hotkeys';
 import { WrappedRoute } from './util/react-router-helpers';
@@ -359,6 +360,7 @@ const SwitchingColumnsArea: React.FC<ISwitchingColumnsArea> = ({ children }) =>
       )}
 
       <WrappedRoute path='/login' page={DefaultPage} component={LoginPage} publicRoute exact />
+      <WrappedRoute path='/reset-password' page={DefaultPage} component={PasswordReset} publicRoute exact />
 
       <WrappedRoute page={EmptyPage} component={GenericNotFound} content={children} />
     </Switch>