add changes from v0.3

This commit is contained in:
JJ Kasper
2018-11-24 00:23:32 -06:00
parent 73f05ce4a3
commit 111cf2ed35
133 changed files with 10768 additions and 7443 deletions

View File

@@ -1,27 +1,13 @@
import getUrl from '../src/util/getUrl'
import { renderStaticOptimized } from 'glamor/server'
import Document, { Head, Main, NextScript } from 'next/document'
import addBase from '../src/util/addBase'
export default class MyDocument extends Document {
static async getInitialProps({ renderPage }) {
const page = renderPage()
const styles = renderStaticOptimized(() => page.html || page.errorHtml)
return { ...page, ...styles }
}
constructor(props) {
super(props)
const { __NEXT_DATA__, ids } = props
if (ids) {
__NEXT_DATA__.ids = this.props.ids
}
}
render() {
return (
<html>
<Head>
<meta charSet="utf-8" />
<meta httpEquiv="X-UA-Compatible" content="IE=edge" />
<meta
name="viewport"
content="width=device-width, initial-scale=1, shrink-to-fit=no"
@@ -29,35 +15,36 @@ export default class MyDocument extends Document {
<link
rel="apple-touch-icon"
sizes="180x180"
href={getUrl('/apple-touch-icon.png')}
href={addBase('/apple-touch-icon.png')}
/>
<link
rel="icon"
type="image/png"
sizes="32x32"
href={getUrl('/favicon-32x32.png')}
href={addBase('/favicon-32x32.png')}
/>
<link
rel="icon"
type="image/png"
sizes="16x16"
href={getUrl('/favicon-16x16.png')}
href={addBase('/favicon-16x16.png')}
/>
<link rel="manifest" href={getUrl('/site.webmanifest')} />
<link rel="manifest" href={addBase('/site.webmanifest')} />
<link
rel="mask-icon"
href={getUrl('/safari-pinned-tab.svg')}
href={addBase('/safari-pinned-tab.svg')}
color="#00d1b2"
/>
<meta name="msapplication-TileColor" content="#202225" />
<meta name="theme-color" content="#202225" />
<style
dangerouslySetInnerHTML={{ __html: this.props.css }}
data-glamor
/>
<script
dangerouslySetInnerHTML={{
__html: 'window.kbConf=' + JSON.stringify(app.get('kbConf')),
__html:
'window.publicConfig=' +
JSON.stringify({
...global.publicConfig,
ssr: false,
}),
}}
/>
</Head>