From d5db0ca07e5949c6c13799da5b26c473f89b5ad9 Mon Sep 17 00:00:00 2001 From: Roman Timashev Date: Tue, 3 Jan 2017 06:31:02 +0300 Subject: [PATCH] [site] updated --- src/index.js | 57 ++++++++++++++++++++--------------------- src/routes/documents.js | 10 +++++++- src/routes/index.js | 4 +-- src/server.js | 2 +- 4 files changed, 40 insertions(+), 33 deletions(-) diff --git a/src/index.js b/src/index.js index 51d7324b..32693988 100644 --- a/src/index.js +++ b/src/index.js @@ -1,40 +1,39 @@ -import 'babel-polyfill'; +import 'babel-polyfill' -import config from './config'; -import {name} from './config'; -import {connect, collection} from './core/db'; -import io from './io'; -import server from './server'; +import config, {name} from './config' +import {connect, collection} from './core/db' +import io from './io' +import server from './server' -import DataManager from 'hudozka-data'; -// var DataManager = require('hudozka-data').default; +import DataManager from 'hudozka-data' function main() { - async function loop() { - const db = config.db.uri; - await connect(db); + async function loop() { + const db = config.db.uri + await connect(db) - try { - let data = new DataManager({ - timeline: collection('timeline'), - schedules: collection('schedules') - }); + try { + let data = new DataManager({ + timeline: collection('timeline'), + schedules: collection('schedules'), + documents: collection('documents'), + }) - let app = server(data); - io(app, data); + let app = server(data) + io(app, data) - app.listen(config.port); - } catch (e) { - console.error(e.stack); - return; - } + app.listen(config.port) + } catch (e) { + console.error(e.stack) + return + } - console.log(`App ${name} started`); - console.log(`listening ${config.port}`); - console.log(`db address ${db}`); - } + console.log(`App ${name} started`) + console.log(`listening ${config.port}`) + console.log(`db address ${db}`) + } - loop(); + loop() } -main(); +main() diff --git a/src/routes/documents.js b/src/routes/documents.js index dda6a0c9..82a62bb6 100644 --- a/src/routes/documents.js +++ b/src/routes/documents.js @@ -8,14 +8,22 @@ async function exists(ctx, id) { return Boolean(i) } -export default function () { +export default function (store) { return compose([ + docs(store), documents(), document(), type() ]) } +function docs(store) { + return route.get('/docs', async ctx => { + const docs = await store.document.find({}) + ctx.body = docs + }) +} + function documents() { return route.get('/documents', json( async(ctx) => { diff --git a/src/routes/index.js b/src/routes/index.js index f3bc91d6..e6ef31d2 100644 --- a/src/routes/index.js +++ b/src/routes/index.js @@ -20,14 +20,14 @@ import pages from './pages'; let main = () => route.get('/', index()); -export function routes() { +export function routes(store) { return compose([ main(), sitemap(), schedule(), news(), gallery(), - documents(), + documents(store), teachers(), events(), articles(), diff --git a/src/server.js b/src/server.js index 568b4661..255a0cca 100644 --- a/src/server.js +++ b/src/server.js @@ -45,7 +45,7 @@ export default function (store) { app.use($(redirect(redirectionTable))); app.use($(helmet())); app.use(queryObject()); - app.use(routes()); + app.use(routes(store)); return Server(app.callback()); }