Skip to content

Commit 839ab34

Browse files
bugybugy
committed
bugy#282 added admin.js to new vue-cli structure
1 parent ac72fdf commit 839ab34

30 files changed

+169
-112
lines changed

‎web-src/package.json‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@
3636
"http-proxy-middleware": "^1.0.3",
3737
"jquery": "^3.4.1",
3838
"mock-socket": "^9.0.2",
39+
"node-sass": "^4.13.1",
40+
"sass-loader": "^8.0.2",
3941
"sinon": "^7.5.0",
4042
"vue-template-compiler": "^2.6.11"
4143
},

‎web-src/public/admin.html‎

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,12 @@
11
<!DOCTYPE html>
22
<html lang="en">
33
<head>
4-
<meta charset="UTF-8">
5-
<meta content="width=device-width, initial-scale=1" name="viewport">
64
<title>Admin panel</title>
5+
<meta charset="utf-8">
6+
<meta content="width=device-width, initial-scale=1" name="viewport">
77

8-
<% for (var css in htmlWebpackPlugin.files.css) { %>
9-
<link href="<%= htmlWebpackPlugin.files.css[css] %>" rel="stylesheet">
10-
<% } %>
11-
12-
<link rel="stylesheet" href="css/index.css">
13-
<link rel="stylesheet" href="css/admin.css">
14-
<link rel="stylesheet" href="css/bash_styles.css">
8+
<link href="<%= BASE_URL %>favicon.ico" rel="icon">
159

16-
<% for (var chunk in htmlWebpackPlugin.files.chunks) { %>
17-
<script src="<%= htmlWebpackPlugin.files.chunks[chunk].entry %>"></script>
18-
<% } %>
1910
</head>
2011
<body>
2112
<div id='admin-page'>

‎web-src/src/admin/AdminApp.vue‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@
1919
</template>
2020

2121
<script>
22+
import executions from '@/common/store/executions-module';
2223
import Vue from 'vue';
2324
import Vuex, {mapActions, mapState} from 'vuex';
24-
import executions from '../history/executions-module';
25-
import scriptConfig from './scripts-config/script-config-module';
26-
import scripts from './scripts-config/scripts-module';
25+
import scriptConfig from './store/script-config-module';
26+
import scripts from './store/scripts-module';
2727
2828
Vue.use(Vuex);
2929

‎web-src/src/admin/admin.js‎

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,13 @@
1+
import '@/common/materializecss/imports/tabs'
2+
import '@/common/style_imports';
13
import Vue from 'vue';
2-
import AdminApp from './admin/AdminApp';
3-
import router from './admin/router';
4-
import './style_imports';
5-
6-
document.addEventListener('DOMContentLoaded', function () {
7-
8-
//noinspection JSAnnotator
9-
new Vue({
10-
router,
11-
el: '#admin-page',
12-
render: h => h(AdminApp)
13-
});
14-
15-
}, false);
4+
import AdminApp from './AdminApp';
5+
import './AdminApp';
6+
import router from './router/router';
167

178

9+
//noinspection JSAnnotator
10+
new Vue({
11+
router,
12+
render: h => h(AdminApp)
13+
}).$mount('#admin-page');

‎web-src/src/admin/components/history/AdminExecutionsLogPage.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
</template>
44

