diff --git a/app/controller/home.js b/app/controller/home.js index e590f25..92b8325 100644 --- a/app/controller/home.js +++ b/app/controller/home.js @@ -7,23 +7,24 @@ const safeGet = require('lodash/get'); class HomeController extends Controller { async index() { - const ctx = this.ctx; + const { ctx, app } = this; const user = ctx.session.user; const { appid, callbackUrl } = ctx.app.config.authorize.dingtalkAuth; - const siteConfig = await this.ctx.model.Config.findOne({ raw: true }); + const siteConfig = await ctx.model.Config.findOne({ raw: true }); const assetsUrl = safeGet(siteConfig, 'data.site.assetsUrl'); - ctx.body = await this.app.render({ + ctx.body = await app.render({ dingtalkAuth: { appid, callbackUrl, }, user, }, { - title: 'Reliable Suites for Macaca', + title: `${app.config.site.name || 'Reliable'} | Reliable Suites for Macaca`, pageId: 'home', - SERVER_ADDRESS: this.config.reliableView.serverUrl, - assetsUrl: assetsUrl || this.config.reliableView.assetsUrl, - version: this.app.config.pkg.version, + SERVER_ADDRESS: app.config.reliableView.serverUrl, + assetsUrl: assetsUrl || app.config.reliableView.assetsUrl, + version: app.config.pkg.version, + siteConfig: app.config.site, }); } } diff --git a/config/config.default.js b/config/config.default.js index 64e5f89..0c5872c 100644 --- a/config/config.default.js +++ b/config/config.default.js @@ -100,4 +100,13 @@ config.static = { dir: path.resolve(__dirname, '..', 'view', distDirName), }; +config.site = { + logo: 'https://macacajs.github.io/reliable/logo/reliable.svg', + name: 'Reliable', + links: { + document: 'https://macacajs.github.io/reliable', + issues: 'https://github.com/macacajs/reliable/issues?utf8=%E2%9C%93&q=', + }, +}; + module.exports = config; diff --git a/view/package.json b/view/package.json index 1e2e5cb..d239406 100644 --- a/view/package.json +++ b/view/package.json @@ -7,10 +7,6 @@ "public/*.css" ], "private": true, - "links": { - "issues": "https://github.com/macacajs/reliable/issues?utf8=%E2%9C%93&q=", - "document": "https://macacajs.github.io/reliable" - }, "scripts": { "dev": "cross-env NODE_ENV=development webpack serve", "dev:test": "NODE_ENV=test npm run dev", diff --git a/view/src/components/Header.js b/view/src/components/Header.js index cbfbbf9..5980bdf 100644 --- a/view/src/components/Header.js +++ b/view/src/components/Header.js @@ -30,7 +30,7 @@ import { LANG_LIST as langList } from '../constants/index'; const nickName = safeGet(window, 'context.user.nick'); const Header = Layout.Header; -const pkg = require('../../package.json'); +const { siteConfig } = window.pageConfig; function ContentHeader (props) { const toggle = () => { @@ -84,7 +84,7 @@ function ContentHeader (props) { }> @@ -92,19 +92,15 @@ function ContentHeader (props) { }> - + - + { nickName &&
- logo -

Reliable

+ logo +

{siteConfig.name}