tmshv/hudozka
1
0 Fork 0
Code Issues Pull Requests Actions Releases Wiki Activity

App layout prop update

Browse Source
This commit is contained in:
tmshv committed 2019-10-17 14:50:09 +03:00
1 parent 228e7824de
commit 3902815113
11 files changed
+89 -100
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

pages/album/[album].jsx
+10 -11
View File
@@ -12,21 +12,20 @@ const Page = (props) => (
menu={buildMenu(props.pageUrl, menuModel)}
showAuthor={true}
menuPadding={true}
layout={'thin'}
>
<Head>
<title>{props.album.title}</title>
</Head>
<div className="content content_thin">
<Article
title={props.album.title}
date={props.album.date}
shareable={true}
>
<Html
html={props.album.post}
/>
</Article>
</div>
<Article
title={props.album.title}
date={props.album.date}
shareable={true}
>
<Html
html={props.album.post}
/>
</Article>
</App>
)
pages/article/[article].jsx
+11 -12
View File
@@ -15,23 +15,22 @@ const Page = (props) => (
menu={buildMenu(props.pageUrl, menuModel)}
showAuthor={true}
menuPadding={true}
layout={'thin'}
>
<Head>
<title>{props.article.title}</title>
<Meta meta={props.meta} />
</Head>
<div className={'content content_thin'}>
<Article
title={props.article.title}
date={props.article.date}
tags={props.article.tags}
shareable={true}
>
<Html
html={props.article.post}
/>
</Article>
</div>
<Article
title={props.article.title}
date={props.article.date}
tags={props.article.tags}
shareable={true}
>
<Html
html={props.article.post}
/>
</Article>
</App>
)
pages/articles/[page].jsx
+6 -7
View File
@@ -13,18 +13,17 @@ const Page = (props) => (
menu={buildMenu(props.pageUrl, menuModel)}
showAuthor={true}
menuPadding={true}
layout={'wide'}
>
<Head>
<title>{props.title}</title>
<Meta meta={props.meta} />
</Head>
<div className="content content_wide">
<ArticleCardList
articles={props.articles}
prevPage={props.prevPage}
nextPage={props.nextPage}
/>
</div>
<ArticleCardList
articles={props.articles}
prevPage={props.prevPage}
nextPage={props.nextPage}
/>
</App>
)
pages/collective.jsx
+20 -21
View File
@@ -16,35 +16,34 @@ const Page = (props) => (
menu={buildMenu(props.pageUrl, menuModel)}
showAuthor={true}
menuPadding={true}
layout={'wide'}
>
<Head>
<title>{props.title}</title>
<Meta meta={props.meta} />
</Head>
<div className="content content_semi-wide">
{!props.image ? null : (
<CollectiveImage
data={props.image}
style={{
marginBottom: 'var(--double-margin)',
}}
{!props.image ? null : (
<CollectiveImage
data={props.image}
style={{
marginBottom: 'var(--double-margin)',
}}
/>
)}
<CardList
items={props.persons}
renderItem={(person, index) => (
<PersonCard
key={index}
profile={person}
picture={person.picture}
url={person.url}
name={person.name}
/>
)}
<CardList
items={props.persons}
renderItem={(person, index) => (
<PersonCard
key={index}
profile={person}
picture={person.picture}
url={person.url}
name={person.name}
/>
)}
/>
</div>
/>
</App>
)
pages/document/[document].jsx
+3 -4
View File
@@ -14,15 +14,14 @@ const Page = (props) => (
menu={buildMenu(props.pageUrl, menuModel)}
showAuthor={true}
menuPadding={true}
layout={'wide'}
>
<Head>
<title>{props.file.title}</title>
<Meta meta={props.meta} />
</Head>
<div className="content content_wide">
<Document {...props.file} />
<Share />
</div>
<Document {...props.file} />
<Share />
</App>
)
pages/documents.tsx
+8 -9
View File
@@ -106,21 +106,20 @@ const Page: NextPage<IProps> = props => (
menu={buildMenu(props.pageUrl, menuModel)}
showAuthor={true}
menuPadding={true}
layout={'thin'}
>
<Head>
<title>{props.title}</title>
<Meta meta={props.meta} />
</Head>
<div className="content content_thin">
{props.collections.map((collection, index) => (
<DocumentList
key={index}
name={collection.name}
documents={collection.items}
/>
))}
</div>
{props.collections.map((collection, index) => (
<DocumentList
key={index}
name={collection.name}
documents={collection.items}
/>
))}
</App>
)
pages/gallery.jsx
+14 -15
View File
@@ -69,27 +69,26 @@ const Page = (props) => (
menu={buildMenu(props.pageUrl, menuModel)}
showAuthor={true}
menuPadding={true}
layout={'wide'}
>
<Head>
<title>{props.title}</title>
<Meta meta={props.meta} />
</Head>
<div className="content content_semi-wide">
<Article
// title={meta.title}
title={'Галерея'}
>
{props.collections.map(([year, albums], index) => (
<ACollection
key={index}
title={year}
albums={albums}
/>
))
}
</Article>
</div>
<Article
// title={meta.title}
title={'Галерея'}
>
{props.collections.map(([year, albums], index) => (
<ACollection
key={index}
title={year}
albums={albums}
/>
))
}
</Article>
</App>
)
pages/index.tsx
+7 -8
View File
@@ -14,21 +14,20 @@ const Page = (props) => (
menu={buildMenu(props.pageUrl, menuModel)}
showAuthor={true}
menuPadding={true}
layout={'wide'}
>
<Head>
<title>{props.title}</title>
<Meta meta={props.meta} />
</Head>
<div className="content content_wide">
<HudozkaTitle />
<HudozkaTitle />
<ArticleCardList
articles={props.articles}
prevPage={props.prevPage}
nextPage={props.nextPage}
/>
</div>
<ArticleCardList
articles={props.articles}
prevPage={props.prevPage}
nextPage={props.nextPage}
/>
</App>
)
pages/schedule.jsx
+4 -5
View File
@@ -12,18 +12,17 @@ const Page = (props) => (
menu={buildMenu(props.pageUrl, menuModel)}
showAuthor={true}
menuPadding={true}
layout={'wide'}
>
<Head>
<title>{props.title}</title>
</Head>
<div className="content content_wide">
{/*<ScheduleList schedules={schedules}/>*/}
{/*<ScheduleList schedules={schedules}/>*/}
<Schedule {...props.schedule} />
<Schedule {...props.schedule} />
<Share />
</div>
<Share />
</App>
)
pages/teacher/[person].jsx
+4 -5
View File
@@ -14,16 +14,15 @@ const Index = (props) => (
menu={buildMenu(props.pageUrl, menuModel)}
showAuthor={true}
menuPadding={true}
layout={'wide'}
>
<Head>
<title>{props.title}</title>
<Meta meta={props.meta} />
</Head>
<div className="content content_thin">
<Page shareable={true}>
{props.person.post}
</Page>
</div>
<Page shareable={true}>
{props.person.post}
</Page>
</App>
)
src/components/App/index.tsx
+2 -3
View File
@@ -16,11 +16,10 @@ export interface IAppProps {
menu: any
showAuthor: boolean
menuPadding: boolean
layout?: 'full' | 'wide' | 'thin'
layout: 'full' | 'wide' | 'thin'
}
export const App: React.FC<IAppProps> = props => {
const layout = props.layout ? props.layout : 'full'
const motionDisabled = useReducedMotion()
return (
@@ -36,7 +35,7 @@ export const App: React.FC<IAppProps> = props => {
</header>
<main className="body-wrapper__content">
<section className={cx('content', `content_${layout}`, {
<section className={cx('content', `content_${props.layout}`, {
'content--padding-top--menu': props.menuPadding,
'reduced-motion': motionDisabled,
})}>