summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--documentation/.vuepress/config.js2
-rw-r--r--documentation/.vuepress/public/img/bas_screenshot.PNG (renamed from documentation/.vuepress/public/img/bss_screenshot.PNG)bin85869 -> 85869 bytes
-rw-r--r--documentation/.vuepress/public/img/de/bas_screenshot.PNG (renamed from documentation/.vuepress/public/img/de/bss_screenshot.PNG)bin85869 -> 85869 bytes
-rw-r--r--documentation/de/webapp/README.md2
-rw-r--r--documentation/webapp/README.md2
-rw-r--r--server/.gitignore1
-rw-r--r--server/app.js3
-rwxr-xr-xserver/bin/www2
-rw-r--r--server/package-lock.json5
-rw-r--r--server/package.json1
-rw-r--r--webapp/src/components/LogModule.vue2
11 files changed, 9 insertions, 11 deletions
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/bss_screenshot.PNG b/documentation/.vuepress/public/img/bas_screenshot.PNG
index 2fb8504..2fb8504 100644
--- a/documentation/.vuepress/public/img/bss_screenshot.PNG
+++ b/documentation/.vuepress/public/img/bas_screenshot.PNG
Binary files differ
diff --git a/documentation/.vuepress/public/img/de/bss_screenshot.PNG b/documentation/.vuepress/public/img/de/bas_screenshot.PNG
index 2fb8504..2fb8504 100644
--- a/documentation/.vuepress/public/img/de/bss_screenshot.PNG
+++ b/documentation/.vuepress/public/img/de/bas_screenshot.PNG
Binary files 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)
+<img :src="$withBase('/img/bas_screenshot.PNG')" alt="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)
+<img :src="$withBase('/img/bas_screenshot.PNG')" alt="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"
></v-date-picker>
</v-menu>
@@ -115,6 +116,7 @@
color="primary"
:locale="locale"
:width="pickerWidth"
+ first-day-of-week="1"
></v-date-picker>
</div>
</template>