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

updated format and lint scripts and applied them

Browse Source
This commit is contained in:
JJ Kasper
2018-06-01 16:52:12 -05:00
parent 53ac8a6793
commit 017a9993ee
58 changed files with 1711 additions and 1568 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.eslintignore Normal file
View File

@@ -0,0 +1,3 @@
.next
styles
config

56
comps/AddDoc.js
View File

@@ -1,49 +1,49 @@
import React, { Component } from 'react';
import { connect } from 'react-redux';
import fetch from 'isomorphic-unfetch';
import mapUser from '../util/mapUser';
import getUrl from '../util/getUrl';
import getJwt from '../util/getJwt';
import React, { Component } from 'react'
import { connect } from 'react-redux'
import fetch from 'isomorphic-unfetch'
import mapUser from '../util/mapUser'
import getUrl from '../util/getUrl'
import getJwt from '../util/getJwt'
const getDoc = async (id, req) => {
let found, doc;
const jwt = getJwt(req);
if(!jwt) return { found, doc, id };
let found, doc
const jwt = getJwt(req)
if (!jwt) return { found, doc, id }
const docRes = await fetch(getUrl('docs/' + id, Boolean(req)), {
method: 'GET',
headers: { Authorization: jwt }
});
if(docRes.ok) {
doc = await docRes.json();
found = true;
headers: { Authorization: jwt },
})
if (docRes.ok) {
doc = await docRes.json()
found = true
}
return { found, doc, id };
};
return { found, doc, id }
}
export default ComposedComponent => {
class DocComp extends Component {
state = {
found: false,
id: null,
doc: {}
doc: {},
}
static async getInitialProps({ query, req }) {
return await getDoc(query.id, req);
return await getDoc(query.id, req)
}
static getDerivedStateFromProps(nextProps, state) {
const { found, id, doc } = nextProps;
if(state.found !== found) return { found, id, doc };
return null;
const { found, id, doc } = nextProps
if (state.found !== found) return { found, id, doc }
return null
}
async componentDidUpdate(prevProps) {
const { user, found, id } = this.props;
if(prevProps.user.email === user.email || found) return;
if(!user.email) return;
this.setState(await getDoc(id));
const { user, found, id } = this.props
if (prevProps.user.email === user.email || found) return
if (!user.email) return
this.setState(await getDoc(id))
}
render() {
return <ComposedComponent {...this.state} />;
return <ComposedComponent {...this.state} />
}
}
return connect(mapUser)(DocComp);
};
return connect(mapUser)(DocComp)
}

74
comps/CodeMirror.js
View File

