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

Merge branch 'main' into refactor/ui

Browse Source
This commit is contained in:
liyasthomas
2021-08-15 19:11:00 +05:30
parent bfc0282e49 74d472e76e
commit c1d2f12e48
3 changed files with 13790 additions and 16921 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
newstore/localpersistence.ts
View File

@@ -2,7 +2,7 @@
import clone from "lodash/clone" import clone from "lodash/clone"
import assign from "lodash/assign" import assign from "lodash/assign"
import eq from "lodash/eq" import isEmpty from "lodash/isEmpty"
import { import {
settingsStore, settingsStore,
bulkApplySettings, bulkApplySettings,
@@ -27,39 +27,46 @@ import { replaceEnvironments, environments$ } from "./environments"
function checkAndMigrateOldSettings() { function checkAndMigrateOldSettings() {
const vuexData = JSON.parse(window.localStorage.getItem("vuex") || "{}") const vuexData = JSON.parse(window.localStorage.getItem("vuex") || "{}")
if (eq(vuexData, {})) return if (isEmpty(vuexData)) return
if (vuexData.postwoman && vuexData.postwoman.settings) { const { postwoman } = vuexData
const settingsData = clone(defaultSettings)
assign(settingsData, vuexData.postwoman.settings) if (!isEmpty(postwoman?.settings)) {
const settingsData = assign(clone(defaultSettings), postwoman.settings)
window.localStorage.setItem("settings", JSON.stringify(settingsData)) window.localStorage.setItem("settings", JSON.stringify(settingsData))
delete vuexData.postwoman.settings delete postwoman.settings
window.localStorage.setItem("vuex", JSON.stringify(vuexData)) window.localStorage.setItem("vuex", JSON.stringify(vuexData))
} }
if (vuexData.postwoman && vuexData.postwoman.collections) { if (postwoman?.collections) {
const restColls = vuexData.postwoman.collections window.localStorage.setItem(
window.localStorage.setItem("collections", JSON.stringify(restColls)) "collections",
JSON.stringify(postwoman.collections)
)
delete vuexData.postwoman.collections delete postwoman.collections
window.localStorage.setItem("vuex", JSON.stringify(vuexData)) window.localStorage.setItem("vuex", JSON.stringify(vuexData))
} }
if (vuexData.postwoman && vuexData.postwoman.collectionsGraphql) { if (postwoman?.collectionsGraphql) {
const gqlColls = vuexData.postwoman.collectionsGraphql window.localStorage.setItem(
window.localStorage.setItem("collectionsGraphql", JSON.stringify(gqlColls)) "collectionsGraphql",
JSON.stringify(postwoman.collectionsGraphql)
)
delete vuexData.postwoman.collectionsGraphql delete postwoman.collectionsGraphql
window.localStorage.setItem("vuex", JSON.stringify(vuexData)) window.localStorage.setItem("vuex", JSON.stringify(vuexData))
} }
if (vuexData.postwoman && vuexData.postwoman.environments) { if (postwoman?.environments) {
const envs = vuexData.postwoman.environments window.localStorage.setItem(
window.localStorage.setItem("environments", JSON.stringify(envs)) "environments",
JSON.stringify(postwoman.environments)
)
delete vuexData.postwoman.environments delete postwoman.environments
window.localStorage.setItem("vuex", JSON.stringify(vuexData)) window.localStorage.setItem("vuex", JSON.stringify(vuexData))
} }

30660
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

8
package.json
View File

@@ -37,7 +37,7 @@
"core-js": "^3.16.1", "core-js": "^3.16.1",
"esprima": "^4.0.1", "esprima": "^4.0.1",
"firebase": "^8.9.1", "firebase": "^8.9.1",
"graphql": "^15.5.0", "graphql": "^15.5.1",
"graphql-language-service-interface": "^2.8.4", "graphql-language-service-interface": "^2.8.4",
"json-loader": "^0.5.7", "json-loader": "^0.5.7",
"lodash": "^4.17.21", "lodash": "^4.17.21",
@@ -63,7 +63,7 @@
"@babel/preset-env": "^7.15.0", "@babel/preset-env": "^7.15.0",
"@commitlint/cli": "^13.1.0", "@commitlint/cli": "^13.1.0",
"@commitlint/config-conventional": "^13.1.0", "@commitlint/config-conventional": "^13.1.0",
"@nuxt/types": "^2.15.7", "@nuxt/types": "^2.15.8",
"@nuxt/typescript-build": "^2.1.0", "@nuxt/typescript-build": "^2.1.0",
"@nuxtjs/color-mode": "^2.1.1", "@nuxtjs/color-mode": "^2.1.1",
"@nuxtjs/dotenv": "^1.4.1", "@nuxtjs/dotenv": "^1.4.1",
@@ -84,12 +84,12 @@
"eslint-config-prettier": "^8.1.0", "eslint-config-prettier": "^8.1.0",
"eslint-plugin-nuxt": ">=2.0.0", "eslint-plugin-nuxt": ">=2.0.0",
"eslint-plugin-prettier": "^3.3.1", "eslint-plugin-prettier": "^3.3.1",
"eslint-plugin-vue": "^7.15.1", "eslint-plugin-vue": "^7.16.0",
"husky": "^7.0.1", "husky": "^7.0.1",
"jest": "^27.0.6", "jest": "^27.0.6",
"jest-serializer-vue": "^2.0.2", "jest-serializer-vue": "^2.0.2",
"lint-staged": "^11.1.2", "lint-staged": "^11.1.2",
"nuxt-windicss": "^1.2.2", "nuxt-windicss": "^1.2.3",
"prettier": "^2.3.2", "prettier": "^2.3.2",
"pretty-quick": "^3.1.1", "pretty-quick": "^3.1.1",
"raw-loader": "^4.0.2", "raw-loader": "^4.0.2",