Update Dependencies, Fix linter, Hide Refresh Button for Trending / Popular

This commit is contained in:
Preston 2020-08-24 17:52:39 -04:00
parent 8b52a61353
commit feea541fdb
7 changed files with 63 additions and 65 deletions

101
package-lock.json generated
View File

@ -2607,12 +2607,12 @@
"dev": true "dev": true
}, },
"@typescript-eslint/eslint-plugin": { "@typescript-eslint/eslint-plugin": {
"version": "3.9.1", "version": "3.10.0",
"resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-3.9.1.tgz", "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-3.10.0.tgz",
"integrity": "sha512-XIr+Mfv7i4paEdBf0JFdIl9/tVxyj+rlilWIfZ97Be0lZ7hPvUbS5iHt9Glc8kRI53dsr0PcAEudbf8rO2wGgg==", "integrity": "sha512-Bbeg9JAnSzZ85Y0gpInZscSpifA6SbEgRryaKdP5ZlUjhTKsvZS4GUIE6xAZCjhNTrf4zXXsySo83ZdHL7it0w==",
"dev": true, "dev": true,
"requires": { "requires": {
"@typescript-eslint/experimental-utils": "3.9.1", "@typescript-eslint/experimental-utils": "3.10.0",
"debug": "^4.1.1", "debug": "^4.1.1",
"functional-red-black-tree": "^1.0.1", "functional-red-black-tree": "^1.0.1",
"regexpp": "^3.0.0", "regexpp": "^3.0.0",
@ -2644,45 +2644,45 @@
} }
}, },
"@typescript-eslint/experimental-utils": { "@typescript-eslint/experimental-utils": {
"version": "3.9.1", "version": "3.10.0",
"resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-3.9.1.tgz", "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-3.10.0.tgz",
"integrity": "sha512-lkiZ8iBBaYoyEKhCkkw4SAeatXyBq9Ece5bZXdLe1LWBUwTszGbmbiqmQbwWA8cSYDnjWXp9eDbXpf9Sn0hLAg==", "integrity": "sha512-e5ZLSTuXgqC/Gq3QzK2orjlhTZVXzwxDujQmTBOM1NIVBZgW3wiIZjaXuVutk9R4UltFlwC9UD2+bdxsA7yyNg==",
"dev": true, "dev": true,
"requires": { "requires": {
"@types/json-schema": "^7.0.3", "@types/json-schema": "^7.0.3",
"@typescript-eslint/types": "3.9.1", "@typescript-eslint/types": "3.10.0",
"@typescript-eslint/typescript-estree": "3.9.1", "@typescript-eslint/typescript-estree": "3.10.0",
"eslint-scope": "^5.0.0", "eslint-scope": "^5.0.0",
"eslint-utils": "^2.0.0" "eslint-utils": "^2.0.0"
} }
}, },
"@typescript-eslint/parser": { "@typescript-eslint/parser": {
"version": "3.9.1", "version": "3.10.0",
"resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-3.9.1.tgz", "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-3.10.0.tgz",
"integrity": "sha512-y5QvPFUn4Vl4qM40lI+pNWhTcOWtpZAJ8pOEQ21fTTW4xTJkRplMjMRje7LYTXqVKKX9GJhcyweMz2+W1J5bMg==", "integrity": "sha512-iJyf3f2HVwscvJR7ySGMXw2DJgIAPKEz8TeU17XVKzgJRV4/VgCeDFcqLzueRe7iFI2gv+Tln4AV88ZOnsCNXg==",
"dev": true, "dev": true,
"requires": { "requires": {
"@types/eslint-visitor-keys": "^1.0.0", "@types/eslint-visitor-keys": "^1.0.0",
"@typescript-eslint/experimental-utils": "3.9.1", "@typescript-eslint/experimental-utils": "3.10.0",
"@typescript-eslint/types": "3.9.1", "@typescript-eslint/types": "3.10.0",
"@typescript-eslint/typescript-estree": "3.9.1", "@typescript-eslint/typescript-estree": "3.10.0",
"eslint-visitor-keys": "^1.1.0" "eslint-visitor-keys": "^1.1.0"
} }
}, },
"@typescript-eslint/types": { "@typescript-eslint/types": {
"version": "3.9.1", "version": "3.10.0",
"resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-3.9.1.tgz", "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-3.10.0.tgz",
"integrity": "sha512-15JcTlNQE1BsYy5NBhctnEhEoctjXOjOK+Q+rk8ugC+WXU9rAcS2BYhoh6X4rOaXJEpIYDl+p7ix+A5U0BqPTw==", "integrity": "sha512-ktUWSa75heQNwH85GRM7qP/UUrXqx9d6yIdw0iLO9/uE1LILW+i+3+B64dUodUS2WFWLzKTlwfi9giqrODibWg==",
"dev": true "dev": true
}, },
"@typescript-eslint/typescript-estree": { "@typescript-eslint/typescript-estree": {
"version": "3.9.1", "version": "3.10.0",
"resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-3.9.1.tgz", "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-3.10.0.tgz",
"integrity": "sha512-IqM0gfGxOmIKPhiHW/iyAEXwSVqMmR2wJ9uXHNdFpqVvPaQ3dWg302vW127sBpAiqM9SfHhyS40NKLsoMpN2KA==", "integrity": "sha512-yjuY6rmVHRhcUKgXaSPNVloRueGWpFNhxR5EQLzxXfiFSl1U/+FBqHhbaGwtPPEgCSt61QNhZgiFjWT27bgAyw==",
"dev": true, "dev": true,
"requires": { "requires": {
"@typescript-eslint/types": "3.9.1", "@typescript-eslint/types": "3.10.0",
"@typescript-eslint/visitor-keys": "3.9.1", "@typescript-eslint/visitor-keys": "3.10.0",
"debug": "^4.1.1", "debug": "^4.1.1",
"glob": "^7.1.6", "glob": "^7.1.6",
"is-glob": "^4.0.1", "is-glob": "^4.0.1",
@ -2738,9 +2738,9 @@
} }
}, },
"@typescript-eslint/visitor-keys": { "@typescript-eslint/visitor-keys": {
"version": "3.9.1", "version": "3.10.0",
"resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-3.9.1.tgz", "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-3.10.0.tgz",
"integrity": "sha512-zxdtUjeoSh+prCpogswMwVUJfEFmCOjdzK9rpNjNBfm6EyPt99x3RrJoBOGZO23FCt0WPKUCOL5mb/9D5LjdwQ==", "integrity": "sha512-g4qftk8lWb/rHZe9uEp8oZSvsJhUvR2cfp7F7qE6DyUD2SsovEs8JDQTRP1xHzsD+pERsEpYNqkDgQXW6+ob5A==",
"dev": true, "dev": true,
"requires": { "requires": {
"eslint-visitor-keys": "^1.1.0" "eslint-visitor-keys": "^1.1.0"
@ -6059,16 +6059,15 @@
"dev": true "dev": true
}, },
"css-loader": { "css-loader": {
"version": "4.2.1", "version": "4.2.2",
"resolved": "https://registry.npmjs.org/css-loader/-/css-loader-4.2.1.tgz", "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-4.2.2.tgz",
"integrity": "sha512-MoqmF1if7Z0pZIEXA4ZF9PgtCXxWbfzfJM+3p+OYfhcrwcqhaCRb74DSnfzRl7e024xEiCRn5hCvfUbTf2sgFA==", "integrity": "sha512-omVGsTkZPVwVRpckeUnLshPp12KsmMSLqYxs12+RzM9jRR5Y+Idn/tBffjXRvOE+qW7if24cuceFJqYR5FmGBg==",
"dev": true, "dev": true,
"requires": { "requires": {
"camelcase": "^6.0.0", "camelcase": "^6.0.0",
"cssesc": "^3.0.0", "cssesc": "^3.0.0",
"icss-utils": "^4.1.1", "icss-utils": "^4.1.1",
"loader-utils": "^2.0.0", "loader-utils": "^2.0.0",
"normalize-path": "^3.0.0",
"postcss": "^7.0.32", "postcss": "^7.0.32",
"postcss-modules-extract-imports": "^2.0.0", "postcss-modules-extract-imports": "^2.0.0",
"postcss-modules-local-by-default": "^3.0.3", "postcss-modules-local-by-default": "^3.0.3",
@ -6080,9 +6079,9 @@
}, },
"dependencies": { "dependencies": {
"ajv": { "ajv": {
"version": "6.12.3", "version": "6.12.4",
"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.3.tgz", "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.4.tgz",
"integrity": "sha512-4K0cK3L1hsqk9xIb2z9vs/XU+PGJZ9PNpJRDS9YLzmNdX6jmVPfamLvTJr0aDAusnHyCHO6MjzlkAsgtqp9teA==", "integrity": "sha512-eienB2c9qVQs2KWexhkrdMLVDoIQCz5KSeLxwg9Lzk4DOfBtIK9PQwwufcsn1jjGuf9WZmqPMbGxOzfcuphJCQ==",
"dev": true, "dev": true,
"requires": { "requires": {
"fast-deep-equal": "^3.1.1", "fast-deep-equal": "^3.1.1",
@ -6154,12 +6153,6 @@
"json5": "^2.1.2" "json5": "^2.1.2"
} }
}, },
"normalize-path": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
"integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
"dev": true
},
"postcss": { "postcss": {
"version": "7.0.32", "version": "7.0.32",
"resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.32.tgz", "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.32.tgz",
@ -6858,9 +6851,9 @@
} }
}, },
"electron": { "electron": {
"version": "9.2.1", "version": "10.0.0",
"resolved": "https://registry.npmjs.org/electron/-/electron-9.2.1.tgz", "resolved": "https://registry.npmjs.org/electron/-/electron-10.0.0.tgz",
"integrity": "sha512-ZsetaQjXB8+9/EFW1FnfK4ukpkwXCxMEaiKiUZhZ0ZLFlLnFCpe0Bg4vdDf7e4boWGcnlgN1jAJpBw7w0eXuqA==", "integrity": "sha512-0XX/LqYAHHCSbfLjUk9VRDPOeYjDPEzA9i7F50AqpEpFIWR2bp++0S0beRANUpPdkvtBDp+0R6vHV3iXPvuKyA==",
"dev": true, "dev": true,
"requires": { "requires": {
"@electron/get": "^1.0.1", "@electron/get": "^1.0.1",
@ -13857,9 +13850,9 @@
} }
}, },
"node-abi": { "node-abi": {
"version": "2.19.0", "version": "2.19.1",
"resolved": "https://registry.npmjs.org/node-abi/-/node-abi-2.19.0.tgz", "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-2.19.1.tgz",
"integrity": "sha512-rpKqVe24p9GvMTgtqUXdLR1WQJBGVlkYPU10qHKv9/1i9V/k04MmFLVK2WcHBf1WKKY+ZsdvARPi8F4tfJ4opA==", "integrity": "sha512-HbtmIuByq44yhAzK7b9j/FelKlHYISKQn0mtvcBrU5QBkhoCMp5bu8Hv5AI34DcKfOAcJBcOEMwLlwO62FFu9A==",
"dev": true, "dev": true,
"requires": { "requires": {
"semver": "^5.4.1" "semver": "^5.4.1"
@ -15327,9 +15320,9 @@
"dev": true "dev": true
}, },
"prettier": { "prettier": {
"version": "2.0.5", "version": "2.1.0",
"resolved": "https://registry.npmjs.org/prettier/-/prettier-2.0.5.tgz", "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.1.0.tgz",
"integrity": "sha512-7PtVymN48hGcO4fGjybyBSIWDsLU4H4XlvOHfq91pz9kkGlonzwTfYkaIEwiRg/dAJF9YlbsduBAgtYLi+8cFg==", "integrity": "sha512-lz28cCbA1cDFHVuY8vvj6QuqOwIpyIfPUYkSl8AZ/vxH8qBXMMjE2knfLHCrZCmUsK/H1bg1P0tOo0dJkTJHvw==",
"dev": true "dev": true
}, },
"prettier-linter-helpers": { "prettier-linter-helpers": {
@ -16402,9 +16395,9 @@
} }
}, },
"sass-loader": { "sass-loader": {
"version": "9.0.3", "version": "10.0.0",
"resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-9.0.3.tgz", "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-10.0.0.tgz",
"integrity": "sha512-fOwsP98ac1VMme+V3+o0HaaMHp8Q/C9P+MUazLFVi3Jl7ORGHQXL1XeRZt3zLSGZQQPC8xE42Y2WptItvGjDQg==", "integrity": "sha512-DEIrVJIXf2P6jtY3fpJu+uWetALCds2PwRA2iwbpzmHvtFmX5j0aX5Uz+YZSeJpjKrpgqWNKngcVxmwVfqxMow==",
"dev": true, "dev": true,
"requires": { "requires": {
"klona": "^1.1.2", "klona": "^1.1.2",
@ -16415,9 +16408,9 @@
}, },
"dependencies": { "dependencies": {
"ajv": { "ajv": {
"version": "6.12.3", "version": "6.12.4",
"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.3.tgz", "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.4.tgz",
"integrity": "sha512-4K0cK3L1hsqk9xIb2z9vs/XU+PGJZ9PNpJRDS9YLzmNdX6jmVPfamLvTJr0aDAusnHyCHO6MjzlkAsgtqp9teA==", "integrity": "sha512-eienB2c9qVQs2KWexhkrdMLVDoIQCz5KSeLxwg9Lzk4DOfBtIK9PQwwufcsn1jjGuf9WZmqPMbGxOzfcuphJCQ==",
"dev": true, "dev": true,
"requires": { "requires": {
"fast-deep-equal": "^3.1.1", "fast-deep-equal": "^3.1.1",

View File

@ -55,15 +55,15 @@
"@babel/plugin-proposal-object-rest-spread": "^7.11.0", "@babel/plugin-proposal-object-rest-spread": "^7.11.0",
"@babel/preset-env": "^7.11.0", "@babel/preset-env": "^7.11.0",
"@babel/preset-typescript": "^7.10.4", "@babel/preset-typescript": "^7.10.4",
"@typescript-eslint/eslint-plugin": "^3.9.1", "@typescript-eslint/eslint-plugin": "^3.10.0",
"@typescript-eslint/parser": "^3.9.1", "@typescript-eslint/parser": "^3.10.0",
"acorn": "^8.0.1", "acorn": "^8.0.1",
"babel-eslint": "^10.1.0", "babel-eslint": "^10.1.0",
"babel-loader": "^8.1.0", "babel-loader": "^8.1.0",
"copy-webpack-plugin": "^6.0.3", "copy-webpack-plugin": "^6.0.3",
"css-loader": "^4.2.1", "css-loader": "^4.2.2",
"devtron": "^1.4.0", "devtron": "^1.4.0",
"electron": "^9.2.1", "electron": "^10.0.0",
"electron-builder": "^22.8.0", "electron-builder": "^22.8.0",
"electron-builder-squirrel-windows": "^22.8.1", "electron-builder-squirrel-windows": "^22.8.1",
"electron-debug": "^3.1.0", "electron-debug": "^3.1.0",
@ -82,12 +82,12 @@
"html-webpack-plugin": "^4.3.0", "html-webpack-plugin": "^4.3.0",
"jest": "^26.4.2", "jest": "^26.4.2",
"mini-css-extract-plugin": "^0.10.0", "mini-css-extract-plugin": "^0.10.0",
"node-abi": "^2.19.0", "node-abi": "^2.19.1",
"node-loader": "^1.0.1", "node-loader": "^1.0.1",
"npm-run-all": "^4.1.5", "npm-run-all": "^4.1.5",
"prettier": "^2.0.5", "prettier": "^2.1.0",
"sass": "^1.26.10", "sass": "^1.26.10",
"sass-loader": "^9.0.3", "sass-loader": "^10.0.0",
"style-loader": "^1.2.1", "style-loader": "^1.2.1",
"tree-kill": "1.2.2", "tree-kill": "1.2.2",
"typescript": "^4.0.2", "typescript": "^4.0.2",

View File

@ -74,7 +74,8 @@ function createWindow () {
nodeIntegration: true, nodeIntegration: true,
nodeIntegrationInWorker: false, nodeIntegrationInWorker: false,
webSecurity: false, webSecurity: false,
backgroundThrottling: false backgroundThrottling: false,
enableRemoteModule: true
}, },
show: false show: false
}) })

View File

@ -5,7 +5,9 @@
> >
<ft-card class="promptCard"> <ft-card class="promptCard">
<slot> <slot>
<h2 class="center">{{ label }}</h2> <h2 class="center">
{{ label }}
</h2>
<ft-flex-box> <ft-flex-box>
<ft-button <ft-button
v-for="(option, index) in optionNames" v-for="(option, index) in optionNames"

View File

@ -14,6 +14,7 @@
/> />
</ft-card> </ft-card>
<ft-icon-button <ft-icon-button
v-if="!isLoading"
icon="sync" icon="sync"
class="floatingTopButton" class="floatingTopButton"
:size="12" :size="12"

View File

@ -70,7 +70,7 @@ export default Vue.extend({
return item.type === 'video' || item.type === 'channel' || item.type === 'playlist' return item.type === 'video' || item.type === 'channel' || item.type === 'playlist'
}) })
this.shownResults = this.shownResults.concat(returnData) this.shownResults = returnData
this.isLoading = false this.isLoading = false
this.$store.commit('setTrendingCache', this.shownResults) this.$store.commit('setTrendingCache', this.shownResults)
}).catch((err) => { }).catch((err) => {
@ -114,7 +114,7 @@ export default Vue.extend({
return item.type === 'video' || item.type === 'channel' || item.type === 'playlist' return item.type === 'video' || item.type === 'channel' || item.type === 'playlist'
}) })
this.shownResults = this.shownResults.concat(returnData) this.shownResults = returnData
this.isLoading = false this.isLoading = false
this.$store.commit('setTrendingCache', this.shownResults) this.$store.commit('setTrendingCache', this.shownResults)
}).catch((err) => { }).catch((err) => {

View File

@ -14,6 +14,7 @@
/> />
</ft-card> </ft-card>
<ft-icon-button <ft-icon-button
v-if="!isLoading"
icon="sync" icon="sync"
class="floatingTopButton" class="floatingTopButton"
:size="12" :size="12"