@@ -1,65 +1,65 @@
import React, { Component } from 'react';
import cm from 'codemirror';
import { getKey, isCtrlKey } from '../util/keys';
import React, { Component } from 'react'
import cm from 'codemirror'
import { getKey, isCtrlKey } from '../util/keys'
if(typeof window !== 'undefined') {
require('codemirror/mode/markdown/markdown');
if (typeof window !== 'undefined') {
require('codemirror/mode/markdown/markdown')
}
export default class CodeMirror extends Component {
handleChange = () => {
if(!this.editor) return;
const value = this.editor.getValue();
if(value !== this.props.value) {
this.props.onChange && this.props.onChange(value);
if(this.editor.getValue() !== this.props.value) {
if(this.state.isControlled) {
this.editor.setValue(this.props.value);
if (!this.editor) return
const value = this.editor.getValue()
if (value !== this.props.value) {
this.props.onChange && this.props.onChange(value)
if (this.editor.getValue() !== this.props.value) {
if (this.state.isControlled) {
this.editor.setValue(this.props.value)
} else {
this.props.value = value;
this.props.value = value
}
}
}
}
checkSubmit = (cm, e) => {
const key = getKey(e);
if(isCtrlKey(key)) {
this.ctrlKey = true;
} else if(key === 13 && this.ctrlKey) {
this.props.onSubmit();
const key = getKey(e)
if (isCtrlKey(key)) {
this.ctrlKey = true
} else if (key === 13 && this.ctrlKey) {
this.props.onSubmit()
}
}
handleKeyUp = (cm, e) => {
if(isCtrlKey(getKey(e))) this.ctrlKey = false;
if (isCtrlKey(getKey(e))) this.ctrlKey = false
}
componentDidMount() {
if(typeof window === 'undefined') return;
this.editor = cm.fromTextArea(this.textarea, this.props.options);
this.editor.on('change', this.handleChange);
if(typeof this.props.onSubmit === 'function') {
this.editor.on('keydown', this.checkSubmit);
this.editor.on('keyup', this.handleKeyUp);
this.setupSubmitKey = true;
if (typeof window === 'undefined') return
this.editor = cm.fromTextArea(this.textarea, this.props.options)
this.editor.on('change', this.handleChange)
if (typeof this.props.onSubmit === 'function') {
this.editor.on('keydown', this.checkSubmit)
this.editor.on('keyup', this.handleKeyUp)
this.setupSubmitKey = true
}
}
componentWillUnmount() {
if(this.setupSubmitKey) {
this.editor.off('keydown', this.checkSubmit);
this.editor.off('keyup', this.handleKeyUp);
this.setupSubmitKey = false;
if (this.setupSubmitKey) {
this.editor.off('keydown', this.checkSubmit)
this.editor.off('keyup', this.handleKeyUp)
this.setupSubmitKey = false
}
}
componentDidUpdate() {
if(!this.editor || !this.props.value) return;
if(this.editor.getValue() !== this.props.value) {
this.editor.setValue(this.props.value);
if (!this.editor || !this.props.value) return
if (this.editor.getValue() !== this.props.value) {
this.editor.setValue(this.props.value)
}
}
render() {
const { value, className, onChange } = this.props;
const { value, className, onChange } = this.props
return (
<div {...{className}}>
<textarea {...{value, onChange}} ref={el => this.textarea = el} />
<div {...{ className }}>
<textarea {...{ value, onChange }} ref={el => (this.textarea = el)} />
</div>
);
)
}
}

40
comps/DocItem.js
View File

@@ -1,20 +1,26 @@
import Link from 'next/link';
import getUrl from '../util/getUrl';
import Link from 'next/link'
import getUrl from '../util/getUrl'
const DocItem = ({ id, name, dir, updated }) => {
name = dir + (dir.length > 0 ? '/' : '') + name;
const as = getUrl('k/' + id);
const href = { pathname: '/k', query: { id } };
return (<tr>
<td><Link {...{href, as}}>
<a><p className='noMargin'>
{ name }
<span className='float-right'>
{new Date(updated).toLocaleDateString('en-US')}
</span>
</p></a>
</Link></td>
</tr>);
};
name = dir + (dir.length > 0 ? '/' : '') + name
const as = getUrl('k/' + id)
const href = { pathname: '/k', query: { id } }
return (
<tr>
<td>
<Link {...{ href, as }}>
<a>
<p className="noMargin">
{name}
<span className="float-right">
{new Date(updated).toLocaleDateString('en-US')}
</span>
</p>
</a>
</Link>
</td>
</tr>
)
}
export default DocItem;
export default DocItem

16
comps/Footer.js
View File

@@ -1,10 +1,16 @@
const Footer = () => (
<footer className='footer'>
<footer className="footer">
<p>
Powered by{' '}
<a href='//github.com/ijjk/mykb' target='_blank' rel='noopener noreferrer'>MYKB</a>
Powered by{' '}
<a
href="//github.com/ijjk/mykb"
target="_blank"
rel="noopener noreferrer"
>
MYKB
</a>
</p>
</footer>
);
)
export default Footer;
export default Footer

112
comps/Header.js
View File

@@ -1,75 +1,79 @@
import React, { Component } from 'react';
import { withRouter } from 'next/router';
import { connect } from 'react-redux';
import { doLogout } from '../redux/actions/userAct';
import Link from 'next/link';
import getUrl from '../util/getUrl';
import mapUser from '../util/mapUser';
import React, { Component } from 'react'
import { withRouter } from 'next/router'
import { connect } from 'react-redux'
import { doLogout } from '../redux/actions/userAct'
import Link from 'next/link'
import getUrl from '../util/getUrl'
import mapUser from '../util/mapUser'
const NavLink = ({ children, href, active }) => {
const activeClass = active ? ' active' : '';
const activeClass = active ? ' active' : ''
return (
<Link href={href} as={getUrl(href)}>
<a className={activeClass}>{children}</a>
</Link>
);
};
const navItems = [
['/', 'Home'],
['/new', 'New Doc'],
['/settings', 'Settings']
];
)
}
const navItems = [['/', 'Home'], ['/new', 'New Doc'], ['/settings', 'Settings']]
class Header extends Component {
state = {
open: false
open: false,
}
hideNav = () => this.setState({ open: false });
toggleNav = () => this.setState({
open: !this.state.open
});
isActive = url => (
getUrl(this.props.router.pathname) === getUrl(url)
);
hideNav = () => this.setState({ open: false })
toggleNav = () =>
this.setState({
open: !this.state.open,
})
isActive = url => getUrl(this.props.router.pathname) === getUrl(url)
logout = e => {
e.preventDefault();
this.hideNav();
doLogout();
};
e.preventDefault()
this.hideNav()
doLogout()
}
render() {
const expandClass = this.state.open ? ' active' : '';
const { user } = this.props;
return(
<nav className='navbar' role='navigation' aria-label='main navigation'>
<div className='navbar-brand'>
<NavLink href='/'>
const expandClass = this.state.open ? ' active' : ''
const { user } = this.props
return (
<nav className="navbar" role="navigation" aria-label="main navigation">
<div className="navbar-brand">
<NavLink href="/">
<h3 onClick={this.hideNav}>MYKB</h3>
</NavLink>
</div>
{!user.email ? null
{!user.email
? null
: [
<div className={'navbar-burger ' + expandClass}
onClick={this.toggleNav} key='burger'
>
<div /><div /><div />
</div>,
<div className={'navbar-items' + expandClass} key='items'>
{navItems.map(item => (
<NavLink key={item[0]} href={item[0]}
active={this.isActive(item[0])}
>
<p className='item' onClick={this.hideNav}>{item[1]}</p>
</NavLink>
))}
<a href='/logout' onClick={this.logout}>
<p className='item'>Logout</p>
</a>
</div>
]}
<div
className={'navbar-burger ' + expandClass}
onClick={this.toggleNav}
key="burger"
>
<div />
<div />
<div />
</div>,
<div className={'navbar-items' + expandClass} key="items">
{navItems.map(item => (
<NavLink
key={item[0]}
href={item[0]}
active={this.isActive(item[0])}
>
<p className="item" onClick={this.hideNav}>
{item[1]}
</p>
</NavLink>
))}
<a href="/logout" onClick={this.logout}>
<p className="item">Logout</p>
</a>
</div>,
]}
</nav>
);
)
}
}
export default withRouter(connect(mapUser)(Header));
export default withRouter(connect(mapUser)(Header))

79
comps/KeyShortcuts.js
View File

@@ -1,8 +1,8 @@
import { Component } from 'react';
import Router from 'next/router';
import getUrl from '../util/getUrl';
import { getKey } from '../util/keys';
import { doLogout } from '../redux/actions/userAct';
import { Component } from 'react'
import Router from 'next/router'
import getUrl from '../util/getUrl'
import { getKey } from '../util/keys'
import { doLogout } from '../redux/actions/userAct'
/* - keyboard shortcuts
g then h -> navigate home
@@ -16,53 +16,56 @@ import { doLogout } from '../redux/actions/userAct';
const keyToUrl = {
72: '/',
78: '/new',
83: '/settings'
};
83: '/settings',
}
const keyToEl = {
69: { sel: '#edit', func: 'click' },
191: { sel: '.search', func: 'focus' }
};
191: { sel: '.search', func: 'focus' },
}
class KeyShortcuts extends Component {
handleDown = e => {
const tag = e.target.tagName;
if(tag === 'INPUT' || tag === 'TEXTAREA') return;
const key = getKey(e);
if(this.prevKey === 71) { // prev key was g
const tag = e.target.tagName
if (tag === 'INPUT' || tag === 'TEXTAREA') return
const key = getKey(e)
if (this.prevKey === 71) {
// prev key was g
switch (key) {
case 72:
case 78:
case 83: {
const url = keyToUrl[key];
Router.push(url, getUrl(url));
break;
}
case 76: {
setTimeout(doLogout, 1);
break;
}
default: break;
case 72:
case 78:
case 83: {
const url = keyToUrl[key]
Router.push(url, getUrl(url))
break
}
case 76: {
setTimeout(doLogout, 1)
break
}
default:
break
}
}
switch (key) {
case 69:
case 191: {
const { sel, func } = keyToEl[key];
const el = document.querySelector(sel);
if(el) setTimeout(() => el[func](), 1);
break;
case 69:
case 191: {
const { sel, func } = keyToEl[key]
const el = document.querySelector(sel)
if (el) setTimeout(() => el[func](), 1)
break
}
default:
break
}
default: break;
}
this.prevKey = key;
};
this.prevKey = key
}
componentDidMount() {
window.addEventListener('keydown', this.handleDown);
window.addEventListener('keydown', this.handleDown)
}
componentWillUnmount() {
window.removeEventListener('keydown', this.handleDown);
window.removeEventListener('keydown', this.handleDown)
}
render = () => null
}
export default KeyShortcuts;
export default KeyShortcuts

75
comps/Login.js
View File

@@ -1,57 +1,66 @@
import React, { Component } from 'react';
import { connect } from 'react-redux';
import { doLogin } from '../redux/actions/userAct';
import Spinner from './Spinner';
import PaddedRow from './PaddedRow';
import mapUser from '../util/mapUser';
import React, { Component } from 'react'
import { connect } from 'react-redux'
import { doLogin } from '../redux/actions/userAct'
import Spinner from './Spinner'
import PaddedRow from './PaddedRow'
import mapUser from '../util/mapUser'
class Login extends Component {
state = {
email: '',
pass: ''
};
pass: '',
}
updVal = e => {
const el = e.target;
const val = el.value;
if(el.getAttribute('type') === 'email') {
return this.setState({ email: val });
const el = e.target
const val = el.value
if (el.getAttribute('type') === 'email') {
return this.setState({ email: val })
}
this.setState({ pass: val });
this.setState({ pass: val })
}
submit = e => {
const { pending } = this.props.user;
let { email, pass } = this.state;
email = email.trim();
pass = pass.trim();
e.preventDefault();
const { pending } = this.props.user
let { email, pass } = this.state
email = email.trim()
pass = pass.trim()
e.preventDefault()
if(pending || email.length === 0 || pass.length == 0) {
return;
if (pending || email.length === 0 || pass.length == 0) {
return
}
doLogin({ email, password: pass });
doLogin({ email, password: pass })
}
render() {
const { pending, error } = this.props.user;
return(
<div className='container content'>
const { pending, error } = this.props.user
return (
<div className="container content">
<PaddedRow amount={25} vCenter>
<h4>Please login to continue</h4>
<form noValidate>
<fieldset>
<label htmlFor='email'>Email:</label>
<input type='email' id='email' name='email'
autoFocus placeholder='John@deux.com'
<label htmlFor="email">Email:</label>
<input
type="email"
id="email"
name="email"
autoFocus
placeholder="John@deux.com"
onChange={this.updVal}
/>
<label htmlFor='pass'>Pass:</label>
<input type='password' id='pass' name='password'
placeholder='Super secret password...' onChange={this.updVal}
<label htmlFor="pass">Pass:</label>
<input
type="password"
id="pass"
name="password"
placeholder="Super secret password..."
onChange={this.updVal}
/>
</fieldset>
<button className={'float-right' + (pending ? ' disabled' : '')}
<button
className={'float-right' + (pending ? ' disabled' : '')}
onClick={this.submit}
>
{pending ? <Spinner /> : 'Submit'}
@@ -61,7 +70,7 @@ class Login extends Component {
</form>
</PaddedRow>
</div>
);
)
}
}
export default connect(mapUser)(Login);
export default connect(mapUser)(Login)

21
comps/Markdown.js
View File

@@ -1,16 +1,11 @@
import dynamic from 'next/dynamic';
import freezeSSR from '../util/freezeSSR';
import dynamic from 'next/dynamic'
import freezeSSR from '../util/freezeSSR'
const Markdown = dynamic(import('react-markdown'), freezeSSR('.Markdown'));
const link = props => (
<a {...props}
target='_blank'
rel='noopener noreferrer'
/>
)
const renderers = { link };
const Markdown = dynamic(import('react-markdown'), freezeSSR('.Markdown'))
const link = props => <a {...props} target="_blank" rel="noopener noreferrer" />
const renderers = { link }
const AddRenderers = ({ className, source }) => (
<Markdown {...{className, source, renderers}} />
);
<Markdown {...{ className, source, renderers }} />
)
export default AddRenderers;
export default AddRenderers

202
comps/MngDoc.js
View File

@@ -1,150 +1,170 @@
import React, { Component } from 'react';
import Router from 'next/router';
import dynamic from 'next/dynamic';
import Page from '../comps/Page';
import Markdown from '../comps/Markdown';
import { checkDir, checkName } from '../util/checkDirParts';
import updStateFromId from '../util/updStateFromId';
import getUrl from '../util/getUrl';
import getJwt from '../util/getJwt';
import React, { Component } from 'react'
import Router from 'next/router'
import dynamic from 'next/dynamic'
import Page from '../comps/Page'
import Markdown from '../comps/Markdown'
import { checkDir, checkName } from '../util/checkDirParts'
import updStateFromId from '../util/updStateFromId'
import getUrl from '../util/getUrl'
import getJwt from '../util/getJwt'
const CodeMirrorSkel = () => (
<div className='column'>
<div className="column">
<textarea style={{ height: 'calc(300px - 1.2rem)', margin: 0 }} />
</div>
);
)
const CodeMirror = dynamic(import('../comps/CodeMirror'), {
loading: CodeMirrorSkel, ssr: false
});
loading: CodeMirrorSkel,
ssr: false,
})
const initState = {
name: '',
dir: '',
md: '## New Document!!',
editMode: false,
error: null,
pending: false
};
pending: false,
}
export default class MngDoc extends Component {
state = initState;
updVal = updStateFromId.bind(this);
updMd = md => this.setState({ md });
state = initState
updVal = updStateFromId.bind(this)
updMd = md => this.setState({ md })
submit = async () => {
let { name, md, dir, editMode } = this.state;
let { name, md, dir, editMode } = this.state
let data = {
name: checkName(name),
dir: checkDir(dir),
md
};
const doErr = error => this.setState({ pending: false, error });
const dirErr = 'can only contain A-Z, a-z, 0-9, -, or . and not start or end with .';
if(!data.name) return doErr(
'Document name ' + (data.name === 0 ? 'can not be empty' : dirErr)
);
if(!data.dir && data.dir !== 0) {
return doErr('Directory ' + dirErr);
} else if(data.dir === 0) {
data.dir = '';
md,
}
if(data.md.trim().length === 0) {
return doErr('Content can not be empty');
const doErr = error => this.setState({ pending: false, error })
const dirErr =
'can only contain A-Z, a-z, 0-9, -, or . and not start or end with .'
if (!data.name)
return doErr(
'Document name ' + (data.name === 0 ? 'can not be empty' : dirErr)
)
if (!data.dir && data.dir !== 0) {
return doErr('Directory ' + dirErr)
} else if (data.dir === 0) {
data.dir = ''
}
if (data.md.trim().length === 0) {
return doErr('Content can not be empty')
}
let url = getUrl('docs'),
method = 'POST',
headers = { Authorization: getJwt(),
'Content-Type': 'application/json'
};
if(editMode) {
let numRemoved = 0;
const dataKeys = Object.keys(data);
headers = {
Authorization: getJwt(),
'Content-Type': 'application/json',
}
if (editMode) {
let numRemoved = 0
const dataKeys = Object.keys(data)
dataKeys.forEach(k => {
if(data[k] === this.props.doc[k]) {
delete data[k];
numRemoved++;
if (data[k] === this.props.doc[k]) {
delete data[k]
numRemoved++
}
});
if(dataKeys.length === numRemoved) return;
url = getUrl('docs/' + this.props.doc.id);
method = 'PATCH';
})
if (dataKeys.length === numRemoved) return
url = getUrl('docs/' + this.props.doc.id)
method = 'PATCH'
}
this.setState({ error: null, pending: true });
this.setState({ error: null, pending: true })
const res = await fetch(url, {
headers, method,
body: JSON.stringify(data)
}).catch(doErr);
headers,
method,
body: JSON.stringify(data),
}).catch(doErr)
try {
data = await res.json();
data = await res.json()
} catch (err) {
data = { message: 'An error occurred submitting doc' };
data = { message: 'An error occurred submitting doc' }
}
if(res.ok) {
const { id } = data;
return Router.push({
pathname: '/k',
query: { id }
}, getUrl(`k/${id}`));
if (res.ok) {
const { id } = data
return Router.push(
{
pathname: '/k',
query: { id },
},
getUrl(`k/${id}`)
)
}
doErr(data.message);
doErr(data.message)
}
static getDerivedStateFromProps(nextProps, prevState) {
const { doc } = nextProps;
if(doc) {
const { name, dir, md } = doc;
return { name, md, dir, editMode: true };
} else if(prevState.id) {
return initState;
const { doc } = nextProps
if (doc) {
const { name, dir, md } = doc
return { name, md, dir, editMode: true }
} else if (prevState.id) {
return initState
}
return null;
return null
}
render() {
const { md, dir, name, error, pending } = this.state;
const rowStyle = { paddingTop: 10 };
return(
const { md, dir, name, error, pending } = this.state
const rowStyle = { paddingTop: 10 }
return (
<Page>
<div className='row fill' style={rowStyle}>
<div className='column column-50'>
<Markdown className='fill Markdown' source={md} />
<div className="row fill" style={rowStyle}>
<div className="column column-50">
<Markdown className="fill Markdown" source={md} />
</div>
<div className='column column-50'>
<div className='row'>
<div className='column column-60'>
<input type='text' maxLength={250}
placeholder='New document name' id='name'
value={name} onChange={this.updVal}
<div className="column column-50">
<div className="row">
<div className="column column-60">
<input
type="text"
maxLength={250}
placeholder="New document name"
id="name"
value={name}
onChange={this.updVal}
/>
</div>
<div className='column'>
<input type='text' maxLength={1024}
placeholder='Subdirectory (optional)' id='dir'
value={dir} onChange={this.updVal}
<div className="column">
<input
type="text"
maxLength={1024}
placeholder="Subdirectory (optional)"
id="dir"
value={dir}
onChange={this.updVal}
/>
</div>
</div>
<div className='row'>
<CodeMirror value={md}
className='column WrapCodeMirror'
<div className="row">
<CodeMirror
value={md}
className="column WrapCodeMirror"
onChange={this.updMd}
onSubmit={this.submit}
options={{
theme: 'monokai',
mode: 'markdown',
lineWrapping: true
lineWrapping: true,
}}
/>
</div>
<div className='row' style={{ marginTop: 5 }}>
<div className='column'>
<div className="row" style={{ marginTop: 5 }}>
<div className="column">
<span>{error}</span>
<button className='float-right'
<button
className="float-right"
style={{ marginTop: 5 }}
onClick={pending ? null : this.submit}
>Submit</button>
>
Submit
</button>
</div>
</div>
</div>
</div>
</Page>
);
)
}
}

20
comps/PaddedRow.js
View File

@@ -1,18 +1,16 @@
const PaddedRow = ({ children, amount, vCenter }) => {
amount = amount || 20;
const PadItem = () => (
<div className={'column column-' + amount + ' nomob'} />
);
let rowProps = {className: 'row'};
if(vCenter) rowProps = {className: 'row v-center'};
else rowProps = {...rowProps, style: {paddingTop: amount}};
amount = amount || 20
const PadItem = () => <div className={'column column-' + amount + ' nomob'} />
let rowProps = { className: 'row' }
if (vCenter) rowProps = { className: 'row v-center' }
else rowProps = { ...rowProps, style: { paddingTop: amount } }
return (
<div {...rowProps}>
<PadItem />
<div className='column'>{ children }</div>
<div className="column">{children}</div>
<PadItem />
</div>
);
};
export default PaddedRow;
)
}
export default PaddedRow

34
comps/Page.js
View File

@@ -1,25 +1,25 @@
import { connect } from 'react-redux';
import Header from './Header';
import KeyShortcuts from './KeyShortcuts';
import Footer from './Footer';
import Login from './Login';
import Setup from './Setup';
import mapUser from '../util/mapUser';
import { connect } from 'react-redux'
import Header from './Header'
import KeyShortcuts from './KeyShortcuts'
import Footer from './Footer'
import Login from './Login'
import Setup from './Setup'
import mapUser from '../util/mapUser'
const Page = ({ user, children }) => {
return (
<div>
<Header />
<KeyShortcuts />
{user.email
? <div className='container content'>
{ children }
</div>
: user.setup
? <Setup /> : <Login {...{user}} />
}
{user.email ? (
<div className="container content">{children}</div>
) : user.setup ? (
<Setup />
) : (
<Login {...{ user }} />
)}
<Footer />
</div>
);
};
export default connect(mapUser)(Page);
)
}
export default connect(mapUser)(Page)

114
comps/Setup.js
View File

@@ -1,8 +1,8 @@
import React, { Component } from 'react';
import { doLogin } from '../redux/actions/userAct';
import PaddedRow from './PaddedRow';
import Spinner from './Spinner';
import getUrl from '../util/getUrl';
import React, { Component } from 'react'
import { doLogin } from '../redux/actions/userAct'
import PaddedRow from './PaddedRow'
import Spinner from './Spinner'
import getUrl from '../util/getUrl'
export default class Setup extends Component {
state = {
@@ -10,88 +10,96 @@ export default class Setup extends Component {
password: '',
confirmPass: '',
pending: false,
error: null
error: null,
}
updVal = e => {
const el = e.target;
let key = 'email';
if(el.id === 'pass') key = 'password';
else if(el.id === 'pass2') key = 'confirmPass';
const obj = {};
obj[key] = el.value;
this.setState(obj);
const el = e.target
let key = 'email'
if (el.id === 'pass') key = 'password'
else if (el.id === 'pass2') key = 'confirmPass'
const obj = {}
obj[key] = el.value
this.setState(obj)
}
submit = e => {
e.preventDefault();
let { email, password, confirmPass, pending } = this.state;
if(pending) return;
email = email.trim();
password = password.trim();
confirmPass = confirmPass.trim();
const hasEmpty = [ email, password, confirmPass ]
.some(val => val.length === 0);
e.preventDefault()
let { email, password, confirmPass, pending } = this.state
if (pending) return
email = email.trim()
password = password.trim()
confirmPass = confirmPass.trim()
const hasEmpty = [email, password, confirmPass].some(
val => val.length === 0
)
if(hasEmpty) return;
if(password.toLowerCase() !== confirmPass.toLowerCase()) {
return this.setState({ error: 'Passwords don\'t match' });
if (hasEmpty) return
if (password.toLowerCase() !== confirmPass.toLowerCase()) {
return this.setState({ error: "Passwords don't match" })
}
this.setState({ pending: true, error: null });
const defaultErr = 'Could not create account';
this.setState({ pending: true, error: null })
const defaultErr = 'Could not create account'
fetch(getUrl('users'), {
method: 'POST',
headers: { 'Content-Type': 'application/json' },
body: JSON.stringify({ email, password, admin: true })
body: JSON.stringify({ email, password, admin: true }),
})
.then(res => {
if(res.ok) {
return doLogin({ email, password }, null, true);
if (res.ok) {
return doLogin({ email, password }, null, true)
}
res.json().then(({ message }) => {
const error = message || defaultErr;
this.setState({ pending: false, error });
});
const error = message || defaultErr
this.setState({ pending: false, error })
})
})
.catch(err => {
const error = err.message || defaultErr;
this.setState({ pending: false, error });
});
const error = err.message || defaultErr
this.setState({ pending: false, error })
})
}
render() {
const { pending, error } = this.state;
return(
<div className='container content'>
const { pending, error } = this.state
return (
<div className="container content">
<PaddedRow amount={25} vCenter>
<div className='column'>
<div className="column">
<h3>Setup account</h3>
<form noValidate>
<fieldset>
<label htmlFor='email'>Email:</label>
<input type='email' autoFocus id='email'
placeholder={'Your email (does\'t have to be actual email)'}
<label htmlFor="email">Email:</label>
<input
type="email"
autoFocus
id="email"
placeholder={"Your email (does't have to be actual email)"}
onChange={this.updVal}
/>
<label htmlFor='pass'>Password:</label>
<input type='password' id='pass' maxLength={512}
placeholder='A super secret password'
<label htmlFor="pass">Password:</label>
<input
type="password"
id="pass"
maxLength={512}
placeholder="A super secret password"
onChange={this.updVal}
/>
<label htmlFor='pass2'>Confirm Password:</label>
<input type='password' id='pass2' maxLength={512}
placeholder='Confirm your super secret password'
<label htmlFor="pass2">Confirm Password:</label>
<input
type="password"
id="pass2"
maxLength={512}
placeholder="Confirm your super secret password"
onChange={this.updVal}
/>
<button className='float-right'
onClick={this.submit}
>
<button className="float-right" onClick={this.submit}>
{pending ? <Spinner /> : 'Submit'}
</button>
{!error ? null : <p className='danger'>{error}</p>}
{!error ? null : <p className="danger">{error}</p>}
</fieldset>
</form>
</div>
</PaddedRow>
</div>
);
)
}
}

6
comps/Spinner.js
View File

@@ -1,4 +1,2 @@
const Spinner = (props) => (
<div className='spinner' {...props}></div>
);
export default Spinner;
const Spinner = props => <div className="spinner" {...props} />
export default Spinner

37
genSecret.js
View File

@@ -1,24 +1,23 @@
const fs = require('fs');
const path = require('path');
const crypto = require('crypto');
const secret = crypto.randomBytes(256).toString('hex');
const { NODE_ENV } = process.env;
let confFile = 'default.json';
/* eslint-disable no-console */
const fs = require('fs')
const path = require('path')
const crypto = require('crypto')
const secret = crypto.randomBytes(256).toString('hex')
const { NODE_ENV } = process.env
let confFile = 'default.json'
if(NODE_ENV && NODE_ENV.toLowerCase() === 'production') {
confFile = 'production.json';
if (NODE_ENV && NODE_ENV.toLowerCase() === 'production') {
confFile = 'production.json'
}
let config = require('./config/' + confFile);
let configPath = path.join(__dirname, 'config', confFile);
let config = require('./config/' + confFile)
let configPath = path.join(__dirname, 'config', confFile)
if(!config.authentication) {
config.authentication = { secret };
if (!config.authentication) {
config.authentication = { secret }
} else {
config.authentication.secret = secret;
config.authentication.secret = secret
}
fs.writeFile(configPath, JSON.stringify(config, null, 2) + '\n',
err => {
if(err) return console.error(err);
console.log('\nAuthentication secret successfully updated in', confFile);
}
);
fs.writeFile(configPath, JSON.stringify(config, null, 2) + '\n', err => {
if (err) return console.error(err)
console.log('\nAuthentication secret successfully updated in', confFile)
})

28
next.config.js
View File

@@ -1,20 +1,22 @@
const withSass = require('@zeit/next-sass');
const withSass = require('@zeit/next-sass')
const { ANALYZE } = process.env
let AnalyzerPlugin;
if(ANALYZE) {
const { BundleAnalyzerPlugin } = require('webpack-bundle-analyzer');
AnalyzerPlugin = BundleAnalyzerPlugin;
let AnalyzerPlugin
if (ANALYZE) {
const { BundleAnalyzerPlugin } = require('webpack-bundle-analyzer')
AnalyzerPlugin = BundleAnalyzerPlugin
}
module.exports = withSass({
poweredByHeader: false,
webpack: function (config, { isServer }) {
webpack: function(config, { isServer }) {
if (ANALYZE) {
config.plugins.push(new AnalyzerPlugin({
analyzerMode: 'server',
analyzerPort: isServer ? 8888 : 8889,
openAnalyzer: true
}))
config.plugins.push(
new AnalyzerPlugin({
analyzerMode: 'server',
analyzerPort: isServer ? 8888 : 8889,
openAnalyzer: true,
})
)
}
return config
}
});
},
})

4
package.json
View File

@@ -24,8 +24,8 @@
"yarn": ">= 0.18.0"
},
"scripts": {
"format": "prettier --write '**/*.js'",
"lint": "eslint ./src ./test ./pages ./redux ./util ./comps --config .eslintrc.json",
"format": "prettier --ignore-path .eslintignore --write '**/*.js'",
"lint": "eslint . --config .eslintrc.json",
"mocha": "cross-env NODE_ENV=production mocha test/ --recursive --exit",
"build": "next build",
"analyze": "cross-env ANALYZE=true next build",

46
pages/_app.js
View File

@@ -1,42 +1,42 @@
import App, { Container } from 'next/app';
import store from '../redux/store';
import { Provider } from 'react-redux';
import { setUser, doLogin } from '../redux/actions/userAct';
import '../styles/style.sass';
const ssr = typeof window === 'undefined';
import App, { Container } from 'next/app'
import store from '../redux/store'
import { Provider } from 'react-redux'
import { setUser, doLogin } from '../redux/actions/userAct'
import '../styles/style.sass'
const ssr = typeof window === 'undefined'
export default class MyApp extends App {
static async getInitialProps ({ Component, ctx }) {
let user = {};
let setup = false;
if(ssr) {
user = ctx.req.user || {};
setup = ctx.req.doSetup || false;
static async getInitialProps({ Component, ctx }) {
let user = {}
let setup = false
if (ssr) {
user = ctx.req.user || {}
setup = ctx.req.doSetup || false
}
let pageProps = {};
let pageProps = {}
if (Component.getInitialProps) {
pageProps = await Component.getInitialProps(ctx);
pageProps = await Component.getInitialProps(ctx)
}
return { Component, pageProps, user, setup };
return { Component, pageProps, user, setup }
}
componentWillMount() {
const { user, setup } = this.props;
setUser({...user, setup});
if(!ssr && !user.email) {
const { jwt } = window.localStorage;
if(jwt) doLogin(null, jwt, true);
const { user, setup } = this.props
setUser({ ...user, setup })
if (!ssr && !user.email) {
const { jwt } = window.localStorage
if (jwt) doLogin(null, jwt, true)
}
}
render () {
let { Component, pageProps } = this.props;
render() {
let { Component, pageProps } = this.props
return (
<Provider store={store}>
<Container>
<Component {...pageProps} />
</Container>
</Provider>
);
)
}
}

21
pages/_document.js
View File

@@ -1,17 +1,20 @@
import Document, { Head, Main, NextScript } from 'next/document';
import getUrl from '../util/getUrl';
import Document, { Head, Main, NextScript } from 'next/document'
import getUrl from '../util/getUrl'
export default class MyDocument extends Document {
render() {
const favicon = getUrl('favicon.ico');
const favicon = getUrl('favicon.ico')
return (
<html>
<Head>
<meta charSet='utf-8'/>
<meta 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'/>
<link rel='stylesheet' href={getUrl('/_next/static/style.css')} />
<meta charSet="utf-8" />
<meta
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" />
<link rel="stylesheet" href={getUrl('/_next/static/style.css')} />
<title>My Knowledge Base</title>
</Head>
<body>
@@ -19,6 +22,6 @@ export default class MyDocument extends Document {
<NextScript />
</body>
</html>
);
)
}
}

25
pages/edit.js
View File

@@ -1,17 +1,18 @@
import React, { Component } from 'react';
import Page from '../comps/Page';
import MngDoc from '../comps/MngDoc';
import AddDoc from '../comps/AddDoc';
import React, { Component } from 'react'
import Page from '../comps/Page'
import MngDoc from '../comps/MngDoc'
import AddDoc from '../comps/AddDoc'
class Edit extends Component {
render() {
const { found, doc } = this.props;
if(!found) return (
<Page>
<h3>Doc not found...</h3>
</Page>
);
return <MngDoc {...{doc}} />;
const { found, doc } = this.props
if (!found)
return (
<Page>
<h3>Doc not found...</h3>
</Page>
)
return <MngDoc {...{ doc }} />
}
}
export default AddDoc(Edit);
export default AddDoc(Edit)

188
pages/index.js
View File

@@ -1,14 +1,14 @@
import React, { Component } from 'react';
import { connect } from 'react-redux';
import Router from 'next/router';
import Paginate from 'react-paginate';
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 mapUser from '../util/mapUser';
import React, { Component } from 'react'
import { connect } from 'react-redux'
import Router from 'next/router'
import Paginate from 'react-paginate'
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 mapUser from '../util/mapUser'
class Index extends Component {
state = {
@@ -18,95 +18,104 @@ class Index extends Component {
pending: false,
error: null,
total: 0,
docs: []
docs: [],
}
static async getInitialProps({ req, query }) {
let page = 1, $search = '';
if(query) {
page = query.page || page;
$search = query.search || $search;
let page = 1,
$search = ''
if (query) {
page = query.page || page
$search = query.search || $search
}
const jwt = getJwt(req);
if(!jwt) return { total: 0, docs: [] };
const q = buildQ({ $search, $skip: page });
const data = await getDocs(q, req ? jwt : false);
return { ...data, page, $search };
const jwt = getJwt(req)
if (!jwt) return { total: 0, docs: [] }
const q = buildQ({ $search, $skip: page })
const data = await getDocs(q, req ? jwt : false)
return { ...data, page, $search }
}
updDocs = (time, doSearch) => {
clearTimeout(this.docsTime);
clearTimeout(this.docsTime)
this.docsTime = setTimeout(async () => {
let { $sort, $search, page } = this.state;
if(doSearch) {
const query = { search: $search };
if(!$search) delete query.search;
Router.push({ pathname: '/', query });
let { $sort, $search, page } = this.state
if (doSearch) {
const query = { search: $search }
if (!$search) delete query.search
Router.push({ pathname: '/', query })
}
this.setState({ error: null });
this.setState({ error: null })
this.docsTime = setTimeout(() => {
this.setState({ pending: true });
}, 125);
this.setState({ pending: true })
}, 125)
const q = buildQ({ $search, $sort, $skip: page });
const data = await getDocs(q);
clearTimeout(this.docsTime);
this.setState({ ...data, pending: false });
}, time || 275);
const q = buildQ({ $search, $sort, $skip: page })
const data = await getDocs(q)
clearTimeout(this.docsTime)
this.setState({ ...data, pending: false })
}, time || 275)
}
updQuery = e => {
this.setState({ [e.target.id]: e.target.value });
this.updDocs(0, e.target.id === '$search');
this.setState({ [e.target.id]: e.target.value })
this.updDocs(0, e.target.id === '$search')
}
handlePage = ({ selected }) => {
const { $search } = this.state;
const page = selected + 1;
const query = {};
this.setState({ page });
if(page > 1) query.page = page;
if($search) query.search = $search;
Router.push({ pathname: '/', query });
this.updDocs(1);
const { $search } = this.state
const page = selected + 1
const query = {}
this.setState({ page })
if (page > 1) query.page = page
if ($search) query.search = $search
Router.push({ pathname: '/', query })
this.updDocs(1)
}
static getDerivedStateFromProps(nextProps, prevState) {
let { docs, total, page, $search } = nextProps;
if(docs.length !== prevState.docs.length ||
page !== prevState.page || $search !== prevState.$search) {
return { total, docs, page, $search, pending: false };
let { docs, total, page, $search } = nextProps
if (
docs.length !== prevState.docs.length ||
page !== prevState.page ||
$search !== prevState.$search
) {
return { total, docs, page, $search, pending: false }
}
return null;
return null
}
componentDidUpdate(prevProps) {
const { user, docs } = this.props;
if(prevProps.user.email === user.email) return;
if(user.email && docs.length === 0) this.updDocs(1);
const { user, docs } = this.props
if (prevProps.user.email === user.email) return
if (user.email && docs.length === 0) this.updDocs(1)
}
render() {
const {
$sort, $search, pending,
error, docs, total, page
} = this.state;
const pages = Math.ceil(total / $limit);
const { $sort, $search, pending, error, docs, total, page } = this.state
const pages = Math.ceil(total / $limit)
return (
<Page>
<PaddedRow>
<input type='text' placeholder='Search knowledge base...'
maxLength={128} value={$search} className='search'
id='$search' onChange={this.updQuery}
<input
type="text"
placeholder="Search knowledge base..."
maxLength={128}
value={$search}
className="search"
id="$search"
onChange={this.updQuery}
/>
</PaddedRow>
<PaddedRow>
<div className='inline' style={{ width: '100%' }}>
<h4 className='noMargin'>Docs</h4>
<div className='float-right inline'>
<label htmlFor='sort'>Sort: </label>
<select id='$sort' value={$sort}
onChange={this.updQuery} style={{ width: 150 }}
<div className="inline" style={{ width: '100%' }}>
<h4 className="noMargin">Docs</h4>
<div className="float-right inline">
<label htmlFor="sort">Sort: </label>
<select
id="$sort"
value={$sort}
onChange={this.updQuery}
style={{ width: 150 }}
>
<option value='updated:-1'>{'Updated (new -> old)'}</option>
<option value='updated:1'>{'Updated (old -> new)'}</option>
<option value='created:-1'>{'Created (new -> old)'}</option>
<option value='created:1'>{'Created (old -> new)'}</option>
<option value='dirName:1'>{'Name (A -> Z)'}</option>
<option value='dirName:-1'>{'Name (Z -> A)'}</option>
<option value="updated:-1">{'Updated (new -> old)'}</option>
<option value="updated:1">{'Updated (old -> new)'}</option>
<option value="created:-1">{'Created (new -> old)'}</option>
<option value="created:1">{'Created (old -> new)'}</option>
<option value="dirName:1">{'Name (A -> Z)'}</option>
<option value="dirName:-1">{'Name (Z -> A)'}</option>
</select>
</div>
</div>
@@ -114,32 +123,37 @@ class Index extends Component {
<PaddedRow>
{docs.length > 0 || error || pending ? null : <p>No docs found...</p>}
{!error ? null : <p>{error}</p>}
{!pending || error ? null : <Spinner style={{ margin: '25px auto 0' }} />}
{docs.length < 1 || pending || error ? null
: <div>
{!pending || error ? null : (
<Spinner style={{ margin: '25px auto 0' }} />
)}
{docs.length < 1 || pending || error ? null : (
<div>
<table>
<thead>
<tr><th>
Doc <span className='float-right'>Modified</span>
</th></tr>
<tr>
<th>
Doc <span className="float-right">Modified</span>
</th>
</tr>
</thead>
<tbody>
{docs.map(doc => <DocItem {...doc} key={doc.id} />)}
</tbody>
</table>
{pages < 2 ? null
: <Paginate pageCount={pages}
containerClassName='paginate'
activeClassName='active'
{pages < 2 ? null : (
<Paginate
pageCount={pages}
containerClassName="paginate"
activeClassName="active"
onPageChange={this.handlePage}
forcePage={page - 1}
/>
}
)}
</div>
}
)}
</PaddedRow>
</Page>
);
)
}
}
export default connect(mapUser)(Index);
export default connect(mapUser)(Index)

77
pages/k.js
View File

@@ -1,53 +1,64 @@
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 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'
class k extends Component {
delete = async () => {
const sure = window.confirm('Are you sure you want to delete this doc? This can not be undone.');
if(!sure) return;
const sure = window.confirm(
'Are you sure you want to delete this doc? This can not be undone.'
)
if (!sure) return
const del = await fetch(getUrl('docs/' + this.props.id), {
headers: { Authorization: getJwt() },
method: 'DELETE'
}).catch(({ message }) => ({ ok: false, message }));
if(del.ok) Router.push('/');
method: 'DELETE',
}).catch(({ message }) => ({ ok: false, message }))
if (del.ok) Router.push('/')
else {
if(!del.message) {
const data = await del.json();
del.message = data.message;
if (!del.message) {
const data = await del.json()
del.message = data.message
}
window.alert(`Could not delete doc, ${del.message}`);
window.alert(`Could not delete doc, ${del.message}`)
}
}
render() {
const { found, id, doc } = this.props;
if(!found) return (
<Page>
<h3>Doc not found...</h3>
</Page>
);
const { found, id, doc } = this.props
if (!found)
return (
<Page>
<h3>Doc not found...</h3>
</Page>
)
return (
<Page>
<h5 style={{ marginBottom: '1rem' }}>
{doc.dir}{doc.dir.length > 0 ? '/' : ''}{doc.name}{' - '}
<Link as={getUrl('edit/' + id)}
href={{ pathname: '/edit', query: { id }}}
{doc.dir}
{doc.dir.length > 0 ? '/' : ''}
{doc.name}
{' - '}
<Link
as={getUrl('edit/' + id)}
href={{ pathname: '/edit', query: { id } }}
>
<a id='edit'>edit</a>
<a id="edit">edit</a>
</Link>
<button className='float-right' onClick={this.delete}
<button
className="float-right"
onClick={this.delete}
style={{ margin: '5px 0 0' }}
>Delete</button>
>
Delete
</button>
</h5>
<Markdown source={doc.md} className='Markdown' />
<Markdown source={doc.md} className="Markdown" />
</Page>
);
)
}
}
export default AddDoc(k);
export default AddDoc(k)

4
pages/new.js
View File

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

119
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 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'
class Settings extends Component {
state = {
@@ -15,53 +15,55 @@ class Settings extends Component {
passErr: null,
curPass: '',
newPass: '',
confPass: ''
confPass: '',
}
updVal = updStateFromId.bind(this);
updVal = updStateFromId.bind(this)
submit = async e => {
e.preventDefault();
const { pending, curPass, newPass, confPass } = this.state;
const { email, _id } = this.props.user;
if(pending) return;
const doErr = passErr => this.setState({ pending: false, passErr });
e.preventDefault()
const { pending, curPass, newPass, confPass } = this.state
const { email, _id } = this.props.user
if (pending) return
const doErr = passErr => this.setState({ pending: false, passErr })
const vals = {
'Current password': curPass,
'New password': newPass,
'Confirm new password': confPass
};
const keys = Object.keys(vals);
for(let i = 0; i < keys.length; i++) {
let key = keys[i], val = vals[key];
if(val.length === 0) return doErr(`${key} is required`);
'Confirm new password': confPass,
}
if(newPass !== confPass) return doErr('New passwords don\'t match');
const keys = Object.keys(vals)
for (let i = 0; i < keys.length; i++) {
let key = keys[i],
val = vals[key]
if (val.length === 0) return doErr(`${key} is required`)
}
if (newPass !== confPass) return doErr("New passwords don't match")
this.setState({ passErr: null, pending: true });
this.setState({ passErr: null, pending: true })
const updRes = await fetch(getUrl('users/' + _id), {
method: 'PATCH',
headers: { 'Content-Type': 'application/json', Authorization: getJwt() },
body: JSON.stringify({ email, password: curPass, newPassword: newPass })
}).catch(doErr);
if(updRes.ok) {
body: JSON.stringify({ email, password: curPass, newPassword: newPass }),
}).catch(doErr)
if (updRes.ok) {
this.setState({
curPass: '', newPass: '', confPass: '',
curPass: '',
newPass: '',
confPass: '',
passErr: 'Password updated successfully',
pending: false
});
pending: false,
})
} else {
let message = 'failed to update password';
let message = 'failed to update password'
try {
const data = await updRes.json();
message = data.message || message;
} catch (err) { doErr(err.message); }
doErr(message);
const data = await updRes.json()
message = data.message || message
} catch (err) {
doErr(err.message)
}
doErr(message)
}
}
render() {
const {
pending, passErr, curPass,
newPass, confPass
} = this.state;
const { pending, passErr, curPass, newPass, confPass } = this.state
return (
<Page>
@@ -71,20 +73,33 @@ class Settings extends Component {
<form noValidate style={{ padding: '0 0 45px' }}>
<h4>Change password</h4>
<fieldset>
<label htmlFor='curPass'>Current Password</label>
<input type='password' id='curPass' onChange={this.updVal}
placeholder='Current super secret password...' value={curPass}
<label htmlFor="curPass">Current Password</label>
<input
type="password"
id="curPass"
onChange={this.updVal}
placeholder="Current super secret password..."
value={curPass}
/>
<label htmlFor='newPass'>New Password</label>
<input type='password' id='newPass' onChange={this.updVal}
placeholder='New super secret password...' value={newPass}
<label htmlFor="newPass">New Password</label>
<input
type="password"
id="newPass"
onChange={this.updVal}
placeholder="New super secret password..."
value={newPass}
/>
<label htmlFor='confPass'>Confirm New Password</label>
<input type='password' id='confPass' onChange={this.updVal}
placeholder='Confirm new super secret password...' value={confPass}
<label htmlFor="confPass">Confirm New Password</label>
<input
type="password"
id="confPass"
onChange={this.updVal}
placeholder="Confirm new super secret password..."
value={confPass}
/>
</fieldset>
<button onClick={this.submit}
<button
onClick={this.submit}
className={'float-right' + (pending ? ' disabled' : '')}
>
{pending ? <Spinner /> : 'Submit'}
@@ -93,7 +108,7 @@ class Settings extends Component {
</form>
</PaddedRow>
</Page>
);
)
}
}
export default connect(mapUser)(Settings);
export default connect(mapUser)(Settings)

110
redux/actions/userAct.js
View File

@@ -1,74 +1,82 @@
import fetch from 'isomorphic-unfetch';
import store from '../store';
import getUrl from '../../util/getUrl';
import fetch from 'isomorphic-unfetch'
import store from '../store'
import getUrl from '../../util/getUrl'
// define action types
export const SET_USER = 'SET_USER';
export const LOGIN_PENDING = 'LOGIN_PENDING';
export const LOGIN_FAILED = 'LOGIN_FAILED';
export const LOGOUT = 'LOGOUT';
export const SET_USER = 'SET_USER'
export const LOGIN_PENDING = 'LOGIN_PENDING'
export const LOGIN_FAILED = 'LOGIN_FAILED'
export const LOGOUT = 'LOGOUT'
export const setUser = user => {
store.dispatch({
type: SET_USER,
data: user
});
}; // setUser
data: user,
})
} // setUser
export const doLogout = () => {
if(typeof window !== 'undefined') {
window.localStorage.removeItem('jwt');
document.cookie = 'jwt=; expires=Thu, 01 Jan 1970 00:00:01 GMT;path=/;';
if (typeof window !== 'undefined') {
window.localStorage.removeItem('jwt')
document.cookie = 'jwt=; expires=Thu, 01 Jan 1970 00:00:01 GMT;path=/;'
}
store.dispatch({ type: LOGOUT });
}; // doLogout
store.dispatch({ type: LOGOUT })
} // doLogout
export async function doLogin (creds, jwt, noPend) {
!noPend && store.dispatch({ type: LOGIN_PENDING });
const authReqOpts = { method: 'POST', credentials: 'include' };
const authReqHead = { headers: jwt ? { Authorization: jwt } : {
'Content-Type': 'application/json' }
};
const authReqBody = jwt ? null : {
body: JSON.stringify({...creds, strategy: 'local'})
};
export async function doLogin(creds, jwt, noPend) {
!noPend && store.dispatch({ type: LOGIN_PENDING })
const authReqOpts = { method: 'POST', credentials: 'include' }
const authReqHead = {
headers: jwt
? { Authorization: jwt }
: {
'Content-Type': 'application/json',
},
}
const authReqBody = jwt
? null
: {
body: JSON.stringify({ ...creds, strategy: 'local' }),
}
const authReq = new Request(getUrl('auth'), {
...authReqOpts, ...authReqHead, ...authReqBody
});
...authReqOpts,
...authReqHead,
...authReqBody,
})
const authRes = await fetch(authReq).catch(err => {
store.dispatch({ type: LOGIN_FAILED, data: err.message });
});
if(!authRes.ok) {
let error;
store.dispatch({ type: LOGIN_FAILED, data: err.message })
})
if (!authRes.ok) {
let error
try {
error = await authRes.json();
error = error.message;
}
catch (err) {
error = authRes.status === 429
? 'Max login attempts reached'
: 'An error occurred during login';
error = await authRes.json()
error = error.message
} catch (err) {
error =
authRes.status === 429
? 'Max login attempts reached'
: 'An error occurred during login'
}
return store.dispatch({
type: LOGIN_FAILED,
data: error
});
data: error,
})
}
const { accessToken } = await authRes.json();
const payload = accessToken.split('.')[1];
const { userId } = JSON.parse(atob(payload));
const { accessToken } = await authRes.json()
const payload = accessToken.split('.')[1]
const { userId } = JSON.parse(atob(payload))
const userReq = new Request(getUrl(`/users/${userId}`), {
headers: {
Authorization: accessToken
}
});
const userRes = await fetch(userReq);
if(!userRes.ok) {
Authorization: accessToken,
},
})
const userRes = await fetch(userReq)
if (!userRes.ok) {
return store.dispatch({
type: LOGIN_FAILED,
data: 'failed to get user'
});
data: 'failed to get user',
})
}
window.localStorage.setItem('jwt', accessToken);
setUser(await userRes.json());
window.localStorage.setItem('jwt', accessToken)
setUser(await userRes.json())
} // doLogin

