Skip to content

Commit d149019

Browse files
committed
Updated dependencies and fix vue.config.js
1 parent 6fc2dac commit d149019

File tree

13 files changed

+16765
-26727
lines changed

13 files changed

+16765
-26727
lines changed

.github/dependabot.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: 'npm'
4+
directory: '/viplab-standalone-frontend-vue'
5+
schedule:
6+
interval: 'weekly'
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
node_modules
2+
dist

viplab-standalone-frontend-vue/Dockerfile-dev

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
# base image: latest 16er version, with 18, build breaks
2-
FROM node:16.14.2-alpine
1+
FROM node:18.13.0-alpine
32

43
# set working directory
54
WORKDIR /app

viplab-standalone-frontend-vue/package-lock.json

Lines changed: 16508 additions & 26457 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

viplab-standalone-frontend-vue/package.json

Lines changed: 23 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -11,36 +11,38 @@
1111
"@fortawesome/fontawesome-svg-core": "^1.2.35",
1212
"@fortawesome/free-solid-svg-icons": "^5.15.3",
1313
"@fortawesome/vue-fontawesome": "^2.0.2",
14+
"@rleys/vue-plotly-basic": "^1.1.14",
1415
"@vue/composition-api": "^1.1.3",
1516
"ace-builds": "^1.4.13",
1617
"ajv": "^6.12.6",
1718
"ansi_up": "^5.1.0",
1819
"base64url": "^3.0.1",
1920
"bootstrap": "^4.5.3",
2021
"bootstrap-vue": "^2.21.2",
22+
"buffer": "^6.0.3",
2123
"crypto-js": "^4.0.0",
2224
"epic-spinners": "^1.1.0",
23-
"eslint": "^7.14.0",
24-
"eslint-plugin-vue": "^7.1.0",
25+
"eslint": "^7.32.0",
26+
"eslint-plugin-vue": "^7.20.0",
27+
"file-loader": "^6.2.0",
2528
"handlebars": "^4.7.7",
2629
"itk": "^14.1.0",
2730
"jquery": "^3.5.1",
2831
"js-base64": "^3.6.0",
29-
"jsonwebtoken": "^8.5.1",
32+
"jsonwebtoken": "^9.0.0",
3033
"jwk-to-pem": "^2.0.4",
31-
"plotly.js": "^1.47.4",
34+
"mustache": "^4.2.0",
35+
"plotly.js": "^1.58.5",
3236
"popper.js": "^1.16.1",
3337
"prismjs": "^1.22.0",
34-
"shader-loader": "^1.3.1",
3538
"url": "^0.11.0",
3639
"v-tooltip": "^2.1.3",
3740
"vee-validate": "^3.4.13",
38-
"vtk.js": "^18.1.11",
39-
"vue": "^2.5.17",
41+
"vtk.js": "^26.0.0",
42+
"vue": "~2.6.0",
4043
"vue-blockui": "^1.1.7",
4144
"vue-demi": "^0.11.3",
4245
"vue-easy-dnd": "^1.19.0",
43-
"vue-plotly": "^1.1.0",
4446
"vue-prism-editor": "^1.2.2",
4547
"vue-router": "^3.5.2",
4648
"vue-simple-alert": "^1.1.1",
@@ -51,20 +53,22 @@
5153
"vue-wait": "^1.4.8",
5254
"vuex": "^3.6.2",
5355
"vuex-persistedstate": "^4.1.0",
54-
"worker-loader": "^2.0.0"
56+
"worker-loader": "^3.0.8"
5557
},
5658
"devDependencies": {
57-
"@vue/cli-plugin-babel": "^3.0.4",
58-
"@vue/cli-plugin-eslint": "^3.0.4",
59-
"@vue/cli-service": "^4.5.9",
59+
"@vue/cli-plugin-babel": "^5.0.8",
60+
"@vue/cli-plugin-eslint": "^5.0.8",
61+
"@vue/cli-service": "^5.0.8",
62+
"babel-eslint": "^10.1.0",
6063
"copy-webpack-plugin": "^6.4.1",
61-
"html-webpack-plugin": "^4.5.2",
62-
"node-sass": "^6.0.1",
63-
"sass-loader": "^10.0.0",
64-
"style-loader": "^3.3.0",
65-
"vue-template-compiler": "^2.5.17",
66-
"webpack": "^4.4.0",
67-
"wslink": "^0.1.15"
64+
"fs": "^0.0.1-security",
65+
"html-webpack-plugin": "^5.5.0",
66+
"node-sass": "^8.0.0",
67+
"path-browserify": "^1.0.1",
68+
"sass-loader": "^13.2.0",
69+
"style-loader": "^3.3.1",
70+
"vue-template-compiler": "~2.6.0",
71+
"webpack": "5.75.0"
6872
},
6973
"eslintConfig": {
7074
"root": true,

viplab-standalone-frontend-vue/public/index.html

Lines changed: 0 additions & 36 deletions
This file was deleted.

viplab-standalone-frontend-vue/src/App.vue

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
{{ json.metadata.description }}
1313
</div>
1414
<div class="item-name">
15-
Go To Teacher-View:
15+
Go To Teacher-View:
1616
<router-link to="/teacher">Go to Teacher-View</router-link>
1717
</div>
1818
<div class="item-name">
@@ -34,6 +34,7 @@
3434
</template>
3535

3636
<script>
37+
global.Buffer = global.Buffer || require('buffer').Buffer;
3738
import base64url from "base64url";
3839
//const Base64 = require('js-base64');
3940
@@ -84,7 +85,7 @@ export default {
8485
let appDiv = document.body;
8586
let data = appDiv.getAttribute("data-template");
8687
let decodedjson = JSON.parse(base64url.decode(data));
87-
88+
8889
console.log(decodedjson)
8990
9091
console.log(Object.keys(this.$store.state.jsonTemplate).length === 0)
@@ -100,12 +101,12 @@ export default {
100101
this.json = {};
101102
this.token = "";
102103
}
103-
104+
104105
// store json in Vuex store
105106
// this.$store.commit("updateJsonTemplate", decodedjson);
106-
107+
107108
//this.token = appDiv.getAttribute("data-token");
108-
109+
109110
110111
// if there are parameters in parts, set var accordingly for rendering of button
111112
for(var file in this.json.files) {
@@ -173,6 +174,6 @@ body {
173174
font-weight: bold;
174175
font-size: 14pt;
175176
}
176-
177+
177178
}
178-
</style>
179+
</style>

viplab-standalone-frontend-vue/src/components/csv-plots/CsvPlot.vue

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@
3737

3838
<script>
3939
40-
import { Plotly } from "vue-plotly";
41-
import plotlyjs from "plotly.js";
40+
import { Plotly } from '@rleys/vue-plotly-basic'
41+
import plotlyjs from "plotly.js"
4242
4343
import base64url from "base64url";
4444
@@ -88,14 +88,14 @@ export default {
8888
} else {
8989
this.loadBase64Data(this.csvs[this.fileIndex]);
9090
}
91-
91+
9292
},
9393
methods: {
9494
//"http://localhost:8080/" + inputFile
9595
loadData: function(context) {
96-
//plotlyjs.d3.csv("https://raw.githubusercontent.com/plotly/datasets/master/2014_apple_stock.csv", function(data){
97-
//plotlyjs.d3.csv("http://localhost:8080/plotly-test.csv", function(data){
98-
plotlyjs.d3.csv(context.csvs[context.fileIndex], function(data){
96+
//plotlyjs.d3.csv("https://raw.githubusercontent.com/plotly/datasets/master/2014_apple_stock.csv", function(data){
97+
//plotlyjs.d3.csv("http://localhost:8080/plotly-test.csv", function(data){
98+
plotlyjs.d3.csv(context.csvs[context.fileIndex], function(data){
9999
context.processData(data);
100100
});
101101
},
@@ -189,13 +189,13 @@ export default {
189189
title: {
190190
text: this.labelProp.label || xkey
191191
},
192-
tickformat: xformat
192+
tickformat: xformat
193193
},
194194
yaxis: {
195195
title: {
196196
text: ytext
197197
},
198-
tickformat: yformat
198+
tickformat: yformat
199199
}
200200
}
201201
@@ -268,4 +268,4 @@ div.btn-group {
268268
div.btn-group > .btn {
269269
margin: 0 0 1px 1px;
270270
}
271-
</style>
271+
</style>

viplab-standalone-frontend-vue/src/components/viplab-plots/gridplot/GridPlot.vue

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<script>
1515
import * as Parser from "../parse.js";
1616
17-
import { Plotly } from 'vue-plotly';
17+
import { Plotly } from '@rleys/vue-plotly-basic';
1818
1919
export default {
2020
name: 'GridPlot',
@@ -53,27 +53,27 @@ export default {
5353
this.datasetList = parseTest.parseValues(testJson);
5454
this.minColor = parseTest.getMinColor();
5555
this.maxColor = parseTest.getMaxColor();
56-
56+
5757
for (var i = 0; i < this.datasetList[0].getWidth(); i++) {
5858
this.xArray.push(this.datasetList[0].getXMin() * 1 + (i * ((this.datasetList[0].getXMax() - this.datasetList[0].getXMin())/this.datasetList[0].getWidth())));
5959
}
60-
60+
6161
for (i = 0; i < this.datasetList[0].getHeight(); i++) {
6262
this.yArray.push(this.datasetList[0].getYMin() * 1 + (i * ((this.datasetList[0].getYMax() - this.datasetList[0].getYMin())/this.datasetList[0].getHeight())));
6363
}
6464
6565
this.create2dGitterplot();
6666
6767
this.layout = {
68-
68+
6969
title: this.datasetList[0].getLabel(),
7070
scene: {
7171
camera: {
7272
eye: { x: -1.25, y: -1.25, z: 1.25 }
7373
},
7474
xaxis: {
7575
range: [this.datasetList[0].getXMin(), this.datasetList[0].getXMax()],
76-
76+
7777
},
7878
yaxis: {
7979
range: [this.datasetList[0].getYMin(), this.datasetList[0].getYMax()],
@@ -84,7 +84,7 @@ export default {
8484
}
8585
}
8686
},
87-
methods: {
87+
methods: {
8888
onChange(event) {
8989
//console.log(event.target.value);
9090
if (event.target.value === "2DGitterplot") {
@@ -115,22 +115,22 @@ export default {
115115
116116
for (var j = 0; j < this.datasetList[0].getData()[0].length; j++) {
117117
Array.prototype.push.apply(xScatterArray, this.xArray);
118-
118+
119119
}
120120
121121
for (j = 0; j < this.datasetList[0].getData().length; j++) {
122122
Array.prototype.push.apply(yScatterArray, this.yArray);
123123
}
124-
124+
125125
var zScatterArray = new Array();
126126
for(var i = 0; i < this.datasetList[0].getData().length; i++) {
127127
zScatterArray = zScatterArray.concat(this.datasetList[0].getData()[i]);
128128
}
129129
yScatterArray.sort(function(a, b){return a - b});
130-
130+
131131
this.data = [{
132132
x: xScatterArray,
133-
y: yScatterArray,
133+
y: yScatterArray,
134134
z: zScatterArray,
135135
mode: 'markers',
136136
marker: {
@@ -170,7 +170,7 @@ export default {
170170
showscale: false
171171
}];
172172
},
173-
}
173+
}
174174
}
175175
</script>
176176

@@ -179,4 +179,4 @@ export default {
179179
.gridplot-component {
180180
border-radius: calc(0.25rem - 1px);
181181
}
182-
</style>
182+
</style>

viplab-standalone-frontend-vue/src/components/viplab-plots/plot2d/plot2d.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
<script>
3535
import * as LinePlotParser from "./LinePlotParser.js";
3636
37-
import { Plotly } from "vue-plotly";
37+
import { Plotly } from "@rleys/vue-plotly-basic";
3838
3939
export default {
4040
name: "Plot2d",
@@ -204,4 +204,4 @@ div.btn-group > .btn {
204204
margin: 0 0 1px 1px;
205205
}
206206
207-
</style>
207+
</style>

viplab-standalone-frontend-vue/src/main.js

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ const routes = [
5353
]
5454

5555
const router = new VueRouter({
56-
routes
56+
routes
5757
})
5858

5959
import Vuex from 'vuex'
@@ -69,10 +69,10 @@ const store = new Vuex.Store({
6969
dataTemplate: "",
7070
ws: "",
7171
generatedComputationTemplate: {
72-
"identifier" : "",
73-
"version" : "3.0.0",
74-
"metadata": { "displayName" : "", "description": "" },
75-
"environment": "Container",
72+
"identifier" : "",
73+
"version" : "3.0.0",
74+
"metadata": { "displayName" : "", "description": "" },
75+
"environment": "Container",
7676
"configuration": {
7777
"running.timelimitInSeconds": 0,
7878
"running.commandLineArguments": "",
@@ -83,7 +83,7 @@ const store = new Vuex.Store({
8383
"resources.volume": "",
8484
"resources.memory": "64mb",
8585
"resources.numCPUs": 1
86-
},
86+
},
8787
"files": []
8888
},
8989
modifiedByTeacher: false,
@@ -127,4 +127,4 @@ fetch(process.env.BASE_URL + "static/config.json?/t=currentTimestamp")
127127
store: store,
128128
render: h => h(App)
129129
}).$mount('#app')
130-
})
130+
})

0 commit comments

Comments
 (0)