ExternalLogin: move to AuthLayout instead of UI
This commit is contained in:
parent
4d898e1075
commit
dd4f41f246
4 changed files with 4 additions and 6 deletions
|
@ -185,7 +185,7 @@ const SoapboxMount = () => {
|
||||||
<Route exact path='/about/:slug?' component={PublicLayout} />
|
<Route exact path='/about/:slug?' component={PublicLayout} />
|
||||||
<Route exact path='/beta/:slug?' component={PublicLayout} />
|
<Route exact path='/beta/:slug?' component={PublicLayout} />
|
||||||
<Route exact path='/mobile/: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) && (
|
{(features.accountCreation && instance.registrations) && (
|
||||||
<Route exact path='/signup' component={AuthLayout} />
|
<Route exact path='/signup' component={AuthLayout} />
|
||||||
)}
|
)}
|
||||||
|
|
|
@ -11,6 +11,7 @@ import LoginPage from '../auth_login/components/login_page';
|
||||||
import PasswordReset from '../auth_login/components/password_reset';
|
import PasswordReset from '../auth_login/components/password_reset';
|
||||||
import PasswordResetConfirm from '../auth_login/components/password_reset_confirm';
|
import PasswordResetConfirm from '../auth_login/components/password_reset_confirm';
|
||||||
import RegistrationForm from '../auth_login/components/registration_form';
|
import RegistrationForm from '../auth_login/components/registration_form';
|
||||||
|
import ExternalLoginForm from '../external_login/components/external-login-form';
|
||||||
import Verification from '../verification';
|
import Verification from '../verification';
|
||||||
import EmailPassthru from '../verification/email_passthru';
|
import EmailPassthru from '../verification/email_passthru';
|
||||||
|
|
||||||
|
@ -44,6 +45,7 @@ const AuthLayout = () => {
|
||||||
<Switch>
|
<Switch>
|
||||||
<Route exact path='/verify' component={Verification} />
|
<Route exact path='/verify' component={Verification} />
|
||||||
<Route exact path='/verify/email/:token' component={EmailPassthru} />
|
<Route exact path='/verify/email/:token' component={EmailPassthru} />
|
||||||
|
<Route exact path='/login/external' component={ExternalLoginForm} />
|
||||||
<Route exact path='/login' component={LoginPage} />
|
<Route exact path='/login' component={LoginPage} />
|
||||||
<Route exact path='/signup' component={RegistrationForm} />
|
<Route exact path='/signup' component={RegistrationForm} />
|
||||||
<Route exact path='/reset-password' component={PasswordReset} />
|
<Route exact path='/reset-password' component={PasswordReset} />
|
||||||
|
|
|
@ -76,7 +76,6 @@ import {
|
||||||
// GroupRemovedAccounts,
|
// GroupRemovedAccounts,
|
||||||
// GroupCreate,
|
// GroupCreate,
|
||||||
// GroupEdit,
|
// GroupEdit,
|
||||||
ExternalLogin,
|
|
||||||
Settings,
|
Settings,
|
||||||
MediaDisplay,
|
MediaDisplay,
|
||||||
EditProfile,
|
EditProfile,
|
||||||
|
@ -173,7 +172,6 @@ const SwitchingColumnsArea: React.FC = ({ children }) => {
|
||||||
// Ex: use /login instead of /auth, but redirect /auth to /login
|
// Ex: use /login instead of /auth, but redirect /auth to /login
|
||||||
return (
|
return (
|
||||||
<Switch>
|
<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='/email-confirmation' page={EmptyPage} component={EmailConfirmation} publicRoute exact />
|
||||||
<WrappedRoute path='/logout' page={EmptyPage} component={LogoutPage} publicRoute exact />
|
<WrappedRoute path='/logout' page={EmptyPage} component={LogoutPage} publicRoute exact />
|
||||||
|
|
||||||
|
|
|
@ -8,13 +8,11 @@ import {
|
||||||
SignUpPanel,
|
SignUpPanel,
|
||||||
} from 'soapbox/features/ui/util/async-components';
|
} from 'soapbox/features/ui/util/async-components';
|
||||||
import { useAppSelector, useFeatures } from 'soapbox/hooks';
|
import { useAppSelector, useFeatures } from 'soapbox/hooks';
|
||||||
import { isStandalone } from 'soapbox/utils/state';
|
|
||||||
|
|
||||||
import { Layout } from '../components/ui';
|
import { Layout } from '../components/ui';
|
||||||
|
|
||||||
const DefaultPage: React.FC = ({ children }) => {
|
const DefaultPage: React.FC = ({ children }) => {
|
||||||
const me = useAppSelector(state => state.me);
|
const me = useAppSelector(state => state.me);
|
||||||
const standalone = useAppSelector(isStandalone);
|
|
||||||
const features = useFeatures();
|
const features = useFeatures();
|
||||||
|
|
||||||
return (
|
return (
|
||||||
|
@ -24,7 +22,7 @@ const DefaultPage: React.FC = ({ children }) => {
|
||||||
</Layout.Main>
|
</Layout.Main>
|
||||||
|
|
||||||
<Layout.Aside>
|
<Layout.Aside>
|
||||||
{!me && !standalone && (
|
{!me && (
|
||||||
<BundleContainer fetchComponent={SignUpPanel}>
|
<BundleContainer fetchComponent={SignUpPanel}>
|
||||||
{Component => <Component key='sign-up-panel' />}
|
{Component => <Component key='sign-up-panel' />}
|
||||||
</BundleContainer>
|
</BundleContainer>
|
||||||
|
|
Loading…
Reference in a new issue