61
redux/reducers/userRed.js
View File

@@ -2,8 +2,8 @@ import {
SET_USER,
LOGIN_PENDING,
LOGIN_FAILED,
LOGOUT
} from '../actions/userAct';
LOGOUT,
} from '../actions/userAct'
const initState = {
setup: false,
@@ -11,35 +11,36 @@ const initState = {
email: null,
admin: null,
pending: false,
error: null
};
error: null,
}
function user(state=initState, action) {
switch(action.type) {
case SET_USER: {
return {
...initState,
...action.data
};
}
case LOGIN_PENDING: {
return {
...initState,
pending: true
};
}
case LOGIN_FAILED: {
return {
...state,
pending: false,
error: action.data
};
}
case LOGOUT: {
return initState;
}
default: return state;
function user(state = initState, action) {
switch (action.type) {
case SET_USER: {
return {
...initState,
...action.data,
}
}
case LOGIN_PENDING: {
return {
...initState,
pending: true,
}
}
case LOGIN_FAILED: {
return {
...state,
pending: false,
error: action.data,
}
}
case LOGOUT: {
return initState
}
default:
return state
}
}
export default user;
export default user

26
redux/store.js
View File

@@ -1,23 +1,19 @@
import {
applyMiddleware,
combineReducers,
createStore
} from 'redux';
import { applyMiddleware, combineReducers, createStore } from 'redux'
import user from './reducers/userRed';
import user from './reducers/userRed'
let middleware;
if(process.env.NODE_ENV !== 'production') {
const logger = require('redux-logger').default;
if(typeof window !== 'undefined') {
middleware = applyMiddleware(logger);
let middleware
if (process.env.NODE_ENV !== 'production') {
const logger = require('redux-logger').default
if (typeof window !== 'undefined') {
middleware = applyMiddleware(logger)
}
}
const reducers = combineReducers({
user
});
user,
})
export default middleware
export default (middleware
? createStore(reducers, middleware)
: createStore(reducers);
: createStore(reducers))

18
src/app.hooks.js
View File

@@ -1,34 +1,34 @@
// Application hooks that run for every service
const logger = require('./hooks/logger');
const logger = require('./hooks/logger')
module.exports = {
before: {
all: [ logger() ],
all: [logger()],
find: [],
get: [],
create: [],
update: [],
patch: [],
remove: []
remove: [],
},
after: {
all: [ logger() ],
all: [logger()],
find: [],
get: [],
create: [],
update: [],
patch: [],
remove: []
remove: [],
},
error: {
all: [ logger() ],
all: [logger()],
find: [],
get: [],
create: [],
update: [],
patch: [],
remove: []
}
};
remove: [],
},
}

