btwedutech/hoppscotch
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 6 Wiki Activity

chore(deps): bump + fix: only allow one from extension and proxy

Browse Source
This commit is contained in:
Liyas Thomas
2021-03-23 19:48:00 +00:00
committed by GitHub
parent c18c2ea9d4
commit 2190a1b6fd
3 changed files with 58 additions and 26565 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26612
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

2
package.json
View File

@@ -57,7 +57,7 @@
"@nuxtjs/google-analytics": "^2.4.0", "@nuxtjs/google-analytics": "^2.4.0",
"@nuxtjs/google-fonts": "^1.3.0", "@nuxtjs/google-fonts": "^1.3.0",
"@nuxtjs/pwa": "^3.3.5", "@nuxtjs/pwa": "^3.3.5",
"@nuxtjs/tailwindcss": "^4.0.1", "@nuxtjs/tailwindcss": "^4.0.2",
"@testing-library/jest-dom": "^5.11.9", "@testing-library/jest-dom": "^5.11.9",
"@types/lodash": "^4.14.168", "@types/lodash": "^4.14.168",
"@vue/test-utils": "^1.1.3", "@vue/test-utils": "^1.1.3",

9
pages/settings.vue
View File

@@ -219,6 +219,9 @@ export default Vue.extend({
PROXY_URL: "", PROXY_URL: "",
PROXY_KEY: "", PROXY_KEY: "",
EXTENSIONS_ENABLED: true,
PROXY_ENABLED: true,
} }
}, },
subscriptions() { subscriptions() {
@@ -252,6 +255,12 @@ export default Vue.extend({
applySetting(key, value) applySetting(key, value)
}, },
toggleSetting<K extends KeysMatching<SettingsType, boolean>>(key: K) { toggleSetting<K extends KeysMatching<SettingsType, boolean>>(key: K) {
if (key === "EXTENSIONS_ENABLED" && this.PROXY_ENABLED) {
toggleSetting("PROXY_ENABLED")
}
if (key === "PROXY_ENABLED" && this.EXTENSIONS_ENABLED) {
toggleSetting("EXTENSIONS_ENABLED")
}
toggleSetting(key) toggleSetting(key)
}, },
toggleSettings<K extends KeysMatching<SettingsType, boolean>>(name: K, value: SettingsType[K]) { toggleSettings<K extends KeysMatching<SettingsType, boolean>>(name: K, value: SettingsType[K]) {