Browse Source

refactor displayEngine.createDisplayList to SiteController base class

pull/1/head
Rob Colbert 3 years ago
parent
commit
6e6be6df26
  1. 3
      app/controllers/admin/host.js
  2. 8
      app/controllers/admin/link.js
  3. 4
      app/controllers/admin/newsletter.js
  4. 16
      app/controllers/link.js
  5. 4
      app/controllers/newsletter.js
  6. 4
      app/controllers/user.js
  7. 7
      app/views/layouts/public-profile.pug
  8. 5
      lib/site-controller.js

3
app/controllers/admin/host.js

@ -49,9 +49,8 @@ class HostController extends SiteController {
} }
async postDeactiveHost (req, res) { async postDeactiveHost (req, res) {
const { displayEngine: displayEngineService } = this.dtp.services;
try { try {
const displayList = displayEngineService.createDisplayList('deactivate-host'); const displayList = this.createDisplayList('deactivate-host');
await NetHost.updateOne( await NetHost.updateOne(
{ _id: res.locals.host._id }, { _id: res.locals.host._id },

8
app/controllers/admin/link.js

@ -54,9 +54,9 @@ class LinkController extends SiteController {
} }
async postUpdateLink (req, res) { async postUpdateLink (req, res) {
const { link: linkService, displayEngine: displayEngineService } = this.dtp.services; const { link: linkService } = this.dtp.services;
try { try {
const displayList = displayEngineService.createDisplayList('update-link'); const displayList = this.createDisplayList('update-link');
await linkService.update(res.locals.link, req.body); await linkService.update(res.locals.link, req.body);
@ -92,9 +92,9 @@ class LinkController extends SiteController {
} }
async deleteLink (req, res) { async deleteLink (req, res) {
const { link: linkService, displayEngine: displayEngineService } = this.dtp.services; const { link: linkService } = this.dtp.services;
try { try {
const displayList = displayEngineService.createDisplayList('delete-link'); const displayList = this.createDisplayList('delete-link');
await linkService.remove(res.locals.link); await linkService.remove(res.locals.link);

4
app/controllers/admin/newsletter.js

@ -90,9 +90,9 @@ class NewsletterController extends SiteController {
} }
async deleteNewsletter (req, res) { async deleteNewsletter (req, res) {
const { newsletter: newsletterService, displayEngine: displayEngineService } = this.dtp.services; const { newsletter: newsletterService } = this.dtp.services;
try { try {
const displayList = displayEngineService.createDisplayList('delete-newsletter'); const displayList = this.createDisplayList('delete-newsletter');
await newsletterService.deleteNewsletter(res.locals.newsletter); await newsletterService.deleteNewsletter(res.locals.newsletter);

16
app/controllers/link.js

@ -88,9 +88,9 @@ class LinkController extends SiteController {
} }
async postSortLinksList (req, res) { async postSortLinksList (req, res) {
const { link: linkService, displayEngine: displayEngineService } = this.dtp.services; const { link: linkService } = this.dtp.services;
try { try {
const displayList = displayEngineService.createDisplayList('sort-links-list'); const displayList = this.createDisplayList('sort-links-list');
await linkService.setItemOrder(req.body.updateOps); await linkService.setItemOrder(req.body.updateOps);
displayList.showNotification( displayList.showNotification(
'List sort order updated', 'List sort order updated',
@ -109,9 +109,9 @@ class LinkController extends SiteController {
} }
async postUpdateLink (req, res) { async postUpdateLink (req, res) {
const { link: linkService, displayEngine: displayEngineService } = this.dtp.services; const { link: linkService } = this.dtp.services;
try { try {
const displayList = displayEngineService.createDisplayList('update-link'); const displayList = this.createDisplayList('update-link');
if (!res.locals.link.user._id.equals(req.user._id)) { if (!res.locals.link.user._id.equals(req.user._id)) {
throw new SiteError(403, 'This is not your link'); throw new SiteError(403, 'This is not your link');
@ -139,9 +139,9 @@ class LinkController extends SiteController {
} }
async postCreateLink (req, res) { async postCreateLink (req, res) {
const { link: linkService, displayEngine: displayEngineService } = this.dtp.services; const { link: linkService } = this.dtp.services;
try { try {
const displayList = displayEngineService.createDisplayList('update-link'); const displayList = this.createDisplayList('update-link');
res.locals.link = await linkService.create(req.user, req.body); res.locals.link = await linkService.create(req.user, req.body);
@ -164,9 +164,9 @@ class LinkController extends SiteController {
} }
async deleteLink (req, res, next) { async deleteLink (req, res, next) {
const { link: linkService, displayEngine: displayEngineService } = this.dtp.services; const { link: linkService } = this.dtp.services;
try { try {
const displayList = displayEngineService.createDisplayList('update-link'); const displayList = this.createDisplayList('update-link');
if (!res.locals.link.user._id.equals(req.user._id)) { if (!res.locals.link.user._id.equals(req.user._id)) {
throw new SiteError(403, 'This is not your link'); throw new SiteError(403, 'This is not your link');
} }

4
app/controllers/newsletter.js

@ -58,9 +58,9 @@ class NewsletterController extends SiteController {
} }
async postAddRecipient (req, res) { async postAddRecipient (req, res) {
const { newsletter: newsletterService, displayEngine: displayEngineService } = this.dtp.services; const { newsletter: newsletterService } = this.dtp.services;
try { try {
const displayList = displayEngineService.createDisplayList('add-recipient'); const displayList = this.createDisplayList('add-recipient');
await newsletterService.addRecipient(req.body.email); await newsletterService.addRecipient(req.body.email);
displayList.showNotification( displayList.showNotification(
'You have been added to the newsletter. Please check your email and verify your email address.', 'You have been added to the newsletter. Please check your email and verify your email address.',

4
app/controllers/user.js

@ -137,9 +137,9 @@ class UserController extends SiteController {
} }
async postUpdateSettings (req, res) { async postUpdateSettings (req, res) {
const { user: userService, displayEngine: displayEngineService } = this.dtp.services; const { user: userService } = this.dtp.services;
try { try {
const displayList = displayEngineService.createDisplayList('app-settings'); const displayList = this.createDisplayList('app-settings');
await userService.updateSettings(req.user, req.body); await userService.updateSettings(req.user, req.body);

7
app/views/layouts/public-profile.pug

@ -1,8 +1,13 @@
extends main extends main
block content-container block content-container
section.uk-section.uk-section-default section.uk-section.uk-section-default
.uk-container.uk-width-xlarge .uk-container.uk-width-xlarge
if user && user.flags.isAdmin
.uk-margin.uk-text-center
a(href=`/admin/user/${user._id}`).uk-button.dtp-button-danger User Admin
.uk-margin.uk-margin-auto.uk-width-small .uk-margin.uk-margin-auto.uk-width-small
img(src="/img/icon/icon-512x512.png").responsive img(src="/img/icon/icon-512x512.png").responsive

5
lib/site-controller.js

@ -38,6 +38,11 @@ class SiteController extends SiteCommon {
return pagination; return pagination;
} }
createDisplayList (name) {
const { displayEngine: displayEngineService } = this.dtp.services;
return displayEngineService.createDisplayList(name);
}
async createCsrfToken (req, name) { async createCsrfToken (req, name) {
const { csrfToken } = this.dtp.platform.services; const { csrfToken } = this.dtp.platform.services;
return csrfToken.create(req, { name }); return csrfToken.create(req, { name });

Loading…
Cancel
Save