refactoring

This commit is contained in:
Čarodej
2022-05-24 10:01:07 +02:00
parent f75c20e5a7
commit 36c5e51b4f
9 changed files with 218 additions and 219 deletions

View File

@@ -62,6 +62,6 @@ return [
], ],
'paginate' => [ 'paginate' => [
'perPage' => 15, 'perPage' => 8,
], ],
]; ];

188
package-lock.json generated
View File

@@ -1231,9 +1231,9 @@
} }
}, },
"@stripe/stripe-js": { "@stripe/stripe-js": {
"version": "1.24.0", "version": "1.29.0",
"resolved": "https://registry.npmjs.org/@stripe/stripe-js/-/stripe-js-1.24.0.tgz", "resolved": "https://registry.npmjs.org/@stripe/stripe-js/-/stripe-js-1.29.0.tgz",
"integrity": "sha512-8CEILOpzoRhGwvgcf6y+BlPyEq1ZqxAv3gsX7LvokFYvbcyH72GRcHQMGXuZS3s7HqfYQuTSFrvZNL/qdkgA9Q==" "integrity": "sha512-OsUxk0VLlum8E2d6onlEdKuQcvLMs7qTrOXCnl/BGV3fAm65qr6h3e1IZ5AX4lgUlPRrzRcddSOA5DvkKKYLvg=="
}, },
"@trysound/sax": { "@trysound/sax": {
"version": "0.2.0", "version": "0.2.0",
@@ -2088,17 +2088,50 @@
"dev": true "dev": true
}, },
"autoprefixer": { "autoprefixer": {
"version": "10.4.2", "version": "10.4.7",
"resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.2.tgz", "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.7.tgz",
"integrity": "sha512-9fOPpHKuDW1w/0EKfRmVnxTDt8166MAnLI3mgZ1JCnhNtYWxcJ6Ud5CO/AVOZi/AvFa8DY9RTy3h3+tFBlrrdQ==", "integrity": "sha512-ypHju4Y2Oav95SipEcCcI5J7CGPuvz8oat7sUtYj3ClK44bldfvtvcxK6IEK++7rqB7YchDGzweZIBG+SD0ZAA==",
"dev": true, "dev": true,
"requires": { "requires": {
"browserslist": "^4.19.1", "browserslist": "^4.20.3",
"caniuse-lite": "^1.0.30001297", "caniuse-lite": "^1.0.30001335",
"fraction.js": "^4.1.2", "fraction.js": "^4.2.0",
"normalize-range": "^0.1.2", "normalize-range": "^0.1.2",
"picocolors": "^1.0.0", "picocolors": "^1.0.0",
"postcss-value-parser": "^4.2.0" "postcss-value-parser": "^4.2.0"
},
"dependencies": {
"browserslist": {
"version": "4.20.3",
"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.20.3.tgz",
"integrity": "sha512-NBhymBQl1zM0Y5dQT/O+xiLP9/rzOIQdKM/eMJBAq7yBgaB6krIYLGejrwVYnSHZdqjscB1SPuAjHwxjvN6Wdg==",
"dev": true,
"requires": {
"caniuse-lite": "^1.0.30001332",
"electron-to-chromium": "^1.4.118",
"escalade": "^3.1.1",
"node-releases": "^2.0.3",
"picocolors": "^1.0.0"
}
},
"caniuse-lite": {
"version": "1.0.30001342",
"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001342.tgz",
"integrity": "sha512-bn6sOCu7L7jcbBbyNhLg0qzXdJ/PMbybZTH/BA6Roet9wxYRm6Tr9D0s0uhLkOZ6MSG+QU6txUgdpr3MXIVqjA==",
"dev": true
},
"electron-to-chromium": {
"version": "1.4.137",
"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.137.tgz",
"integrity": "sha512-0Rcpald12O11BUogJagX3HsCN3FE83DSqWjgXoHo5a72KUKMSfI39XBgJpgNNxS9fuGzytaFjE06kZkiVFy2qA==",
"dev": true
},
"node-releases": {
"version": "2.0.4",
"resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.4.tgz",
"integrity": "sha512-gbMzqQtTtDz/00jQzZ21PQzdI9PyLYqUSvD0p3naOhX4odFji0ZxYdnVwPTxmSwkmxhcFImpozceidSG+AgoPQ==",
"dev": true
}
} }
}, },
"aws-sign2": { "aws-sign2": {
@@ -4159,9 +4192,9 @@
"dev": true "dev": true
}, },
"fraction.js": { "fraction.js": {
"version": "4.1.2", "version": "4.2.0",
"resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.1.2.tgz", "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.2.0.tgz",
"integrity": "sha512-o2RiJQ6DZaR/5+Si0qJUIy637QMRudSi9kU/FFzx9EZazrIdnBgpU+3sEWCxAVhH2RtxW2Oz+T4p2o8uOPVcgA==", "integrity": "sha512-MhLuK+2gUcnZe8ZHlaaINnQLl0xRIGRfcGk2yl8xoQAfHrSsL3rYu6FCmBdkdbhc9EPlwyGHewaRsvwRMJtAlA==",
"dev": true "dev": true
}, },
"fresh": { "fresh": {
@@ -4761,9 +4794,9 @@
} }
}, },
"immutable": { "immutable": {
"version": "4.0.0", "version": "4.1.0",
"resolved": "https://registry.npmjs.org/immutable/-/immutable-4.0.0.tgz", "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.1.0.tgz",
"integrity": "sha512-zIE9hX70qew5qTUjSS7wi1iwj/l7+m54KWU247nhM3v806UdGj1yDndXj+IOYxxtW9zyLI+xqFNZjTuDaLUqFw==", "integrity": "sha512-oNkuqVTA8jqG1Q6c+UglTOD1xhC1BtjKI7XkCXRkZHrN5m18/XsnUp8Q89GkQO/z+0WjonSvl0FLhDYftp46nQ==",
"dev": true "dev": true
}, },
"import-fresh": { "import-fresh": {
@@ -5252,9 +5285,9 @@
"dev": true "dev": true
}, },
"laravel-echo": { "laravel-echo": {
"version": "1.11.3", "version": "1.11.7",
"resolved": "https://registry.npmjs.org/laravel-echo/-/laravel-echo-1.11.3.tgz", "resolved": "https://registry.npmjs.org/laravel-echo/-/laravel-echo-1.11.7.tgz",
"integrity": "sha512-VNTnnoF8gK29ovxslnrFDt3xgrKiKKW1kTnKKO1A4kYVj4UCKmNO4x2ehRlfg2UTrG/oggwk95p+S9ftQYjXdw==", "integrity": "sha512-LhEZp/RbdtdMlhptJyn452+aXfz+A1UW2bhJM7NROgXhnNgj+6P9BkG9JcPCBMernp5TGkOGI6A0NPbkAWYWGg==",
"dev": true "dev": true
}, },
"laravel-mix": { "laravel-mix": {
@@ -5980,9 +6013,9 @@
"integrity": "sha512-8ZtvEnA2c5aYCZYd1cvgdnU6cqwixRoYg70xPLWUws5ORTa/lnw+u4amixRS/Ac5U5mQVgp9pnlSUnbNWFaWZQ==" "integrity": "sha512-8ZtvEnA2c5aYCZYd1cvgdnU6cqwixRoYg70xPLWUws5ORTa/lnw+u4amixRS/Ac5U5mQVgp9pnlSUnbNWFaWZQ=="
}, },
"nanoid": { "nanoid": {
"version": "3.3.1", "version": "3.3.4",
"resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.1.tgz", "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz",
"integrity": "sha512-n6Vs/3KGyxPQd6uO0eH4Bv0ojGSUvuLlIHtC3Y0kEO23YRge8H9x1GCzLn28YX0H66pMkxuaeESFq4tKISKwdw==", "integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==",
"dev": true "dev": true
}, },
"negotiator": { "negotiator": {
@@ -6259,9 +6292,9 @@
"integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=" "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
}, },
"object-hash": { "object-hash": {
"version": "2.2.0", "version": "3.0.0",
"resolved": "https://registry.npmjs.org/object-hash/-/object-hash-2.2.0.tgz", "resolved": "https://registry.npmjs.org/object-hash/-/object-hash-3.0.0.tgz",
"integrity": "sha512-gScRMn0bS5fH+IuwyIFgnh9zBdo4DV+6GhygmWM9HyNJSgS0hScp1f5vjtm7oIIOiT9trXrShAkLFSc2IqKNgw==", "integrity": "sha512-RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw==",
"dev": true "dev": true
}, },
"object-is": { "object-is": {
@@ -6657,12 +6690,12 @@
} }
}, },
"postcss": { "postcss": {
"version": "8.4.8", "version": "8.4.14",
"resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.8.tgz", "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.14.tgz",
"integrity": "sha512-2tXEqGxrjvAO6U+CJzDL2Fk2kPHTv1jQsYkSoMeOis2SsYaXRO2COxTdQp99cYvif9JTXaAk9lYGc3VhJt7JPQ==", "integrity": "sha512-E398TUmfAYFPBSdzgeieK2Y1+1cpdxJx8yXbK/m57nRhKSmk1GB2tO4lbLBtlkfPQTDKfe4Xqv1ASWPpayPEig==",
"dev": true, "dev": true,
"requires": { "requires": {
"nanoid": "^3.3.1", "nanoid": "^3.3.4",
"picocolors": "^1.0.0", "picocolors": "^1.0.0",
"source-map-js": "^1.0.2" "source-map-js": "^1.0.2"
} }
@@ -7047,9 +7080,9 @@
} }
}, },
"prettier-plugin-tailwindcss": { "prettier-plugin-tailwindcss": {
"version": "0.1.8", "version": "0.1.11",
"resolved": "https://registry.npmjs.org/prettier-plugin-tailwindcss/-/prettier-plugin-tailwindcss-0.1.8.tgz", "resolved": "https://registry.npmjs.org/prettier-plugin-tailwindcss/-/prettier-plugin-tailwindcss-0.1.11.tgz",
"integrity": "sha512-hwarSBCswAXa+kqYtaAkFr3Vop9o04WOyZs0qo3NyvW8L7f1rif61wRyq0+ArmVThOuRBcJF5hjGXYk86cwemg==", "integrity": "sha512-a28+1jvpIZQdZ/W97wOXb6VqI762MKE/TxMMuibMEHhyYsSxQA8Ek30KObd5kJI2HF1ldtSYprFayXJXi3pz8Q==",
"dev": true "dev": true
}, },
"pretty-time": { "pretty-time": {
@@ -7586,9 +7619,9 @@
"integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
}, },
"sass": { "sass": {
"version": "1.49.9", "version": "1.52.1",
"resolved": "https://registry.npmjs.org/sass/-/sass-1.49.9.tgz", "resolved": "https://registry.npmjs.org/sass/-/sass-1.52.1.tgz",
"integrity": "sha512-YlYWkkHP9fbwaFRZQRXgDi3mXZShslVmmo+FVK3kHLUELHHEYrCmL1x6IUjC7wLS6VuJSAFXRQS/DxdsC4xL1A==", "integrity": "sha512-fSzYTbr7z8oQnVJ3Acp9hV80dM1fkMN7mSD/25mpcct9F7FPBMOI8krEYALgU1aZoqGhQNhTPsuSmxjnIvAm4Q==",
"dev": true, "dev": true,
"requires": { "requires": {
"chokidar": ">=3.0.0 <4.0.0", "chokidar": ">=3.0.0 <4.0.0",
@@ -8197,62 +8230,34 @@
"integrity": "sha512-X324n9OtpTmOMqEgDUEA/RgLrNfBF/jwJdctaPZDzB3mppxJk7TLIDmOreEDm1Bq4R9LSPu4Epf8VSdovNU+iA==" "integrity": "sha512-X324n9OtpTmOMqEgDUEA/RgLrNfBF/jwJdctaPZDzB3mppxJk7TLIDmOreEDm1Bq4R9LSPu4Epf8VSdovNU+iA=="
}, },
"tailwindcss": { "tailwindcss": {
"version": "3.0.23", "version": "3.0.24",
"resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.0.23.tgz", "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.0.24.tgz",
"integrity": "sha512-+OZOV9ubyQ6oI2BXEhzw4HrqvgcARY38xv3zKcjnWtMIZstEsXdI9xftd1iB7+RbOnj2HOEzkA0OyB5BaSxPQA==", "integrity": "sha512-H3uMmZNWzG6aqmg9q07ZIRNIawoiEcNFKDfL+YzOPuPsXuDXxJxB9icqzLgdzKNwjG3SAro2h9SYav8ewXNgig==",
"dev": true, "dev": true,
"requires": { "requires": {
"arg": "^5.0.1", "arg": "^5.0.1",
"chalk": "^4.1.2",
"chokidar": "^3.5.3", "chokidar": "^3.5.3",
"color-name": "^1.1.4", "color-name": "^1.1.4",
"cosmiconfig": "^7.0.1",
"detective": "^5.2.0", "detective": "^5.2.0",
"didyoumean": "^1.2.2", "didyoumean": "^1.2.2",
"dlv": "^1.1.3", "dlv": "^1.1.3",
"fast-glob": "^3.2.11", "fast-glob": "^3.2.11",
"glob-parent": "^6.0.2", "glob-parent": "^6.0.2",
"is-glob": "^4.0.3", "is-glob": "^4.0.3",
"lilconfig": "^2.0.5",
"normalize-path": "^3.0.0", "normalize-path": "^3.0.0",
"object-hash": "^2.2.0", "object-hash": "^3.0.0",
"postcss": "^8.4.6", "picocolors": "^1.0.0",
"postcss": "^8.4.12",
"postcss-js": "^4.0.0", "postcss-js": "^4.0.0",
"postcss-load-config": "^3.1.0", "postcss-load-config": "^3.1.4",
"postcss-nested": "5.0.6", "postcss-nested": "5.0.6",
"postcss-selector-parser": "^6.0.9", "postcss-selector-parser": "^6.0.10",
"postcss-value-parser": "^4.2.0", "postcss-value-parser": "^4.2.0",
"quick-lru": "^5.1.1", "quick-lru": "^5.1.1",
"resolve": "^1.22.0" "resolve": "^1.22.0"
}, },
"dependencies": { "dependencies": {
"ansi-styles": {
"version": "4.3.0",
"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
"dev": true,
"requires": {
"color-convert": "^2.0.1"
}
},
"chalk": {
"version": "4.1.2",
"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
"dev": true,
"requires": {
"ansi-styles": "^4.1.0",
"supports-color": "^7.1.0"
}
},
"color-convert": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
"dev": true,
"requires": {
"color-name": "~1.1.4"
}
},
"color-name": { "color-name": {
"version": "1.1.4", "version": "1.1.4",
"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
@@ -8268,19 +8273,30 @@
"is-glob": "^4.0.3" "is-glob": "^4.0.3"
} }
}, },
"has-flag": { "lilconfig": {
"version": "4.0.0", "version": "2.0.5",
"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-2.0.5.tgz",
"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", "integrity": "sha512-xaYmXZtTHPAw5m+xLN8ab9C+3a8YmV3asNSPOATITbtwrfbwaLJj8h66H1WMIpALCkqsIzK3h7oQ+PdX+LQ9Eg==",
"dev": true "dev": true
}, },
"supports-color": { "postcss-load-config": {
"version": "7.2.0", "version": "3.1.4",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-3.1.4.tgz",
"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", "integrity": "sha512-6DiM4E7v4coTE4uzA8U//WhtPwyhiim3eyjEMFCnUpzbrkK9wJHgKDT2mR+HbtSrd/NubVaYTOpSpjUl8NQeRg==",
"dev": true, "dev": true,
"requires": { "requires": {
"has-flag": "^4.0.0" "lilconfig": "^2.0.5",
"yaml": "^1.10.2"
}
},
"postcss-selector-parser": {
"version": "6.0.10",
"resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.10.tgz",
"integrity": "sha512-IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w==",
"dev": true,
"requires": {
"cssesc": "^3.0.0",
"util-deprecate": "^1.0.2"
} }
} }
} }
@@ -8597,9 +8613,9 @@
"integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==" "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A=="
}, },
"v-click-outside": { "v-click-outside": {
"version": "3.1.2", "version": "3.2.0",
"resolved": "https://registry.npmjs.org/v-click-outside/-/v-click-outside-3.1.2.tgz", "resolved": "https://registry.npmjs.org/v-click-outside/-/v-click-outside-3.2.0.tgz",
"integrity": "sha512-gMdRqfRE6m6XU6SiFi3dyBlFB2MWogiXpof8Aa3LQysrl9pzTndqp/iEaAphLoadaQUFnQ0ec6fLLaxr7LiY6A==" "integrity": "sha512-QD0bDy38SHJXQBjgnllmkI/rbdiwmq9RC+/+pvrFjYJKTn8dtp7Penf9q1lLBta280fYG2q53mgLhQ+3l3z74w=="
}, },
"validate-npm-package-license": { "validate-npm-package-license": {
"version": "3.0.4", "version": "3.0.4",
@@ -8695,9 +8711,9 @@
"integrity": "sha512-W+y2EAI/BxS4Vlcca9scQv8ifeBFck56DRtSwWJ2H4Cw1GLNUYxiZxUHHkuzuI5JPW/cYtL1bPO5xPyEXx4LmQ==" "integrity": "sha512-W+y2EAI/BxS4Vlcca9scQv8ifeBFck56DRtSwWJ2H4Cw1GLNUYxiZxUHHkuzuI5JPW/cYtL1bPO5xPyEXx4LmQ=="
}, },
"vue-router": { "vue-router": {
"version": "3.5.3", "version": "3.5.4",
"resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.5.3.tgz", "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.5.4.tgz",
"integrity": "sha512-FUlILrW3DGitS2h+Xaw8aRNvGTwtuaxrRkNSHWTizOfLUie7wuYwezeZ50iflRn8YPV5kxmU2LQuu3nM/b3Zsg==" "integrity": "sha512-x+/DLAJZv2mcQ7glH2oV9ze8uPwcI+H+GgTgTmb5I55bCgY3+vXWIsqbYUzbBSZnwFHEJku4eoaH/x98veyymQ=="
}, },
"vue-style-loader": { "vue-style-loader": {
"version": "4.1.3", "version": "4.1.3",

View File

@@ -10,39 +10,39 @@
"production": "mix --production" "production": "mix --production"
}, },
"devDependencies": { "devDependencies": {
"autoprefixer": "^10.4.2", "autoprefixer": "^10.4.7",
"axios": "^0.21.4", "axios": "^0.21.4",
"cross-env": "^5.1", "cross-env": "^5.1",
"laravel-echo": "^1.11.3", "laravel-echo": "^1.11.7",
"laravel-mix": "^6.0.43", "laravel-mix": "^6.0.43",
"postcss": "^8.4.8", "postcss": "^8.4.14",
"prettier": "^2.5.1", "prettier": "^2.5.1",
"prettier-plugin-import-sort": "0.0.7", "prettier-plugin-import-sort": "0.0.7",
"prettier-plugin-tailwindcss": "^0.1.8", "prettier-plugin-tailwindcss": "^0.1.11",
"pusher-js": "^7.0.6", "pusher-js": "^7.0.6",
"resolve-url-loader": "^2.3.1", "resolve-url-loader": "^2.3.1",
"sass": "^1.49.9", "sass": "^1.52.1",
"sass-loader": "^8.0.2", "sass-loader": "^8.0.2",
"tailwindcss": "^3.0.23", "tailwindcss": "^3.0.24",
"tailwindcss-debug-screens": "^2.2.1", "tailwindcss-debug-screens": "^2.2.1",
"vue-loader": "^15.9.8", "vue-loader": "^15.9.8",
"vue-template-compiler": "^2.6.14" "vue-template-compiler": "^2.6.14"
}, },
"dependencies": { "dependencies": {
"@paypal/paypal-js": "^4.2.2", "@paypal/paypal-js": "^4.2.2",
"@stripe/stripe-js": "^1.24.0", "@stripe/stripe-js": "^1.29.0",
"lodash": "^4.17.21", "lodash": "^4.17.21",
"node-sass": "^4.14.1", "node-sass": "^4.14.1",
"pdfvuer": "^1.9.2", "pdfvuer": "^1.9.2",
"tailwind-scrollbar-hide": "^1.1.7", "tailwind-scrollbar-hide": "^1.1.7",
"twemoji": "^13.1.0", "twemoji": "^13.1.0",
"v-click-outside": "^3.1.2", "v-click-outside": "^3.2.0",
"vee-validate": "^3.4.14", "vee-validate": "^3.4.14",
"vue": "^2.6.14", "vue": "^2.6.14",
"vue-feather-icons": "^5.1.0", "vue-feather-icons": "^5.1.0",
"vue-i18n": "^8.27.0", "vue-i18n": "^8.27.0",
"vue-recaptcha-v3": "^1.9.0", "vue-recaptcha-v3": "^1.9.0",
"vue-router": "^3.5.3", "vue-router": "^3.5.4",
"vuex": "^3.6.2" "vuex": "^3.6.2"
} }
} }