193
src/app.js
View File

@@ -1,131 +1,126 @@
const favicon = require('serve-favicon');
const fs = require('fs');
const path = require('path');
const compress = require('compression');
const cors = require('cors');
const helmet = require('helmet');
const cookieParser = require('cookie-parser')();
const RateLimit = require('express-rate-limit');
const trustIPs = require('./trustIPs');
const logger = require('winston');
const favicon = require('serve-favicon')
const fs = require('fs')
const path = require('path')
const compress = require('compression')
const cors = require('cors')
const helmet = require('helmet')
const cookieParser = require('cookie-parser')()
const RateLimit = require('express-rate-limit')
const trustIPs = require('./trustIPs')
const logger = require('winston')
const feathers = require('@feathersjs/feathers');
const express = require('@feathersjs/express');
const configuration = require('@feathersjs/configuration');
const hostConfig = require('../config/host.json');
const feathers = require('@feathersjs/feathers')
const express = require('@feathersjs/express')
const configuration = require('@feathersjs/configuration')
const hostConfig = require('../config/host.json')
const middleware = require('./middleware');
const services = require('./services');
const appHooks = require('./app.hooks');
const channels = require('./channels');
const authentication = require('./authentication');
const middleware = require('./middleware')
const services = require('./services')
const appHooks = require('./app.hooks')
const channels = require('./channels')
const authentication = require('./authentication')
const dev = process.env.NODE_ENV !== 'production';
const basePath = require('../util/basePath');
const stripBase = require('../util/stripBase');
const getUrl = require('../util/getUrl');
const { parse } = require('url');
const nxt = require('next')({ dev, quiet: true });
const nxtHandler = nxt.getRequestHandler();
const dev = process.env.NODE_ENV !== 'production'
const basePath = require('../util/basePath')
const stripBase = require('../util/stripBase')
const getUrl = require('../util/getUrl')
const { parse } = require('url')
const nxt = require('next')({ dev, quiet: true })
const nxtHandler = nxt.getRequestHandler()
const app = express(feathers());
const app = express(feathers())
app.run = async port => {
const server = app.listen(port);
await nxt.prepare();
const server = app.listen(port)
await nxt.prepare()
if(dev) {
if (dev) {
server.on('upgrade', (req, socket) => {
nxtHandler(req, socket, parse(stripBase(req.url), true));
});
nxtHandler(req, socket, parse(stripBase(req.url), true))
})
}
return server;
};
return server
}
// Load app configuration
app.configure(configuration());
app.configure(configuration())
// load host config
Object.keys(hostConfig).forEach(key => (
app.set(key, hostConfig[key])
));
app.set('didSetup', false);
Object.keys(hostConfig).forEach(key => app.set(key, hostConfig[key]))
app.set('didSetup', false)
try {
fs.statSync(path.join(__dirname, '..', 'db', '.didSetup'));
app.set('didSetup', true);
}
catch(err) {
fs.statSync(path.join(__dirname, '..', 'db', '.didSetup'))
app.set('didSetup', true)
} catch (err) {
app.use((req, res, next) => {
req.doSetup = !app.get('didSetup');
next();
});
req.doSetup = !app.get('didSetup')
next()
})
}
const authLimit = new RateLimit({
windowMs: 5 * 60 * 1000, // 5 minutes
max: 5, // 5 attempts then block
delayAfter: 3, // slow down after 3 fails
delayMs: 2 * 1000
});
app.authLimit = authLimit;
app.use(getUrl('auth'), authLimit);
app.patch(getUrl('users/*'), authLimit);
delayMs: 2 * 1000,
})
app.authLimit = authLimit
app.use(getUrl('auth'), authLimit)
app.patch(getUrl('users/*'), authLimit)
// Enable CORS, security, compression, favicon and body parsing
trustIPs(app);
app.use(cors());
app.use(helmet({
hidePoweredBy: { setTo: 'hamsters' }
}));
trustIPs(app)
app.use(cors())
app.use(
helmet({
hidePoweredBy: { setTo: 'hamsters' },
})
)
if(!dev) app.use(compress());
app.use(express.json()); // use { limit } option to increase max post size
app.use(express.urlencoded({ extended: true }));
app.use(getUrl('/'), favicon('favicon.ico'));
app.configure(express.rest()); // Set up Plugins and providers
app.configure(middleware); // middleware/index.js
app.configure(authentication); // Set up authentication
app.configure(services); // Set up our services (see `services/index.js`)
app.configure(channels); // Set up event channels (see channels.js)
if (!dev) app.use(compress())
app.use(express.json()) // use { limit } option to increase max post size
app.use(express.urlencoded({ extended: true }))
app.use(getUrl('/'), favicon('favicon.ico'))
app.configure(express.rest()) // Set up Plugins and providers
app.configure(middleware) // middleware/index.js
app.configure(authentication) // Set up authentication
app.configure(services) // Set up our services (see `services/index.js`)
app.configure(channels) // Set up event channels (see channels.js)
const checkJWT = async (req, res, next) => {
const result = await req.app.authenticate('jwt', {})(req);
if(result.success) {
req.jwt = req.cookies.jwt;
delete result.data.user.password;
req.user = result.data.user;
const result = await req.app.authenticate('jwt', {})(req)
if (result.success) {
req.jwt = req.cookies.jwt
delete result.data.user.password
req.user = result.data.user
}
next();
};
nxt.setAssetPrefix(basePath); // setup next.js routes
next()
}
nxt.setAssetPrefix(basePath) // setup next.js routes
;['/', '/logout', '/new', '/settings'].forEach(route => {
app.get(getUrl(route), cookieParser, checkJWT, (req, res) => {
const { query } = parse(req.url, true)
nxt.render(req, res, route, query)
})
})
;['/k', '/edit'].forEach(route => {
app.get(getUrl(route + '/:id'), cookieParser, checkJWT, (req, res) => {
nxt.render(req, res, route, { id: req.params.id })
})
})
[ '/', '/logout', '/new', '/settings' ]
.forEach(route => {
app.get(getUrl(route), cookieParser, checkJWT, (req, res) => {
const { query } = parse(req.url, true);
nxt.render(req, res, route, query);
});
});
[ '/k', '/edit' ]
.forEach(route => {
app.get(getUrl(route + '/:id'), cookieParser, checkJWT, (req, res) => {
nxt.render(req, res, route, { id: req.params.id });
});
});
const notFound = express.notFound();
const notFound = express.notFound()
app.use((req, res, next) => {
let accept = req.get('accept');
if(accept && accept.toLowerCase() === 'application/json')
return notFound(req, res, next);
if(req.url.substr(0, basePath.length) !== basePath)
return nxt.render404(req, res);
nxtHandler(req, res, parse(stripBase(req.url), true));
});
let accept = req.get('accept')
if (accept && accept.toLowerCase() === 'application/json')
return notFound(req, res, next)
if (req.url.substr(0, basePath.length) !== basePath)
return nxt.render404(req, res)
nxtHandler(req, res, parse(stripBase(req.url), true))
})
app.use(express.errorHandler({ logger }));
app.hooks(appHooks);
app.use(express.errorHandler({ logger }))
app.hooks(appHooks)
module.exports = app;
module.exports = app

