sforkowany z mirror/soapbox
/auth/verify --> /verify
rodzic
4765db5ef3
commit
e08a297eff
|
@ -157,7 +157,7 @@ const SoapboxMount = () => {
|
||||||
<>
|
<>
|
||||||
<ScrollContext shouldUpdateScroll={shouldUpdateScroll}>
|
<ScrollContext shouldUpdateScroll={shouldUpdateScroll}>
|
||||||
<Switch>
|
<Switch>
|
||||||
<Redirect from='/v1/verify_email/:token' to='/auth/verify/email/:token' />
|
<Redirect from='/v1/verify_email/:token' to='/verify/email/:token' />
|
||||||
|
|
||||||
{waitlisted && <Route render={(props) => <WaitlistPage {...props} account={account} />} />}
|
{waitlisted && <Route render={(props) => <WaitlistPage {...props} account={account} />} />}
|
||||||
|
|
||||||
|
@ -170,7 +170,7 @@ const SoapboxMount = () => {
|
||||||
<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 exact path='/login' component={AuthLayout} />
|
||||||
<Route path='/auth/verify' component={AuthLayout} />
|
<Route path='/verify' component={AuthLayout} />
|
||||||
<Route path='/reset-password' component={AuthLayout} />
|
<Route path='/reset-password' component={AuthLayout} />
|
||||||
<Route path='/edit-password' component={AuthLayout} />
|
<Route path='/edit-password' component={AuthLayout} />
|
||||||
|
|
||||||
|
|
|
@ -42,12 +42,11 @@ const AuthLayout = () => {
|
||||||
<Card variant='rounded' size='xl'>
|
<Card variant='rounded' size='xl'>
|
||||||
<CardBody>
|
<CardBody>
|
||||||
<Switch>
|
<Switch>
|
||||||
<Route exact path='/auth/verify' component={Verification} />
|
<Route exact path='/verify' component={Verification} />
|
||||||
<Route exact path='/auth/verify/email/:token' component={EmailPassthru} />
|
<Route exact path='/verify/email/:token' component={EmailPassthru} />
|
||||||
<Route exact path='/login' component={LoginPage} />
|
<Route exact path='/login' component={LoginPage} />
|
||||||
<Route exact path='/reset-password' component={PasswordReset} />
|
<Route exact path='/reset-password' component={PasswordReset} />
|
||||||
<Route exact path='/edit-password' component={PasswordResetConfirm} />
|
<Route exact path='/edit-password' component={PasswordResetConfirm} />
|
||||||
{/* <Route exact path='/auth/confirmation' component={EmailConfirmation} /> */}
|
|
||||||
|
|
||||||
<Redirect from='/auth/password/new' to='/reset-password' />
|
<Redirect from='/auth/password/new' to='/reset-password' />
|
||||||
<Redirect from='/auth/password/edit' to='/edit-password' />
|
<Redirect from='/auth/password/edit' to='/edit-password' />
|
||||||
|
|
|
@ -49,7 +49,7 @@ const LandingPage = () => {
|
||||||
<Text theme='muted' align='center'>Social Media Without Discrimination</Text>
|
<Text theme='muted' align='center'>Social Media Without Discrimination</Text>
|
||||||
</Stack>
|
</Stack>
|
||||||
|
|
||||||
<Button to='/auth/verify' theme='primary' block>Create an account</Button>
|
<Button to='/verify' theme='primary' block>Create an account</Button>
|
||||||
</Stack>
|
</Stack>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
|
@ -96,7 +96,7 @@ const Header = () => {
|
||||||
|
|
||||||
{(isOpen || features.pepe && pepeOpen) && (
|
{(isOpen || features.pepe && pepeOpen) && (
|
||||||
<Button
|
<Button
|
||||||
to={features.pepe ? '/auth/verify' : '/signup'} // FIXME: actually route this somewhere
|
to={features.pepe ? '/verify' : '/signup'} // FIXME: actually route this somewhere
|
||||||
theme='primary'
|
theme='primary'
|
||||||
>
|
>
|
||||||
{intl.formatMessage(messages.register)}
|
{intl.formatMessage(messages.register)}
|
||||||
|
|
|
@ -39,7 +39,7 @@ const LandingPageModal = ({ onClose }) => {
|
||||||
</Button>
|
</Button>
|
||||||
|
|
||||||
{isOpen && (
|
{isOpen && (
|
||||||
<Button to='/auth/verify' theme='primary' block>
|
<Button to='/verify' theme='primary' block>
|
||||||
{intl.formatMessage(messages.register)}
|
{intl.formatMessage(messages.register)}
|
||||||
</Button>
|
</Button>
|
||||||
)}
|
)}
|
||||||
|
|
|
@ -9,7 +9,7 @@ import Verification from '../index';
|
||||||
|
|
||||||
const TestableComponent = () => (
|
const TestableComponent = () => (
|
||||||
<Switch>
|
<Switch>
|
||||||
<Route path='/auth/verify' exact><Verification /></Route>
|
<Route path='/verify' exact><Verification /></Route>
|
||||||
<Route path='/' exact><span data-testid='home'>Homepage</span></Route>
|
<Route path='/' exact><span data-testid='home'>Homepage</span></Route>
|
||||||
</Switch>
|
</Switch>
|
||||||
);
|
);
|
||||||
|
@ -18,7 +18,7 @@ const renderComponent = (store) => render(
|
||||||
<TestableComponent />,
|
<TestableComponent />,
|
||||||
{},
|
{},
|
||||||
store,
|
store,
|
||||||
{ initialEntries: ['/auth/verify'] },
|
{ initialEntries: ['/verify'] },
|
||||||
);
|
);
|
||||||
|
|
||||||
describe('<Verification />', () => {
|
describe('<Verification />', () => {
|
||||||
|
|
Ładowanie…
Reference in New Issue