diff --git a/next.config.js b/next.config.js index c35db51d..ab9fd3b4 100644 --- a/next.config.js +++ b/next.config.js @@ -17,7 +17,7 @@ function createPath(page, map, query, items) { module.exports = withCss(withSass({ exportTrailingSlash: true, env: { - ARTICLES_PAGE_SIZE: 15, + APP_ARTICLES_PAGE_SIZE: 15, }, webpack(config) { config.resolve.modules.push(__dirname) @@ -33,7 +33,7 @@ module.exports = withCss(withSass({ return { // ...defaultPathMap, - '/': { page: '/', query: { pageSize: articlesPageSize } }, + '/': { page: '/' }, '/documents': { page: '/documents' }, '/gallery': { page: '/gallery' }, '/collective': { page: '/collective' }, diff --git a/pages/index.tsx b/pages/index.tsx index 670a1156..6553bf45 100644 --- a/pages/index.tsx +++ b/pages/index.tsx @@ -1,13 +1,13 @@ import React from 'react' import Head from 'next/head' -import { App } from '../src/components/App' -import { Meta } from '../src/components/Meta' -import { ArticleCardList } from '../src/components/ArticleCardList' -import { HudozkaTitle } from '../src/components/HudozkaTitle' -import menuModel from '../src/models/menu' -import { meta } from '../src/lib/meta' -import { buildMenu } from '../src/lib/menu' -import { createApiUrl, requestGet, wrapInitialProps } from '../src/next-lib' +import { App } from 'src/components/App' +import { Meta } from 'src/components/Meta' +import { ArticleCardList } from 'src/components/ArticleCardList' +import { HudozkaTitle } from 'src/components/HudozkaTitle' +import menuModel from 'src/models/menu' +import { meta } from 'src/lib/meta' +import { buildMenu } from 'src/lib/menu' +import { createApiUrl, requestGet } from 'src/next-lib' import { NextPage } from 'next' interface IProps { @@ -41,10 +41,10 @@ const Page: NextPage = props => ( ) -Page.getInitialProps = wrapInitialProps(async (ctx) => { +export const unstable_getStaticProps = async () => { const pageUrl = '/' const page = 1 - const pageSize = ctx.query.pageSize || 15 + const pageSize = process.env.APP_ARTICLES_PAGE_SIZE const res = await requestGet(createApiUrl(`/api/articles?page=${page}&pageSize=${pageSize}`), {}) as any const articles = res.items || [] const nextPage = res.nextPage @@ -52,16 +52,18 @@ Page.getInitialProps = wrapInitialProps(async (ctx) => { const title = 'Шлиссельбургская ДХШ' return { - articles, - nextPage, - prevPage, - pageUrl, - title, - meta: meta({ + props: { + articles, + nextPage, + prevPage, + pageUrl, title, - url: pageUrl, - }) + meta: meta({ + title, + url: pageUrl, + }) + } } -}) +} -export default Page \ No newline at end of file +export default Page