58
src/authentication.js
View File

@@ -1,26 +1,28 @@
const authentication = require('@feathersjs/authentication');
const jwt = require('@feathersjs/authentication-jwt');
const local = require('@feathersjs/authentication-local');
const getUrl = require('../util/getUrl');
const authentication = require('@feathersjs/authentication')
const jwt = require('@feathersjs/authentication-jwt')
const local = require('@feathersjs/authentication-local')
const getUrl = require('../util/getUrl')
module.exports = function (app) {
const config = app.get('authentication');
config.path = getUrl(config.path);
config.service = getUrl('users');
module.exports = function(app) {
const config = app.get('authentication')
config.path = getUrl(config.path)
config.service = getUrl('users')
// Set up authentication with the secret
app.configure(authentication(
Object.assign({}, config, {
cookie: {
enabled: true,
httpOnly: false,
secure: false,
name: 'jwt',
}
})
));
app.configure(jwt());
app.configure(local());
app.configure(
authentication(
Object.assign({}, config, {
cookie: {
enabled: true,
httpOnly: false,
secure: false,
name: 'jwt',
},
})
)
)
app.configure(jwt())
app.configure(local())
// The `authentication` service is used to create a JWT.
// The before `create` hook registers strategies that can be used
@@ -30,13 +32,11 @@ module.exports = function (app) {
create: [
authentication.hooks.authenticate(config.strategies),
ctx => {
ctx.app.authLimit.resetKey(ctx.params.ip);
return ctx;
}
ctx.app.authLimit.resetKey(ctx.params.ip)
return ctx
},
],
remove: [
authentication.hooks.authenticate('jwt')
]
}
});
};
remove: [authentication.hooks.authenticate('jwt')],
},
})
}

27
src/channels.js
View File

@@ -1,26 +1,26 @@
module.exports = function(app) {
if(typeof app.channel !== 'function') {
if (typeof app.channel !== 'function') {
// If no real-time functionality has been configured just return
return;
return
}
app.on('connection', connection => {
// On a new real-time connection, add it to the anonymous channel
app.channel('anonymous').join(connection);
});
app.channel('anonymous').join(connection)
})
app.on('login', (authResult, { connection }) => {
// connection can be undefined if there is no
// real-time connection, e.g. when logging in via REST
if(connection) {
if (connection) {
// Obtain the logged in user from the connection
// const user = connection.user;
// The connection is no longer anonymous, remove it
app.channel('anonymous').leave(connection);
app.channel('anonymous').leave(connection)
// Add it to the authenticated user channel
app.channel('authenticated').join(connection);
app.channel('authenticated').join(connection)
// Channels can be named anything and joined on any condition
@@ -34,18 +34,21 @@ module.exports = function(app) {
// app.channel(`emails/${user.email}`).join(channel);
// app.channel(`userIds/$(user.id}`).join(channel);
}
});
})
// eslint-disable-next-line no-unused-vars
app.publish((data, hook) => {
// Here you can add event publishers to channels set up in `channels.js`
// To publish only for a specific event use `app.publish(eventname, () => {})`
console.log('Publishing all events to all authenticated users. See `channels.js` and https://docs.feathersjs.com/api/channels.html for more information.'); // eslint-disable-line
// eslint-disable-next-line
console.log(
'Publishing all events to all authenticated users. See `channels.js` and https://docs.feathersjs.com/api/channels.html for more information.'
)
// e.g. to publish all service events to all authenticated users use
return app.channel('authenticated');
});
return app.channel('authenticated')
})
// Here you can also add service specific event publishers
// e..g the publish the `users` service `created` event to the `admins` channel
@@ -58,4 +61,4 @@ module.exports = function(app) {
// app.channel(`emails/${data.recipientEmail}`)
// ];
// });
};
}

18
src/hooks/logger.js
View File

@@ -1,23 +1,25 @@
// A hook that logs service method before, after and error
// See https://github.com/winstonjs/winston for documentation
// about the logger.
const logger = require('winston');
const logger = require('winston')
// To see more detailed messages, uncomment the following line
// logger.level = 'debug';
module.exports = function () {
module.exports = function() {
return context => {
// This debugs the service call and a stringified version of the hook context
// You can customize the mssage (and logger) to your needs
logger.debug(`${context.type} app.service('${context.path}').${context.method}()`);
logger.debug(
`${context.type} app.service('${context.path}').${context.method}()`
)
if(typeof context.toJSON === 'function') {
logger.debug('Hook Context', JSON.stringify(context, null, ' '));
if (typeof context.toJSON === 'function') {
logger.debug('Hook Context', JSON.stringify(context, null, ' '))
}
if (context.error) {
logger.error(context.error);
logger.error(context.error)
}
};
};
}
}

8
src/index.js
View File

@@ -1,6 +1,6 @@
const logger = require('winston');
const app = require('./app');
const port = app.get('port');
const logger = require('winston')
const app = require('./app')
const port = app.get('port')
app.run(port).then(() => {
logger.info('MYKB listening at http://%s:%d', app.get('host'), port)
@@ -8,4 +8,4 @@ app.run(port).then(() => {
process.on('unhandledRejection', (reason, p) =>
logger.error('Unhandled Rejection at: Promise ', p, reason)
);
)

10
src/middleware/index.js
View File

@@ -1,11 +1,11 @@
// eslint-disable-next-line no-unused-vars
module.exports = function (app) {
module.exports = function(app) {
// Add your custom middleware here. Remember, that
// in Express the order matters
// add req.ip to feathers
app.use((req, res, next) => {
req.feathers.ip = req.ip;
next();
});
};
req.feathers.ip = req.ip
next()
})
}

18
src/models/users.model.js
View File

@@ -1,14 +1,14 @@
const NeDB = require('nedb');
const path = require('path');
const NeDB = require('nedb')
const path = require('path')
module.exports = function (app) {
const dbPath = app.get('nedb');
module.exports = function(app) {
const dbPath = app.get('nedb')
const Model = new NeDB({
filename: path.join(dbPath, 'users.db'),
autoload: true
});
autoload: true,
})
Model.ensureIndex({ fieldName: 'email', unique: true });
Model.ensureIndex({ fieldName: 'email', unique: true })
return Model;
};
return Model
}

338
src/services/docs/docs.class.js
View File

