From dd4f41f2465ee6eaf63c8b11992dd245e4bb4ccb Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Sat, 7 May 2022 11:52:56 -0500
Subject: [PATCH] ExternalLogin: move to AuthLayout instead of UI

---
 app/soapbox/containers/soapbox.tsx         | 2 +-
 app/soapbox/features/auth_layout/index.tsx | 2 ++
 app/soapbox/features/ui/index.tsx          | 2 --
 app/soapbox/pages/default_page.tsx         | 4 +---
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/app/soapbox/containers/soapbox.tsx b/app/soapbox/containers/soapbox.tsx
index ffc19ad21..8ec61a645 100644
--- a/app/soapbox/containers/soapbox.tsx
+++ b/app/soapbox/containers/soapbox.tsx
@@ -185,7 +185,7 @@ const SoapboxMount = () => {
                 <Route exact path='/about/:slug?' component={PublicLayout} />
                 <Route exact path='/beta/:slug?' component={PublicLayout} />
                 <Route exact path='/mobile/:slug?' component={PublicLayout} />
-                <Route exact path='/login' component={AuthLayout} />
+                <Route path='/login' component={AuthLayout} />
                 {(features.accountCreation && instance.registrations) && (
                   <Route exact path='/signup' component={AuthLayout} />
                 )}
diff --git a/app/soapbox/features/auth_layout/index.tsx b/app/soapbox/features/auth_layout/index.tsx
index 7a0d39c71..cb5edd8c4 100644
--- a/app/soapbox/features/auth_layout/index.tsx
+++ b/app/soapbox/features/auth_layout/index.tsx
@@ -11,6 +11,7 @@ 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 RegistrationForm from '../auth_login/components/registration_form';
+import ExternalLoginForm from '../external_login/components/external-login-form';
 import Verification from '../verification';
 import EmailPassthru from '../verification/email_passthru';
 
@@ -44,6 +45,7 @@ const AuthLayout = () => {
                 <Switch>
                   <Route exact path='/verify' component={Verification} />
                   <Route exact path='/verify/email/:token' component={EmailPassthru} />
+                  <Route exact path='/login/external' component={ExternalLoginForm} />
                   <Route exact path='/login' component={LoginPage} />
                   <Route exact path='/signup' component={RegistrationForm} />
                   <Route exact path='/reset-password' component={PasswordReset} />
diff --git a/app/soapbox/features/ui/index.tsx b/app/soapbox/features/ui/index.tsx
index 91eda245f..6cf6515d6 100644
--- a/app/soapbox/features/ui/index.tsx
+++ b/app/soapbox/features/ui/index.tsx
@@ -76,7 +76,6 @@ import {
   // GroupRemovedAccounts,
   // GroupCreate,
   // GroupEdit,
-  ExternalLogin,
   Settings,
   MediaDisplay,
   EditProfile,
@@ -173,7 +172,6 @@ const SwitchingColumnsArea: React.FC = ({ children }) => {
   // Ex: use /login instead of /auth, but redirect /auth to /login
   return (
     <Switch>
-      <WrappedRoute path='/login/external' page={EmptyPage} component={ExternalLogin} content={children} publicRoute exact />
       <WrappedRoute path='/email-confirmation' page={EmptyPage} component={EmailConfirmation} publicRoute exact />
       <WrappedRoute path='/logout' page={EmptyPage} component={LogoutPage} publicRoute exact />
 
diff --git a/app/soapbox/pages/default_page.tsx b/app/soapbox/pages/default_page.tsx
index 1bf2c2731..21c9026f5 100644
--- a/app/soapbox/pages/default_page.tsx
+++ b/app/soapbox/pages/default_page.tsx
@@ -8,13 +8,11 @@ import {
   SignUpPanel,
 } from 'soapbox/features/ui/util/async-components';
 import { useAppSelector, useFeatures } from 'soapbox/hooks';
-import { isStandalone } from 'soapbox/utils/state';
 
 import { Layout } from '../components/ui';
 
 const DefaultPage: React.FC = ({ children }) => {
   const me = useAppSelector(state => state.me);
-  const standalone = useAppSelector(isStandalone);
   const features = useFeatures();
 
   return (
@@ -24,7 +22,7 @@ const DefaultPage: React.FC = ({ children }) => {
       </Layout.Main>
 
       <Layout.Aside>
-        {!me && !standalone && (
+        {!me && (
           <BundleContainer fetchComponent={SignUpPanel}>
             {Component => <Component key='sign-up-panel' />}
           </BundleContainer>