From 769d04194fcab5169ed975caf61d7f7857b10dab Mon Sep 17 00:00:00 2001 From: Roman Timashev Date: Wed, 24 Feb 2016 18:09:20 +0300 Subject: [PATCH] /team -> /collective --- src/models/menu.js | 2 +- src/routes/collective.js | 2 +- src/server.js | 5 ++--- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/models/menu.js b/src/models/menu.js index 808cfa45..a2b947f3 100644 --- a/src/models/menu.js +++ b/src/models/menu.js @@ -18,7 +18,7 @@ export default [ }, { "text": "Коллектив", - "url": "/team", + "url": "/collective", "color": "pink" }, { diff --git a/src/routes/collective.js b/src/routes/collective.js index 9ea5d069..1b1d277f 100644 --- a/src/routes/collective.js +++ b/src/routes/collective.js @@ -1,5 +1,5 @@ import route from 'koa-route'; -import {json} from './'; +import {index, json} from './'; import db from '../core/db'; import {getCourseNameByID} from '../models/course'; import team from '../models/team'; diff --git a/src/server.js b/src/server.js index b75f9fec..c9c94e05 100644 --- a/src/server.js +++ b/src/server.js @@ -10,7 +10,7 @@ import helmet from 'koa-helmet'; import bodyParser from 'koa-bodyparser'; import config from './config'; -import routes from './routes'; +import {index} from './routes'; import sitemap from './routes/sitemap'; import schedule from './routes/schedule'; @@ -63,8 +63,7 @@ app.use(function *(next) { yield next; }); -app.use(route.get('/', routes.index())); -app.use(route.get('/team', routes.index())); +app.use(route.get('/', index())); sitemap(app); schedule(app);