diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f5a29d7..8639110 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,5 +1,5 @@ before_script: - - export VERSION=1.0.1 + - export VERSION=1.1.0 - chmod +x packaging/build-package.sh packaging/package-upload.sh stages: diff --git a/package.json b/package.json index eee01e5..3675db5 100644 --- a/package.json +++ b/package.json @@ -10,10 +10,15 @@ "build": "node build/build.js" }, "dependencies": { - "bootstrap": "^4.0.0-beta.2", - "bootstrap-vue": "^1.3.0", + "@fortawesome/fontawesome": "^1.1.5", + "@fortawesome/fontawesome-free-regular": "^5.0.9", + "@fortawesome/fontawesome-free-solid": "^5.0.9", + "@fortawesome/vue-fontawesome": "0.0.22", + "bootstrap": "^4.0.0", + "bootstrap-vue": "^1.5.1", "event-emitter": "^0.3.5", "jquery": "^3.2.1", + "moment": "^2.22.0", "tiny-emitter": "^2.0.2", "util.inherits": "^1.0.3", "vue": "^2.4.2", @@ -39,18 +44,20 @@ "friendly-errors-webpack-plugin": "^1.1.3", "html-webpack-plugin": "^2.28.0", "http-proxy-middleware": "^0.17.3", - "webpack-bundle-analyzer": "^2.2.1", - "semver": "^5.3.0", - "shelljs": "^0.7.6", + "node-sass": "^4.8.3", "opn": "^5.1.0", "optimize-css-assets-webpack-plugin": "^2.0.0", "ora": "^1.2.0", "rimraf": "^2.6.0", + "sass-loader": "^6.0.7", + "semver": "^5.3.0", + "shelljs": "^0.7.6", "url-loader": "^0.5.8", "vue-loader": "^13.0.4", "vue-style-loader": "^3.0.1", "vue-template-compiler": "^2.4.2", - "webpack": "^2.6.1", + "webpack": "^2.7.0", + "webpack-bundle-analyzer": "^2.2.1", "webpack-dev-middleware": "^1.10.0", "webpack-hot-middleware": "^2.18.0", "webpack-merge": "^4.1.0" diff --git a/src/App.vue b/src/App.vue index c26c33c..47571e4 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,21 +1,23 @@ diff --git a/src/components/Job.vue b/src/components/Job.vue index ae90d1e..9b95ebf 100644 --- a/src/components/Job.vue +++ b/src/components/Job.vue @@ -1,19 +1,29 @@ @@ -28,8 +38,20 @@ return 'Ripping'; } else if (this.job.stage === 'transcode') { return 'Transcoding'; + } else if (this.job.stage === 'copy') { + return 'Copying'; } return 'Unknown: ' + this.job.stage; + }, + eta: function() { + if (this.job.eta == 0) { + return 'Unknown'; + } + + // Job is in nanoseconds because of Go's time.Duration + let eta = moment.duration(this.job.eta / 1000); + + return eta.humanize(); } } } diff --git a/src/components/Nav.vue b/src/components/Nav.vue new file mode 100644 index 0000000..cbf472b --- /dev/null +++ b/src/components/Nav.vue @@ -0,0 +1,21 @@ + + + diff --git a/src/components/Status.vue b/src/components/Status.vue index cc823dd..1c96b3e 100644 --- a/src/components/Status.vue +++ b/src/components/Status.vue @@ -1,9 +1,9 @@ diff --git a/src/components/status/CPUStatus.vue b/src/components/status/CPUStatus.vue index 1e4e2c1..12ebbaa 100644 --- a/src/components/status/CPUStatus.vue +++ b/src/components/status/CPUStatus.vue @@ -1,21 +1,38 @@ diff --git a/src/components/status/DiskStatus.vue b/src/components/status/DiskStatus.vue index 5883e9c..f5d5143 100644 --- a/src/components/status/DiskStatus.vue +++ b/src/components/status/DiskStatus.vue @@ -1,10 +1,22 @@ + diff --git a/src/components/status/MemoryStatus.vue b/src/components/status/MemoryStatus.vue index fd9a295..668d6ab 100644 --- a/src/components/status/MemoryStatus.vue +++ b/src/components/status/MemoryStatus.vue @@ -1,11 +1,15 @@