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 ProfileSettingsPage

Browse source
This commit is contained in:
Vesa Luusua 2017-10-20 18:22:36 +03:00
parent de19161a4c
commit bc92abd93d
3 changed files with 61 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/containers/ProfileSettingsPage/ProfileSettingsPage.css
View file

@ -5,7 +5,7 @@
}
.content {
width: calc(100% - 48px);
margin: 12px 24px;
margin: 12px 24px 24px 24px;
@media (--viewportMedium) {
max-width: 565px;

36
src/containers/ProfileSettingsPage/ProfileSettingsPage.js
View file

@ -6,7 +6,15 @@ import { FormattedMessage } from 'react-intl';
import * as propTypes from '../../util/propTypes';
import { ensureCurrentUser } from '../../util/data';
import { isScrollingDisabled } from '../../ducks/UI.duck';
import { Page, UserNav } from '../../components';
import {
Page,
UserNav,
LayoutSingleColumn,
LayoutWrapperTopbar,
LayoutWrapperMain,
LayoutWrapperFooter,
Footer,
} from '../../components';
import { ProfileSettingsForm, TopbarContainer } from '../../containers';
import { clearUpdatedForm, updateProfile, uploadImage } from './ProfileSettingsPage.duck';
@ -91,15 +99,23 @@ export class ProfileSettingsPageComponent extends Component {
title="Profile settings"
scrollingDisabled={scrollingDisabled}
>
<TopbarContainer currentPage="ProfileSettingsPage" />
<UserNav selectedPageName="ProfileSettingsPage" />
<div className={css.content}>
<h1>
<FormattedMessage id="ProfileSettingsPage.title" />
</h1>
{profileSettingsForm}
</div>
<LayoutSingleColumn>
<LayoutWrapperTopbar>
<TopbarContainer currentPage="ProfileSettingsPage" />
<UserNav selectedPageName="ProfileSettingsPage" />
</LayoutWrapperTopbar>
<LayoutWrapperMain>
<div className={css.content}>
<h1>
<FormattedMessage id="ProfileSettingsPage.title" />
</h1>
{profileSettingsForm}
</div>
</LayoutWrapperMain>
<LayoutWrapperFooter>
<Footer />
</LayoutWrapperFooter>
</LayoutSingleColumn>
</Page>
);
}

47
src/containers/ProfileSettingsPage/__snapshots__/ProfileSettingsPage.test.js.snap
View file

@ -7,21 +7,42 @@ exports[`ContactDetailsPage matches snapshot 1`] = `
scrollingDisabled={false}
title="Profile settings"
>
<withRouter(Connect(TopbarContainerComponent))
currentPage="ProfileSettingsPage"
/>
<UserNav
<LayoutSingleColumn
className={null}
rootClassName={null}
selectedPageName="ProfileSettingsPage"
/>
<div>
<h1>
<FormattedMessage
id="ProfileSettingsPage.title"
values={Object {}}
>
<LayoutWrapperTopbar
className={null}
rootClassName={null}
>
<withRouter(Connect(TopbarContainerComponent))
currentPage="ProfileSettingsPage"
/>
</h1>
</div>
<UserNav
className={null}
rootClassName={null}
selectedPageName="ProfileSettingsPage"
/>
</LayoutWrapperTopbar>
<LayoutWrapperMain
className={null}
rootClassName={null}
>
<div>
<h1>
<FormattedMessage
id="ProfileSettingsPage.title"
values={Object {}}
/>
</h1>
</div>
</LayoutWrapperMain>
<LayoutWrapperFooter
className={null}
rootClassName={null}
>
<InjectIntl(Footer) />
</LayoutWrapperFooter>
</LayoutSingleColumn>
</Page>
`;