@@ -1,225 +1,233 @@
const errors = require('@feathersjs/errors');
const gitP = require('simple-git/promise');
const fs = require('fs-extra');
const path = require('path');
const loadDocs = require('./loadDocs');
const comparableFields = [ 'name', 'dir' ];
let git;
const errors = require('@feathersjs/errors')
const gitP = require('simple-git/promise')
const fs = require('fs-extra')
const path = require('path')
const loadDocs = require('./loadDocs')
const comparableFields = ['name', 'dir']
let git
class Service {
constructor (options) {
this.options = options || {};
this.docsDir = this.options.docsDir;
this.$limit = this.options.paginate.default;
this.useGit = this.options.useGit;
this.maxDocSize = 1024 * 100; // 100 kb (don't try sending if bigger)
this.docs = {};
this.updTimeouts = {};
loadDocs.bind(this)();
constructor(options) {
this.options = options || {}
this.docsDir = this.options.docsDir
this.$limit = this.options.paginate.default
this.useGit = this.options.useGit
this.maxDocSize = 1024 * 100 // 100 kb (don't try reading if bigger)
this.docs = {}
this.updTimeouts = {}
loadDocs.bind(this)()
if(this.useGit) {
git = gitP(this.docsDir);
if (this.useGit) {
git = gitP(this.docsDir)
fs.stat(path.join(this.docsDir, '.git'), async err => {
if(err && err.code === 'ENOENT') {
if (err && err.code === 'ENOENT') {
git.init().then(() => {
if(this.numInitDocs === 0) return;
git.add('./*').then(() => git.commit('initial commit'));
});
if (this.numInitDocs === 0) return
git.add('./*').then(() => git.commit('initial commit'))
})
}
});
})
}
}
async getMd (id) {
const doc = this.docs[id];
if(doc.md) return doc.md;
const docPath = path.join(this.docsDir, doc.dir, doc.name);
const { size } = await fs.stat(docPath);
if(size > this.maxDocSize) return 'Document is too big to display...';
const buff = await fs.readFile(docPath);
return buff.toString();
async getMd(id) {
const doc = this.docs[id]
if (doc.md) return doc.md
const docPath = path.join(this.docsDir, doc.dir, doc.name)
const { size } = await fs.stat(docPath)
if (size > this.maxDocSize) return 'Document is too big to display...'
const buff = await fs.readFile(docPath)
return buff.toString()
}
async isMatch (id, $search) {
const doc = this.docs[id];
const name = doc.name.toLowerCase();
async isMatch(id, $search) {
const doc = this.docs[id]
const name = doc.name.toLowerCase()
if(name.indexOf($search) > -1) return true;
const dir = doc.dir.toLowerCase();
if (name.indexOf($search) > -1) return true
const dir = doc.dir.toLowerCase()
if(dir.indexOf($search) > -1) return true;
const relPath = dir + (dir.length > 0 ? '/' : '') + name;
if (dir.indexOf($search) > -1) return true
const relPath = dir + (dir.length > 0 ? '/' : '') + name
if(relPath.toLowerCase().indexOf($search) > -1) return true;
let md = await this.getMd(id);
md = md.toLowerCase();
if (relPath.toLowerCase().indexOf($search) > -1) return true
let md = await this.getMd(id)
md = md.toLowerCase()
if(md.indexOf($search) > -1) return true;
return false;
if (md.indexOf($search) > -1) return true
return false
}
async checkRmDir (dir) {
if(dir === '') return;
const parts = dir.split('/');
const n = parts.length;
for(let i = 0; i < n; i++) {
const dir = parts.filter((p, pIdx) => pIdx < (n - i)).join('/');
const docsInDir = await this.find({ query: { dir } });
if(docsInDir.total === 0) {
async checkRmDir(dir) {
if (dir === '') return
const parts = dir.split('/')
const n = parts.length
for (let i = 0; i < n; i++) {
const dir = parts.filter((p, pIdx) => pIdx < n - i).join('/')
const docsInDir = await this.find({ query: { dir } })
if (docsInDir.total === 0) {
try {
await fs.rmdir(path.join(this.docsDir, dir));
} catch(err) { return; }
} else return;
await fs.rmdir(path.join(this.docsDir, dir))
} catch (err) {
return
}
} else return
}
}
async find (params) {
const { query } = params;
let { $limit, $skip, $search, $select, $sort } = query;
if($skip < 0) $skip = 0;
$limit = $limit || this.$limit;
if($search) {
$search = $search.toLowerCase().trim();
async find(params) {
const { query } = params
let { $limit, $skip, $search, $select, $sort } = query
if ($skip < 0) $skip = 0
$limit = $limit || this.$limit
if ($search) {
$search = $search.toLowerCase().trim()
}
let ids = Object.keys(this.docs);
const data = [];
const toComp = comparableFields.filter(f => typeof query[f] !== 'undefined');
if(toComp.length > 0) {
let ids = Object.keys(this.docs)
const data = []
const toComp = comparableFields.filter(f => typeof query[f] !== 'undefined')
if (toComp.length > 0) {
ids = ids.filter(id => {
const doc = this.docs[id];
return !toComp.some(f => doc[f] !== query[f]);
});
const doc = this.docs[id]
return !toComp.some(f => doc[f] !== query[f])
})
}
if($search) {
if ($search) {
ids = await Promise.all(
ids.map(async id => await this.isMatch(id, $search) ? id : null)
);
ids = ids.filter(Boolean);
ids.map(async id => ((await this.isMatch(id, $search)) ? id : null))
)
ids = ids.filter(Boolean)
}
if(ids.length === 0) return { total: 0, data };
if($sort) {
const sortKey = Object.keys($sort).pop();
const ascDesc = $sort[sortKey];
if(this.docs[ids[0]][sortKey] || sortKey === 'dirName') { // make sure valid key
if (ids.length === 0) return { total: 0, data }
if ($sort) {
const sortKey = Object.keys($sort).pop()
const ascDesc = $sort[sortKey]
if (this.docs[ids[0]][sortKey] || sortKey === 'dirName') {
ids.sort((a, b) => {
let val1, val2, parseVals;
const docA = this.docs[a],
docB = this.docs[b];
if(sortKey === 'dirName') {
parseVals = doc => path.join(doc.dir, doc.name);
a = this.docs[a]
b = this.docs[b]
let parseVal
if (sortKey === 'dirName') {
parseVal = doc => path.join(doc.dir, doc.name)
} else {
parseVal = doc => doc[sortKey]
}
else {
parseVals = doc => doc[sortKey];
}
[val1, val2] = [docA, docB].map(parseVals);
let c = 0;
if(val1 < val2) c = -1;
else if(val1 > val2) c = 1;
return c * ascDesc;
});
a = parseVal(a)
b = parseVal(b)
let c = 0
if (a < b) c = -1
else if (a > b) c = 1
return c * ascDesc
})
}
}
for(let i = $skip || 0; i < ids.length && data.length < $limit; i++) {
const id = ids[i];
let doc = $select && !$select.md ? this.docs[id] : this.get(id);
if($select) {
let _doc = {};
$select.forEach(k => _doc[k] = doc[k]);
doc = _doc;
for (let i = $skip || 0; i < ids.length && data.length < $limit; i++) {
const id = ids[i]
let doc = $select && !$select.md ? this.docs[id] : this.get(id)
if ($select) {
let _doc = {}
$select.forEach(k => (_doc[k] = doc[k]))
doc = _doc
}
data.push(doc);
data.push(doc)
}
return { total: ids.length, data };
return { total: ids.length, data }
}
async get (id, params) { // eslint-disable-line no-unused-vars
const doc = this.docs[id];
if(!doc) throw new errors.NotFound(`No record found for id '${id}'`);
if(!doc.md) doc.md = await this.getMd(id);
return this.docs[id];
// eslint-disable-next-line no-unused-vars
async get(id, params) {
const doc = this.docs[id]
if (!doc) throw new errors.NotFound(`No record found for id '${id}'`)
if (!doc.md) doc.md = await this.getMd(id)
return this.docs[id]
}
async create (data, params) { // eslint-disable-line no-unused-vars
if(Array.isArray(data)) {
return await Promise.all(data.map(current => this.create(current)));
// eslint-disable-next-line no-unused-vars
async create(data, params) {
if (Array.isArray(data)) {
return await Promise.all(data.map(current => this.create(current)))
}
const { name, dir, md } = data;
const { name, dir, md } = data
try {
const rPath = path.join(dir, name);
const docPath = path.join(this.docsDir, rPath);
await fs.outputFile(docPath, md);
const rPath = path.join(dir, name)
const docPath = path.join(this.docsDir, rPath)
await fs.outputFile(docPath, md)
if(this.useGit) {
git.add(rPath).then(() => git.commit(`added doc ${rPath}`));
if (this.useGit) {
git.add(rPath).then(() => git.commit(`added doc ${rPath}`))
}
const ts = new Date().toJSON();
return this.setDoc(path.join(dir, name), ts, md, ts);
}
catch (err) {
throw new errors.GeneralError('could not create doc');
const ts = new Date().toJSON()
return this.setDoc(path.join(dir, name), ts, md, ts)
} catch (err) {
throw new errors.GeneralError('could not create doc')
}
}
async update (id, data, params) { // eslint-disable-line no-unused-vars
throw new errors.MethodNotAllowed('can not update on docs service');
// eslint-disable-next-line no-unused-vars
async update(id, data, params) {
throw new errors.MethodNotAllowed('can not update on docs service')
}
async patch (id, data, params) { // eslint-disable-line no-unused-vars
const doc = this.docs[id];
if(!doc) throw new errors.NotFound(`No record found for id '${id}'`);
let { name, dir, md } = data;
let diffDir = Boolean(doc.dir !== dir);
if(!name) name = doc.name;
if(typeof dir !== 'string') {
dir = doc.dir;
diffDir = false;
// eslint-disable-next-line no-unused-vars
async patch(id, data, params) {
const doc = this.docs[id]
if (!doc) throw new errors.NotFound(`No record found for id '${id}'`)
let { name, dir, md } = data
let diffDir = Boolean(doc.dir !== dir)
if (!name) name = doc.name
if (typeof dir !== 'string') {
dir = doc.dir
diffDir = false
}
const rPath = path.join(dir, name);
const docPath = path.join(this.docsDir, rPath);
if(name !== doc.name || diffDir) {
const oldRPath = path.join(doc.dir, doc.name);
const oldPath = path.join(this.docsDir, oldRPath);
await fs.ensureDir(path.join(this.docsDir, dir));
await fs.move(oldPath, docPath);
const rPath = path.join(dir, name)
const docPath = path.join(this.docsDir, rPath)
if (name !== doc.name || diffDir) {
const oldRPath = path.join(doc.dir, doc.name)
const oldPath = path.join(this.docsDir, oldRPath)
await fs.ensureDir(path.join(this.docsDir, dir))
await fs.move(oldPath, docPath)
if(this.useGit) {
git.rm(oldRPath)
if (this.useGit) {
git
.rm(oldRPath)
.then(() => git.add(rPath))
.then(() => git.commit(`renamed doc ${oldRPath} ${rPath}`));
.then(() => git.commit(`renamed doc ${oldRPath} ${rPath}`))
}
id = this.getId(path.join(dir, name));
this.docs[id] = Object.assign({}, doc, { id, name, dir });
delete this.docs[doc.id];
if(diffDir) this.checkRmDir(doc.dir);
id = this.getId(path.join(dir, name))
this.docs[id] = Object.assign({}, doc, { id, name, dir })
delete this.docs[doc.id]
if (diffDir) this.checkRmDir(doc.dir)
}
if(md) {
await fs.writeFile(docPath, md);
if(this.useGit) {
git.add(rPath).then(() => git.commit(`updated doc ${rPath}`));
if (md) {
await fs.writeFile(docPath, md)
if (this.useGit) {
git.add(rPath).then(() => git.commit(`updated doc ${rPath}`))
}
this.docs[id].md = md;
this.docs[id].md = md
}
return this.docs[id];
return this.docs[id]
}
async remove (id, params) { // eslint-disable-line no-unused-vars
const doc = this.docs[id];
if(!id) throw new errors.NotFound(`No record found for id '${id}'`);
const rPath = path.join(doc.dir, doc.name);
const docPath = path.join(this.docsDir, rPath);
await fs.unlink(docPath);
// eslint-disable-next-line no-unused-vars
async remove(id, params) {
const doc = this.docs[id]
if (!id) throw new errors.NotFound(`No record found for id '${id}'`)
const rPath = path.join(doc.dir, doc.name)
const docPath = path.join(this.docsDir, rPath)
await fs.unlink(docPath)
if(this.useGit) {
git.rm(rPath).then(() => git.commit(`removed doc ${rPath}`));
if (this.useGit) {
git.rm(rPath).then(() => git.commit(`removed doc ${rPath}`))
}
delete this.docs[id];
this.checkRmDir(doc.dir);
return doc;
delete this.docs[id]
this.checkRmDir(doc.dir)
return doc
}
}
module.exports = function (options) {
return new Service(options);
};
module.exports = function(options) {
return new Service(options)
}
module.exports.Service = Service;
module.exports.Service = Service

131
src/services/docs/docs.hooks.js
View File

@@ -1,72 +1,81 @@
const { authenticate } = require('@feathersjs/authentication').hooks;
const { checkDir, checkName } = require('../../../util/checkDirParts');
const { disable, invalid, adminOnly } = require('../hooksUtil');
const getUrl = require('../../../util/getUrl');
const { authenticate } = require('@feathersjs/authentication').hooks
const { checkDir, checkName } = require('../../../util/checkDirParts')
const { disable, invalid, adminOnly } = require('../hooksUtil')
const getUrl = require('../../../util/getUrl')
const nameIsValid = name => {
name = checkName(name);
if(!name) return invalid('name');
if(name.substr(name.length - 3).toLowerCase() !== '.md') {
name += '.md';
name = checkName(name)
if (!name) return invalid('name')
if (name.substr(name.length - 3).toLowerCase() !== '.md') {
name += '.md'
}
return name;
};
return name
}
const dirIsValid = dir => {
dir = checkDir(dir);
if(!dir && dir !== 0) return invalid('dir');
else if(dir === 0) return '';
return dir;
};
dir = checkDir(dir)
if (!dir && dir !== 0) return invalid('dir')
else if (dir === 0) return ''
return dir
}
const mdIsValid = md => {
if(typeof md !== 'string' || md.trim().length === 0) {
return invalid('md');
if (typeof md !== 'string' || md.trim().length === 0) {
return invalid('md')
}
return md;
};
return md
}
const pathTaken = async (name, dir, app) => {
const matches = await app.service(getUrl('docs')).find({ query: { name, dir } });
if(matches.total > 0) {
return invalid(null, 'filename is taken');
const matches = await app
.service(getUrl('docs'))
.find({ query: { name, dir } })
if (matches.total > 0) {
return invalid(null, 'filename is taken')
}
};
}
module.exports = {
before: {
all: [ authenticate('jwt') ],
all: [authenticate('jwt')],
find: [],
get: [],
create: [ async ctx => {
const { app, data } = ctx;
let { name, dir, md } = data;
const k = {};
k.name = nameIsValid(name);
k.dir = dirIsValid(dir);
k.md = mdIsValid(md);
await pathTaken(k.name, k.dir, app);
ctx.data = k;
return ctx;
}],
update: [ disable ],
patch: [ async ctx => {
const { data, app } = ctx;
const { name, dir, md } = data;
const k = {};
if(name) k.name = nameIsValid(name);
if(typeof dir === 'string') k.dir = dirIsValid(dir); // allow empty string
if(name || typeof dir === 'string') {
let checkName, checkDir;
if(!name || typeof dir !== 'string') {
const doc = await app.service(getUrl('docs')).get(ctx.id);
if(!name) checkName = doc.name;
if(typeof dir !== 'string') checkDir = doc.dir;
create: [
async ctx => {
const { app, data } = ctx
let { name, dir, md } = data
const k = {}
k.name = nameIsValid(name)
k.dir = dirIsValid(dir)
k.md = mdIsValid(md)
await pathTaken(k.name, k.dir, app)
ctx.data = k
return ctx
},
],
update: [disable],
patch: [
async ctx => {
const { data, app } = ctx
const { name, dir, md } = data
const k = {}
if (name) k.name = nameIsValid(name)
if (typeof dir === 'string') k.dir = dirIsValid(dir) // allow empty string
if (name || typeof dir === 'string') {
let checkName, checkDir
if (!name || typeof dir !== 'string') {
const doc = await app.service(getUrl('docs')).get(ctx.id)
if (!name) checkName = doc.name
if (typeof dir !== 'string') checkDir = doc.dir
}
await pathTaken(
k.name || checkName,
typeof k.dir === 'string' ? k.dir : checkDir,
app
)
}
await pathTaken(k.name || checkName,
typeof k.dir === 'string' ? k.dir : checkDir, app);
}
if(md) k.md = mdIsValid(md);
if(Object.keys(k).length === 0) invalid(null, 'nothing to update');
ctx.data = k;
return ctx;
}],
remove: [ adminOnly ]
if (md) k.md = mdIsValid(md)
if (Object.keys(k).length === 0) invalid(null, 'nothing to update')
ctx.data = k
return ctx
},
],
remove: [adminOnly],
},
after: {
@@ -76,7 +85,7 @@ module.exports = {
create: [],
update: [],
patch: [],
remove: []
remove: [],
},
error: {
@@ -86,6 +95,6 @@ module.exports = {
create: [],
update: [],
patch: [],
remove: []
}
};
remove: [],
},
}

31
src/services/docs/docs.service.js
View File

@@ -1,29 +1,28 @@
// Initializes the `docs` service on path `/docs`
const createService = require('./docs.class.js');
const hooks = require('./docs.hooks');
const getUrl = require('../../../util/getUrl');
const createService = require('./docs.class.js')
const hooks = require('./docs.hooks')
const getUrl = require('../../../util/getUrl')
module.exports = function (app) {
const paginate = app.get('paginate');
const docsDir = app.get('docsDir');
const cacheSize = app.get('cacheSize');
const useGit = app.get('useGit');
module.exports = function(app) {
const paginate = app.get('paginate')
const docsDir = app.get('docsDir')
const cacheSize = app.get('cacheSize')
const useGit = app.get('useGit')
const options = {
name: 'docs',
paginate,
docsDir,
cacheSize,
useGit
};
const url = getUrl('docs');
useGit,
}
const url = getUrl('docs')
// Initialize our service with any options it requires
app.use(url, createService(options));
app.use(url, createService(options))
// Get our initialized service so that we can register hooks and filters
const service = app.service(url);
const service = app.service(url)
service.hooks(hooks);
};
service.hooks(hooks)
}

116
src/services/docs/loadDocs.js
View File

@@ -1,64 +1,78 @@
const chokidar = require('chokidar');
const fs = require('fs-extra');
const path = require('path');
const glob = require('glob');
const crypto = require('crypto');
const chokidar = require('chokidar')
const fs = require('fs-extra')
const path = require('path')
const glob = require('glob')
const crypto = require('crypto')
async function loadDocs() {
const { docsDir, cacheSize } = this.options;
this.numInitDocs = glob.sync(path.join(docsDir, '**/*.md')).length;
this.cached = 0;
this.loaded = false;
const { docsDir, cacheSize } = this.options
this.numInitDocs = glob.sync(path.join(docsDir, '**/*.md')).length
this.cached = 0
this.loaded = false
const getId = relPath => (crypto.createHash('sha1')
.update(relPath).digest().toString('base64')
.substr(0, 16).split('/').join('_')
);
this.getId = getId;
const getId = relPath =>
crypto
.createHash('sha1')
.update(relPath)
.digest()
.toString('base64')
.substr(0, 16)
.split('/')
.join('_')
this.getId = getId
const setDoc = (relPath, created, md, updated) => {
const id = getId(relPath);
let dir = relPath.split('/');
const name = dir.pop();
dir = dir.join('/');
const id = getId(relPath)
let dir = relPath.split('/')
const name = dir.pop()
dir = dir.join('/')
const doc = {
id, name, dir, created, md, updated
};
this.docs[id] = doc;
return doc;
};
this.setDoc = setDoc;
id,
name,
dir,
created,
md,
updated,
}
this.docs[id] = doc
return doc
}
this.setDoc = setDoc
const watcher = chokidar.watch(path.join(docsDir, '/**/*.md'), { persistent: true });
const watcher = chokidar.watch(path.join(docsDir, '/**/*.md'), {
persistent: true,
})
const relPath = path => {
path = path.split(docsDir).pop();
if(path.substr(0, 1) === '/') path = path.substr(1);
return path;
};
path = path.split(docsDir).pop()
if (path.substr(0, 1) === '/') path = path.substr(1)
return path
}
const handleDoc = async (path, stats) => {
const rPath = relPath(path);
if(!stats) stats = await fs.stat(path);
else { // stats was set so it's a change event
const changedDoc = this.docs[getId(rPath)];
if(changedDoc && changedDoc.md) this.cached -= changedDoc.md.length;
const rPath = relPath(path)
if (!stats) stats = await fs.stat(path)
else {
// stats was set so it's a change event
const changedDoc = this.docs[getId(rPath)]
if (changedDoc && changedDoc.md) this.cached -= changedDoc.md.length
}
const { birthtime, size, mtime } = stats;
let md = null;
if(size < this.maxDocSize && (this.cached + size) < cacheSize) {
md = await fs.readFile(path);
md = md.toString();
this.cached += md.length;
const { birthtime, size, mtime } = stats
let md = null
if (size < this.maxDocSize && this.cached + size < cacheSize) {
md = await fs.readFile(path)
md = md.toString()
this.cached += md.length
}
setDoc(rPath, birthtime, md, mtime);
};
watcher.on('add', handleDoc); // file added
watcher.on('change', handleDoc); // file changed (rename triggers unlink then add)
watcher.on('unlink', path => { // file removed
const id = getId(relPath(path));
if(this.docs[id] && this.docs[id].md) {
this.cached -= this.docs[id].md.length;
setDoc(rPath, birthtime, md, mtime)
}
watcher.on('add', handleDoc) // file added
watcher.on('change', handleDoc) // file changed (rename triggers unlink then add)
watcher.on('unlink', path => {
// file removed
const id = getId(relPath(path))
if (this.docs[id] && this.docs[id].md) {
this.cached -= this.docs[id].md.length
}
delete this.docs[id];
});
delete this.docs[id]
})
}
module.exports = loadDocs;
module.exports = loadDocs

20
src/services/hooksUtil.js
View File

@@ -1,23 +1,23 @@
const { BadRequest, Forbidden } = require('@feathersjs/errors');
const { BadRequest, Forbidden } = require('@feathersjs/errors')
const isAdmin = ctx => {
const { params } = ctx;
return Boolean(params.user && params.user.admin);
};
const { params } = ctx
return Boolean(params.user && params.user.admin)
}
module.exports = {
disable: () => {
throw new BadRequest('method not allowed');
throw new BadRequest('method not allowed')
},
invalid: (field, msg) => {
throw new BadRequest(msg || `invalid ${field} value`);
throw new BadRequest(msg || `invalid ${field} value`)
},
isAdmin: isAdmin,
adminOnly: ctx => {
if(!isAdmin(ctx)) throw new Forbidden('invalid permission');
return ctx;
}
};
if (!isAdmin(ctx)) throw new Forbidden('invalid permission')
return ctx
},
}

12
src/services/index.js
View File

@@ -1,6 +1,6 @@
const users = require('./users/users.service.js');
const docs = require('./docs/docs.service.js');
module.exports = function (app) {
app.configure(users);
app.configure(docs);
};
const users = require('./users/users.service.js')
const docs = require('./docs/docs.service.js')
module.exports = function(app) {
app.configure(users)
app.configure(docs)
}

91
src/services/users/users.hooks.js
View File

@@ -1,71 +1,76 @@
const { authenticate } = require('@feathersjs/authentication').hooks;
const { Forbidden } = require('@feathersjs/errors');
const fs = require('fs');
const path = require('path');
const { disable, invalid, isAdmin, adminOnly } = require('../hooksUtil');
const { authenticate } = require('@feathersjs/authentication').hooks
const { Forbidden } = require('@feathersjs/errors')
const fs = require('fs')
const path = require('path')
const { disable, invalid, isAdmin, adminOnly } = require('../hooksUtil')
const {
hashPassword, protect
} = require('@feathersjs/authentication-local').hooks;
hashPassword,
protect,
} = require('@feathersjs/authentication-local').hooks
const invalidStr = str => Boolean(
typeof str !== 'string' || str.trim().length === 0);
const invalidStr = str =>
Boolean(typeof str !== 'string' || str.trim().length === 0)
module.exports = {
before: {
all: [],
find: [ authenticate('jwt') ],
get: [ authenticate('jwt') ],
find: [authenticate('jwt')],
get: [authenticate('jwt')],
create: [
async ctx => {
const { data, app } = ctx;
if(app.get('didSetup') && !isAdmin(ctx)) {
throw new Forbidden('invalid permission');
const { data, app } = ctx
if (app.get('didSetup') && !isAdmin(ctx)) {
throw new Forbidden('invalid permission')
}
const { email, password, admin } = data;
if(invalidStr(email)) invalid('email');
if(invalidStr(password)) invalid('password');
if(typeof admin !== 'boolean') invalid('admin');
const { email, password, admin } = data
if (invalidStr(email)) invalid('email')
if (invalidStr(password)) invalid('password')
if (typeof admin !== 'boolean') invalid('admin')
ctx.data = { email, password, admin };
return ctx;
ctx.data = { email, password, admin }
return ctx
},
hashPassword()
hashPassword(),
],
update: [ disable ],
patch: [ authenticate('local'),
update: [disable],
patch: [
authenticate('local'),
async ctx => {
const { newPassword } = ctx.data;
if(invalidStr(newPassword)) invalid('newPassword');
ctx.data = { password: newPassword };
await hashPassword()(ctx);
ctx.app.authLimit.resetKey(ctx.params.ip);
return ctx;
}
const { newPassword } = ctx.data
if (invalidStr(newPassword)) invalid('newPassword')
ctx.data = { password: newPassword }
await hashPassword()(ctx)
ctx.app.authLimit.resetKey(ctx.params.ip)
return ctx
},
],
remove: [ authenticate('jwt'), adminOnly ]
remove: [authenticate('jwt'), adminOnly],
},
after: {
all: [
// Make sure the password field is never sent to the client
// Always must be the last hook
protect('password')
protect('password'),
],
find: [],
get: [],
create: [
async ctx => {
const { app } = ctx;
if(app.get('didSetup')) return ctx;
app.set('didSetup', true);
fs.writeFileSync( // create empty file so we cant stat it
path.join(__dirname, '..', '..', '..', 'db', '.didSetup'), '');
return ctx;
}
const { app } = ctx
if (app.get('didSetup')) return ctx
app.set('didSetup', true)
fs.writeFileSync(
// create empty file so we cant stat it
path.join(__dirname, '..', '..', '..', 'db', '.didSetup'),
''
)
return ctx
},
],
update: [],
patch: [],
remove: []
remove: [],
},
error: {
@@ -75,6 +80,6 @@ module.exports = {
create: [],
update: [],
patch: [],
remove: []
}
};
remove: [],
},
}

28
src/services/users/users.service.js
View File

@@ -1,25 +1,25 @@
// Initializes the `users` service on path `/users`
const createService = require('feathers-nedb');
const createModel = require('../../models/users.model');
const hooks = require('./users.hooks');
const getUrl = require('../../../util/getUrl');
const createService = require('feathers-nedb')
const createModel = require('../../models/users.model')
const hooks = require('./users.hooks')
const getUrl = require('../../../util/getUrl')
module.exports = function (app) {
const Model = createModel(app);
const paginate = app.get('paginate');
module.exports = function(app) {
const Model = createModel(app)
const paginate = app.get('paginate')
const options = {
name: 'users',
Model,
paginate
};
const url = getUrl('users');
paginate,
}
const url = getUrl('users')
// Initialize our service with any options it requires
app.use(url, createService(options));
app.use(url, createService(options))
// Get our initialized service so that we can register hooks and filters
const service = app.service(url);
const service = app.service(url)
service.hooks(hooks);
};
service.hooks(hooks)
}

71
src/trustIPs.js
View File

@@ -1,50 +1,49 @@
/* eslint-disable no-console */
const fs = require('fs');
const path = require('path');
const fetch = require('isomorphic-unfetch');
const ips = require('../config/trustIPs.json');
ips.push('loopback');
const fs = require('fs')
const path = require('path')
const fetch = require('isomorphic-unfetch')
const ips = require('../config/trustIPs.json')
ips.push('loopback')
const cfv4 = 'https://www.cloudflare.com/ips-v4';
const cfv6 = 'https://www.cloudflare.com/ips-v6';
const cfConf = path.join(__dirname, '../config/cfIPs.json');
const refreshInterval = 24 * 60 * 60 * 1000;
const cfv4 = 'https://www.cloudflare.com/ips-v4'
const cfv6 = 'https://www.cloudflare.com/ips-v6'
const cfConf = path.join(__dirname, '../config/cfIPs.json')
const refreshInterval = 24 * 60 * 60 * 1000
const getIps = str => {
str = str.split('\n').map(ip => ip.trim());
str = str.filter(ip => ip.length !== 0);
return str;
};
str = str.split('\n').map(ip => ip.trim())
str = str.filter(ip => ip.length !== 0)
return str
}
const getCfIps = async app => {
const cfIps = [];
let res = await fetch(cfv4);
if(res.ok) {
cfIps.push(...getIps(await res.text()));
const cfIps = []
let res = await fetch(cfv4)
if (res.ok) {
cfIps.push(...getIps(await res.text()))
}
res = await fetch(cfv6);
if(res.ok) {
cfIps.push(...getIps(await res.text()));
res = await fetch(cfv6)
if (res.ok) {
cfIps.push(...getIps(await res.text()))
}
fs.writeFile(cfConf, JSON.stringify(cfIps, null, 2), err => {
if(err) console.error(err);
});
app.set('trust proxy', [...ips, ...cfIps]);
};
if (err) console.error(err)
})
app.set('trust proxy', [...ips, ...cfIps])
}
module.exports = app => {
if(!app.get('trustCloudflare')) {
return app.set('trust proxy', ips);
if (!app.get('trustCloudflare')) {
return app.set('trust proxy', ips)
}
fs.readFile(cfConf, async (err, buff) => {
if(err) {
if(err.code === 'ENOENT') getCfIps(app);
else return console.error(err);
if (err) {
if (err.code === 'ENOENT') getCfIps(app)
else return console.error(err)
} else {
const cfIps = JSON.parse(buff.toString())
app.set('trust proxy', [...ips, ...cfIps])
}
else {
const cfIps = JSON.parse(buff.toString());
app.set('trust proxy', [...ips, ...cfIps]);
}
setInterval(() => getCfIps(app), refreshInterval);
});
};
setInterval(() => getCfIps(app), refreshInterval)
})
}

67
test/app.test.js
View File

@@ -1,55 +1,56 @@
const assert = require('assert');
const rp = require('request-promise');
const url = require('url');
const app = require('../src/app');
const getUrlPath = require('../util/getUrl');
const assert = require('assert')
const rp = require('request-promise')
const url = require('url')
const app = require('../src/app')
const getUrlPath = require('../util/getUrl')
const port = app.get('port') || 3030;
const getUrl = pathname => url.format({
hostname: app.get('host') || 'localhost',
protocol: 'http',
port,
pathname: getUrlPath(pathname)
});
const port = app.get('port') || 3030
const getUrl = pathname =>
url.format({
hostname: app.get('host') || 'localhost',
protocol: 'http',
port,
pathname: getUrlPath(pathname),
})
describe('Feathers application tests', () => {
before(async () => {
this.server = await app.run(port);
});
this.server = await app.run(port)
})
after(done => {
this.server.close(done);
});
this.server.close(done)
})
it('starts and shows the index page', () => {
return rp(getUrl('/')).then(body =>
assert.ok(body.indexOf('<html>') !== -1)
);
});
)
})
describe('404', function() {
it('shows a 404 HTML page', () => {
return rp({
url: getUrl('path/to/nowhere'),
headers: {
'Accept': 'text/html'
}
Accept: 'text/html',
},
}).catch(res => {
assert.equal(res.statusCode, 404);
assert.ok(res.error.indexOf('<html>') !== -1);
});
});
assert.equal(res.statusCode, 404)
assert.ok(res.error.indexOf('<html>') !== -1)
})
})
it('shows a 404 JSON error without stack trace', () => {
return rp({
url: getUrl('path/to/nowhere'),
json: true
json: true,
}).catch(res => {
assert.equal(res.statusCode, 404);
assert.equal(res.error.code, 404);
assert.equal(res.error.message, 'Page not found');
assert.equal(res.error.name, 'NotFound');
});
});
});
});
assert.equal(res.statusCode, 404)
assert.equal(res.error.code, 404)
assert.equal(res.error.message, 'Page not found')
assert.equal(res.error.name, 'NotFound')
})
})
})
})

