Merge branch 'master' into fix/default-page-image
This commit is contained in:
commit
b96e06068e
7 files changed
-65
No files matched your search
@@ -9,10 +9,6 @@ module.exports = {
|
||||
"promise",
|
||||
"react",
|
||||
],
|
||||
"globals": {
|
||||
"angular": true,
|
||||
"DISQUS": true
|
||||
},
|
||||
"rules": {
|
||||
"semi": ["error", "never"],
|
||||
"space-before-function-paren": "off",
|
||||
|
||||
@@ -50,8 +50,6 @@ export const unstable_getStaticProps = async (ctx: any) => {
|
||||
}
|
||||
|
||||
export const unstable_getStaticPaths = async () => {
|
||||
console.log('call file unstable_getStaticPaths')
|
||||
|
||||
const urls = await requestGet<IResponseItems<string>>(createApiUrl(`/api/files/urls`), null)
|
||||
if (!urls) {
|
||||
return null
|
||||
|
||||
File renamed without changes.
@@ -1,5 +1,4 @@
|
||||
import dynamic from 'next/dynamic'
|
||||
import Comments from '../Comments'
|
||||
import { Wrapper } from '../Wrapper'
|
||||
import { ConfigContext } from 'src/context/ConfigContext'
|
||||
import config from 'src/config'
|
||||
@@ -61,8 +60,6 @@ export const App: React.FC<IAppProps> = props => {
|
||||
{props.children}
|
||||
</Content>
|
||||
</Block>
|
||||
|
||||
{/* <Comments /> */}
|
||||
</Wrapper>
|
||||
</ConfigContext.Provider>
|
||||
)
|
||||
|
||||
@@ -1,28 +0,0 @@
|
||||
const React = require('react')
|
||||
const Paginator = require('./Paginator')
|
||||
const Article = require('./Article')
|
||||
|
||||
const ArticleList = ({articles, nextPage, prevPage}) => (
|
||||
<div>
|
||||
{!prevPage ? null : (
|
||||
<Paginator url={`/articles/${prevPage}`} type="top"/>
|
||||
)}
|
||||
|
||||
{articles.map(article => (
|
||||
<Article
|
||||
key={article.url}
|
||||
url={article.url}
|
||||
title={article.title}
|
||||
date={article.date}
|
||||
data={article.post}
|
||||
shareable={false}
|
||||
/>
|
||||
))}
|
||||
|
||||
{!nextPage ? null : (
|
||||
<Paginator url={`/articles/${nextPage}`} type="bottom"/>
|
||||
)}
|
||||
</div>
|
||||
)
|
||||
|
||||
module.exports = ArticleList
|
||||
@@ -1,9 +0,0 @@
|
||||
const React = require('react')
|
||||
|
||||
const Comments = ({contentClass = 'content_thin'}) => (
|
||||
<div className={`content ${contentClass}`}>
|
||||
<div id="disqus_thread"/>
|
||||
</div>
|
||||
)
|
||||
|
||||
module.exports = Comments
|
||||
@@ -1,19 +0,0 @@
|
||||
class ImageArtifactType {
|
||||
constructor() {
|
||||
throw new Error('Cannot create instance of ImageArtifactType')
|
||||
}
|
||||
}
|
||||
|
||||
ImageArtifactType.SMALL = 'small'
|
||||
ImageArtifactType.MEDIUM = 'medium'
|
||||
ImageArtifactType.BIG = 'big'
|
||||
ImageArtifactType.LARGE = 'large'
|
||||
ImageArtifactType.ORIGIN = 'original'
|
||||
ImageArtifactType.ORIGINAL = 'original'
|
||||
|
||||
ImageArtifactType.FACEBOOK = 'fb'
|
||||
|
||||
ImageArtifactType.RETINA_DENSITY = 2
|
||||
ImageArtifactType.retina = type => `${type}@${ImageArtifactType.RETINA_DENSITY}`
|
||||
|
||||
module.exports = ImageArtifactType
|
||||
Reference in new issue
Block a user