sidebar service; new logged-out home design

app/controllers/home.js

@@ -18,7 +18,7 @@ class HomeController extends SiteController {
 
   async start ( ) {
     const { dtp } = this;
-    const { limiter: limiterService } = dtp.services;
+    const { limiter: limiterService, sidebar: sidebarService } = dtp.services;
 
     const router = express.Router();
     dtp.app.use('/', router);
@@ -37,6 +37,7 @@ class HomeController extends SiteController {
 
     router.get('/',
       limiterService.create(limiterService.config.home.getHome),
+      sidebarService.middleware(),
       this.getHome.bind(this),
     );
   }
@@ -70,14 +71,11 @@ class HomeController extends SiteController {
   }
 
   async getHome (req, res, next) {
-    const { link: linkService, user: userService } = this.dtp.services;
+    const { link: linkService } = this.dtp.services;
     try {
       res.locals.pagination = this.getPaginationParameters(req, 20);
       if (req.user) {
         res.locals.links = await linkService.getForUser(req.user, res.locals.pagination);
-        res.locals.recentLinks = await linkService.getRecent(3);
-        res.locals.popularLinks = await linkService.getPopular(3);
-        res.locals.recentUsers = await userService.getRecent(3);
         res.render('index-logged-in');
       } else {
         res.render('index');

app/services/sidebar.js

@@ -0,0 +1,35 @@
+// sidebar.js
+// Copyright (C) 2021 Digital Telepresence, LLC
+// License: Apache-2.0
+
+'use strict';
+
+const { SiteService } = require('../../lib/site-lib');
+
+class SidebarService extends SiteService {
+
+  constructor (dtp) {
+    super(dtp, module.exports);
+  }
+
+  middleware ( ) {
+    return async (req, res, next) => {
+      const { link: linkService, user: userService } = this.dtp.services;
+      try {
+        res.locals.popularLinks = await linkService.getPopular(3);
+        res.locals.recentLinks = await linkService.getRecent(3);
+        res.locals.recentUsers = await userService.getRecent(3);
+        return next();
+      } catch (error) {
+        this.log.error('failed to populate sidebar', { error });
+        return next(error);
+      }
+    };
+  }
+}
+
+module.exports = {
+  slug: 'sidebar',
+  name: 'sidebar',
+  create: (dtp) => { return new SidebarService(dtp); },
+};

app/views/index.pug

@@ -1,18 +1,15 @@
-extends layouts/main
+extends layouts/main-sidebar
 block content
 
-  section.uk-section.uk-section-default
+  .sr-only
-    .uk-container
+    h1.uk-margin-remove= site.name
-      .uk-margin.uk-text-center
+    .uk-text-lead= site.description
-        h1.uk-margin-remove= site.name
-        .uk-text-lead= site.description
 
-      p #{site.name} provides a landing page people can use to display a collection of links. These can be used for people to help others find them on social media, ways to donate and support them, and more.
+  .uk-margin
-      
+    img(src=`/img/social-cards/${site.domainKey}.png`).responsive.uk-border-rounded
-      p We do not allow the promotion of pornography or linking to it. This is otherwise a free-speech online service and will not ban people for their social or political views.
 
-      div(uk-grid)
+  .uk-margin
-        .uk-width-1-2
+    div #{site.name} provides a landing page you configure with your links on it. Use it as a springboard into all your social media profiles, streaming channels, websites, podcasts, stores, blogs, and whatever else you can link to using a valid URL.
-          a(href="/welcome/signup").uk-button.dtp-button-primary.uk-display-block Sign Up
+    
-        .uk-width-1-2
+  .uk-margin
-          a(href="/welcome/login").uk-button.dtp-button-default.uk-display-block Login
+    a(href="/welcome").uk-button.dtp-button-primary.uk-display-block Get Started