16
test/services/docs.test.js
View File

@@ -1,10 +1,10 @@
const assert = require('assert');
const app = require('../../src/app');
const getUrl = require('../../util/getUrl');
const assert = require('assert')
const app = require('../../src/app')
const getUrl = require('../../util/getUrl')
describe('\'docs\' service', () => {
describe("'docs' service", () => {
it('registered the service', () => {
const service = app.service(getUrl('docs'));
assert.ok(service, 'Registered the service');
});
});
const service = app.service(getUrl('docs'))
assert.ok(service, 'Registered the service')
})
})

16
test/services/users.test.js
View File

@@ -1,10 +1,10 @@
const assert = require('assert');
const app = require('../../src/app');
const getUrl = require('../../util/getUrl');
const assert = require('assert')
const app = require('../../src/app')
const getUrl = require('../../util/getUrl')
describe('\'users\' service', () => {
describe("'users' service", () => {
it('registered the service', () => {
const service = app.service(getUrl('users'));
assert.ok(service, 'Registered the service');
});
});
const service = app.service(getUrl('users'))
assert.ok(service, 'Registered the service')
})
})

10
util/basePath.js
View File

@@ -1,8 +1,8 @@
// make sure basePath doesn't end with /
let { basePath } = require('../config/host.json');
const urlChars = basePath.split('');
let { basePath } = require('../config/host.json')
const urlChars = basePath.split('')
if(basePath.length > 1 && urlChars.pop() === '/') {
basePath = urlChars.join('');
if (basePath.length > 1 && urlChars.pop() === '/') {
basePath = urlChars.join('')
}
module.exports = basePath;
module.exports = basePath

76
util/checkDirParts.js
View File

@@ -1,48 +1,52 @@
const isOkDirPart = str => {
if(str.length > 255 || str.length === 0) return false;
const end = str.length - 1;
for(let i = 0; i < str.length; i++) {
const c = str.charCodeAt(i);
if(!(c > 47 && c < 58) && // 0-9
!(c > 64 && c < 91) && // A-Z
!(c > 96 && c < 123) && // a-z
!(c === 95) && !(c === 45) && // _ and -
!((c === 46 || c === 32) && // period or space if not first or last
i !== 0 && i !== end)) {
return false;
if (str.length > 255 || str.length === 0) return false
const end = str.length - 1
for (let i = 0; i < str.length; i++) {
const c = str.charCodeAt(i)
if (
!(c > 47 && c < 58) && // 0-9
!(c > 64 && c < 91) && // A-Z
!(c > 96 && c < 123) && // a-z
!(c === 95) &&
!(c === 45) && // _ and -
!(
(c === 46 || c === 32) && // period or space if not first or last
i !== 0 &&
i !== end
)
) {
return false
}
}
return true;
};
return true
}
module.exports = {
checkDir: dir => {
if(typeof dir !== 'string') return false;
dir = dir.trim();
if(dir.length === 0) return 0;
if(dir.indexOf('/') > -1) {
dir = dir.split('/').filter(p => p.length !== 0);
if(dir.length === 1) {
if(!isOkDirPart(dir[0])) false;
dir = dir[0];
} else if(dir.length === 0) {
dir = '';
} else if(dir.some(part => !isOkDirPart(part))) {
return false;
if (typeof dir !== 'string') return false
dir = dir.trim()
if (dir.length === 0) return 0
if (dir.indexOf('/') > -1) {
dir = dir.split('/').filter(p => p.length !== 0)
if (dir.length === 1) {
if (!isOkDirPart(dir[0])) false
dir = dir[0]
} else if (dir.length === 0) {
dir = ''
} else if (dir.some(part => !isOkDirPart(part))) {
return false
}
} else if(!isOkDirPart(dir)) {
return false;
} else if (!isOkDirPart(dir)) {
return false
}
return Array.isArray(dir) ? dir.join('/') : dir;
return Array.isArray(dir) ? dir.join('/') : dir
},
checkName: name => {
if(typeof name !== 'string') return false;
name = name.trim();
if(name.length === 0) return 0;
if(!isOkDirPart(name)) return false;
return name;
if (typeof name !== 'string') return false
name = name.trim()
if (name.length === 0) return 0
if (!isOkDirPart(name)) return false
return name
},
};
}

28
util/freezeSSR.js
View File

@@ -1,21 +1,21 @@
const freezeSSR = selector => {
const FrozenSSR = () => {
let __html = '';
let props = {};
if(typeof document !== 'undefined') {
let el = document.querySelector(selector);
if(el) {
__html = el.innerHTML;
let __html = ''
let props = {}
if (typeof document !== 'undefined') {
let el = document.querySelector(selector)
if (el) {
__html = el.innerHTML
el.getAttributeNames().forEach(attr => {
const attrKey = attr === 'class' ? 'className' : attr;
props[attrKey] = el.getAttribute(attr);
});
const attrKey = attr === 'class' ? 'className' : attr
props[attrKey] = el.getAttribute(attr)
})
}
}
return <div {...props} dangerouslySetInnerHTML={{ __html }} />;
};
return <div {...props} dangerouslySetInnerHTML={{ __html }} />
}
return { loading: FrozenSSR };
};
return { loading: FrozenSSR }
}
export default freezeSSR;
export default freezeSSR

57
util/getDocs.js
View File

@@ -1,36 +1,39 @@
import fetch from 'isomorphic-unfetch';
import parseSort from './parseSort';
import getUrl from './getUrl';
import getJwt from './getJwt';
import fetch from 'isomorphic-unfetch'
import parseSort from './parseSort'
import getUrl from './getUrl'
import getJwt from './getJwt'
export const $limit = 12; // number of docs per page
export const select = ['id', 'name', 'updated', 'dir']
.map((f, i) => ({ [`$select[${i}]`]: f }));
export const $limit = 12 // number of docs per page
export const select = ['id', 'name', 'updated', 'dir'].map((f, i) => ({
[`$select[${i}]`]: f,
}))
export const getDocs = async (q, jwt) => {
const docsRes = await fetch(getUrl('docs', Boolean(jwt)) + q, {
headers: { Authorization: jwt || getJwt() }
}).catch(({ message }) => ({ ok: false, error: message }));
if(docsRes.ok) {
const res = await docsRes.json();
const total = res.total || 0;
const docs = res.data || [];
return { docs, total };
headers: { Authorization: jwt || getJwt() },
}).catch(({ message }) => ({ ok: false, error: message }))
if (docsRes.ok) {
const res = await docsRes.json()
const total = res.total || 0
const docs = res.data || []
return { docs, total }
}
return { total: 0, docs: [], error: docsRes.message };
};
return { total: 0, docs: [], error: docsRes.message }
}
export const buildQ = q => {
if(!q.$search) delete q.$search;
if(!q.$skip) delete q.$skip;
if (!q.$search) delete q.$search
if (!q.$skip) delete q.$skip
else {
q.$skip = (q.$skip - 1) * $limit;
q.$skip = (q.$skip - 1) * $limit
}
const $sort = parseSort(q.$sort ? q.$sort : 'updated:-1');
delete q.$sort;
select.forEach(sel => q = {...q, ...sel});
q = { $limit, ...q };
let url = Object.keys(q).map(k => `${k}=${encodeURIComponent(q[k])}`).join('&');
url = `?${url}&${$sort}`;
return url;
};
const $sort = parseSort(q.$sort ? q.$sort : 'updated:-1')
delete q.$sort
select.forEach(sel => (q = { ...q, ...sel }))
q = { $limit, ...q }
let url = Object.keys(q)
.map(k => `${k}=${encodeURIComponent(q[k])}`)
.join('&')
url = `?${url}&${$sort}`
return url
}

