diff --git a/config/env/development.js b/config/env/development.js index a1c192c9..a326ecd3 100644 --- a/config/env/development.js +++ b/config/env/development.js @@ -64,8 +64,8 @@ module.exports = { options: { service: process.env.MAILER_SERVICE_PROVIDER || '"Gmail"', auth: { - user: process.env.MAILER_EMAIL_ID || 'taobataoma@gmail.com', - pass: process.env.MAILER_PASSWORD || 'ykyghbmpjfdliyph' + user: process.env.MAILER_EMAIL_ID || 'somename@domain.com', + pass: process.env.MAILER_PASSWORD || 'somepassword' } } }, diff --git a/modules/forums/client/controllers/forums.client.controller.js b/modules/forums/client/controllers/forums.client.controller.js index 617f5e99..a2be57d7 100644 --- a/modules/forums/client/controllers/forums.client.controller.js +++ b/modules/forums/client/controllers/forums.client.controller.js @@ -29,6 +29,7 @@ // get forums list ForumsService.get({}, function (items) { + console.log(items); vm.forums = items.forumsList; vm.forumsTopicsCount = items.forumsTopicsCount; vm.forumsRepliesCount = items.forumsRepliesCount; diff --git a/modules/forums/server/controllers/forums.server.controller.js b/modules/forums/server/controllers/forums.server.controller.js index e28cbc60..675ea4e9 100644 --- a/modules/forums/server/controllers/forums.server.controller.js +++ b/modules/forums/server/controllers/forums.server.controller.js @@ -51,12 +51,20 @@ exports.list = function (req, res) { Topic.aggregate({ $project: { 'forum': '$forum', + 'year': { + '$year': '$createdAt' + }, + 'month': { + '$month': '$createdAt' + }, 'day': { '$dayOfMonth': '$createdAt' } } }, { $match: { + year: moment.utc().year(), + month: moment.utc().month() + 1, day: moment.utc().date() } }, { @@ -79,14 +87,20 @@ exports.list = function (req, res) { }, { $project: { 'forum': '$forum', - //'title': '$title', - //'createdAt': '$_replies.createdAt', + 'year': { + '$year': '$_replies.createdAt' + }, + 'month': { + '$month': '$_replies.createdAt' + }, 'day': { '$dayOfMonth': '$_replies.createdAt' } } }, { $match: { + year: moment.utc().year(), + month: moment.utc().month() + 1, day: moment.utc().date() } }, {