refactor: ejs default layout

Author: atian25

app/controller/page.js

@@ -4,31 +4,16 @@ const Controller = require('egg').Controller;
 
 class PageController extends Controller {
   async about() {
-    await this.ctx.render(
-      'static/about',
-      {
-        pageTitle: '关于我们',
-      },
-      {
-        layout: 'layout.html',
-      }
-    );
+    await this.ctx.render('static/about', { pageTitle: '关于我们' });
   }
 
   // FAQ
   async faq() {
-    await this.ctx.render('static/faq', {},
-      {
-        layout: 'layout.html',
-      });
+    await this.ctx.render('static/faq');
   }
 
   async getstart() {
-    await this.ctx.render('static/getstart', {
-      pageTitle: 'Node.js 新手入门',
-    }, {
-      layout: 'layout.html',
-    });
+    await this.ctx.render('static/getstart', { pageTitle: 'Node.js 新手入门' });
   }
 
   async robots() {
@@ -43,10 +28,7 @@ class PageController extends Controller {
   }
 
   async api() {
-    await this.ctx.render('static/api', {},
-      {
-        layout: 'layout.html',
-      });
+    await this.ctx.render('static/api');
   }
 
 }

app/controller/sign.js

@@ -5,11 +5,8 @@ const Controller = require('egg').Controller;
 class SignController extends Controller {
   async showLogin() {
     const { ctx } = this;
-    const data = {};
-    const options = {
-      layout: 'layout.html',
-    };
-    await ctx.render('/sign/signin', data, options);
+    const locals = {};
+    await ctx.render('/sign/signin', locals);
   }
 
   async signup() {

app/controller/site.js

@@ -84,24 +84,20 @@ class HomeController extends Controller {
     }
 
     const tabName = this.ctx.helper.tabName(tab);
-    const viewOptions = {
-      layout: 'layout.html',
+
+    const locals = {
+      topics,
+      current_page: page,
+      list_topic_count: limit,
+      tops,
+      no_reply_topics,
+      pages,
+      tabs: this.config.tabs,
+      tab,
+      pageTitle: tabName && tabName + '版块',
     };
-    await this.ctx.render(
-      'index',
-      {
-        topics,
-        current_page: page,
-        list_topic_count: limit,
-        tops,
-        no_reply_topics,
-        pages,
-        tabs: this.config.tabs,
-        tab,
-        pageTitle: tabName && tabName + '版块',
-      },
-      viewOptions
-    );
+
+    await this.ctx.render('index', locals);
   }
 
   async sitemap() {

config/config.default.js

@@ -1,7 +1,5 @@
 'use strict';
 
-const path = require('path');
-
 module.exports = appInfo => {
   const config = {};
 
@@ -43,14 +41,15 @@ module.exports = appInfo => {
   };
 
   config.view = {
-    root: path.join(appInfo.baseDir, 'app/view'),
     defaultViewEngine: 'ejs',
     mapping: {
       '.html': 'ejs',
     },
   };
 
-  config.ejs = {};
+  config.ejs = {
+    layout: 'layout.html',
+  };
 
   return config;
 };