8
util/getJwt.js
View File

@@ -1,6 +1,6 @@
export default req => {
if(req) return req.jwt;
if(typeof window !== 'undefined') {
return window.localStorage.getItem('jwt');
if (req) return req.jwt
if (typeof window !== 'undefined') {
return window.localStorage.getItem('jwt')
}
};
}

16
util/getUrl.js
View File

@@ -1,15 +1,15 @@
const url = require('url');
const urljoin = require('url-join');
const basePath = require('./basePath');
const { host, port, protocol } = require('../config/host.json');
const url = require('url')
const urljoin = require('url-join')
const basePath = require('./basePath')
const { host, port, protocol } = require('../config/host.json')
module.exports = (path, absolute) => {
path = urljoin(basePath, path);
if(!absolute) return path;
path = urljoin(basePath, path)
if (!absolute) return path
return url.format({
hostname: host,
port,
protocol,
pathname: path,
});
};
})
}

4
util/keys.js
View File

@@ -1,4 +1,4 @@
module.exports = {
getKey: e => e.which || e.keyCode,
isCtrlKey: key => key === 91 || key === 93 || key === 17
};
isCtrlKey: key => key === 91 || key === 93 || key === 17,
}

4
util/mapUser.js
View File

@@ -1,3 +1,3 @@
export default ({ user }) => {
return { user };
};
return { user }
}

33
util/parseSort.js
View File

@@ -1,18 +1,19 @@
export default sort => {
let key, ascDesc;
switch(typeof sort) {
case 'object': {
key = Object.keys(sort).pop();
ascDesc = sort[key];
break;
let key, ascDesc
switch (typeof sort) {
case 'object': {
key = Object.keys(sort).pop()
ascDesc = sort[key]
break
}
case 'string': {
const parts = sort.split(':')
key = parts[0]
ascDesc = parts[1]
break
}
default:
break
}
case 'string': {
const parts = sort.split(':');
key = parts[0];
ascDesc = parts[1];
break;
}
default: break;
}
return `$sort[${key}]=${ascDesc}`;
};
return `$sort[${key}]=${ascDesc}`
}

10
util/stripBase.js
View File

@@ -1,8 +1,8 @@
const basePath = require('./basePath');
const basePath = require('./basePath')
module.exports = url => {
if(basePath !== '/') {
url = url.split(basePath).join('');
if (basePath !== '/') {
url = url.split(basePath).join('')
}
return url;
};
return url
}

6
util/updStateFromId.js
View File

@@ -1,4 +1,4 @@
export default function updateStateFromId(e){
const el = e.target;
this.setState({ [el.id]: el.value });
export default function updateStateFromId(e) {
const el = e.target
this.setState({ [el.id]: el.value })
}