maverick/flex-template-web
1
0
Fork 0
mirror of https://github.com/kingomarnajjar/flex-template-web.git synced 2026-07-26 06:47:17 +10:00
Code Issues Projects Releases Packages Wiki Activity Actions

Footer to AuthenticationPage

Browse source
This commit is contained in:
Vesa Luusua 2017-10-20 18:17:43 +03:00
parent f3252b28ae
commit c48f16d81d
3 changed files with 102 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/containers/AuthenticationPage/AuthenticationPage.css
View file

@ -1,5 +1,13 @@
@import '../../marketplace.css';
.layoutWrapperMain {
min-height: calc(100vh - var(--topbarHeight));
@media (--viewportMedium) {
min-height: calc(100vh - var(--topbarHeightDesktop));
}
}
.root {
@apply --marketplaceModalRootStyles;
}

22
src/containers/AuthenticationPage/AuthenticationPage.js
View file

@ -20,6 +20,11 @@ import {
IconEmailSent,
InlineTextButton,
IconClose,
LayoutSingleColumn,
LayoutWrapperTopbar,
LayoutWrapperMain,
LayoutWrapperFooter,
Footer,
} from '../../components';
import { LoginForm, SignupForm, TopbarContainer } from '../../containers';
import { login, authenticationInProgress, signup } from '../../ducks/Auth.duck';
@ -216,10 +221,19 @@ export const AuthenticationPageComponent = props => {
name: schemaTitle,
}}
>
<TopbarContainer className={topbarClasses} />
<div className={css.root}>
{showEmailVerification ? emailVerificationContent : formContent}
</div>
<LayoutSingleColumn>
<LayoutWrapperTopbar>
<TopbarContainer className={topbarClasses} />
</LayoutWrapperTopbar>
<LayoutWrapperMain className={css.layoutWrapperMain}>
<div className={css.root}>
{showEmailVerification ? emailVerificationContent : formContent}
</div>
</LayoutWrapperMain>
<LayoutWrapperFooter>
<Footer />
</LayoutWrapperFooter>
</LayoutSingleColumn>
</Page>
);
};

131
src/containers/AuthenticationPage/__snapshots__/AuthenticationPage.test.js.snap
View file

@ -14,61 +14,82 @@ exports[`AuthenticationPageComponent matches snapshot 1`] = `
scrollingDisabled={false}
title="AuthenticationPage.schemaTitleLogin"
>
<withRouter(Connect(TopbarContainerComponent))
className=""
/>
<div>
<div>
<TabNavHorizontal
className={null}
rootClassName={null}
skin="light"
tabClassName={null}
tabRootClassName={null}
tabs={
Array [
Object {
"linkProps": Object {
"name": "SignupPage",
"to": Object {
"state": Object {
"from": "/protected",
},
},
},
"selected": false,
"text": <h1>
<FormattedMessage
id="AuthenticationPage.signupLinkText"
values={Object {}}
/>
</h1>,
},
Object {
"linkProps": Object {
"name": "LoginPage",
"to": Object {
"state": Object {
"from": "/protected",
},
},
},
"selected": true,
"text": <h1>
<FormattedMessage
id="AuthenticationPage.loginLinkText"
values={Object {}}
/>
</h1>,
},
]
}
<LayoutSingleColumn
className={null}
rootClassName={null}
>
<LayoutWrapperTopbar
className={null}
rootClassName={null}
>
<withRouter(Connect(TopbarContainerComponent))
className=""
/>
<ReduxForm
inProgress={false}
onSubmit={[Function]}
/>
</div>
</div>
</LayoutWrapperTopbar>
<LayoutWrapperMain
className={null}
rootClassName={null}
>
<div>
<div>
<TabNavHorizontal
className={null}
rootClassName={null}
skin="light"
tabClassName={null}
tabRootClassName={null}
tabs={
Array [
Object {
"linkProps": Object {
"name": "SignupPage",
"to": Object {
"state": Object {
"from": "/protected",
},
},
},
"selected": false,
"text": <h1>
<FormattedMessage
id="AuthenticationPage.signupLinkText"
values={Object {}}
/>
</h1>,
},
Object {
"linkProps": Object {
"name": "LoginPage",
"to": Object {
"state": Object {
"from": "/protected",
},
},
},
"selected": true,
"text": <h1>
<FormattedMessage
id="AuthenticationPage.loginLinkText"
values={Object {}}
/>
</h1>,
},
]
}
/>
<ReduxForm
inProgress={false}
onSubmit={[Function]}
/>
</div>
</div>
</LayoutWrapperMain>
<LayoutWrapperFooter
className={null}
rootClassName={null}
>
<InjectIntl(Footer) />
</LayoutWrapperFooter>
</LayoutSingleColumn>
</Page>
`;