View File

@@ -1,75 +1,75 @@
{ {
"/js/main.js": "/js/main.js", "/js/main.js": "/js/main.js",
"/chunks/request.js": "/chunks/request.js?id=e12cca6ff4d753a0", "/chunks/request.js": "/chunks/request.js?id=4dae0cd347eacccf",
"/chunks/request-upload.js": "/chunks/request-upload.js?id=6f7ff06d99abc1db", "/chunks/request-upload.js": "/chunks/request-upload.js?id=37b9e11f7f085164",
"/chunks/setup-wizard.js": "/chunks/setup-wizard.js?id=e8b9ac5e5a0854bf", "/chunks/setup-wizard.js": "/chunks/setup-wizard.js?id=19a0784e59d768ec",
"/chunks/status-check.js": "/chunks/status-check.js?id=4c7482ca1bc4806d", "/chunks/status-check.js": "/chunks/status-check.js?id=ca27b637120e086a",
"/chunks/purchase-code.js": "/chunks/purchase-code.js?id=95910a6098545b18", "/chunks/purchase-code.js": "/chunks/purchase-code.js?id=df5bd89528649783",
"/chunks/database.js": "/chunks/database.js?id=f075fa5bd4011705", "/chunks/database.js": "/chunks/database.js?id=6bd9994bd24d6c8d",
"/chunks/environment-setup.js": "/chunks/environment-setup.js?id=6a2f88cf2e1c8c42", "/chunks/environment-setup.js": "/chunks/environment-setup.js?id=fc9b6215ce43229b",
"/chunks/app-setup.js": "/chunks/app-setup.js?id=fac96a371fa057a9", "/chunks/app-setup.js": "/chunks/app-setup.js?id=77937d105dfa28ba",
"/chunks/admin-account.js": "/chunks/admin-account.js?id=f207f8887394310d", "/chunks/admin-account.js": "/chunks/admin-account.js?id=6dbc3fe81f957a59",
"/chunks/shared.js": "/chunks/shared.js?id=cdfbac570212aaba", "/chunks/shared.js": "/chunks/shared.js?id=811ed03bd8ff236a",
"/chunks/shared/browser.js": "/chunks/shared/browser.js?id=82de4b533b350338", "/chunks/shared/browser.js": "/chunks/shared/browser.js?id=ae81a41ecf6222f9",
"/chunks/shared/single-file.js": "/chunks/shared/single-file.js?id=fda3ee1897218fb4", "/chunks/shared/single-file.js": "/chunks/shared/single-file.js?id=9ccb8bb19b95a23f",
"/chunks/shared/authenticate.js": "/chunks/shared/authenticate.js?id=a68c497e91a6fadb", "/chunks/shared/authenticate.js": "/chunks/shared/authenticate.js?id=672e931a9fb0b672",
"/chunks/not-found.js": "/chunks/not-found.js?id=cbcb2fcb42696af3", "/chunks/not-found.js": "/chunks/not-found.js?id=9f6ce23ce5d969f1",
"/chunks/temporary-unavailable.js": "/chunks/temporary-unavailable.js?id=8b78c188c3ef58cc", "/chunks/temporary-unavailable.js": "/chunks/temporary-unavailable.js?id=f564565faa09d6d6",
"/chunks/admin.js": "/chunks/admin.js?id=23b353c5fba8f97b", "/chunks/admin.js": "/chunks/admin.js?id=c48facc21639ee2c",
"/chunks/dashboard.js": "/chunks/dashboard.js?id=c265489f6698ba44", "/chunks/dashboard.js": "/chunks/dashboard.js?id=c7fa2f0dc8ed949c",
"/chunks/invoices.js": "/chunks/invoices.js?id=4888dcbcb1371d33", "/chunks/invoices.js": "/chunks/invoices.js?id=1416cbf6d1a593ac",
"/chunks/subscriptions.js": "/chunks/subscriptions.js?id=c754f2735eefc4c9", "/chunks/subscriptions.js": "/chunks/subscriptions.js?id=5bf6704f5b599f36",
"/chunks/pages.js": "/chunks/pages.js?id=d7fa7d4e7183174e", "/chunks/pages.js": "/chunks/pages.js?id=c8380d571e91e8be",
"/chunks/page-edit.js": "/chunks/page-edit.js?id=3bd81e19fcce81aa", "/chunks/page-edit.js": "/chunks/page-edit.js?id=b19868b3100360a3",
"/chunks/plans.js": "/chunks/plans.js?id=d69f27e0eef6cd1a", "/chunks/plans.js": "/chunks/plans.js?id=c8506e0e20966ef7",
"/chunks/users.js": "/chunks/users.js?id=89c6cffd734c97b0", "/chunks/users.js": "/chunks/users.js?id=ec687ee365c4248a",
"/chunks/user-create.js": "/chunks/user-create.js?id=200db7025d533298", "/chunks/user-create.js": "/chunks/user-create.js?id=bb3b30ce248209f0",
"/chunks/plan-create/fixed.js": "/chunks/plan-create/fixed.js?id=9d40af67b3f3eb25", "/chunks/plan-create/fixed.js": "/chunks/plan-create/fixed.js?id=a8ffa08ce94ddf4e",
"/chunks/plan-create/metered.js": "/chunks/plan-create/metered.js?id=47674b7d5dd105e6", "/chunks/plan-create/metered.js": "/chunks/plan-create/metered.js?id=3b516dcccbbef20a",
"/chunks/user.js": "/chunks/user.js?id=b9b5caf4720670e9", "/chunks/user.js": "/chunks/user.js?id=c191b906a0496fe5",
"/chunks/user-detail.js": "/chunks/user-detail.js?id=ae8139dee6bc9148", "/chunks/user-detail.js": "/chunks/user-detail.js?id=80491654e6ee63b1",
"/chunks/user-storage.js": "/chunks/user-storage.js?id=415f9f91492ec6eb", "/chunks/user-storage.js": "/chunks/user-storage.js?id=69eb59b682c5482f",
"/chunks/user-subscription.js": "/chunks/user-subscription.js?id=2e485797f12f64c8", "/chunks/user-subscription.js": "/chunks/user-subscription.js?id=a69ebc3b23446cda",
"/chunks/user-password.js": "/chunks/user-password.js?id=30e1861f3b9f4e2b", "/chunks/user-password.js": "/chunks/user-password.js?id=e1c4ebc07ba426e6",
"/chunks/user-delete.js": "/chunks/user-delete.js?id=61995898ac991620", "/chunks/user-delete.js": "/chunks/user-delete.js?id=82b5180a1d9e1217",
"/chunks/plan.js": "/chunks/plan.js?id=d8cdd722694b202d", "/chunks/plan.js": "/chunks/plan.js?id=4b267375ea9f19b3",
"/chunks/plan-subscribers.js": "/chunks/plan-subscribers.js?id=a264bff3e18fbb1c", "/chunks/plan-subscribers.js": "/chunks/plan-subscribers.js?id=a956ceca6865c50c",
"/chunks/plan-settings.js": "/chunks/plan-settings.js?id=aaaf30d34d941711", "/chunks/plan-settings.js": "/chunks/plan-settings.js?id=f366690f8764bb20",
"/chunks/plan-delete.js": "/chunks/plan-delete.js?id=385d94cbf75154cd", "/chunks/plan-delete.js": "/chunks/plan-delete.js?id=e26d5bd3ecbb4bb1",
"/chunks/payments.js": "/chunks/payments.js?id=26aa71dcfe9109fb", "/chunks/payments.js": "/chunks/payments.js?id=dc4586691c25de6f",
"/chunks/payments/billings.js": "/chunks/payments/billings.js?id=c2edc02c0261af92", "/chunks/payments/billings.js": "/chunks/payments/billings.js?id=9942aaac1bdb11e5",
"/chunks/payments/settings.js": "/chunks/payments/settings.js?id=72383895b3bfb5a4", "/chunks/payments/settings.js": "/chunks/payments/settings.js?id=717bf97ba2ffdc28",
"/chunks/app-settings.js": "/chunks/app-settings.js?id=a6b8202457054e7c", "/chunks/app-settings.js": "/chunks/app-settings.js?id=55da23af2b076069",
"/chunks/app-appearance.js": "/chunks/app-appearance.js?id=8a139759c507aab3", "/chunks/app-appearance.js": "/chunks/app-appearance.js?id=c308941663208358",
"/chunks/app-index.js": "/chunks/app-index.js?id=0237d25f5fec22f8", "/chunks/app-index.js": "/chunks/app-index.js?id=aa62aedf1f38cc22",
"/chunks/app-environment.js": "/chunks/app-environment.js?id=5cdd3a4a5276b300", "/chunks/app-environment.js": "/chunks/app-environment.js?id=538eea914fc27794",
"/chunks/app-others.js": "/chunks/app-others.js?id=8c9ef45b8163b98e", "/chunks/app-others.js": "/chunks/app-others.js?id=3282fb7a70e8e02e",
"/chunks/app-sign-in-out.js": "/chunks/app-sign-in-out.js?id=bdd9ab8b100e63e9", "/chunks/app-sign-in-out.js": "/chunks/app-sign-in-out.js?id=3f8e5f906a4dee4e",
"/chunks/app-adsense.js": "/chunks/app-adsense.js?id=916521e9750df132", "/chunks/app-adsense.js": "/chunks/app-adsense.js?id=4ee8de4ac0dae19e",
"/chunks/app-server.js": "/chunks/app-server.js?id=daa05ca55f05276e", "/chunks/app-server.js": "/chunks/app-server.js?id=dd8c15d4646053cd",
"/chunks/app-language.js": "/chunks/app-language.js?id=3dc649491be91954", "/chunks/app-language.js": "/chunks/app-language.js?id=ba087a47c8efca29",
"/chunks/homepage.js": "/chunks/homepage.js?id=8d839489cb2670b7", "/chunks/homepage.js": "/chunks/homepage.js?id=f1cfba4f0152f4b9",
"/chunks/dynamic-page.js": "/chunks/dynamic-page.js?id=0b84c5e06b3f1202", "/chunks/dynamic-page.js": "/chunks/dynamic-page.js?id=2504793131107b1f",
"/chunks/contact-us.js": "/chunks/contact-us.js?id=c2f9beea77a7109b", "/chunks/contact-us.js": "/chunks/contact-us.js?id=2e0b16655d2d85d7",
"/chunks/successfully-email-verified.js": "/chunks/successfully-email-verified.js?id=d080d93ce30187d1", "/chunks/successfully-email-verified.js": "/chunks/successfully-email-verified.js?id=25b805ade5230382",
"/chunks/successfully-email-send.js": "/chunks/successfully-email-send.js?id=5d0042e9619ed73e", "/chunks/successfully-email-send.js": "/chunks/successfully-email-send.js?id=f4562229776d9f56",
"/chunks/sign-in.js": "/chunks/sign-in.js?id=379b9147d37291d5", "/chunks/sign-in.js": "/chunks/sign-in.js?id=295d214d04f2a86d",
"/chunks/sign-up.js": "/chunks/sign-up.js?id=d1bcad80748579ae", "/chunks/sign-up.js": "/chunks/sign-up.js?id=77351b7631a6ee6c",
"/chunks/forgotten-password.js": "/chunks/forgotten-password.js?id=7e713217b427cc06", "/chunks/forgotten-password.js": "/chunks/forgotten-password.js?id=50a1bc5e4ed86ec9",
"/chunks/create-new-password.js": "/chunks/create-new-password.js?id=094a12eb5ba69c9f", "/chunks/create-new-password.js": "/chunks/create-new-password.js?id=f652de052dba55c1",
"/chunks/settings.js": "/chunks/settings.js?id=7ef82be482dcf31d", "/chunks/settings.js": "/chunks/settings.js?id=f41a95bc12c30010",
"/chunks/profile.js": "/chunks/profile.js?id=d280577d80754c91", "/chunks/profile.js": "/chunks/profile.js?id=5b2ed82815320625",
"/chunks/settings-password.js": "/chunks/settings-password.js?id=4f56d97ef76cff6e", "/chunks/settings-password.js": "/chunks/settings-password.js?id=c912a79595c2efcb",
"/chunks/settings-storage.js": "/chunks/settings-storage.js?id=e6866a6ffd9c3a80", "/chunks/settings-storage.js": "/chunks/settings-storage.js?id=6fec7aac1a5280c7",
"/chunks/billing.js": "/chunks/billing.js?id=ce81cf6583d26d4c", "/chunks/billing.js": "/chunks/billing.js?id=3a9b4a3869602995",
"/chunks/platform.js": "/chunks/platform.js?id=8899666aebaf9db4", "/chunks/platform.js": "/chunks/platform.js?id=b966740835699124",
"/chunks/files.js": "/chunks/files.js?id=a6dbd9f43e4eb694", "/chunks/files.js": "/chunks/files.js?id=4e608db6e46c8e1a",
"/chunks/recent-uploads.js": "/chunks/recent-uploads.js?id=8f087976e1d1af41", "/chunks/recent-uploads.js": "/chunks/recent-uploads.js?id=75ae670c0dd88d28",
"/chunks/my-shared-items.js": "/chunks/my-shared-items.js?id=969ac9f4297e1179", "/chunks/my-shared-items.js": "/chunks/my-shared-items.js?id=20366862e84678f3",
"/chunks/trash.js": "/chunks/trash.js?id=da9791f0f6155a99", "/chunks/trash.js": "/chunks/trash.js?id=3930329bfca5ef73",
"/chunks/team-folders.js": "/chunks/team-folders.js?id=88bce3b12b4dce95", "/chunks/team-folders.js": "/chunks/team-folders.js?id=bf4c9aa124ec9b8e",
"/chunks/shared-with-me.js": "/chunks/shared-with-me.js?id=45b03e5063720b33", "/chunks/shared-with-me.js": "/chunks/shared-with-me.js?id=87d0fb60c573f01d",
"/chunks/invitation.js": "/chunks/invitation.js?id=3220065b746aa8fe", "/chunks/invitation.js": "/chunks/invitation.js?id=9ed8456c9d6d5ce1",
"/css/tailwind.css": "/css/tailwind.css", "/css/tailwind.css": "/css/tailwind.css",
"/css/app.css": "/css/app.css" "/css/app.css": "/css/app.css"
} }

