From 73dd738970bb51f68f29a99af597a8514a28336c Mon Sep 17 00:00:00 2001 From: Axel <1597611+axeloz@users.noreply.github.com> Date: Fri, 24 Dec 2021 09:53:53 +0100 Subject: [PATCH] Fixing loader --- public/js/app.js | 2 +- resources/views/app.vue | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/public/js/app.js b/public/js/app.js index c5f672c..d0de876 100644 --- a/public/js/app.js +++ b/public/js/app.js @@ -343,7 +343,7 @@ eval("\n\nvar bind = __webpack_require__(/*! ./helpers/bind */ \"./node_modules/ /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => { "use strict"; -eval("__webpack_require__.r(__webpack_exports__);\n/* harmony export */ __webpack_require__.d(__webpack_exports__, {\n/* harmony export */ \"default\": () => (__WEBPACK_DEFAULT_EXPORT__)\n/* harmony export */ });\n/* harmony import */ var _components_tasklist_vue__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./components/tasklist.vue */ \"./resources/views/components/tasklist.vue\");\n/* harmony import */ var _components_quickview_vue__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./components/quickview.vue */ \"./resources/views/components/quickview.vue\");\n//\n//\n//\n//\n//\n//\n//\n//\n//\n\n\n/* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = ({\n components: {\n QuickView: _components_quickview_vue__WEBPACK_IMPORTED_MODULE_1__[\"default\"],\n TaskList: _components_tasklist_vue__WEBPACK_IMPORTED_MODULE_0__[\"default\"]\n },\n data: function data() {\n return {\n refreshed_time: null,\n refresh: null,\n loading: true,\n color: '#FF0000',\n size: '10rem'\n };\n },\n computed: {\n refreshedTime: function refreshedTime() {\n return this.refreshed_time != null ? this.moment(this.refreshed_time).format('HH:mm:ss') : 'never';\n }\n },\n methods: {\n getTasks: function getTasks() {\n var _this = this;\n\n this.$http.get('/api/getTasks').then(function (response) {\n return _this.$store.commit('setTasks', response.data);\n }).then(function () {\n _this.refreshed_time = _this.moment();\n\n _this.loading.hide();\n })[\"catch\"](function (error) {\n return window.alert('Cannot get tasks');\n });\n this.refreshed_time = this.moment();\n }\n },\n beforeRouteLeave: function beforeRouteLeave(to, from, next) {\n clearTimeout(this.refresh);\n next();\n },\n mounted: function mounted() {\n var _this2 = this;\n\n this.loading = this.$loading.show();\n this.getTasks();\n this.refresh = window.setInterval(function () {\n _this2.getTasks();\n }, 10000);\n }\n});//# sourceURL=[module]\n//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiLi9ub2RlX21vZHVsZXMvYmFiZWwtbG9hZGVyL2xpYi9pbmRleC5qcz8/Y2xvbmVkUnVsZVNldC01WzBdLnJ1bGVzWzBdLnVzZVswXSEuL25vZGVfbW9kdWxlcy92dWUtbG9hZGVyL2xpYi9pbmRleC5qcz8/dnVlLWxvYWRlci1vcHRpb25zIS4vcmVzb3VyY2VzL3ZpZXdzL2FwcC52dWU/dnVlJnR5cGU9c2NyaXB0Jmxhbmc9anMmLmpzIiwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7OztBQVdBO0FBQ0E7QUFDQTtBQUNBO0FBQ0EsZ0ZBREE7QUFFQTtBQUZBLEdBREE7QUFLQTtBQUNBO0FBQ0EsMEJBREE7QUFFQSxtQkFGQTtBQUdBLG1CQUhBO0FBSUEsc0JBSkE7QUFLQTtBQUxBO0FBT0EsR0FiQTtBQWNBO0FBQ0E7QUFDQTtBQUNBO0FBSEEsR0FkQTtBQW1CQTtBQUNBO0FBQUE7O0FBQ0Esc0NBQ0EsSUFEQSxDQUNBO0FBQUE7QUFBQSxPQURBLEVBRUEsSUFGQSxDQUVBO0FBQ0E7O0FBQ0E7QUFDQSxPQUxBLFdBTUE7QUFBQTtBQUFBLE9BTkE7QUFPQTtBQUNBO0FBVkEsR0FuQkE7QUErQkEsa0JBL0JBLDRCQStCQSxFQS9CQSxFQStCQSxJQS9CQSxFQStCQSxJQS9CQSxFQStCQTtBQUNBO0FBQ0E7QUFDQSxHQWxDQTtBQW1DQTtBQUFBOztBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0EsS0FGQSxFQUVBLEtBRkE7QUFHQTtBQXpDQSIsInNvdXJjZXMiOlsid2VicGFjazovLy9yZXNvdXJjZXMvdmlld3MvYXBwLnZ1ZT9kNzRiIl0sInNvdXJjZXNDb250ZW50IjpbIjx0ZW1wbGF0ZT5cbiAgICA8ZGl2IGNsYXNzPVwiY29udGFpbmVyXCI+XG4gICAgICAgIDxoMT5Nb25pdG9MaXRlIERhc2hib2FyZDwvaDE+XG4gICAgICAgIDxwIGNsYXNzPVwicmVmcmVzaGVkLXRpbWVcIj5MYXN0IHJlZnJlc2g6IDxiciAvPjxzcGFuIGNsYXNzPVwiY2xvY2tcIj57eyByZWZyZXNoZWRUaW1lIH19PC9zcGFuPjwvcD5cbiAgICAgICAgPHF1aWNrLXZpZXc+PC9xdWljay12aWV3PlxuICAgICAgICA8dGFzay1saXN0PjwvdGFzay1saXN0PlxuICAgIDwvZGl2PlxuPC90ZW1wbGF0ZT5cblxuPHNjcmlwdD5cblxuICAgIGltcG9ydCBUYXNrTGlzdCBmcm9tICcuL2NvbXBvbmVudHMvdGFza2xpc3QudnVlJ1xuICAgIGltcG9ydCBRdWlja1ZpZXcgZnJvbSAnLi9jb21wb25lbnRzL3F1aWNrdmlldy52dWUnXG4gICAgZXhwb3J0IGRlZmF1bHR7XG4gICAgICAgIGNvbXBvbmVudHM6IHtcbiAgICAgICAgICAgIFF1aWNrVmlldyxcbiAgICAgICAgICAgIFRhc2tMaXN0LFxuICAgICAgICB9LFxuICAgICAgICBkYXRhOiBmdW5jdGlvbigpIHtcbiAgICAgICAgICAgIHJldHVybiB7XG4gICAgICAgICAgICAgICAgcmVmcmVzaGVkX3RpbWU6IG51bGwsXG4gICAgICAgICAgICAgICAgcmVmcmVzaDogbnVsbCxcbiAgICAgICAgICAgICAgICBsb2FkaW5nOiB0cnVlLFxuICAgICAgICAgICAgICAgIGNvbG9yOiAnI0ZGMDAwMCcsXG4gICAgICAgICAgICAgICAgc2l6ZTogJzEwcmVtJyxcbiAgICAgICAgICAgIH1cbiAgICAgICAgfSxcbiAgICAgICAgY29tcHV0ZWQ6IHtcbiAgICAgICAgICAgIHJlZnJlc2hlZFRpbWU6IGZ1bmN0aW9uKCkge1xuICAgICAgICAgICAgICAgIHJldHVybiB0aGlzLnJlZnJlc2hlZF90aW1lICE9IG51bGwgPyB0aGlzLm1vbWVudCh0aGlzLnJlZnJlc2hlZF90aW1lKS5mb3JtYXQoJ0hIOm1tOnNzJykgOiAnbmV2ZXInXG4gICAgICAgICAgICB9XG4gICAgICAgIH0sXG4gICAgICAgIG1ldGhvZHM6IHtcbiAgICAgICAgICAgIGdldFRhc2tzOiBmdW5jdGlvbigpIHtcbiAgICAgICAgICAgICAgICB0aGlzLiRodHRwLmdldCgnL2FwaS9nZXRUYXNrcycpXG4gICAgICAgICAgICAgICAgLnRoZW4ocmVzcG9uc2UgPT4gdGhpcy4kc3RvcmUuY29tbWl0KCdzZXRUYXNrcycsIHJlc3BvbnNlLmRhdGEpKVxuICAgICAgICAgICAgICAgIC50aGVuKCgpID0+IHtcbiAgICAgICAgICAgICAgICAgICAgdGhpcy5yZWZyZXNoZWRfdGltZSA9IHRoaXMubW9tZW50KCk7XG4gICAgICAgICAgICAgICAgICAgIHRoaXMubG9hZGluZy5oaWRlKClcbiAgICAgICAgICAgICAgICB9KVxuICAgICAgICAgICAgICAgIC5jYXRjaChlcnJvciA9PiB3aW5kb3cuYWxlcnQoJ0Nhbm5vdCBnZXQgdGFza3MnKSlcbiAgICAgICAgICAgICAgICB0aGlzLnJlZnJlc2hlZF90aW1lID0gdGhpcy5tb21lbnQoKTtcbiAgICAgICAgICAgIH1cbiAgICAgICAgfSxcbiAgICAgICAgYmVmb3JlUm91dGVMZWF2ZSh0bywgZnJvbSwgbmV4dCkge1xuICAgICAgICAgICAgY2xlYXJUaW1lb3V0KHRoaXMucmVmcmVzaCk7XG4gICAgICAgICAgICBuZXh0KCk7XG4gICAgICAgIH0sXG4gICAgICAgIG1vdW50ZWQ6IGZ1bmN0aW9uKCkge1xuICAgICAgICAgICAgdGhpcy5sb2FkaW5nID0gdGhpcy4kbG9hZGluZy5zaG93KClcbiAgICAgICAgICAgIHRoaXMuZ2V0VGFza3MoKVxuICAgICAgICAgICAgdGhpcy5yZWZyZXNoID0gd2luZG93LnNldEludGVydmFsKCgpID0+IHtcbiAgICAgICAgICAgICAgICB0aGlzLmdldFRhc2tzKCk7XG4gICAgICAgICAgICB9LCAxMDAwMClcbiAgICAgICAgfVxuICAgIH1cbjwvc2NyaXB0PlxuXG48c3R5bGUgc2NvcGVkPlxuXG48L3N0eWxlPiJdLCJuYW1lcyI6W10sInNvdXJjZVJvb3QiOiIifQ==\n//# sourceURL=webpack-internal:///./node_modules/babel-loader/lib/index.js??clonedRuleSet-5[0].rules[0].use[0]!./node_modules/vue-loader/lib/index.js??vue-loader-options!./resources/views/app.vue?vue&type=script&lang=js&\n"); +eval("__webpack_require__.r(__webpack_exports__);\n/* harmony export */ __webpack_require__.d(__webpack_exports__, {\n/* harmony export */ \"default\": () => (__WEBPACK_DEFAULT_EXPORT__)\n/* harmony export */ });\n/* harmony import */ var _components_tasklist_vue__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./components/tasklist.vue */ \"./resources/views/components/tasklist.vue\");\n/* harmony import */ var _components_quickview_vue__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./components/quickview.vue */ \"./resources/views/components/quickview.vue\");\n//\n//\n//\n//\n//\n//\n//\n//\n//\n\n\n/* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = ({\n components: {\n QuickView: _components_quickview_vue__WEBPACK_IMPORTED_MODULE_1__[\"default\"],\n TaskList: _components_tasklist_vue__WEBPACK_IMPORTED_MODULE_0__[\"default\"]\n },\n data: function data() {\n return {\n refreshed_time: null,\n refresh: null,\n loading: true,\n color: '#FF0000',\n size: '10rem'\n };\n },\n computed: {\n refreshedTime: function refreshedTime() {\n return this.refreshed_time != null ? this.moment(this.refreshed_time).format('HH:mm:ss') : 'never';\n }\n },\n methods: {\n getTasks: function getTasks() {\n var _this = this;\n\n this.$http.get('/api/getTasks').then(function (response) {\n return _this.$store.commit('setTasks', response.data);\n }).then(function () {\n _this.refreshed_time = _this.moment();\n\n _this.loading.hide();\n })[\"catch\"](function (error) {\n _this.loading.hide();\n\n clearTimeout(_this.refresh);\n window.alert('An error occurred when getting tasks. Automatic refresh has been disabled. You should fix and reload this page.');\n });\n this.refreshed_time = this.moment();\n }\n },\n beforeRouteLeave: function beforeRouteLeave(to, from, next) {\n clearTimeout(this.refresh);\n next();\n },\n mounted: function mounted() {\n var _this2 = this;\n\n this.loading = this.$loading.show();\n this.getTasks();\n this.refresh = window.setInterval(function () {\n _this2.getTasks();\n }, 60000);\n }\n});//# sourceURL=[module]\n//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiLi9ub2RlX21vZHVsZXMvYmFiZWwtbG9hZGVyL2xpYi9pbmRleC5qcz8/Y2xvbmVkUnVsZVNldC01WzBdLnJ1bGVzWzBdLnVzZVswXSEuL25vZGVfbW9kdWxlcy92dWUtbG9hZGVyL2xpYi9pbmRleC5qcz8/dnVlLWxvYWRlci1vcHRpb25zIS4vcmVzb3VyY2VzL3ZpZXdzL2FwcC52dWU/dnVlJnR5cGU9c2NyaXB0Jmxhbmc9anMmLmpzIiwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7OztBQVdBO0FBQ0E7QUFDQTtBQUNBO0FBQ0EsZ0ZBREE7QUFFQTtBQUZBLEdBREE7QUFLQTtBQUNBO0FBQ0EsMEJBREE7QUFFQSxtQkFGQTtBQUdBLG1CQUhBO0FBSUEsc0JBSkE7QUFLQTtBQUxBO0FBT0EsR0FiQTtBQWNBO0FBQ0E7QUFDQTtBQUNBO0FBSEEsR0FkQTtBQW1CQTtBQUNBO0FBQUE7O0FBQ0Esc0NBQ0EsSUFEQSxDQUNBO0FBQUE7QUFBQSxPQURBLEVBRUEsSUFGQSxDQUVBO0FBQ0E7O0FBQ0E7QUFDQSxPQUxBLFdBTUE7QUFDQTs7QUFDQTtBQUNBO0FBQ0EsT0FWQTtBQVdBO0FBQ0E7QUFkQSxHQW5CQTtBQW1DQSxrQkFuQ0EsNEJBbUNBLEVBbkNBLEVBbUNBLElBbkNBLEVBbUNBLElBbkNBLEVBbUNBO0FBQ0E7QUFDQTtBQUNBLEdBdENBO0FBdUNBO0FBQUE7O0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQSxLQUZBLEVBRUEsS0FGQTtBQUdBO0FBN0NBIiwic291cmNlcyI6WyJ3ZWJwYWNrOi8vL3Jlc291cmNlcy92aWV3cy9hcHAudnVlP2Q3NGIiXSwic291cmNlc0NvbnRlbnQiOlsiPHRlbXBsYXRlPlxuICAgIDxkaXYgY2xhc3M9XCJjb250YWluZXJcIj5cbiAgICAgICAgPGgxPk1vbml0b0xpdGUgRGFzaGJvYXJkPC9oMT5cbiAgICAgICAgPHAgY2xhc3M9XCJyZWZyZXNoZWQtdGltZVwiPkxhc3QgcmVmcmVzaDogPGJyIC8+PHNwYW4gY2xhc3M9XCJjbG9ja1wiPnt7IHJlZnJlc2hlZFRpbWUgfX08L3NwYW4+PC9wPlxuICAgICAgICA8cXVpY2stdmlldz48L3F1aWNrLXZpZXc+XG4gICAgICAgIDx0YXNrLWxpc3Q+PC90YXNrLWxpc3Q+XG4gICAgPC9kaXY+XG48L3RlbXBsYXRlPlxuXG48c2NyaXB0PlxuXG4gICAgaW1wb3J0IFRhc2tMaXN0IGZyb20gJy4vY29tcG9uZW50cy90YXNrbGlzdC52dWUnXG4gICAgaW1wb3J0IFF1aWNrVmlldyBmcm9tICcuL2NvbXBvbmVudHMvcXVpY2t2aWV3LnZ1ZSdcbiAgICBleHBvcnQgZGVmYXVsdHtcbiAgICAgICAgY29tcG9uZW50czoge1xuICAgICAgICAgICAgUXVpY2tWaWV3LFxuICAgICAgICAgICAgVGFza0xpc3QsXG4gICAgICAgIH0sXG4gICAgICAgIGRhdGE6IGZ1bmN0aW9uKCkge1xuICAgICAgICAgICAgcmV0dXJuIHtcbiAgICAgICAgICAgICAgICByZWZyZXNoZWRfdGltZTogbnVsbCxcbiAgICAgICAgICAgICAgICByZWZyZXNoOiBudWxsLFxuICAgICAgICAgICAgICAgIGxvYWRpbmc6IHRydWUsXG4gICAgICAgICAgICAgICAgY29sb3I6ICcjRkYwMDAwJyxcbiAgICAgICAgICAgICAgICBzaXplOiAnMTByZW0nLFxuICAgICAgICAgICAgfVxuICAgICAgICB9LFxuICAgICAgICBjb21wdXRlZDoge1xuICAgICAgICAgICAgcmVmcmVzaGVkVGltZTogZnVuY3Rpb24oKSB7XG4gICAgICAgICAgICAgICAgcmV0dXJuIHRoaXMucmVmcmVzaGVkX3RpbWUgIT0gbnVsbCA/IHRoaXMubW9tZW50KHRoaXMucmVmcmVzaGVkX3RpbWUpLmZvcm1hdCgnSEg6bW06c3MnKSA6ICduZXZlcidcbiAgICAgICAgICAgIH1cbiAgICAgICAgfSxcbiAgICAgICAgbWV0aG9kczoge1xuICAgICAgICAgICAgZ2V0VGFza3M6IGZ1bmN0aW9uKCkge1xuICAgICAgICAgICAgICAgIHRoaXMuJGh0dHAuZ2V0KCcvYXBpL2dldFRhc2tzJylcbiAgICAgICAgICAgICAgICAudGhlbihyZXNwb25zZSA9PiB0aGlzLiRzdG9yZS5jb21taXQoJ3NldFRhc2tzJywgcmVzcG9uc2UuZGF0YSkpXG4gICAgICAgICAgICAgICAgLnRoZW4oKCkgPT4ge1xuICAgICAgICAgICAgICAgICAgICB0aGlzLnJlZnJlc2hlZF90aW1lID0gdGhpcy5tb21lbnQoKTtcbiAgICAgICAgICAgICAgICAgICAgdGhpcy5sb2FkaW5nLmhpZGUoKVxuICAgICAgICAgICAgICAgIH0pXG4gICAgICAgICAgICAgICAgLmNhdGNoKGVycm9yID0+IHtcbiAgICAgICAgICAgICAgICAgICAgdGhpcy5sb2FkaW5nLmhpZGUoKVxuICAgICAgICAgICAgICAgICAgICBjbGVhclRpbWVvdXQodGhpcy5yZWZyZXNoKVxuICAgICAgICAgICAgICAgICAgICB3aW5kb3cuYWxlcnQoJ0FuIGVycm9yIG9jY3VycmVkIHdoZW4gZ2V0dGluZyB0YXNrcy4gQXV0b21hdGljIHJlZnJlc2ggaGFzIGJlZW4gZGlzYWJsZWQuIFlvdSBzaG91bGQgZml4IGFuZCByZWxvYWQgdGhpcyBwYWdlLicpXG4gICAgICAgICAgICAgICAgfSlcbiAgICAgICAgICAgICAgICB0aGlzLnJlZnJlc2hlZF90aW1lID0gdGhpcy5tb21lbnQoKTtcbiAgICAgICAgICAgIH1cbiAgICAgICAgfSxcbiAgICAgICAgYmVmb3JlUm91dGVMZWF2ZSh0bywgZnJvbSwgbmV4dCkge1xuICAgICAgICAgICAgY2xlYXJUaW1lb3V0KHRoaXMucmVmcmVzaClcbiAgICAgICAgICAgIG5leHQoKTtcbiAgICAgICAgfSxcbiAgICAgICAgbW91bnRlZDogZnVuY3Rpb24oKSB7XG4gICAgICAgICAgICB0aGlzLmxvYWRpbmcgPSB0aGlzLiRsb2FkaW5nLnNob3coKVxuICAgICAgICAgICAgdGhpcy5nZXRUYXNrcygpXG4gICAgICAgICAgICB0aGlzLnJlZnJlc2ggPSB3aW5kb3cuc2V0SW50ZXJ2YWwoKCkgPT4ge1xuICAgICAgICAgICAgICAgIHRoaXMuZ2V0VGFza3MoKTtcbiAgICAgICAgICAgIH0sIDYwMDAwKVxuICAgICAgICB9XG4gICAgfVxuPC9zY3JpcHQ+XG5cbjxzdHlsZSBzY29wZWQ+XG5cbjwvc3R5bGU+Il0sIm5hbWVzIjpbXSwic291cmNlUm9vdCI6IiJ9\n//# sourceURL=webpack-internal:///./node_modules/babel-loader/lib/index.js??clonedRuleSet-5[0].rules[0].use[0]!./node_modules/vue-loader/lib/index.js??vue-loader-options!./resources/views/app.vue?vue&type=script&lang=js&\n"); /***/ }), diff --git a/resources/views/app.vue b/resources/views/app.vue index b4fbac5..79abb42 100644 --- a/resources/views/app.vue +++ b/resources/views/app.vue @@ -38,12 +38,16 @@ this.refreshed_time = this.moment(); this.loading.hide() }) - .catch(error => window.alert('Cannot get tasks')) + .catch(error => { + this.loading.hide() + clearTimeout(this.refresh) + window.alert('An error occurred when getting tasks. Automatic refresh has been disabled. You should fix and reload this page.') + }) this.refreshed_time = this.moment(); } }, beforeRouteLeave(to, from, next) { - clearTimeout(this.refresh); + clearTimeout(this.refresh) next(); }, mounted: function() { @@ -51,7 +55,7 @@ this.getTasks() this.refresh = window.setInterval(() => { this.getTasks(); - }, 10000) + }, 60000) } }