danamir/mykb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

added better favicons, moved from sass to glamor, moved components

Browse Source 
and utils to src dir, and removed packages no longer being used
This commit is contained in:
JJ Kasper
2018-11-04 01:28:46 -06:00
parent b47f3917bd
commit 31321e635a
99 changed files with 3821 additions and 21818 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
pages/_app.js
View File

@@ -1,11 +1,10 @@
import App, { Container } from 'next/app'
import store from '../redux/store'
import Head from 'next/head'
import '../src/styles/global'
import store from '../src/redux/store'
import { Provider } from 'react-redux'
import { setUser, doLogin } from '../redux/actions/userAct'
// Don't load sass during ssr
if (!global.kbConf) {
require('../styles/style.sass')
}
import App, { Container } from 'next/app'
import { setUser, doLogin } from '../src/redux/actions/userAct'
const ssr = typeof window === 'undefined'
export default class MyApp extends App {
@@ -36,9 +35,15 @@ export default class MyApp extends App {
let { Component, pageProps } = this.props
return (
<Provider store={store}>
<Container>
<Component {...pageProps} />
</Container>
<>
<Head>
<title>My Knowledge Base</title>
</Head>
<Container>
<Component {...pageProps} />
</Container>
</>
</Provider>
)
}

29
pages/_document.js
View File

@@ -1,9 +1,23 @@
import getUrl from '../src/util/getUrl'
import { renderStaticOptimized } from 'glamor/server'
import Document, { Head, Main, NextScript } from 'next/document'
import getUrl from '../util/getUrl'
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() {
const favicon = getUrl('favicon.ico')
return (
<html>
<Head>
@@ -12,9 +26,14 @@ export default class MyDocument extends Document {
name="viewport"
content="width=device-width, initial-scale=1, shrink-to-fit=no"
/>
<link rel="shortcut icon" href={favicon} type="image/x-icon" />
<link rel="icon" href={favicon} type="image/x-icon" />
<title>My Knowledge Base</title>
<link rel="apple-touch-icon" sizes="180x180" href={getUrl("/apple-touch-icon.png")}/>
<link rel="icon" type="image/png" sizes="32x32" href={getUrl("/favicon-32x32.png")}/>
<link rel="icon" type="image/png" sizes="16x16" href={getUrl("/favicon-16x16.png")}/>
<link rel="manifest" href={getUrl("/site.webmanifest")}/>
<link rel="mask-icon" href={getUrl("/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')),

6
pages/edit.js
View File

@@ -1,7 +1,7 @@
import React, { Component } from 'react'
import Page from '../comps/Page'
import MngDoc from '../comps/MngDoc'
import AddDoc from '../comps/AddDoc'
import Page from '../src/components/Page'
import MngDoc from '../src/components/MngDoc'
import AddDoc from '../src/components/AddDoc'
class Edit extends Component {
render() {

16
pages/index.js
View File

@@ -3,14 +3,14 @@ import { connect } from 'react-redux'
import Router from 'next/router'
import Paginate from 'react-paginate'
import { format } from 'url'
import Page from '../comps/Page'
import PaddedRow from '../comps/PaddedRow'
import Spinner from '../comps/Spinner'
import DocItem from '../comps/DocItem'
import { $limit, getDocs, buildQ } from '../util/getDocs'
import getJwt from '../util/getJwt'
import getUrl from '../util/getUrl'
import mapUser from '../util/mapUser'
import Page from '../src/components/Page'
import PaddedRow from '../src/components/PaddedRow'
import Spinner from '../src/components/Spinner'
import DocItem from '../src/components/DocItem'
import { $limit, getDocs, buildQ } from '../src/util/getDocs'
import getJwt from '../src/util/getJwt'
import getUrl from '../src/util/getUrl'
import mapUser from '../src/util/mapUser'
class Index extends Component {
state = {

10
pages/k.js
View File

@@ -2,11 +2,11 @@ import React, { Component } from 'react'
import Link from 'next/link'
import Router from 'next/router'
import fetch from 'isomorphic-unfetch'
import Page from '../comps/Page'
import Markdown from '../comps/Markdown'
import AddDoc from '../comps/AddDoc'
import getUrl from '../util/getUrl'
import getJwt from '../util/getJwt'
import Page from '../src/components/Page'
import Markdown from '../src/components/Markdown'
import AddDoc from '../src/components/AddDoc'
import getUrl from '../src/util/getUrl'
import getJwt from '../src/util/getJwt'
class k extends Component {
delete = async () => {

2
pages/new.js
View File

@@ -1,2 +1,2 @@
import MngDoc from '../comps/MngDoc'
import MngDoc from '../src/components/MngDoc'
export default MngDoc

14
pages/settings.js
View File

@@ -1,13 +1,13 @@
import React, { Component } from 'react'
import { connect } from 'react-redux'
import fetch from 'isomorphic-unfetch'
import Page from '../comps/Page'
import PaddedRow from '../comps/PaddedRow'
import Spinner from '../comps/Spinner'
import updStateFromId from '../util/updStateFromId'
import mapUser from '../util/mapUser'
import getUrl from '../util/getUrl'
import getJwt from '../util/getJwt'
import Page from '../src/components/Page'
import PaddedRow from '../src/components/PaddedRow'
import Spinner from '../src/components/Spinner'
import updStateFromId from '../src/util/updStateFromId'
import mapUser from '../src/util/mapUser'
import getUrl from '../src/util/getUrl'
import getJwt from '../src/util/getJwt'
class Settings extends Component {
state = {