View File

@@ -28,10 +28,11 @@
<!-- Infinite Loader Element --> <!-- Infinite Loader Element -->
<div <div
class="relative h-16" v-show="showInfiniteLoadSpinner"
v-if="showInfiniteLoadSpinner" class="relative h-16 md:my-0 my-4"
id='infinite-loader'> ref="infinityLoader"
<Spinner/> >
<Spinner />
</div> </div>
</div> </div>
</template> </template>
@@ -41,6 +42,7 @@ import ItemHandler from './ItemHandler'
import { events } from '../../bus' import { events } from '../../bus'
import { mapGetters } from 'vuex' import { mapGetters } from 'vuex'
import Spinner from './Spinner' import Spinner from './Spinner'
import { debounce } from 'lodash'
export default { export default {
name: 'FileBrowser', name: 'FileBrowser',
@@ -60,38 +62,31 @@ export default {
return this.clipboard return this.clipboard
} }
}, },
continueInfiniteScroll() { canLoadMoreEntries() {
if(this.paginate) return this.paginate?.currentPage !== this.paginate?.lastPage
return this.paginate.paginate.currentPage !== this.paginate.paginate.lastPage
}, },
showInfiniteLoadSpinner() { showInfiniteLoadSpinner() {
return this.continueInfiniteScroll && this.entries.length !== 0 && this.paginate.paginate.perPage <= this.entries.length return this.canLoadMoreEntries && this.entries.length !== 0 && this.paginate.perPage <= this.entries.length
}, },
}, },
data() { data() {
return { return {
draggingId: undefined, draggingId: undefined,
isDragging: false, isDragging: false,
infiniteScrollLoad: false, isLoadingNewEntries: false,
} }
}, },
methods: { methods: {
infiniteScroll() { infiniteScroll: debounce(function () {
if (this.isInfinityLoaderAtBottomPage() && this.canLoadMoreEntries && !this.isLoadingNewEntries) {
this.isLoadingNewEntries = true
if( this.continueInfiniteScroll && this.elementInViewport() ) { this.$getDataByLocation(this.paginate.currentPage + 1)
.then(() => this.isLoadingNewEntries = false)
if(! this.infiniteScrollLoad) {
this.infiniteScrollLoad = true
this.$getDataByLocation(this.paginate.paginate.currentPage + 1).then(() => {
this.infiniteScrollLoad = false
})
} }
} }, 150),
}, isInfinityLoaderAtBottomPage() {
elementInViewport() { let rect = this.$refs.infinityLoader.getBoundingClientRect()
var item = document.getElementById('infinite-loader')
var rect = item.getBoundingClientRect()
return ( return (
rect.bottom > 0 && rect.bottom > 0 &&
@@ -126,7 +121,7 @@ export default {
// Store dragged folder // Store dragged folder
this.draggingId = data this.draggingId = data
// TODO: founded issue on firefox // TODO: found issue on firefox
}, },
dragFinish(data, event) { dragFinish(data, event) {
if (event.dataTransfer.items.length === 0) { if (event.dataTransfer.items.length === 0) {
@@ -176,8 +171,10 @@ export default {
}, },
}, },
created() { created() {
if(this.$isMobile()) // Track document scrolling to load new entries if needed
document.addEventListener('scroll', this.infiniteScroll, true) if (window.innerWidth <= 1024) {
document.addEventListener('scroll', this.infiniteScroll)
}
events.$on('drop', () => { events.$on('drop', () => {
this.isDragging = false this.isDragging = false

View File

@@ -19,7 +19,7 @@ const actions = {
getFolder: ({ commit, getters },{page, id}) => { getFolder: ({ commit, getters },{page, id}) => {
return new Promise ((resolve, reject) => { return new Promise ((resolve, reject) => {
if( !page) if(!page)
commit('LOADING_STATE', { loading: true, data: [] }) commit('LOADING_STATE', { loading: true, data: [] })
let currentPage = page || 1 let currentPage = page || 1
@@ -27,9 +27,7 @@ const actions = {
axios axios
.get(`${getters.api}/browse/folders/${id}/${getters.sorting.URI}&page=${currentPage}`) .get(`${getters.api}/browse/folders/${id}/${getters.sorting.URI}&page=${currentPage}`)
.then((response) => { .then((response) => {
commit('SET_PAGINATE', { commit('SET_PAGINATE', response.data.meta.paginate)
paginate: response.data.meta.paginate
})
commit('LOADING_STATE', { commit('LOADING_STATE', {
loading: false, loading: false,
@@ -70,9 +68,7 @@ const actions = {
.get(getters.api + `/browse/latest?page=${currentPage}`) .get(getters.api + `/browse/latest?page=${currentPage}`)
.then((response) => { .then((response) => {
commit('SET_PAGINATE', { commit('SET_PAGINATE', response.data.meta.paginate)
paginate: response.data.meta.paginate
})
commit('LOADING_STATE', { commit('LOADING_STATE', {
loading: false, loading: false,
@@ -103,9 +99,7 @@ const actions = {
.get(`${getters.api}/browse/share${getters.sorting.URI}&page=${currentPage}`) .get(`${getters.api}/browse/share${getters.sorting.URI}&page=${currentPage}`)
.then((response) => { .then((response) => {
commit('SET_PAGINATE', { commit('SET_PAGINATE', response.data.meta.paginate)
paginate: response.data.meta.paginate
})
commit('LOADING_STATE', { commit('LOADING_STATE', {
loading: false, loading: false,
@@ -136,9 +130,7 @@ const actions = {
.get(`${getters.api}/browse/trash/${id}/${getters.sorting.URI}&page=${currentPage}`) .get(`${getters.api}/browse/trash/${id}/${getters.sorting.URI}&page=${currentPage}`)
.then((response) => { .then((response) => {
commit('SET_PAGINATE', { commit('SET_PAGINATE', response.data.meta.paginate)
paginate: response.data.meta.paginate
})
commit('LOADING_STATE', { commit('LOADING_STATE', {
loading: false, loading: false,

View File

@@ -31,9 +31,7 @@ const actions = {
axios axios
.get(`/api/browse/folders/${id}/${router.currentRoute.params.token}${getters.sorting.URI}&page=${currentPage}`) .get(`/api/browse/folders/${id}/${router.currentRoute.params.token}${getters.sorting.URI}&page=${currentPage}`)
.then((response) => { .then((response) => {
commit('SET_PAGINATE', { commit('SET_PAGINATE', response.data.meta.paginate)
paginate: response.data.meta.paginate
})
commit('LOADING_STATE', { commit('LOADING_STATE', {
loading: false, loading: false,

View File

@@ -24,9 +24,7 @@ const actions = {
axios axios
.get(`${getters.api}/teams/folders/${id}/${getters.sorting.URI}&page=${currentPage}`) .get(`${getters.api}/teams/folders/${id}/${getters.sorting.URI}&page=${currentPage}`)
.then((response) => { .then((response) => {
commit('SET_PAGINATE', { commit('SET_PAGINATE', response.data.meta.paginate)
paginate: response.data.meta.paginate
})
commit('LOADING_STATE', { commit('LOADING_STATE', {
loading: false, loading: false,
@@ -77,9 +75,7 @@ const actions = {
axios axios
.get(`${getters.api}/teams/shared-with-me/${id}/${getters.sorting.URI}&page=${currentPage}`) .get(`${getters.api}/teams/shared-with-me/${id}/${getters.sorting.URI}&page=${currentPage}`)
.then((response) => { .then((response) => {
commit('SET_PAGINATE', { commit('SET_PAGINATE', response.data.meta.paginate)
paginate: response.data.meta.paginate
})
commit('LOADING_STATE', { commit('LOADING_STATE', {
loading: false, loading: false,

View File

@@ -1174,7 +1174,7 @@ if (! function_exists('replace_occurrence')) {
'total' => $totalItemsCount, 'total' => $totalItemsCount,
], ],
[ [
'first' => $uri . '&page=' . 1, 'first' => $uri . '&page=1',
'last' => $uri . '&page=' . $lastPage, 'last' => $uri . '&page=' . $lastPage,
'next' => $currentPage == $lastPage ? null : $uri . '&page=' . $currentPage + 1, 'next' => $currentPage == $lastPage ? null : $uri . '&page=' . $currentPage + 1,
'prev' => $currentPage == 1 ? null : $uri . '&page=' . $currentPage - 1, 'prev' => $currentPage == 1 ? null : $uri . '&page=' . $currentPage - 1,