From 32b7865605e8a4f505aa5e34387efa842139c24f Mon Sep 17 00:00:00 2001 From: fliiiix Date: Tue, 7 Apr 2020 15:32:49 +0200 Subject: [PATCH 1/2] Revert "web(feat): enable custom html header" This reverts commit ace01ce50f90a261632c186fc5e414f28db9d068. --- web/README.md | 9 --------- web/src/components/Layout.vue | 9 ++------- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/web/README.md b/web/README.md index 1c02c26d4..a06633912 100644 --- a/web/README.md +++ b/web/README.md @@ -31,14 +31,5 @@ yarn build yarn lint ``` -### Basic Header Theeming - -Not happy with the default Docat logo and header? -Just add your custom html header with `VUE_APP_HEADER_HTML`. - -``` -VUE_APP_HEADER_HTML="

MyCompany

" -``` - ### Customize configuration See [Configuration Reference](https://cli.vuejs.org/config/). diff --git a/web/src/components/Layout.vue b/web/src/components/Layout.vue index c50b57509..4b93898bc 100644 --- a/web/src/components/Layout.vue +++ b/web/src/components/Layout.vue @@ -5,7 +5,8 @@
-
+ +

DOCAT

@@ -32,12 +33,6 @@ export default { name: 'layout', props: { fullscreen: Boolean, - }, - data() { - const defaultHeader = '

DOCAT

'; - return { - header: process.env.VUE_APP_HEADER_HTML || defaultHeader, - } } } From 0d4d1d7f3de7e0a0ff8251e4c5d989be98c64fe6 Mon Sep 17 00:00:00 2001 From: fliiiix Date: Tue, 7 Apr 2020 17:17:06 +0200 Subject: [PATCH 2/2] web(feat): Add config file and custom header --- web/README.md | 9 +++++++++ web/package.json | 4 +++- web/src/components/Layout.vue | 17 +++++++++++++++-- web/src/repositories/ProjectRepository.js | 12 ++++++++++++ 4 files changed, 39 insertions(+), 3 deletions(-) diff --git a/web/README.md b/web/README.md index a06633912..c729fb1fc 100644 --- a/web/README.md +++ b/web/README.md @@ -31,5 +31,14 @@ yarn build yarn lint ``` +### Basic Header Theeming + +Not happy with the default Docat logo and header? +Just add your custom html header to the `/var/www/html/config.json` file. + +``` +{"headerHTML": "

MyCompany

"} +``` + ### Customize configuration See [Configuration Reference](https://cli.vuejs.org/config/). diff --git a/web/package.json b/web/package.json index 20d92611a..73614116c 100644 --- a/web/package.json +++ b/web/package.json @@ -41,7 +41,9 @@ "plugin:vue/essential", "eslint:recommended" ], - "rules": {}, + "rules": { + "no-console": "off" + }, "parserOptions": { "parser": "babel-eslint" }, diff --git a/web/src/components/Layout.vue b/web/src/components/Layout.vue index 4b93898bc..007085ef6 100644 --- a/web/src/components/Layout.vue +++ b/web/src/components/Layout.vue @@ -5,8 +5,7 @@
- -

DOCAT

+
@@ -29,10 +28,24 @@ diff --git a/web/src/repositories/ProjectRepository.js b/web/src/repositories/ProjectRepository.js index b8193a5f6..78a57e5d4 100644 --- a/web/src/repositories/ProjectRepository.js +++ b/web/src/repositories/ProjectRepository.js @@ -3,6 +3,18 @@ import Repository from '@/repositories/Repository' const resource = 'doc' export default { + /** + * Get Config + */ + async getConfig() { + try { + const result = await Repository.get(`${Repository.defaults.baseURL}/config.json`) + return result.data; + } catch { + return {} + } + }, + /** * Returns all projects */