diff --git a/.gitignore b/.gitignore index 2d9daf0c0..95462e401 100644 --- a/.gitignore +++ b/.gitignore @@ -8,8 +8,8 @@ files/*.zip # database dumps db_dumps/ - -# backend +logs/ +# backen backend/sessions backend/node_modules backend/logs diff --git a/backend/db/config/config.js b/backend/db/config/config.js index 950a86320..dc8019c17 100644 --- a/backend/db/config/config.js +++ b/backend/db/config/config.js @@ -3,6 +3,9 @@ * * @author Nils Dycke */ +const path = require("path"); +require("dotenv").config({path: path.resolve(__dirname, "../../../.env")}); + module.exports = { development: { username: 'postgres', diff --git a/frontend/src/components/dashboard/settings/SettingItem.vue b/frontend/src/components/dashboard/settings/SettingItem.vue index 73a7f26b6..0aa674590 100644 --- a/frontend/src/components/dashboard/settings/SettingItem.vue +++ b/frontend/src/components/dashboard/settings/SettingItem.vue @@ -33,7 +33,7 @@ :checked="setting.value" class="form-check-input" role="switch" - title="Activate/Deactivate NLP support" + :title="getBooleanToggleTooltip(setting)" type="checkbox" > @@ -137,6 +137,10 @@ export default { } }, methods: { + getBooleanToggleTooltip(setting){ + const label = (setting.description && setting.description.trim()) || setting.key; + return `${label}`; + }, toggleCollapse() { this.collapsed = !this.collapsed; },