55
<script>
6+
import ExecutionsLogPage from '@/common/components/history/executions-log-page';
67
import {mapActions, mapState} from 'vuex';
7-
import ExecutionsLogPage from '../../history/executions-log-page';
88
99
export default {
1010
name: 'AdminExecutionsLogPage',

‎web-src/src/admin/components/scripts-config/ParamListItem.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
</template>
2424

2525
<script>
26-
import {forEachKeyValue, isEmptyObject, isEmptyString, isNull} from '../../common';
26+
import {forEachKeyValue, isEmptyObject, isEmptyString, isNull} from '@/common/utils/common';
2727
import ParameterConfigForm from './ParameterConfigForm';
2828
2929
export default {

‎web-src/src/admin/components/scripts-config/ParameterConfigForm.vue‎

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -66,13 +66,14 @@
6666
</template>
6767

6868
<script>
69+
import Checkbox from '@/common/components/checkbox';
70+
import ChipsList from '@/common/components/ChipsList';
71+
import Combobox from '@/common/components/combobox';
72+
import TextArea from '@/common/components/TextArea';
73+
import Textfield from '@/common/components/textfield';
74+
import {forEachKeyValue, isEmptyString} from '@/common/utils/common';
75+
import get from 'lodash/get';
6976
import Vue from 'vue';
70-
import {forEachKeyValue, isEmptyString} from '../../common';
71-
import Checkbox from '../../components/checkbox';
72-
import ChipsList from '../../components/ChipsList';
73-
import Combobox from '../../components/combobox';
74-
import TextArea from '../../components/TextArea';
75-
import Textfield from '../../components/textfield';
7677
import {
7778
allowedValuesFromScriptField,
7879
allowedValuesScriptField,
@@ -202,20 +203,20 @@
202203
this.arg = config['param'];
203204
this.envVar = config['env_var'];
204205
this.type = config['type'];
205-
this.noValue = _.get(config, 'no_value', false);
206-
this.required = _.get(config, 'required', false);
206+
this.noValue = get(config, 'no_value', false);
207+
this.required = get(config, 'required', false);
207208
this.min = config['min'];
208209
this.max = config['max'];
209-
this.constant = !!_.get(config, 'constant', false);
210-
this.secure = !!_.get(config, 'secure', false);
211-
this.multipleArguments = !!_.get(config, 'multiple_arguments', false);
212-
this.separator = _.get(config, 'separator', ',');
210+
this.constant = !!get(config, 'constant', false);
211+
this.secure = !!get(config, 'secure', false);
212+
this.multipleArguments = !!get(config, 'multiple_arguments', false);
213+
this.separator = get(config, 'separator', ',');
213214
this.fileDir = config['file_dir'];
214-
this.recursive = !!_.get(config, 'file_recursive', false);
215-
this.fileType = _.get(config, 'file_type', 'any');
216-
this.fileExtensions = _.get(config, 'file_extensions', []);
215+
this.recursive = !!get(config, 'file_recursive', false);
216+
this.fileType = get(config, 'file_type', 'any');
217+
this.fileExtensions = get(config, 'file_extensions', []);
217218
218-
const defaultValue = _.get(config, 'default', '');
219+
const defaultValue = get(config, 'default', '');
219220
if (this.isRecursiveFile()) {
220221
if (Array.isArray(defaultValue)) {
221222
this.defaultValue = defaultValue.join('/');
@@ -230,7 +231,7 @@
230231
this.defaultValue = defaultValue.toString();
231232
}
232233
233-
const allowedValues = _.get(config, 'values', []);
234+
const allowedValues = get(config, 'values', []);
234235
if (Array.isArray(allowedValues) || !allowedValues['script']) {
235236
this.allowedValues = allowedValues;
236237
this.allowedValuesFromScript = false;

‎web-src/src/admin/components/scripts-config/ScriptConfig.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
</template>
1818

1919
<script>
20+
import PromisableButton from '@/common/components/PromisableButton';
2021
import {mapActions, mapState} from 'vuex';
21-
import PromisableButton from '../../components/PromisableButton';
2222
import ParameterConfigForm from './ParameterConfigForm';
2323
import ScriptConfigForm from './ScriptConfigForm';
2424
import ScriptParamList from './ScriptParamList';

‎web-src/src/admin/components/scripts-config/ScriptConfigForm.vue‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@
3131
</template>
3232

3333
<script>
34-
import _ from 'lodash';
35-
import {forEachKeyValue, isEmptyArray, isEmptyString, isNull} from '../../common';
36-
import CheckBox from '../../components/checkbox'
37-
import ChipsList from '../../components/ChipsList';
38-
import TextArea from '../../components/TextArea';
39-
import TextField from '../../components/textfield'
34+
import CheckBox from '@/common/components/checkbox';
35+
import ChipsList from '@/common/components/ChipsList';
36+
import TextArea from '@/common/components/TextArea';
37+
import TextField from '@/common/components/textfield'
38+
import {forEachKeyValue, isEmptyArray, isEmptyString, isNull} from '@/common/utils/common';
39+
import get from 'lodash/get';
4040
import {
4141
allowAllField,
4242
bashFormattingField,
@@ -117,10 +117,10 @@
117117
this.scriptPath = config['script_path'];
118118
this.description = config['description'];
119119
this.workingDirectory = config['working_directory'];
120-
this.requiresTerminal = _.get(config, 'requires_terminal', true);
120+
this.requiresTerminal = get(config, 'requires_terminal', true);
121121
this.includeScript = config['include'];
122-
this.bashFormatting = _.get(config, 'bash_formatting', true);
123-
let allowedUsers = _.get(config, 'allowed_users');
122+
this.bashFormatting = get(config, 'bash_formatting', true);
123+
let allowedUsers = get(config, 'allowed_users');
124124
if (isNull(allowedUsers)) {
125125
allowedUsers = [];
126126
}

‎web-src/src/admin/components/scripts-config/ScriptParamList.vue‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,9 @@
1313
</template>
1414

1515
<script>
16-
import {guid} from '../../common'
16+
import '@/common/materializecss/imports/collapsible'
17+
import '@/common/materializecss/imports/toast'
18+
import {guid} from '@/common/utils/common'
1719
import ParamListItem from './ParamListItem';
1820
1921
export default {

0 commit comments

Comments
 (0)