Skip to content

I
inventory-promotion-react
Commit b18719b5 authored by Ben Anderson's avatar Ben Anderson
Browse files
Options

Merged current version of dev for deployment

parents a0234bbd 19d97ad5
Hide whitespace changes
Inline Side-by-side
Showing with 12981 additions and 305 deletions
deployment.yaml
View file @ b18719b5
...@@ -14,7 +14,7 @@ spec: ...@@ -14,7 +14,7 @@ spec:
spec: spec:
containers: containers:
- name: afp-inventory-ui-container - name: afp-inventory-ui-container
image: nexus.mynisum.com/afp-inventory-ui:11 image: nexus.mynisum.com/afp-inventory-ui:12
imagePullPolicy: Always imagePullPolicy: Always
ports: ports:
- containerPort: 8081 - containerPort: 8081
......
package-lock.json
View file @ b18719b5
...@@ -2564,9 +2564,9 @@ ...@@ -2564,9 +2564,9 @@
} }
}, },
"node_modules/@testing-library/react": { "node_modules/@testing-library/react": {
"version": "11.2.6", "version": "11.2.7",
"resolved": "https://registry.npmjs.org/@testing-library/react/-/react-11.2.6.tgz", "resolved": "https://registry.npmjs.org/@testing-library/react/-/react-11.2.7.tgz",
"integrity": "sha512-TXMCg0jT8xmuU8BkKMtp8l7Z50Ykew5WNX8UoIKTaLFwKkP2+1YDhOLA2Ga3wY4x29jyntk7EWfum0kjlYiSjQ==", "integrity": "sha512-tzRNp7pzd5QmbtXNG/mhdcl7Awfu/Iz1RaVHY75zTdOkmHCuzMhRL83gWHSgOAcjS3CCbyfwUHMZgRJb4kAfpA==",
"dependencies": { "dependencies": {
"@babel/runtime": "^7.12.5", "@babel/runtime": "^7.12.5",
"@testing-library/dom": "^7.28.1" "@testing-library/dom": "^7.28.1"
...@@ -3382,6 +3382,14 @@ ...@@ -3382,6 +3382,14 @@
"node": ">= 8" "node": ">= 8"
} }
}, },
"node_modules/anymatch/node_modules/normalize-path": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
"integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
"engines": {
"node": ">=0.10.0"
}
},
"node_modules/aproba": { "node_modules/aproba": {
"version": "1.2.0", "version": "1.2.0",
"resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz", "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
...@@ -4846,6 +4854,15 @@ ...@@ -4846,6 +4854,15 @@
"fsevents": "~2.3.1" "fsevents": "~2.3.1"
} }
}, },
"node_modules/chokidar/node_modules/normalize-path": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
"integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
"optional": true,
"engines": {
"node": ">=0.10.0"
}
},
"node_modules/chownr": { "node_modules/chownr": {
"version": "2.0.0", "version": "2.0.0",
"resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz", "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz",
...@@ -5324,9 +5341,13 @@ ...@@ -5324,9 +5341,13 @@
"integrity": "sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=" "integrity": "sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U="
}, },
"node_modules/contains-path": { "node_modules/contains-path": {
"version": "0.1.0", "version": "1.0.0",
"resolved": "https://registry.npmjs.org/contains-path/-/contains-path-0.1.0.tgz", "resolved": "https://registry.npmjs.org/contains-path/-/contains-path-1.0.0.tgz",
"integrity": "sha1-/ozxhP9mcLa67wGp1IYaXL7EEgo=", "integrity": "sha1-NFizMhhWA+ju0Y9RjUoQiIo6vJE=",
"dependencies": {
"normalize-path": "^2.1.1",
"path-starts-with": "^1.0.0"
},
"engines": { "engines": {
"node": ">=0.10.0" "node": ">=0.10.0"
} }
...@@ -7026,11 +7047,11 @@ ...@@ -7026,11 +7047,11 @@
"integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
}, },
"node_modules/eslint-module-utils": { "node_modules/eslint-module-utils": {
"version": "2.6.0", "version": "2.6.1",
"resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.6.0.tgz", "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.6.1.tgz",
"integrity": "sha512-6j9xxegbqe8/kZY8cYpcp0xhbK0EgJlg3g9mib3/miLaExuuwc3n5UEfSnU6hWMbT0FAYVvDbL9RrRgpUeQIvA==", "integrity": "sha512-ZXI9B8cxAJIH4nfkhTwcRTEAnrVfobYqwjWy/QMCZ8rHkZHFjf9yO4BzpiF9kCSfNlMG54eKigISHpX0+AaT4A==",
"dependencies": { "dependencies": {
"debug": "^2.6.9", "debug": "^3.2.7",
"pkg-dir": "^2.0.0" "pkg-dir": "^2.0.0"
}, },
"engines": { "engines": {
...@@ -7038,18 +7059,13 @@ ...@@ -7038,18 +7059,13 @@
} }
}, },
"node_modules/eslint-module-utils/node_modules/debug": { "node_modules/eslint-module-utils/node_modules/debug": {
"version": "2.6.9", "version": "3.2.7",
"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
"dependencies": { "dependencies": {
"ms": "2.0.0" "ms": "^2.1.1"
} }
}, },
"node_modules/eslint-module-utils/node_modules/ms": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
"integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
},
"node_modules/eslint-plugin-flowtype": { "node_modules/eslint-plugin-flowtype": {
"version": "5.7.2", "version": "5.7.2",
"resolved": "https://registry.npmjs.org/eslint-plugin-flowtype/-/eslint-plugin-flowtype-5.7.2.tgz", "resolved": "https://registry.npmjs.org/eslint-plugin-flowtype/-/eslint-plugin-flowtype-5.7.2.tgz",
...@@ -7066,22 +7082,25 @@ ...@@ -7066,22 +7082,25 @@
} }
}, },
"node_modules/eslint-plugin-import": { "node_modules/eslint-plugin-import": {
"version": "2.22.1", "version": "2.23.0",
"resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.22.1.tgz", "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.23.0.tgz",
"integrity": "sha512-8K7JjINHOpH64ozkAhpT3sd+FswIZTfMZTjdx052pnWrgRCVfp8op9tbjpAk3DdUeI/Ba4C8OjdC0r90erHEOw==", "integrity": "sha512-W5v1f7Cbam6BwbSSKtN6+yoUAms07ozbqAEhLOtf5erEqRv7w67PeZuAuBThaUkzdq2GfBx/5GBvxF+NWJshrQ==",
"dependencies": { "dependencies": {
"array-includes": "^3.1.1", "array-includes": "^3.1.3",
"array.prototype.flat": "^1.2.3", "array.prototype.flat": "^1.2.4",
"contains-path": "^0.1.0", "contains-path": "^1.0.0",
"debug": "^2.6.9", "debug": "^2.6.9",
"doctrine": "1.5.0", "doctrine": "^2.1.0",
"eslint-import-resolver-node": "^0.3.4", "eslint-import-resolver-node": "^0.3.4",
"eslint-module-utils": "^2.6.0", "eslint-module-utils": "^2.6.1",
"find-up": "^2.0.0",
"has": "^1.0.3", "has": "^1.0.3",
"is-core-module": "^2.4.0",
"minimatch": "^3.0.4", "minimatch": "^3.0.4",
"object.values": "^1.1.1", "object.values": "^1.1.3",
"read-pkg-up": "^2.0.0", "pkg-up": "^2.0.0",
"resolve": "^1.17.0", "read-pkg-up": "^3.0.0",
"resolve": "^1.20.0",
"tsconfig-paths": "^3.9.0" "tsconfig-paths": "^3.9.0"
}, },
"engines": { "engines": {
...@@ -7100,27 +7119,94 @@ ...@@ -7100,27 +7119,94 @@
} }
}, },
"node_modules/eslint-plugin-import/node_modules/doctrine": { "node_modules/eslint-plugin-import/node_modules/doctrine": {
"version": "1.5.0", "version": "2.1.0",
"resolved": "https://registry.npmjs.org/doctrine/-/doctrine-1.5.0.tgz", "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
"integrity": "sha1-N53Ocw9hZvds76TmcHoVmwLFpvo=", "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
"dependencies": { "dependencies": {
"esutils": "^2.0.2", "esutils": "^2.0.2"
"isarray": "^1.0.0"
}, },
"engines": { "engines": {
"node": ">=0.10.0" "node": ">=0.10.0"
} }
}, },
"node_modules/eslint-plugin-import/node_modules/isarray": { "node_modules/eslint-plugin-import/node_modules/find-up": {
"version": "1.0.0", "version": "2.1.0",
"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
"integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
"dependencies": {
"locate-path": "^2.0.0"
},
"engines": {
"node": ">=4"
}
},
"node_modules/eslint-plugin-import/node_modules/locate-path": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
"integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
"dependencies": {
"p-locate": "^2.0.0",
"path-exists": "^3.0.0"
},
"engines": {
"node": ">=4"
}
}, },
"node_modules/eslint-plugin-import/node_modules/ms": { "node_modules/eslint-plugin-import/node_modules/ms": {
"version": "2.0.0", "version": "2.0.0",
"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
"integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
}, },
"node_modules/eslint-plugin-import/node_modules/p-limit": {
"version": "1.3.0",
"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
"integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
"dependencies": {
"p-try": "^1.0.0"
},
"engines": {
"node": ">=4"
}
},
"node_modules/eslint-plugin-import/node_modules/p-locate": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
"integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
"dependencies": {
"p-limit": "^1.1.0"
},
"engines": {
"node": ">=4"
}
},
"node_modules/eslint-plugin-import/node_modules/p-try": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
"integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
"engines": {
"node": ">=4"
}
},
"node_modules/eslint-plugin-import/node_modules/path-exists": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
"integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
"engines": {
"node": ">=4"
}
},
"node_modules/eslint-plugin-import/node_modules/resolve": {
"version": "1.20.0",
"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.20.0.tgz",
"integrity": "sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==",
"dependencies": {
"is-core-module": "^2.2.0",
"path-parse": "^1.0.6"
},
"funding": {
"url": "https://github.com/sponsors/ljharb"
}
},
"node_modules/eslint-plugin-jest": { "node_modules/eslint-plugin-jest": {
"version": "24.3.6", "version": "24.3.6",
"resolved": "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-24.3.6.tgz", "resolved": "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-24.3.6.tgz",
...@@ -7389,6 +7475,14 @@ ...@@ -7389,6 +7475,14 @@
"webpack": "^4.0.0 || ^5.0.0" "webpack": "^4.0.0 || ^5.0.0"
} }
}, },
"node_modules/eslint-webpack-plugin/node_modules/normalize-path": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
"integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
"engines": {
"node": ">=0.10.0"
}
},
"node_modules/eslint-webpack-plugin/node_modules/schema-utils": { "node_modules/eslint-webpack-plugin/node_modules/schema-utils": {
"version": "3.0.0", "version": "3.0.0",
"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.0.0.tgz", "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.0.0.tgz",
...@@ -11310,13 +11404,13 @@ ...@@ -11310,13 +11404,13 @@
"integrity": "sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA=" "integrity": "sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA="
}, },
"node_modules/load-json-file": { "node_modules/load-json-file": {
"version": "2.0.0", "version": "4.0.0",
"resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz", "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz",
"integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=", "integrity": "sha1-L19Fq5HjMhYjT9U62rZo607AmTs=",
"dependencies": { "dependencies": {
"graceful-fs": "^4.1.2", "graceful-fs": "^4.1.2",
"parse-json": "^2.2.0", "parse-json": "^4.0.0",
"pify": "^2.0.0", "pify": "^3.0.0",
"strip-bom": "^3.0.0" "strip-bom": "^3.0.0"
}, },
"engines": { "engines": {
...@@ -11324,22 +11418,23 @@ ...@@ -11324,22 +11418,23 @@
} }
}, },
"node_modules/load-json-file/node_modules/parse-json": { "node_modules/load-json-file/node_modules/parse-json": {
"version": "2.2.0", "version": "4.0.0",
"resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz", "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
"integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=", "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=",
"dependencies": { "dependencies": {
"error-ex": "^1.2.0" "error-ex": "^1.3.1",
"json-parse-better-errors": "^1.0.1"
}, },
"engines": { "engines": {
"node": ">=0.10.0" "node": ">=4"
} }
}, },
"node_modules/load-json-file/node_modules/pify": { "node_modules/load-json-file/node_modules/pify": {
"version": "2.3.0", "version": "3.0.0",
"resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
"integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
"engines": { "engines": {
"node": ">=0.10.0" "node": ">=4"
} }
}, },
"node_modules/load-json-file/node_modules/strip-bom": { "node_modules/load-json-file/node_modules/strip-bom": {
...@@ -12132,9 +12227,15 @@ ...@@ -12132,9 +12227,15 @@
} }
}, },
"node_modules/node-releases": { "node_modules/node-releases": {
<<<<<<< HEAD
"version": "1.1.71", "version": "1.1.71",
"resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.71.tgz", "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.71.tgz",
"integrity": "sha512-zR6HoT6LrLCRBwukmrVbHv0EpEQjksO6GmFcZQQuCAy139BEsoVKPYnf3jongYW83fAa1torLGYwxxky/p28sg==" "integrity": "sha512-zR6HoT6LrLCRBwukmrVbHv0EpEQjksO6GmFcZQQuCAy139BEsoVKPYnf3jongYW83fAa1torLGYwxxky/p28sg=="
=======
"version": "1.1.72",
"resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.72.tgz",
"integrity": "sha512-LLUo+PpH3dU6XizX3iVoubUNheF/owjXCZZ5yACDxNnPtgFuludV1ZL3ayK1kVep42Rmm0+R9/Y60NQbZ2bifw=="
>>>>>>> dev
}, },
"node_modules/normalize-package-data": { "node_modules/normalize-package-data": {
"version": "2.5.0", "version": "2.5.0",
...@@ -12156,9 +12257,12 @@ ...@@ -12156,9 +12257,12 @@
} }
}, },
"node_modules/normalize-path": { "node_modules/normalize-path": {
"version": "3.0.0", "version": "2.1.1",
"resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
"integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
"dependencies": {
"remove-trailing-separator": "^1.0.1"
},
"engines": { "engines": {
"node": ">=0.10.0" "node": ">=0.10.0"
} }
...@@ -12805,6 +12909,17 @@ ...@@ -12805,6 +12909,17 @@
"resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz", "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz",
"integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==" "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw=="
}, },
"node_modules/path-starts-with": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/path-starts-with/-/path-starts-with-1.0.0.tgz",
"integrity": "sha1-soJDAV6LE43lcmgqxS2kLmRq2E4=",
"dependencies": {
"normalize-path": "^2.1.1"
},
"engines": {
"node": ">=4"
}
},
"node_modules/path-to-regexp": { "node_modules/path-to-regexp": {
"version": "1.8.0", "version": "1.8.0",
"resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.8.0.tgz", "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.8.0.tgz",
...@@ -12963,48 +13078,67 @@ ...@@ -12963,48 +13078,67 @@
} }
}, },
"node_modules/pkg-up": { "node_modules/pkg-up": {
"version": "3.1.0", "version": "2.0.0",
"resolved": "https://registry.npmjs.org/pkg-up/-/pkg-up-3.1.0.tgz", "resolved": "https://registry.npmjs.org/pkg-up/-/pkg-up-2.0.0.tgz",
"integrity": "sha512-nDywThFk1i4BQK4twPQ6TA4RT8bDY96yeuCVBWL3ePARCiEKDRSrNGbFIgUJpLp+XeIR65v8ra7WuJOFUBtkMA==", "integrity": "sha1-yBmscoBZpGHKscOImivjxJoATX8=",
"dependencies": { "dependencies": {
"find-up": "^3.0.0" "find-up": "^2.1.0"
}, },
"engines": { "engines": {
"node": ">=8" "node": ">=4"
} }
}, },
"node_modules/pkg-up/node_modules/find-up": { "node_modules/pkg-up/node_modules/find-up": {
"version": "3.0.0", "version": "2.1.0",
"resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz", "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
"integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==", "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
"dependencies": { "dependencies": {
"locate-path": "^3.0.0" "locate-path": "^2.0.0"
}, },
"engines": { "engines": {
"node": ">=6" "node": ">=4"
} }
}, },
"node_modules/pkg-up/node_modules/locate-path": { "node_modules/pkg-up/node_modules/locate-path": {
"version": "3.0.0", "version": "2.0.0",
"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz", "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
"integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==", "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
"dependencies": { "dependencies": {
"p-locate": "^3.0.0", "p-locate": "^2.0.0",
"path-exists": "^3.0.0" "path-exists": "^3.0.0"
}, },
"engines": { "engines": {
"node": ">=6" "node": ">=4"
}
},
"node_modules/pkg-up/node_modules/p-limit": {
"version": "1.3.0",
"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
"integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
"dependencies": {
"p-try": "^1.0.0"
},
"engines": {
"node": ">=4"
} }
}, },
"node_modules/pkg-up/node_modules/p-locate": { "node_modules/pkg-up/node_modules/p-locate": {
"version": "3.0.0", "version": "2.0.0",
"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz", "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
"integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==", "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
"dependencies": { "dependencies": {
"p-limit": "^2.0.0" "p-limit": "^1.1.0"
}, },
"engines": { "engines": {
"node": ">=6" "node": ">=4"
}
},
"node_modules/pkg-up/node_modules/p-try": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
"integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
"engines": {
"node": ">=4"
} }
}, },
"node_modules/pkg-up/node_modules/path-exists": { "node_modules/pkg-up/node_modules/path-exists": {
...@@ -14840,6 +14974,59 @@ ...@@ -14840,6 +14974,59 @@
"node": ">= 4" "node": ">= 4"
} }
}, },
"node_modules/react-dev-utils/node_modules/locate-path": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
"integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
"dependencies": {
"p-locate": "^3.0.0",
"path-exists": "^3.0.0"
},
"engines": {
"node": ">=6"
}
},
"node_modules/react-dev-utils/node_modules/p-locate": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
"integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
"dependencies": {
"p-limit": "^2.0.0"
},
"engines": {
"node": ">=6"
}
},
"node_modules/react-dev-utils/node_modules/path-exists": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
"integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
"engines": {
"node": ">=4"
}
},
"node_modules/react-dev-utils/node_modules/pkg-up": {
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/pkg-up/-/pkg-up-3.1.0.tgz",
"integrity": "sha512-nDywThFk1i4BQK4twPQ6TA4RT8bDY96yeuCVBWL3ePARCiEKDRSrNGbFIgUJpLp+XeIR65v8ra7WuJOFUBtkMA==",
"dependencies": {
"find-up": "^3.0.0"
},
"engines": {
"node": ">=8"
}
},
"node_modules/react-dev-utils/node_modules/pkg-up/node_modules/find-up": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
"integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
"dependencies": {
"locate-path": "^3.0.0"
},
"engines": {
"node": ">=6"
}
},
"node_modules/react-dev-utils/node_modules/supports-color": { "node_modules/react-dev-utils/node_modules/supports-color": {
"version": "5.5.0", "version": "5.5.0",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
...@@ -15136,25 +15323,25 @@ ...@@ -15136,25 +15323,25 @@
} }
}, },
"node_modules/read-pkg": { "node_modules/read-pkg": {
"version": "2.0.0", "version": "3.0.0",
"resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz", "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz",
"integrity": "sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=", "integrity": "sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=",
"dependencies": { "dependencies": {
"load-json-file": "^2.0.0", "load-json-file": "^4.0.0",
"normalize-package-data": "^2.3.2", "normalize-package-data": "^2.3.2",
"path-type": "^2.0.0" "path-type": "^3.0.0"
}, },
"engines": { "engines": {
"node": ">=4" "node": ">=4"
} }
}, },
"node_modules/read-pkg-up": { "node_modules/read-pkg-up": {
"version": "2.0.0", "version": "3.0.0",
"resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz", "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-3.0.0.tgz",
"integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=", "integrity": "sha1-PtSWaF26D4/hGNBpHcUfSh/5bwc=",
"dependencies": { "dependencies": {
"find-up": "^2.0.0", "find-up": "^2.0.0",
"read-pkg": "^2.0.0" "read-pkg": "^3.0.0"
}, },
"engines": { "engines": {
"node": ">=4" "node": ">=4"
...@@ -15222,22 +15409,22 @@ ...@@ -15222,22 +15409,22 @@
} }
}, },
"node_modules/read-pkg/node_modules/path-type": { "node_modules/read-pkg/node_modules/path-type": {
"version": "2.0.0", "version": "3.0.0",
"resolved": "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz", "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz",
"integrity": "sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=", "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==",
"dependencies": { "dependencies": {
"pify": "^2.0.0" "pify": "^3.0.0"
}, },
"engines": { "engines": {
"node": ">=4" "node": ">=4"
} }
}, },
"node_modules/read-pkg/node_modules/pify": { "node_modules/read-pkg/node_modules/pify": {
"version": "2.3.0", "version": "3.0.0",
"resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
"integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
"engines": { "engines": {
"node": ">=0.10.0" "node": ">=4"
} }
}, },
"node_modules/readable-stream": { "node_modules/readable-stream": {
...@@ -16211,17 +16398,6 @@ ...@@ -16211,17 +16398,6 @@
"node": ">=0.10.0" "node": ">=0.10.0"
} }
}, },
"node_modules/sane/node_modules/normalize-path": {
"version": "2.1.1",
"resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
"integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
"dependencies": {
"remove-trailing-separator": "^1.0.1"
},
"engines": {
"node": ">=0.10.0"
}
},
"node_modules/sane/node_modules/npm-run-path": { "node_modules/sane/node_modules/npm-run-path": {
"version": "2.0.2", "version": "2.0.2",
"resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz", "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
...@@ -17685,9 +17861,15 @@ ...@@ -17685,9 +17861,15 @@
"integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==" "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw=="
}, },
"node_modules/table": { "node_modules/table": {
<<<<<<< HEAD
"version": "6.7.0", "version": "6.7.0",
"resolved": "https://registry.npmjs.org/table/-/table-6.7.0.tgz", "resolved": "https://registry.npmjs.org/table/-/table-6.7.0.tgz",
"integrity": "sha512-SAM+5p6V99gYiiy2gT5ArdzgM1dLDed0nkrWmG6Fry/bUS/m9x83BwpJUOf1Qj/x2qJd+thL6IkIx7qPGRxqBw==", "integrity": "sha512-SAM+5p6V99gYiiy2gT5ArdzgM1dLDed0nkrWmG6Fry/bUS/m9x83BwpJUOf1Qj/x2qJd+thL6IkIx7qPGRxqBw==",
=======
"version": "6.7.1",
"resolved": "https://registry.npmjs.org/table/-/table-6.7.1.tgz",
"integrity": "sha512-ZGum47Yi6KOOFDE8m223td53ath2enHcYLgOCjGr5ngu8bdIARQk6mN/wRMv4yMRcHnCSnHbCEha4sobQx5yWg==",
>>>>>>> dev
"dependencies": { "dependencies": {
"ajv": "^8.0.1", "ajv": "^8.0.1",
"lodash.clonedeep": "^4.5.0", "lodash.clonedeep": "^4.5.0",
...@@ -18805,18 +18987,6 @@ ...@@ -18805,18 +18987,6 @@
"normalize-path": "^2.1.1" "normalize-path": "^2.1.1"
} }
}, },
"node_modules/watchpack-chokidar2/node_modules/anymatch/node_modules/normalize-path": {
"version": "2.1.1",
"resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
"integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
"optional": true,
"dependencies": {
"remove-trailing-separator": "^1.0.1"
},
"engines": {
"node": ">=0.10.0"
}
},
"node_modules/watchpack-chokidar2/node_modules/binary-extensions": { "node_modules/watchpack-chokidar2/node_modules/binary-extensions": {
"version": "1.13.1", "version": "1.13.1",
"resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz", "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz",
...@@ -18882,6 +19052,15 @@ ...@@ -18882,6 +19052,15 @@
"fsevents": "^1.2.7" "fsevents": "^1.2.7"
} }
}, },
"node_modules/watchpack-chokidar2/node_modules/chokidar/node_modules/normalize-path": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
"integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
"optional": true,
"engines": {
"node": ">=0.10.0"
}
},
"node_modules/watchpack-chokidar2/node_modules/fill-range": { "node_modules/watchpack-chokidar2/node_modules/fill-range": {
"version": "4.0.0", "version": "4.0.0",
"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz", "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
...@@ -19255,17 +19434,6 @@ ...@@ -19255,17 +19434,6 @@
"normalize-path": "^2.1.1" "normalize-path": "^2.1.1"
} }
}, },
"node_modules/webpack-dev-server/node_modules/anymatch/node_modules/normalize-path": {
"version": "2.1.1",
"resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
"integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
"dependencies": {
"remove-trailing-separator": "^1.0.1"
},
"engines": {
"node": ">=0.10.0"
}
},
"node_modules/webpack-dev-server/node_modules/binary-extensions": { "node_modules/webpack-dev-server/node_modules/binary-extensions": {
"version": "1.13.1", "version": "1.13.1",
"resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz", "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz",
...@@ -19335,6 +19503,14 @@ ...@@ -19335,6 +19503,14 @@
"fsevents": "^1.2.7" "fsevents": "^1.2.7"
} }
}, },
"node_modules/webpack-dev-server/node_modules/chokidar/node_modules/normalize-path": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
"integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
"engines": {
"node": ">=0.10.0"
}
},
"node_modules/webpack-dev-server/node_modules/cliui": { "node_modules/webpack-dev-server/node_modules/cliui": {
"version": "5.0.0", "version": "5.0.0",
"resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz", "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
...@@ -22592,9 +22768,9 @@ ...@@ -22592,9 +22768,9 @@
} }
}, },
"@testing-library/react": { "@testing-library/react": {
"version": "11.2.6", "version": "11.2.7",
"resolved": "https://registry.npmjs.org/@testing-library/react/-/react-11.2.6.tgz", "resolved": "https://registry.npmjs.org/@testing-library/react/-/react-11.2.7.tgz",
"integrity": "sha512-TXMCg0jT8xmuU8BkKMtp8l7Z50Ykew5WNX8UoIKTaLFwKkP2+1YDhOLA2Ga3wY4x29jyntk7EWfum0kjlYiSjQ==", "integrity": "sha512-tzRNp7pzd5QmbtXNG/mhdcl7Awfu/Iz1RaVHY75zTdOkmHCuzMhRL83gWHSgOAcjS3CCbyfwUHMZgRJb4kAfpA==",
"requires": { "requires": {
"@babel/runtime": "^7.12.5", "@babel/runtime": "^7.12.5",
"@testing-library/dom": "^7.28.1" "@testing-library/dom": "^7.28.1"
...@@ -23260,6 +23436,13 @@ ...@@ -23260,6 +23436,13 @@
"requires": { "requires": {
"normalize-path": "^3.0.0", "normalize-path": "^3.0.0",
"picomatch": "^2.0.4" "picomatch": "^2.0.4"
},
"dependencies": {
"normalize-path": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
"integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA=="
}
} }
}, },
"aproba": { "aproba": {
...@@ -24439,6 +24622,14 @@ ...@@ -24439,6 +24622,14 @@
"is-glob": "~4.0.1", "is-glob": "~4.0.1",
"normalize-path": "~3.0.0", "normalize-path": "~3.0.0",
"readdirp": "~3.5.0" "readdirp": "~3.5.0"
},
"dependencies": {
"normalize-path": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
"integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
"optional": true
}
} }
}, },
"chownr": { "chownr": {
...@@ -24845,9 +25036,13 @@ ...@@ -24845,9 +25036,13 @@
"integrity": "sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=" "integrity": "sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U="
}, },
"contains-path": { "contains-path": {
"version": "0.1.0", "version": "1.0.0",
"resolved": "https://registry.npmjs.org/contains-path/-/contains-path-0.1.0.tgz", "resolved": "https://registry.npmjs.org/contains-path/-/contains-path-1.0.0.tgz",
"integrity": "sha1-/ozxhP9mcLa67wGp1IYaXL7EEgo=" "integrity": "sha1-NFizMhhWA+ju0Y9RjUoQiIo6vJE=",
"requires": {
"normalize-path": "^2.1.1",
"path-starts-with": "^1.0.0"
}
}, },
"content-disposition": { "content-disposition": {
"version": "0.5.3", "version": "0.5.3",
...@@ -26227,26 +26422,21 @@ ...@@ -26227,26 +26422,21 @@
} }
}, },
"eslint-module-utils": { "eslint-module-utils": {
"version": "2.6.0", "version": "2.6.1",
"resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.6.0.tgz", "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.6.1.tgz",
"integrity": "sha512-6j9xxegbqe8/kZY8cYpcp0xhbK0EgJlg3g9mib3/miLaExuuwc3n5UEfSnU6hWMbT0FAYVvDbL9RrRgpUeQIvA==", "integrity": "sha512-ZXI9B8cxAJIH4nfkhTwcRTEAnrVfobYqwjWy/QMCZ8rHkZHFjf9yO4BzpiF9kCSfNlMG54eKigISHpX0+AaT4A==",
"requires": { "requires": {
"debug": "^2.6.9", "debug": "^3.2.7",
"pkg-dir": "^2.0.0" "pkg-dir": "^2.0.0"
}, },
"dependencies": { "dependencies": {
"debug": { "debug": {
"version": "2.6.9", "version": "3.2.7",
"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
"requires": { "requires": {
"ms": "2.0.0" "ms": "^2.1.1"
} }
},
"ms": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
"integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
} }
} }
}, },
...@@ -26260,22 +26450,25 @@ ...@@ -26260,22 +26450,25 @@
} }
}, },
"eslint-plugin-import": { "eslint-plugin-import": {
"version": "2.22.1", "version": "2.23.0",
"resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.22.1.tgz", "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.23.0.tgz",
"integrity": "sha512-8K7JjINHOpH64ozkAhpT3sd+FswIZTfMZTjdx052pnWrgRCVfp8op9tbjpAk3DdUeI/Ba4C8OjdC0r90erHEOw==", "integrity": "sha512-W5v1f7Cbam6BwbSSKtN6+yoUAms07ozbqAEhLOtf5erEqRv7w67PeZuAuBThaUkzdq2GfBx/5GBvxF+NWJshrQ==",
"requires": { "requires": {
"array-includes": "^3.1.1", "array-includes": "^3.1.3",
"array.prototype.flat": "^1.2.3", "array.prototype.flat": "^1.2.4",
"contains-path": "^0.1.0", "contains-path": "^1.0.0",
"debug": "^2.6.9", "debug": "^2.6.9",
"doctrine": "1.5.0", "doctrine": "^2.1.0",
"eslint-import-resolver-node": "^0.3.4", "eslint-import-resolver-node": "^0.3.4",
"eslint-module-utils": "^2.6.0", "eslint-module-utils": "^2.6.1",
"find-up": "^2.0.0",
"has": "^1.0.3", "has": "^1.0.3",
"is-core-module": "^2.4.0",
"minimatch": "^3.0.4", "minimatch": "^3.0.4",
"object.values": "^1.1.1", "object.values": "^1.1.3",
"read-pkg-up": "^2.0.0", "pkg-up": "^2.0.0",
"resolve": "^1.17.0", "read-pkg-up": "^3.0.0",
"resolve": "^1.20.0",
"tsconfig-paths": "^3.9.0" "tsconfig-paths": "^3.9.0"
}, },
"dependencies": { "dependencies": {
...@@ -26288,23 +26481,69 @@ ...@@ -26288,23 +26481,69 @@
} }
}, },
"doctrine": { "doctrine": {
"version": "1.5.0", "version": "2.1.0",
"resolved": "https://registry.npmjs.org/doctrine/-/doctrine-1.5.0.tgz", "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
"integrity": "sha1-N53Ocw9hZvds76TmcHoVmwLFpvo=", "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
"requires": { "requires": {
"esutils": "^2.0.2", "esutils": "^2.0.2"
"isarray": "^1.0.0"
} }
}, },
"isarray": { "find-up": {
"version": "1.0.0", "version": "2.1.0",
"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
"integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
"requires": {
"locate-path": "^2.0.0"
}
},
"locate-path": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
"integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
"requires": {
"p-locate": "^2.0.0",
"path-exists": "^3.0.0"
}
}, },
"ms": { "ms": {
"version": "2.0.0", "version": "2.0.0",
"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
"integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
},
"p-limit": {
"version": "1.3.0",
"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
"integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
"requires": {
"p-try": "^1.0.0"
}
},
"p-locate": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
"integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
"requires": {
"p-limit": "^1.1.0"
}
},
"p-try": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
"integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M="
},
"path-exists": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
"integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU="
},
"resolve": {
"version": "1.20.0",
"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.20.0.tgz",
"integrity": "sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==",
"requires": {
"is-core-module": "^2.2.0",
"path-parse": "^1.0.6"
}
} }
} }
}, },
...@@ -26475,6 +26714,11 @@ ...@@ -26475,6 +26714,11 @@
"schema-utils": "^3.0.0" "schema-utils": "^3.0.0"
}, },
"dependencies": { "dependencies": {
"normalize-path": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
"integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA=="
},
"schema-utils": { "schema-utils": {
"version": "3.0.0", "version": "3.0.0",
"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.0.0.tgz", "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.0.0.tgz",
...@@ -29512,28 +29756,29 @@ ...@@ -29512,28 +29756,29 @@
"integrity": "sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA=" "integrity": "sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA="
}, },
"load-json-file": { "load-json-file": {
"version": "2.0.0", "version": "4.0.0",
"resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz", "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz",
"integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=", "integrity": "sha1-L19Fq5HjMhYjT9U62rZo607AmTs=",
"requires": { "requires": {
"graceful-fs": "^4.1.2", "graceful-fs": "^4.1.2",
"parse-json": "^2.2.0", "parse-json": "^4.0.0",
"pify": "^2.0.0", "pify": "^3.0.0",
"strip-bom": "^3.0.0" "strip-bom": "^3.0.0"
}, },
"dependencies": { "dependencies": {
"parse-json": { "parse-json": {
"version": "2.2.0", "version": "4.0.0",
"resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz", "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
"integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=", "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=",
"requires": { "requires": {
"error-ex": "^1.2.0" "error-ex": "^1.3.1",
"json-parse-better-errors": "^1.0.1"
} }
}, },
"pify": { "pify": {
"version": "2.3.0", "version": "3.0.0",
"resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
"integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=" "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY="
}, },
"strip-bom": { "strip-bom": {
"version": "3.0.0", "version": "3.0.0",
...@@ -30192,9 +30437,15 @@ ...@@ -30192,9 +30437,15 @@
} }
}, },
"node-releases": { "node-releases": {
<<<<<<< HEAD
"version": "1.1.71", "version": "1.1.71",
"resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.71.tgz", "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.71.tgz",
"integrity": "sha512-zR6HoT6LrLCRBwukmrVbHv0EpEQjksO6GmFcZQQuCAy139BEsoVKPYnf3jongYW83fAa1torLGYwxxky/p28sg==" "integrity": "sha512-zR6HoT6LrLCRBwukmrVbHv0EpEQjksO6GmFcZQQuCAy139BEsoVKPYnf3jongYW83fAa1torLGYwxxky/p28sg=="
=======
"version": "1.1.72",
"resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.72.tgz",
"integrity": "sha512-LLUo+PpH3dU6XizX3iVoubUNheF/owjXCZZ5yACDxNnPtgFuludV1ZL3ayK1kVep42Rmm0+R9/Y60NQbZ2bifw=="
>>>>>>> dev
}, },
"normalize-package-data": { "normalize-package-data": {
"version": "2.5.0", "version": "2.5.0",
...@@ -30215,9 +30466,12 @@ ...@@ -30215,9 +30466,12 @@
} }
}, },
"normalize-path": { "normalize-path": {
"version": "3.0.0", "version": "2.1.1",
"resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
"integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==" "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
"requires": {
"remove-trailing-separator": "^1.0.1"
}
}, },
"normalize-range": { "normalize-range": {
"version": "0.1.2", "version": "0.1.2",
...@@ -30704,6 +30958,14 @@ ...@@ -30704,6 +30958,14 @@
"resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz", "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz",
"integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==" "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw=="
}, },
"path-starts-with": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/path-starts-with/-/path-starts-with-1.0.0.tgz",
"integrity": "sha1-soJDAV6LE43lcmgqxS2kLmRq2E4=",
"requires": {
"normalize-path": "^2.1.1"
}
},
"path-to-regexp": { "path-to-regexp": {
"version": "1.8.0", "version": "1.8.0",
"resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.8.0.tgz", "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.8.0.tgz",
...@@ -30819,38 +31081,51 @@ ...@@ -30819,38 +31081,51 @@
} }
}, },
"pkg-up": { "pkg-up": {
"version": "3.1.0", "version": "2.0.0",
"resolved": "https://registry.npmjs.org/pkg-up/-/pkg-up-3.1.0.tgz", "resolved": "https://registry.npmjs.org/pkg-up/-/pkg-up-2.0.0.tgz",
"integrity": "sha512-nDywThFk1i4BQK4twPQ6TA4RT8bDY96yeuCVBWL3ePARCiEKDRSrNGbFIgUJpLp+XeIR65v8ra7WuJOFUBtkMA==", "integrity": "sha1-yBmscoBZpGHKscOImivjxJoATX8=",
"requires": { "requires": {
"find-up": "^3.0.0" "find-up": "^2.1.0"
}, },
"dependencies": { "dependencies": {
"find-up": { "find-up": {
"version": "3.0.0", "version": "2.1.0",
"resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz", "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
"integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==", "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
"requires": { "requires": {
"locate-path": "^3.0.0" "locate-path": "^2.0.0"
} }
}, },
"locate-path": { "locate-path": {
"version": "3.0.0", "version": "2.0.0",
"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz", "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
"integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==", "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
"requires": { "requires": {
"p-locate": "^3.0.0", "p-locate": "^2.0.0",
"path-exists": "^3.0.0" "path-exists": "^3.0.0"
} }
}, },
"p-limit": {
"version": "1.3.0",
"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
"integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
"requires": {
"p-try": "^1.0.0"
}
},
"p-locate": { "p-locate": {
"version": "3.0.0", "version": "2.0.0",
"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz", "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
"integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==", "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
"requires": { "requires": {
"p-limit": "^2.0.0" "p-limit": "^1.1.0"
} }
}, },
"p-try": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
"integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M="
},
"path-exists": { "path-exists": {
"version": "3.0.0", "version": "3.0.0",
"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
...@@ -32349,6 +32624,46 @@ ...@@ -32349,6 +32624,46 @@
"resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz", "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz",
"integrity": "sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==" "integrity": "sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw=="
}, },
"locate-path": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
"integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
"requires": {
"p-locate": "^3.0.0",
"path-exists": "^3.0.0"
}
},
"p-locate": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
"integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
"requires": {
"p-limit": "^2.0.0"
}
},
"path-exists": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
"integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU="
},
"pkg-up": {
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/pkg-up/-/pkg-up-3.1.0.tgz",
"integrity": "sha512-nDywThFk1i4BQK4twPQ6TA4RT8bDY96yeuCVBWL3ePARCiEKDRSrNGbFIgUJpLp+XeIR65v8ra7WuJOFUBtkMA==",
"requires": {
"find-up": "^3.0.0"
},
"dependencies": {
"find-up": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
"integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
"requires": {
"locate-path": "^3.0.0"
}
}
}
},
"supports-color": { "supports-color": {
"version": "5.5.0", "version": "5.5.0",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
...@@ -32586,37 +32901,37 @@ ...@@ -32586,37 +32901,37 @@
} }
}, },
"read-pkg": { "read-pkg": {
"version": "2.0.0", "version": "3.0.0",
"resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz", "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz",
"integrity": "sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=", "integrity": "sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=",
"requires": { "requires": {
"load-json-file": "^2.0.0", "load-json-file": "^4.0.0",
"normalize-package-data": "^2.3.2", "normalize-package-data": "^2.3.2",
"path-type": "^2.0.0" "path-type": "^3.0.0"
}, },
"dependencies": { "dependencies": {
"path-type": { "path-type": {
"version": "2.0.0", "version": "3.0.0",
"resolved": "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz", "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz",
"integrity": "sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=", "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==",
"requires": { "requires": {
"pify": "^2.0.0" "pify": "^3.0.0"
} }
}, },
"pify": { "pify": {
"version": "2.3.0", "version": "3.0.0",
"resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
"integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=" "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY="
} }
} }
}, },
"read-pkg-up": { "read-pkg-up": {
"version": "2.0.0", "version": "3.0.0",
"resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz", "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-3.0.0.tgz",
"integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=", "integrity": "sha1-PtSWaF26D4/hGNBpHcUfSh/5bwc=",
"requires": { "requires": {
"find-up": "^2.0.0", "find-up": "^2.0.0",
"read-pkg": "^2.0.0" "read-pkg": "^3.0.0"
}, },
"dependencies": { "dependencies": {
"find-up": { "find-up": {
...@@ -33432,14 +33747,6 @@ ...@@ -33432,14 +33747,6 @@
"to-regex": "^3.0.2" "to-regex": "^3.0.2"
} }
}, },
"normalize-path": {
"version": "2.1.1",
"resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
"integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
"requires": {
"remove-trailing-separator": "^1.0.1"
}
},
"npm-run-path": { "npm-run-path": {
"version": "2.0.2", "version": "2.0.2",
"resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz", "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
...@@ -34629,9 +34936,15 @@ ...@@ -34629,9 +34936,15 @@
"integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==" "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw=="
}, },
"table": { "table": {
<<<<<<< HEAD
"version": "6.7.0", "version": "6.7.0",
"resolved": "https://registry.npmjs.org/table/-/table-6.7.0.tgz", "resolved": "https://registry.npmjs.org/table/-/table-6.7.0.tgz",
"integrity": "sha512-SAM+5p6V99gYiiy2gT5ArdzgM1dLDed0nkrWmG6Fry/bUS/m9x83BwpJUOf1Qj/x2qJd+thL6IkIx7qPGRxqBw==", "integrity": "sha512-SAM+5p6V99gYiiy2gT5ArdzgM1dLDed0nkrWmG6Fry/bUS/m9x83BwpJUOf1Qj/x2qJd+thL6IkIx7qPGRxqBw==",
=======
"version": "6.7.1",
"resolved": "https://registry.npmjs.org/table/-/table-6.7.1.tgz",
"integrity": "sha512-ZGum47Yi6KOOFDE8m223td53ath2enHcYLgOCjGr5ngu8bdIARQk6mN/wRMv4yMRcHnCSnHbCEha4sobQx5yWg==",
>>>>>>> dev
"requires": { "requires": {
"ajv": "^8.0.1", "ajv": "^8.0.1",
"lodash.clonedeep": "^4.5.0", "lodash.clonedeep": "^4.5.0",
...@@ -35509,17 +35822,6 @@ ...@@ -35509,17 +35822,6 @@
"requires": { "requires": {
"micromatch": "^3.1.4", "micromatch": "^3.1.4",
"normalize-path": "^2.1.1" "normalize-path": "^2.1.1"
},
"dependencies": {
"normalize-path": {
"version": "2.1.1",
"resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
"integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
"optional": true,
"requires": {
"remove-trailing-separator": "^1.0.1"
}
}
} }
}, },
"binary-extensions": { "binary-extensions": {
...@@ -35575,6 +35877,14 @@ ...@@ -35575,6 +35877,14 @@
"path-is-absolute": "^1.0.0", "path-is-absolute": "^1.0.0",
"readdirp": "^2.2.1", "readdirp": "^2.2.1",
"upath": "^1.1.1" "upath": "^1.1.1"
},
"dependencies": {
"normalize-path": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
"integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
"optional": true
}
} }
}, },
"fill-range": { "fill-range": {
...@@ -36096,16 +36406,6 @@ ...@@ -36096,16 +36406,6 @@
"requires": { "requires": {
"micromatch": "^3.1.4", "micromatch": "^3.1.4",
"normalize-path": "^2.1.1" "normalize-path": "^2.1.1"
},
"dependencies": {
"normalize-path": {
"version": "2.1.1",
"resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
"integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
"requires": {
"remove-trailing-separator": "^1.0.1"
}
}
} }
}, },
"binary-extensions": { "binary-extensions": {
...@@ -36162,6 +36462,13 @@ ...@@ -36162,6 +36462,13 @@
"path-is-absolute": "^1.0.0", "path-is-absolute": "^1.0.0",
"readdirp": "^2.2.1", "readdirp": "^2.2.1",
"upath": "^1.1.1" "upath": "^1.1.1"
},
"dependencies": {
"normalize-path": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
"integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA=="
}
} }
}, },
"cliui": { "cliui": {
src/App.js
View file @ b18719b5
...@@ -4,35 +4,31 @@ import Main from "./component/Main"; ...@@ -4,35 +4,31 @@ import Main from "./component/Main";
import AuthRoute from "./component/AuthRoute"; import AuthRoute from "./component/AuthRoute";
import { Switch } from "react-router"; import { Switch } from "react-router";
import Login from "./component/Login"; import Login from "./component/Login";
import 'semantic-ui-css/semantic.min.css' import "semantic-ui-css/semantic.min.css";
import React, { useState, createContext, useEffect } from 'react'; import React, { useState, createContext, useEffect } from "react";
export const AuthContext = createContext(); export const AuthContext = createContext();
function App() { function App() {
const[isLoggedIn, setIsLoggedIn] = useState(false); const [isLoggedIn, setIsLoggedIn] = useState(false);
const[user, setUser] = useState(null); const [user, setUser] = useState(null);
console.log(user);
const state = { const state = {
user, user,
setUser, setUser,
isLoggedIn, isLoggedIn,
setIsLoggedIn setIsLoggedIn,
} };
useEffect(()=>{
localStorage.setItem("loggedIn", isLoggedIn)
}, [isLoggedIn]) useEffect(() => {
localStorage.setItem("loggedIn", isLoggedIn);
}, [isLoggedIn]);
return ( return (
<AuthContext.Provider value={state}> <AuthContext.Provider value={state}>
<div> <div>
<Switch> <Switch>
<AuthRoute path="/login"> <AuthRoute exact path="/login">
<Login /> <Login />
</AuthRoute> </AuthRoute>
<AuthRoute> <AuthRoute>
......
src/component/AuthRoute.jsx
View file @ b18719b5
...@@ -12,16 +12,13 @@ export default function AuthRoute({ children, ...rest }) { ...@@ -12,16 +12,13 @@ export default function AuthRoute({ children, ...rest }) {
render={({ location }) => { render={({ location }) => {
if (isLoggedIn) { if (isLoggedIn) {
if (location.pathname === "/login") { if (location.pathname === "/login") {
// return <Redirect to="/" />; return <Redirect to="/products" />;
return children; } else return children;
} else { } else {
return children; if (location.pathname !== "/login") {
} return <Redirect to="/login" />;
} else if (location.pathname !== "/login") { } else return children;
// return <Redirect to="/login" />;
return children;
} }
return children;
}} }}
/> />
); );
......
src/component/Header.jsx
View file @ b18719b5
...@@ -4,14 +4,14 @@ import Search from "./Search"; ...@@ -4,14 +4,14 @@ import Search from "./Search";
import ".././styles/Header.css" import ".././styles/Header.css"
import LogoutButton from "./session/LogoutButton"; import LogoutButton from "./session/LogoutButton";
const Header = ({login, setLogin}) => { const Header = ({ login, setLogin }) => {
const [show, setShow] = useState(false); const [show, setShow] = useState(false);
return ( return (
<nav className="navbar navbar-expand-lg navbar-dark"> <nav className="navbar navbar-expand-lg navbar-dark">
<div className="container-fluid"> <div id="parent" className="container-fluid">
<Link className="navbar-brand" to="/"> <Link className="navbar-brand" to="/">
Ascend <img id="logo" src="../../../logo.jpeg" alt="Nisum Logo"></img>
</Link> </Link>
<button <button
className="navbar-toggler" className="navbar-toggler"
...@@ -30,7 +30,7 @@ const Header = ({login, setLogin}) => { ...@@ -30,7 +30,7 @@ const Header = ({login, setLogin}) => {
id="navbarSupportedContent" id="navbarSupportedContent"
> >
<ul className="navbar-nav me-auto mb-2 mb-lg-0"> <ul className="navbar-nav me-auto mb-2 mb-lg-0">
<li className="nav-item" style={{color: "red"}}> <li className="nav-item">
<Link className="nav-link" to="/products"> <Link className="nav-link" to="/products">
Products Products
</Link> </Link>
...@@ -41,13 +41,11 @@ const Header = ({login, setLogin}) => { ...@@ -41,13 +41,11 @@ const Header = ({login, setLogin}) => {
</Link> </Link>
</li> </li>
</ul> </ul>
<div id="page-title" className="nav-item mx-auto"> <h1>Inventory, Promotions, Pricing</h1>
</div> <LogoutButton />
<LogoutButton/>
</div> </div>
</div> </div>
<h1 id="page-title">Inventory, Promotions, Pricing</h1>
</nav> </nav>
); );
}; };
......
src/component/Main.jsx
View file @ b18719b5
...@@ -15,7 +15,7 @@ export default function Main() { ...@@ -15,7 +15,7 @@ export default function Main() {
<AuthRoute exact path="/products/new"> <AuthRoute exact path="/products/new">
<ProductForm method="POST" /> <ProductForm method="POST" />
</AuthRoute> </AuthRoute>
<AuthRoute exact path="/products/edit/:productId"> <AuthRoute exact path="/products/:productId/update">
<ProductForm method="PUT" /> <ProductForm method="PUT" />
</AuthRoute> </AuthRoute>
<AuthRoute <AuthRoute
......
src/component/ProductForm.jsx
View file @ b18719b5
...@@ -21,7 +21,7 @@ export default function ProductForm(props) { ...@@ -21,7 +21,7 @@ export default function ProductForm(props) {
const { productId } = useParams("productId"); const { productId } = useParams("productId");
useEffect(() => { useEffect(() => {
fetch(`${Config.inventoryUrl}${productId}/`).then((res) => { fetch(`${Config.inventoryUrl}/${productId}/`).then((res) => {
if (res.ok) { if (res.ok) {
console.log(res); console.log(res);
res.json().then((data) => { res.json().then((data) => {
......
src/component/ProductIndex.jsx
View file @ b18719b5
...@@ -10,7 +10,7 @@ export default function ProductIndex() { ...@@ -10,7 +10,7 @@ export default function ProductIndex() {
const [categories, setCategories] = useState([]); const [categories, setCategories] = useState([]);
const [activeCategory, setActiveCategory] = useState(""); const [activeCategory, setActiveCategory] = useState("");
console.log(displayProducts); // console.log(displayProducts);
const fetchProducts = async () => { const fetchProducts = async () => {
const res = await fetch(`${Config.inventoryUrl}`); const res = await fetch(`${Config.inventoryUrl}`);
if (res.ok) { if (res.ok) {
......
src/component/ProductRow.jsx
View file @ b18719b5
import React, { useState } from "react"; import React, { useState } from "react";
import "./../styles/ProductRow.css"; import "./../styles/ProductRow.css";
import { Modal, Button, Alert } from "react-bootstrap"; import { Modal, Button, Alert } from "react-bootstrap";
import { useHistory } from "react-router";
export default function ProductRow({ product, handleDelete }) { export default function ProductRow({ product, handleDelete }) {
const [show, setShow] = useState(false); const [show, setShow] = useState(false);
const [showConfirm, setShowConfirm] = useState(false); const [showConfirm, setShowConfirm] = useState(false);
const history = useHistory();
const handleClose = () => { const handleClose = () => {
setShow(false); setShow(false);
...@@ -60,7 +62,10 @@ export default function ProductRow({ product, handleDelete }) { ...@@ -60,7 +62,10 @@ export default function ProductRow({ product, handleDelete }) {
> >
Delete product Delete product
</Button> </Button>
<Button variant="primary" href={`/products/edit/${product.sku}`}> <Button
variant="primary"
onClick={() => history.push(`/products/${product.sku}/update`)}
>
Edit Product Edit Product
</Button> </Button>
......
src/component/session/LoginButton.jsx
View file @ b18719b5
...@@ -10,13 +10,14 @@ const clientId = ...@@ -10,13 +10,14 @@ const clientId =
function LoginButton({}){ function LoginButton({}){
const { isLoggedIn, setIsLoggedIn } = useContext(AuthContext); const { isLoggedIn, setIsLoggedIn,setUser } = useContext(AuthContext);
const onSuccessLogin = (res) =>{ const onSuccessLogin = (res) =>{
setIsLoggedIn(true); setIsLoggedIn(true);
const { tokenId, profileObj } = res; const { tokenId, profileObj } = res;
setUser(profileObj);
}; };
const onFailure = (res) =>{ const onFailure = (res) =>{
setIsLoggedIn(false); setIsLoggedIn(false);
}; };
...@@ -34,6 +35,7 @@ function LoginButton({}){ ...@@ -34,6 +35,7 @@ function LoginButton({}){
onSuccess= {onSuccessLogin} onSuccess= {onSuccessLogin}
onFailure= {onFailure} onFailure= {onFailure}
cookiePolicy={'single_host_origin'} cookiePolicy={'single_host_origin'}
isSignedIn={true}
/> />
</div> </div>
</div> </div>
......
src/component/session/LoginButtonPage.css
View file @ b18719b5
...@@ -2,4 +2,5 @@ ...@@ -2,4 +2,5 @@
padding: 50px; padding: 50px;
justify-content: center; justify-content: center;
} }
\ No newline at end of file
src/component/session/LogoutButton.jsx
View file @ b18719b5
import React, { useContext } from "react"; import React, {useContext} from 'react';
import { GoogleLogout } from "react-google-login"; import {GoogleLogout} from 'react-google-login';
import { AuthContext } from "../../App"; import {AuthContext} from "../../App";
import { Dropdown } from 'react-bootstrap';
import "./LogoutDropDown.css";
const google_ClientID = process.env.REACT_APP_GOOGLE_CLIENT_ID; const google_ClientID = process.env.REACT_APP_GOOGLE_CLIENT_ID;
const clientId = `925243198137-7066age7c8m7sfuufcheruoa43ng55ts.apps.googleusercontent.com`; const clientId = `925243198137-7066age7c8m7sfuufcheruoa43ng55ts.apps.googleusercontent.com`;
function LogoutButton() { function LogoutButton() {
const { isLoggedIn, setIsLoggedIn } = useContext(AuthContext); const { isLoggedIn, setIsLoggedIn, user , setUser } = useContext(AuthContext);
const onSuccessLogout= (res) =>{
setIsLoggedIn(false);
}
const onSuccessLogout = (res) => { return(
setIsLoggedIn(false); <div>
}; <Dropdown>
<Dropdown.Toggle className="dropdown">
{user != null ?
<p><img className="profile-pic" src={user.imageUrl}/>
{user.name}</p>
: <p>User</p>
}
</Dropdown.Toggle>
<Dropdown.Menu>
<Dropdown.Item>Profile</Dropdown.Item>
<Dropdown.Item><GoogleLogout
render={props => (<div onClick={props.onClick}>Logout</div>)}
clientId= {clientId}
buttonText="Logout"
onLogoutSuccess={onSuccessLogout}
isSignedIn={false}
/></Dropdown.Item>
</Dropdown.Menu>
</Dropdown>
return ( </div>
<div> );
<GoogleLogout
clientId={clientId}
buttonText="Logout"
onLogoutSuccess={onSuccessLogout}
/>
</div>
);
} }
export default LogoutButton; export default LogoutButton;
src/component/session/LogoutDropDown.css 0 → 100644
View file @ b18719b5
.profile-pic{
position: relative;
width: 28px;
height: 28px;
overflow: hidden;
border-radius: 50%;
padding: 2px;
}
.dropdown{
color:#EBEBEB;
background-color: transparent;
border-color: transparent;
}
.dropdown:hover{
color:#CCCDCF;
background-color: transparent;
border-color: transparent;
}
.dropdown-toggle:after {
display: none;
}
src/config.js
View file @ b18719b5
class Config { class Config {
static inventoryUrl = "http://13.64.175.185:8080/api/products"; static inventoryUrl = "http://13.64.175.185:8080/api/products";
static promotionsUrl = "http://40.118.215.99:8082/api/promos"; static promotionsUrl = "http://168.62.203.53:8082/api/promos";
static sessionUrl = "http://localhost:8080/api/sessions"; static sessionUrl = "http://localhost:8080/api/sessions";
} }
......
src/emptProduct.js
View file @ b18719b5
...@@ -9,5 +9,4 @@ const emptyProduct = { ...@@ -9,5 +9,4 @@ const emptyProduct = {
productDesciption: "", productDesciption: "",
productImageUrl: "", productImageUrl: "",
}; };
export default emptyProduct;
export default emptyProduct; \ No newline at end of file
src/index.js
View file @ b18719b5
...@@ -12,10 +12,11 @@ storage.setItem("loggedIn", "false"); ...@@ -12,10 +12,11 @@ storage.setItem("loggedIn", "false");
ReactDOM.render( ReactDOM.render(
<React.StrictMode> <React.StrictMode>
<BrowserRouter> <BrowserRouter>
<App /> <App />
</BrowserRouter> </BrowserRouter>
</React.StrictMode>, </React.StrictMode>,
document.getElementById("root") document.getElementById('root')
); );
// If you want to start measuring performance in your app, pass a function // If you want to start measuring performance in your app, pass a function
......
src/styles/Header.css
View file @ b18719b5
.navbar { .navbar {
background-color: #00567D; background-color: #00567D;
position: relative;
} }
#page-title{ #page-title{
position: absolute;
display: flex;
justify-content: center;
align-items: center;
margin-top: auto;
margin-bottom: auto;
left: 0;
right: 0;
color: #EBEBEB; color: #EBEBEB;
pointer-events: none;
}
#logo{
width: 100px;
height: 50px;
}
.nav-link{
color: #EBEBEB !important;
}
.nav-link:hover{
color: #CCCDCF !important;
} }
\ No newline at end of file
yarn.lock 0 → 100644
View file @ b18719b5
This source diff could not be displayed because it is too large. You can view the blob instead.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment