diff options
| author | Joas Schilling <coding@schilljs.com> | 2019-10-18 13:02:17 +0300 |
|---|---|---|
| committer | Joas Schilling <coding@schilljs.com> | 2019-10-18 14:14:09 +0300 |
| commit | 42eb6249b508f2a470d5b68cf4a1893a90c261d6 (patch) | |
| tree | ec0ac8743616b4fd8a519b4b275cd3c3d169c191 | |
| parent | 690c54d2dba8d8db841c9cd4d4870b05c8ed14eb (diff) | |
Move GeneralSettings to src/
Signed-off-by: Joas Schilling <coding@schilljs.com>
| -rw-r--r-- | src/GeneralSettings.js (renamed from vue/src/GeneralSettings.js) | 2 | ||||
| -rw-r--r-- | src/views/AdminSettings/GeneralSettings.vue (renamed from vue/src/views/GeneralSettings.vue) | 0 | ||||
| -rw-r--r-- | vue/webpack.common.js | 1 | ||||
| -rw-r--r-- | webpack.common.js | 3 |
4 files changed, 3 insertions, 3 deletions
diff --git a/vue/src/GeneralSettings.js b/src/GeneralSettings.js index abc36e4f8..d54f90bff 100644 --- a/vue/src/GeneralSettings.js +++ b/src/GeneralSettings.js @@ -21,7 +21,7 @@ */ import Vue from 'vue' -import GeneralSettings from './views/GeneralSettings' +import GeneralSettings from './views/AdminSettings/GeneralSettings' Vue.prototype.t = t Vue.prototype.n = n diff --git a/vue/src/views/GeneralSettings.vue b/src/views/AdminSettings/GeneralSettings.vue index e50d49427..e50d49427 100644 --- a/vue/src/views/GeneralSettings.vue +++ b/src/views/AdminSettings/GeneralSettings.vue diff --git a/vue/webpack.common.js b/vue/webpack.common.js index c53806dce..e54fce742 100644 --- a/vue/webpack.common.js +++ b/vue/webpack.common.js @@ -5,7 +5,6 @@ module.exports = { entry: { "collections": path.join(__dirname, 'src', 'collections.js'), "collectionsintegration": path.join(__dirname, 'src', 'collectionsintegration.js'), - "admin/general-settings": path.join(__dirname, 'src', 'GeneralSettings.js'), "admin/signaling-server": path.join(__dirname, 'src', 'SignalingServerSettings.js'), "admin/stun-server": path.join(__dirname, 'src', 'StunServerSettings.js'), "admin/turn-server": path.join(__dirname, 'src', 'TurnServerSettings.js'), diff --git a/webpack.common.js b/webpack.common.js index b890bee7d..66382d121 100644 --- a/webpack.common.js +++ b/webpack.common.js @@ -5,7 +5,8 @@ const StyleLintPlugin = require('stylelint-webpack-plugin') module.exports = { entry: { 'admin/allowed-groups': path.join(__dirname, 'src', 'AllowedGroupsSettings.js'), - "admin/commands": path.join(__dirname, 'src', 'CommandsSettings.js'), + 'admin/commands': path.join(__dirname, 'src', 'CommandsSettings.js'), + 'admin/general-settings': path.join(__dirname, 'src', 'GeneralSettings.js'), 'talk': path.join(__dirname, 'src', 'main.js') }, output: { |