From fe1404de4f95863b20980fb47aff9a5dc8ce3adf Mon Sep 17 00:00:00 2001 From: rob Date: Thu, 7 Jul 2022 01:25:57 -0400 Subject: [PATCH] naming conventions --- app/controllers/admin/newsletter.js | 13 ++++++++----- app/controllers/comment.js | 6 ++---- app/controllers/content-report.js | 4 +--- app/controllers/newsletter.js | 8 +++----- app/controllers/page.js | 4 +--- app/controllers/post.js | 4 +--- 6 files changed, 16 insertions(+), 23 deletions(-) diff --git a/app/controllers/admin/newsletter.js b/app/controllers/admin/newsletter.js index 78a8a05..3e04ef4 100644 --- a/app/controllers/admin/newsletter.js +++ b/app/controllers/admin/newsletter.js @@ -4,7 +4,6 @@ 'use strict'; -const DTP_COMPONENT_NAME = 'admin:newsletter'; const express = require('express'); const { SiteController, SiteError } = require('../../../lib/site-lib'); @@ -12,7 +11,7 @@ const { SiteController, SiteError } = require('../../../lib/site-lib'); class NewsletterController extends SiteController { constructor (dtp) { - super(dtp, DTP_COMPONENT_NAME); + super(dtp, module.exports); } async start ( ) { @@ -117,7 +116,11 @@ class NewsletterController extends SiteController { } } -module.exports = async (dtp) => { - let controller = new NewsletterController(dtp); - return controller; +module.exports = { + name: 'adminNewsletter', + slug: 'admin-newsletter', + create: async (dtp) => { + let controller = new NewsletterController(dtp); + return controller; + }, }; \ No newline at end of file diff --git a/app/controllers/comment.js b/app/controllers/comment.js index 980e010..6eb027a 100644 --- a/app/controllers/comment.js +++ b/app/controllers/comment.js @@ -4,8 +4,6 @@ 'use strict'; -const DTP_COMPONENT_NAME = 'comment'; - const express = require('express'); const numeral = require('numeral'); @@ -14,7 +12,7 @@ const { SiteController, SiteError } = require('../../lib/site-lib'); class CommentController extends SiteController { constructor (dtp) { - super(dtp, DTP_COMPONENT_NAME); + super(dtp, module.exports); } async start ( ) { @@ -27,7 +25,7 @@ class CommentController extends SiteController { dtp.app.use('/comment', router); router.use(async (req, res, next) => { - res.locals.currentView = DTP_COMPONENT_NAME; + res.locals.currentView = module.exports.slug; return next(); }); diff --git a/app/controllers/content-report.js b/app/controllers/content-report.js index 165c0ea..b253b86 100644 --- a/app/controllers/content-report.js +++ b/app/controllers/content-report.js @@ -4,8 +4,6 @@ 'use strict'; -const DTP_COMPONENT_NAME = 'content-report'; - const express = require('express'); const multer = require('multer'); @@ -14,7 +12,7 @@ const { SiteController } = require('../../lib/site-lib'); class ContentReportController extends SiteController { constructor (dtp) { - super(dtp, DTP_COMPONENT_NAME); + super(dtp, module.exports); } async start ( ) { diff --git a/app/controllers/newsletter.js b/app/controllers/newsletter.js index 9924704..c1edfba 100644 --- a/app/controllers/newsletter.js +++ b/app/controllers/newsletter.js @@ -4,8 +4,6 @@ 'use strict'; -const DTP_COMPONENT_NAME = 'newsletter'; - const express = require('express'); const multer = require('multer'); @@ -14,20 +12,20 @@ const { SiteController } = require('../../lib/site-lib'); class NewsletterController extends SiteController { constructor (dtp) { - super(dtp, DTP_COMPONENT_NAME); + super(dtp, module.exports); } async start ( ) { const { dtp } = this; const { limiter: limiterService } = dtp.services; - const upload = multer({ dest: `/tmp/${this.dtp.config.site.domainKey}/uploads/${DTP_COMPONENT_NAME}` }); + const upload = multer({ dest: `/tmp/${this.dtp.config.site.domainKey}/uploads/${module.exports.slug}` }); const router = express.Router(); dtp.app.use('/newsletter', router); router.use(async (req, res, next) => { - res.locals.currentView = DTP_COMPONENT_NAME; + res.locals.currentView = module.exports.slug; return next(); }); diff --git a/app/controllers/page.js b/app/controllers/page.js index d1ecab7..24a7d1c 100644 --- a/app/controllers/page.js +++ b/app/controllers/page.js @@ -4,8 +4,6 @@ 'use strict'; -const DTP_COMPONENT_NAME = 'page'; - const express = require('express'); const { SiteController, SiteError } = require('../../lib/site-lib'); @@ -13,7 +11,7 @@ const { SiteController, SiteError } = require('../../lib/site-lib'); class PageController extends SiteController { constructor (dtp) { - super(dtp, DTP_COMPONENT_NAME); + super(dtp, module.exports); } async start ( ) { diff --git a/app/controllers/post.js b/app/controllers/post.js index 1a62c95..44fed27 100644 --- a/app/controllers/post.js +++ b/app/controllers/post.js @@ -4,8 +4,6 @@ 'use strict'; -const DTP_COMPONENT_NAME = 'post'; - const express = require('express'); const multer = require('multer'); @@ -14,7 +12,7 @@ const { SiteController, SiteError } = require('../../lib/site-lib'); class PostController extends SiteController { constructor (dtp) { - super(dtp, DTP_COMPONENT_NAME); + super(dtp, module.exports); } async start ( ) {