From a9db540cbef65316c54f5bd1f1a9da97f5f3b12a Mon Sep 17 00:00:00 2001 From: Udo Walter Date: Wed, 17 Apr 2019 21:11:05 +0000 Subject: [server] remove laterjs; intergrate documentation into server --- documentation/.vuepress/config.js | 2 ++ documentation/.vuepress/public/img/bas_screenshot.PNG | Bin 0 -> 85869 bytes documentation/.vuepress/public/img/bss_screenshot.PNG | Bin 85869 -> 0 bytes .../.vuepress/public/img/de/bas_screenshot.PNG | Bin 0 -> 85869 bytes .../.vuepress/public/img/de/bss_screenshot.PNG | Bin 85869 -> 0 bytes documentation/de/webapp/README.md | 2 +- documentation/webapp/README.md | 2 +- server/.gitignore | 1 + server/app.js | 3 +-- server/bin/www | 2 +- server/package-lock.json | 5 ----- server/package.json | 1 - webapp/src/components/LogModule.vue | 2 ++ 13 files changed, 9 insertions(+), 11 deletions(-) create mode 100644 documentation/.vuepress/public/img/bas_screenshot.PNG delete mode 100644 documentation/.vuepress/public/img/bss_screenshot.PNG create mode 100644 documentation/.vuepress/public/img/de/bas_screenshot.PNG delete mode 100644 documentation/.vuepress/public/img/de/bss_screenshot.PNG diff --git a/documentation/.vuepress/config.js b/documentation/.vuepress/config.js index 5a76b61..5ad0884 100644 --- a/documentation/.vuepress/config.js +++ b/documentation/.vuepress/config.js @@ -1,4 +1,6 @@ module.exports = { + base: '/documentation/', + dest: '../server/public_documentation', title: 'BAS Documentation', description: 'Boot Auswahl Server', themeConfig: { diff --git a/documentation/.vuepress/public/img/bas_screenshot.PNG b/documentation/.vuepress/public/img/bas_screenshot.PNG new file mode 100644 index 0000000..2fb8504 Binary files /dev/null and b/documentation/.vuepress/public/img/bas_screenshot.PNG differ diff --git a/documentation/.vuepress/public/img/bss_screenshot.PNG b/documentation/.vuepress/public/img/bss_screenshot.PNG deleted file mode 100644 index 2fb8504..0000000 Binary files a/documentation/.vuepress/public/img/bss_screenshot.PNG and /dev/null differ diff --git a/documentation/.vuepress/public/img/de/bas_screenshot.PNG b/documentation/.vuepress/public/img/de/bas_screenshot.PNG new file mode 100644 index 0000000..2fb8504 Binary files /dev/null and b/documentation/.vuepress/public/img/de/bas_screenshot.PNG differ diff --git a/documentation/.vuepress/public/img/de/bss_screenshot.PNG b/documentation/.vuepress/public/img/de/bss_screenshot.PNG deleted file mode 100644 index 2fb8504..0000000 Binary files a/documentation/.vuepress/public/img/de/bss_screenshot.PNG and /dev/null differ diff --git a/documentation/de/webapp/README.md b/documentation/de/webapp/README.md index 66eeb4e..cb8e8ce 100644 --- a/documentation/de/webapp/README.md +++ b/documentation/de/webapp/README.md @@ -1,3 +1,3 @@ # Webapplikation -![BSS Screenshot](/img/de/bss_screenshot.PNG) +BAS Screenshot diff --git a/documentation/webapp/README.md b/documentation/webapp/README.md index 7e3a5c0..e916ebf 100644 --- a/documentation/webapp/README.md +++ b/documentation/webapp/README.md @@ -1,3 +1,3 @@ # Webapplication -![BSS Screenshot](/img/bss_screenshot.PNG) +BAS Screenshot diff --git a/server/.gitignore b/server/.gitignore index 66af4f4..c74fd45 100644 --- a/server/.gitignore +++ b/server/.gitignore @@ -10,6 +10,7 @@ .DS_Store node_modules/ /public/ +/public_documentation/ /tftp/ /ipxe/ipxe/ npm-debug.log* diff --git a/server/app.js b/server/app.js index 2751a9a..c80473d 100644 --- a/server/app.js +++ b/server/app.js @@ -6,8 +6,6 @@ var compression = require('compression') var fileUpload = require('express-fileupload') process.env.TZ = 'Europe/Berlin' -const later = require('later') -later.date.localTime() var app = express() @@ -35,6 +33,7 @@ var apiRouter = require(path.join(__dirname, 'router')) app.use('/api', apiRouter) app.use('/files', express.static('public_files')) +app.use('/documentation', express.static('public_documentation')) app.use(express.static('public')) app.use('*', express.static('public')) diff --git a/server/bin/www b/server/bin/www index 3cfebbd..28815c4 100755 --- a/server/bin/www +++ b/server/bin/www @@ -18,7 +18,7 @@ var config = require(path.join(__appdir, 'config', 'config')).https * Get port from environment and store in Express. */ -var port = normalizePort(config.port || process.env.PORT || '3000') +var port = normalizePort(process.env.PORT || config.port || '3000') app.set('port', port) /** diff --git a/server/package-lock.json b/server/package-lock.json index d9b6798..e6c98bd 100644 --- a/server/package-lock.json +++ b/server/package-lock.json @@ -2467,11 +2467,6 @@ "safe-buffer": "^5.0.1" } }, - "later": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/later/-/later-1.2.0.tgz", - "integrity": "sha1-8s9sTdeVbdL1IK3wMpg26YdrrQ8=" - }, "lcid": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz", diff --git a/server/package.json b/server/package.json index e3484c9..d726807 100644 --- a/server/package.json +++ b/server/package.json @@ -18,7 +18,6 @@ "http-errors": "^1.7.2", "infoblox": "^1.1.5", "jsonwebtoken": "^8.5.0", - "later": "^1.2.0", "morgan": "^1.9.1", "mysql": "^2.16.0", "mysql2": "^1.6.5", diff --git a/webapp/src/components/LogModule.vue b/webapp/src/components/LogModule.vue index 6c9ba43..e365701 100644 --- a/webapp/src/components/LogModule.vue +++ b/webapp/src/components/LogModule.vue @@ -78,6 +78,7 @@ color="primary" :locale="locale" :width="pickerWidth" + first-day-of-week="1" > @@ -115,6 +116,7 @@ color="primary" :locale="locale" :width="pickerWidth" + first-day-of-week="1" > -- cgit v1.2.3-55-g7522