From 3eb94d861f01dd8499a8cd7cd1ba57d11d2506db Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 11 Aug 2021 10:53:05 +0000 Subject: [PATCH 01/28] Bump path-parse from 1.0.6 to 1.0.7 Bumps [path-parse](https://github.com/jbgutierrez/path-parse) from 1.0.6 to 1.0.7. - [Release notes](https://github.com/jbgutierrez/path-parse/releases) - [Commits](https://github.com/jbgutierrez/path-parse/commits/v1.0.7) --- updated-dependencies: - dependency-name: path-parse dependency-type: indirect ... Signed-off-by: dependabot[bot] --- package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index b6e638fe6..a10899891 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2959,9 +2959,9 @@ "dev": true }, "path-parse": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz", - "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==" + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", + "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==" }, "path-type": { "version": "3.0.0", From 5a2e2aa0537d0c9d15312426efa0bc627656d348 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 11 Aug 2021 23:44:28 +0000 Subject: [PATCH 02/28] Bump path-parse from 1.0.6 to 1.0.7 in /shared Bumps [path-parse](https://github.com/jbgutierrez/path-parse) from 1.0.6 to 1.0.7. - [Release notes](https://github.com/jbgutierrez/path-parse/releases) - [Commits](https://github.com/jbgutierrez/path-parse/commits/v1.0.7) --- updated-dependencies: - dependency-name: path-parse dependency-type: indirect ... Signed-off-by: dependabot[bot] --- shared/package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/shared/package-lock.json b/shared/package-lock.json index ac3cca3e7..31c4c1520 100644 --- a/shared/package-lock.json +++ b/shared/package-lock.json @@ -1707,9 +1707,9 @@ "dev": true }, "path-parse": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz", - "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==", + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", + "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==", "dev": true }, "path-type": { From dc5823770e0071e1e0e50b8f8d978babd3d5ee27 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 21 Sep 2021 12:42:52 +0000 Subject: [PATCH 03/28] Bump tmpl from 1.0.4 to 1.0.5 in /frontend Bumps [tmpl](https://github.com/daaku/nodejs-tmpl) from 1.0.4 to 1.0.5. - [Release notes](https://github.com/daaku/nodejs-tmpl/releases) - [Commits](https://github.com/daaku/nodejs-tmpl/commits/v1.0.5) --- updated-dependencies: - dependency-name: tmpl dependency-type: indirect ... Signed-off-by: dependabot[bot] --- frontend/package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/frontend/package-lock.json b/frontend/package-lock.json index 312484c4f..e9e9e7a1f 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -18085,9 +18085,9 @@ } }, "tmpl": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.4.tgz", - "integrity": "sha1-I2QN17QtAEM5ERQIIOXPRA5SHdE=" + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz", + "integrity": "sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==" }, "to-arraybuffer": { "version": "1.0.1", From 600ec1440709bb987d90ab733f8193d7b6797e6c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 21 Oct 2021 07:29:12 +0000 Subject: [PATCH 04/28] Bump axios from 0.21.1 to 0.21.4 Bumps [axios](https://github.com/axios/axios) from 0.21.1 to 0.21.4. - [Release notes](https://github.com/axios/axios/releases) - [Changelog](https://github.com/axios/axios/blob/master/CHANGELOG.md) - [Commits](https://github.com/axios/axios/compare/v0.21.1...v0.21.4) --- updated-dependencies: - dependency-name: axios dependency-type: indirect ... Signed-off-by: dependabot[bot] --- package-lock.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index b6e638fe6..d42cb12b8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -505,11 +505,11 @@ "integrity": "sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==" }, "axios": { - "version": "0.21.1", - "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.1.tgz", - "integrity": "sha512-dKQiRHxGD9PPRIUNIWvZhPTPpl1rf/OxTYKsqKUDjBwYylTvV7SjSHJb9ratfyzM6wCdLCOYLzs73qpg5c4iGA==", + "version": "0.21.4", + "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz", + "integrity": "sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==", "requires": { - "follow-redirects": "^1.10.0" + "follow-redirects": "^1.14.0" } }, "babel-code-frame": { From 412334799420859d77b0eb3582e701cc6295425f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 5 Nov 2021 11:28:50 +0000 Subject: [PATCH 05/28] Bump axios from 0.21.1 to 0.21.2 in /frontend Bumps [axios](https://github.com/axios/axios) from 0.21.1 to 0.21.2. - [Release notes](https://github.com/axios/axios/releases) - [Changelog](https://github.com/axios/axios/blob/master/CHANGELOG.md) - [Commits](https://github.com/axios/axios/compare/v0.21.1...v0.21.2) --- updated-dependencies: - dependency-name: axios dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- frontend/package-lock.json | 8 ++++---- frontend/package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/frontend/package-lock.json b/frontend/package-lock.json index 371608e91..1fe34a2c9 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -5233,11 +5233,11 @@ "dev": true }, "axios": { - "version": "0.21.1", - "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.1.tgz", - "integrity": "sha512-dKQiRHxGD9PPRIUNIWvZhPTPpl1rf/OxTYKsqKUDjBwYylTvV7SjSHJb9ratfyzM6wCdLCOYLzs73qpg5c4iGA==", + "version": "0.21.2", + "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.2.tgz", + "integrity": "sha512-87otirqUw3e8CzHTMO+/9kh/FSgXt/eVDvipijwDtEuwbkySWZ9SBm6VEubmJ/kLKEoLQV/POhxXFb66bfekfg==", "requires": { - "follow-redirects": "^1.10.0" + "follow-redirects": "^1.14.0" } }, "axobject-query": { diff --git a/frontend/package.json b/frontend/package.json index 3b6cf21ec..c5699027f 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -16,7 +16,7 @@ "@welldone-software/why-did-you-render": "^4.2.5", "antd": "^4.3.1", "auth0-js": "^9.13.2", - "axios": "^0.21.1", + "axios": "^0.21.2", "babel-plugin-import": "^1.13.0", "cloudinary-react": "^1.5.0", "connected-react-router": "^6.8.0", From e8dd262c878ad471efea6fada2fa7dc9487378b6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 8 Dec 2021 13:25:25 +0000 Subject: [PATCH 06/28] Bump object-path from 0.11.5 to 0.11.8 in /shared Bumps [object-path](https://github.com/mariocasciaro/object-path) from 0.11.5 to 0.11.8. - [Release notes](https://github.com/mariocasciaro/object-path/releases) - [Commits](https://github.com/mariocasciaro/object-path/commits) --- updated-dependencies: - dependency-name: object-path dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- shared/package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/shared/package-lock.json b/shared/package-lock.json index ac3cca3e7..5068cc5ee 100644 --- a/shared/package-lock.json +++ b/shared/package-lock.json @@ -1559,9 +1559,9 @@ "dev": true }, "object-path": { - "version": "0.11.5", - "resolved": "https://registry.npmjs.org/object-path/-/object-path-0.11.5.tgz", - "integrity": "sha512-jgSbThcoR/s+XumvGMTMf81QVBmah+/Q7K7YduKeKVWL7N111unR2d6pZZarSk6kY/caeNxUDyxOvMWyzoU2eg==" + "version": "0.11.8", + "resolved": "https://registry.npmjs.org/object-path/-/object-path-0.11.8.tgz", + "integrity": "sha512-YJjNZrlXJFM42wTBn6zgOJVar9KFJvzx6sTWDte8sWZF//cnjl0BxHNpfZx+ZffXX63A9q0b1zsFiBX4g4X5KA==" }, "object.assign": { "version": "4.1.0", From 86252d318883ba2c7d25872345231ca69724ff91 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 12 Feb 2022 19:14:34 +0000 Subject: [PATCH 07/28] Bump ajv from 6.12.2 to 6.12.6 Bumps [ajv](https://github.com/ajv-validator/ajv) from 6.12.2 to 6.12.6. - [Release notes](https://github.com/ajv-validator/ajv/releases) - [Commits](https://github.com/ajv-validator/ajv/compare/v6.12.2...v6.12.6) --- updated-dependencies: - dependency-name: ajv dependency-type: indirect ... Signed-off-by: dependabot[bot] --- package-lock.json | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/package-lock.json b/package-lock.json index b6e638fe6..8ddd74dae 100644 --- a/package-lock.json +++ b/package-lock.json @@ -160,9 +160,9 @@ } }, "ajv": { - "version": "6.12.2", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.2.tgz", - "integrity": "sha512-k+V+hzjm5q/Mr8ef/1Y9goCmlsK4I6Sm74teeyGvFk1XrOsbsKLjEdrvny42CZ+a8sXbk8KWpY/bDwS+FLL2UQ==", + "version": "6.12.6", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", + "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", "requires": { "fast-deep-equal": "^3.1.1", "fast-json-stable-stringify": "^2.0.0", @@ -1967,19 +1967,6 @@ "requires": { "ajv": "^6.12.3", "har-schema": "^2.0.0" - }, - "dependencies": { - "ajv": { - "version": "6.12.6", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", - "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", - "requires": { - "fast-deep-equal": "^3.1.1", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.4.1", - "uri-js": "^4.2.2" - } - } } }, "has": { From 91f498acf0d5ab1430668b61d842c499ab55846f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 13 Feb 2022 00:45:06 +0000 Subject: [PATCH 08/28] Bump ajv from 6.12.2 to 6.12.6 in /shared Bumps [ajv](https://github.com/ajv-validator/ajv) from 6.12.2 to 6.12.6. - [Release notes](https://github.com/ajv-validator/ajv/releases) - [Commits](https://github.com/ajv-validator/ajv/compare/v6.12.2...v6.12.6) --- updated-dependencies: - dependency-name: ajv dependency-type: indirect ... Signed-off-by: dependabot[bot] --- shared/package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/shared/package-lock.json b/shared/package-lock.json index ac3cca3e7..fbcdfb441 100644 --- a/shared/package-lock.json +++ b/shared/package-lock.json @@ -57,9 +57,9 @@ "dev": true }, "ajv": { - "version": "6.12.2", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.2.tgz", - "integrity": "sha512-k+V+hzjm5q/Mr8ef/1Y9goCmlsK4I6Sm74teeyGvFk1XrOsbsKLjEdrvny42CZ+a8sXbk8KWpY/bDwS+FLL2UQ==", + "version": "6.12.6", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", + "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", "dev": true, "requires": { "fast-deep-equal": "^3.1.1", From 1a1f8c3987ba21694f76506d46a46f9fcd92a667 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 14 Feb 2022 09:35:19 +0000 Subject: [PATCH 09/28] Bump follow-redirects from 1.14.1 to 1.14.8 Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.14.1 to 1.14.8. - [Release notes](https://github.com/follow-redirects/follow-redirects/releases) - [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.14.1...v1.14.8) --- updated-dependencies: - dependency-name: follow-redirects dependency-type: indirect ... Signed-off-by: dependabot[bot] --- package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index b6e638fe6..359f31251 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1753,9 +1753,9 @@ "integrity": "sha512-eNMNr5exLoavuAMhIUVsOKF79SWd/zG104ef6sxBTSw+cZc6BXdQXDvYcGvp0VbxVVSp1XDUNoz7mg1xMtSznA==" }, "follow-redirects": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.1.tgz", - "integrity": "sha512-HWqDgT7ZEkqRzBvc2s64vSZ/hfOceEol3ac/7tKwzuvEyWx3/4UegXh5oBOIotkGsObyk3xznnSRVADBgWSQVg==" + "version": "1.14.8", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.8.tgz", + "integrity": "sha512-1x0S9UVJHsQprFcEC/qnNzBLcIxsjAV905f/UkQxbclCsoTWlacCNOpQa/anodLl2uaEKFhfWOvM2Qg77+15zA==" }, "forever-agent": { "version": "0.6.1", From bc071d6ddeb560c94b77c2561aa159a81a7c681b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 15 Mar 2022 20:21:32 +0000 Subject: [PATCH 10/28] Bump lodash-es from 4.17.15 to 4.17.21 Bumps [lodash-es](https://github.com/lodash/lodash) from 4.17.15 to 4.17.21. - [Release notes](https://github.com/lodash/lodash/releases) - [Commits](https://github.com/lodash/lodash/compare/4.17.15...4.17.21) --- updated-dependencies: - dependency-name: lodash-es dependency-type: indirect ... Signed-off-by: dependabot[bot] --- package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index b6e638fe6..c92e58402 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2467,9 +2467,9 @@ "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==" }, "lodash-es": { - "version": "4.17.15", - "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.15.tgz", - "integrity": "sha512-rlrc3yU3+JNOpZ9zj5pQtxnx2THmvRykwL4Xlxoa8I9lHBlVbbyPhgyPMioxVZ4NqyxaVVtaJnzsyOidQIhyyQ==" + "version": "4.17.21", + "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.21.tgz", + "integrity": "sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==" }, "lodash.clonedeep": { "version": "4.5.0", From d9d02ae7175ddbc04ca166e0a9bc5bf0be7ff416 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 15 Mar 2022 20:21:34 +0000 Subject: [PATCH 11/28] Bump lodash-es from 4.17.15 to 4.17.21 in /shared Bumps [lodash-es](https://github.com/lodash/lodash) from 4.17.15 to 4.17.21. - [Release notes](https://github.com/lodash/lodash/releases) - [Commits](https://github.com/lodash/lodash/compare/4.17.15...4.17.21) --- updated-dependencies: - dependency-name: lodash-es dependency-type: indirect ... Signed-off-by: dependabot[bot] --- shared/package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/shared/package-lock.json b/shared/package-lock.json index ac3cca3e7..878225944 100644 --- a/shared/package-lock.json +++ b/shared/package-lock.json @@ -1262,9 +1262,9 @@ "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==" }, "lodash-es": { - "version": "4.17.15", - "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.15.tgz", - "integrity": "sha512-rlrc3yU3+JNOpZ9zj5pQtxnx2THmvRykwL4Xlxoa8I9lHBlVbbyPhgyPMioxVZ4NqyxaVVtaJnzsyOidQIhyyQ==" + "version": "4.17.21", + "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.21.tgz", + "integrity": "sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==" }, "log-symbols": { "version": "3.0.0", From df1bc77709eabcfc86afeea22b8f94d125413a8d Mon Sep 17 00:00:00 2001 From: Javier Hernandez Date: Fri, 16 Feb 2024 17:48:32 +0200 Subject: [PATCH 12/28] Create dependabot.yml --- .github/dependabot.yml | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 .github/dependabot.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 000000000..0f57ebb10 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,38 @@ +# To get started with Dependabot version updates, you'll need to specify which +# package ecosystems to update and where the package manifests are located. +# Please see the documentation for all configuration options: +# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file + +version: 2 +updates: + - package-ecosystem: "npm" # See documentation for possible values + # Root + directory: "/" # Location of package manifests + schedule: + interval: "weekly" + assignees: + - "wickathou" + + - package-ecosystem: "npm" # See documentation for possible values + # Frontend + directory: "/frontend/" # Location of package manifests + schedule: + interval: "weekly" + assignees: + - "wickathou" + + - package-ecosystem: "npm" # See documentation for possible values + # Backend + directory: "/backend/" # Location of package manifests + schedule: + interval: "weekly" + assignees: + - "wickathou" + + - package-ecosystem: "npm" # See documentation for possible values + # Shared + directory: "/shared/" # Location of package manifests + schedule: + interval: "weekly" + assignees: + - "wickathou" From 28710e2d576fb3940f56c238ff555b5fd0de588d Mon Sep 17 00:00:00 2001 From: Javier Date: Fri, 16 Feb 2024 18:09:32 +0200 Subject: [PATCH 13/28] Updated object-path to 0.11.8 --- frontend/package.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/package.json b/frontend/package.json index ea96a8498..ba51f92a1 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -35,7 +35,7 @@ "moment": "^2.26.0", "moment-timezone": "^0.5.31", "notistack": "^0.9.16", - "object-path": "^0.11.5", + "object-path": "^0.11.8", "pdf-lib": "^1.17.1", "qrcode.react": "^1.0.0", "react": "16.13.1", diff --git a/package.json b/package.json index 0a6d56c25..dc715b196 100644 --- a/package.json +++ b/package.json @@ -71,4 +71,4 @@ "npm": "6.9.0" }, "type": "module" -} \ No newline at end of file +} From f3cabd5513252de5ae6040e19b36543f5c21370e Mon Sep 17 00:00:00 2001 From: Javier Date: Fri, 16 Feb 2024 19:08:58 +0200 Subject: [PATCH 14/28] Updated ansi-regex dependency --- shared/package-lock.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/shared/package-lock.json b/shared/package-lock.json index e43ae0d58..12a0b97d7 100644 --- a/shared/package-lock.json +++ b/shared/package-lock.json @@ -86,9 +86,9 @@ } }, "ansi-regex": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", - "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==", + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", "dev": true }, "ansi-styles": { @@ -1754,9 +1754,9 @@ }, "dependencies": { "ansi-regex": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", - "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz", + "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==", "dev": true } } From 4b46aa6d5c93295b3fc74e91ecca23a1b37aef05 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 21 Feb 2024 08:44:29 +0000 Subject: [PATCH 15/28] Bump ip from 1.1.5 to 1.1.9 Bumps [ip](https://github.com/indutny/node-ip) from 1.1.5 to 1.1.9. - [Commits](https://github.com/indutny/node-ip/compare/v1.1.5...v1.1.9) --- updated-dependencies: - dependency-name: ip dependency-type: indirect ... Signed-off-by: dependabot[bot] --- package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 5869dca78..d0ea4a570 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3390,9 +3390,9 @@ } }, "ip": { - "version": "1.1.5", - "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz", - "integrity": "sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo=" + "version": "1.1.9", + "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.9.tgz", + "integrity": "sha512-cyRxvOEpNHNtchU3Ln9KC/auJgup87llfQpQ+t5ghoC/UhL16SWzbueiCsdTnWmqAWl7LadfuwhlqmtOaqMHdQ==" }, "is-accessor-descriptor": { "version": "0.1.6", From 9825fa03559de5a54ba925cb233a6f3a6a967f17 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 21 Feb 2024 14:50:36 +0000 Subject: [PATCH 16/28] Bump axios from 0.21.4 to 0.28.0 in /frontend Bumps [axios](https://github.com/axios/axios) from 0.21.4 to 0.28.0. - [Release notes](https://github.com/axios/axios/releases) - [Changelog](https://github.com/axios/axios/blob/v0.28.0/CHANGELOG.md) - [Commits](https://github.com/axios/axios/compare/v0.21.4...v0.28.0) --- updated-dependencies: - dependency-name: axios dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- frontend/package-lock.json | 15 +++++++++++---- frontend/package.json | 2 +- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/frontend/package-lock.json b/frontend/package-lock.json index 1e54e94c2..ce3fd1e68 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -5231,11 +5231,13 @@ "dev": true }, "axios": { - "version": "0.21.4", - "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz", - "integrity": "sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==", + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/axios/-/axios-0.28.0.tgz", + "integrity": "sha512-Tu7NYoGY4Yoc7I+Npf9HhUMtEEpV7ZiLH9yndTCoNhcpBH0kwcvFbzYN9/u5QKI5A6uefjsNNWaz5olJVYS62Q==", "requires": { - "follow-redirects": "^1.14.0" + "follow-redirects": "^1.15.0", + "form-data": "^4.0.0", + "proxy-from-env": "^1.1.0" } }, "axobject-query": { @@ -14913,6 +14915,11 @@ "ipaddr.js": "1.9.1" } }, + "proxy-from-env": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz", + "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==" + }, "prr": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz", diff --git a/frontend/package.json b/frontend/package.json index d8f3d9c91..fb631f1db 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -17,7 +17,7 @@ "@welldone-software/why-did-you-render": "^4.2.5", "antd": "^4.3.1", "auth0-js": "^9.13.2", - "axios": "^0.21.1", + "axios": "^0.28.0", "babel-plugin-import": "^1.13.0", "cloudinary-react": "^1.5.0", "connected-react-router": "^6.8.0", From e19aee4d35cc39e18952117bbec8b856d417d610 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 21 Feb 2024 16:28:54 +0000 Subject: [PATCH 17/28] Bump axios from 0.21.4 to 0.28.0 in /backend Bumps [axios](https://github.com/axios/axios) from 0.21.4 to 0.28.0. - [Release notes](https://github.com/axios/axios/releases) - [Changelog](https://github.com/axios/axios/blob/v0.28.0/CHANGELOG.md) - [Commits](https://github.com/axios/axios/compare/v0.21.4...v0.28.0) --- updated-dependencies: - dependency-name: axios dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- backend/package-lock.json | 354 ++++++++++++++------------------------ backend/package.json | 2 +- 2 files changed, 126 insertions(+), 230 deletions(-) diff --git a/backend/package-lock.json b/backend/package-lock.json index a771ee139..54eb2fba9 100644 --- a/backend/package-lock.json +++ b/backend/package-lock.json @@ -2624,6 +2624,7 @@ }, "eslint": { "version": "6.8.0", + "resolved": false, "integrity": "sha512-K+Iayyo2LtyYhDSYwz5D5QdWw0hCacNzyq1Y821Xna2xSJj7cijoLLYmLxTQgcgZ9mC61nryMy9S7GRbYpI5Ig==", "requires": { "@babel/code-frame": "^7.0.0", @@ -2682,6 +2683,7 @@ }, "eslint-config-airbnb-base": { "version": "14.1.0", + "resolved": false, "integrity": "sha512-+XCcfGyCnbzOnktDVhwsCAx+9DmrzEmuwxyHUJpw+kqBVT744OUBrB09khgFKlK1lshVww6qXGsYPZpavoNjJw==", "requires": { "confusing-browser-globals": "^1.0.9", @@ -2691,6 +2693,7 @@ }, "eslint-config-prettier": { "version": "6.11.0", + "resolved": false, "integrity": "sha512-oB8cpLWSAjOVFEJhhyMZh6NOEOtBVziaqdDQ86+qhDHFbZXoRTM7pNSvFRfW/W/L/LrQ38C99J5CGuRBBzBsdA==", "requires": { "get-stdin": "^6.0.0" @@ -2746,6 +2749,7 @@ }, "eslint-plugin-import": { "version": "2.20.2", + "resolved": false, "integrity": "sha512-FObidqpXrR8OnCh4iNsxy+WACztJLXAHBO5hK79T1Hc77PgQZkyDGA5Ag9xAvRpglvLNxhH/zSmZ70/pZ31dHg==", "requires": { "array-includes": "^3.0.3", @@ -2788,6 +2792,7 @@ }, "eslint-plugin-prettier": { "version": "3.1.3", + "resolved": false, "integrity": "sha512-+HG5jmu/dN3ZV3T6eCD7a4BlAySdN7mLIbJYo0z1cFQuI+r2DiTJEFeF68ots93PsnrMxbzIZ2S/ieX+mkrBeQ==", "requires": { "prettier-linter-helpers": "^1.0.0" @@ -3560,6 +3565,7 @@ }, "prettier": { "version": "2.0.5", + "resolved": false, "integrity": "sha512-7PtVymN48hGcO4fGjybyBSIWDsLU4H4XlvOHfq91pz9kkGlonzwTfYkaIEwiRg/dAJF9YlbsduBAgtYLi+8cFg==" }, "prettier-linter-helpers": { @@ -5080,14 +5086,6 @@ "@types/node": "*" } }, - "@types/pump": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/@types/pump/-/pump-1.1.1.tgz", - "integrity": "sha512-wpRerjHDxFBQ4r8XNv3xHJZeuqrBBoeQ/fhgkooV2F7KsPIYRROb/+f9ODgZfOEyO5/w2ej4YQdpPPXipT8DAA==", - "requires": { - "@types/node": "*" - } - }, "@types/qs": { "version": "6.9.7", "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.7.tgz", @@ -5375,6 +5373,16 @@ "requires": { "@apollo/utils.keyvaluecache": "^1.0.1", "apollo-server-env": "^4.2.1" + }, + "dependencies": { + "apollo-server-env": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/apollo-server-env/-/apollo-server-env-4.2.1.tgz", + "integrity": "sha512-vm/7c7ld+zFMxibzqZ7SSa5tBENc4B0uye9LTfjJwGoQFY5xsUPH5FpO5j0bMUDZ8YYNbrF9SNtzc5Cngcr90g==", + "requires": { + "node-fetch": "^2.6.7" + } + } } }, "apollo-graphql": { @@ -5473,6 +5481,14 @@ "whatwg-mimetype": "^3.0.0" }, "dependencies": { + "apollo-server-env": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/apollo-server-env/-/apollo-server-env-4.2.1.tgz", + "integrity": "sha512-vm/7c7ld+zFMxibzqZ7SSa5tBENc4B0uye9LTfjJwGoQFY5xsUPH5FpO5j0bMUDZ8YYNbrF9SNtzc5Cngcr90g==", + "requires": { + "node-fetch": "^2.6.7" + } + }, "uuid": { "version": "9.0.0", "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.0.tgz", @@ -5480,23 +5496,15 @@ } } }, - "apollo-server-env": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/apollo-server-env/-/apollo-server-env-4.2.1.tgz", - "integrity": "sha512-vm/7c7ld+zFMxibzqZ7SSa5tBENc4B0uye9LTfjJwGoQFY5xsUPH5FpO5j0bMUDZ8YYNbrF9SNtzc5Cngcr90g==", - "requires": { - "node-fetch": "^2.6.7" - } - }, "apollo-server-errors": { "version": "3.3.1", "resolved": "https://registry.npmjs.org/apollo-server-errors/-/apollo-server-errors-3.3.1.tgz", "integrity": "sha512-xnZJ5QWs6FixHICXHxUfm+ZWqqxrNuPlQ+kj5m6RtEgIpekOPssH/SD9gf2B4HuWV0QozorrygwZnux8POvyPA==" }, "apollo-server-express": { - "version": "2.26.1", - "resolved": "https://registry.npmjs.org/apollo-server-express/-/apollo-server-express-2.26.1.tgz", - "integrity": "sha512-eATTtlGhZFuo4KNRgaQ25jflUchI18oMd0vZyx0uIQ/CM0FPttO1noQ0fPAO6U0oSrxS8J9fCh8naJFDTUsZ0w==", + "version": "2.25.2", + "resolved": "https://registry.npmjs.org/apollo-server-express/-/apollo-server-express-2.25.2.tgz", + "integrity": "sha512-A2gF2e85vvDugPlajbhr0A14cDFDIGX0mteNOJ8P3Z3cIM0D4hwrWxJidI+SzobefDIyIHu1dynFedJVhV0euQ==", "requires": { "@apollographql/graphql-playground-html": "1.6.27", "@types/accepts": "^1.3.5", @@ -5505,8 +5513,8 @@ "@types/express": "^4.17.12", "@types/express-serve-static-core": "^4.17.21", "accepts": "^1.3.5", - "apollo-server-core": "^2.26.1", - "apollo-server-types": "^0.10.0", + "apollo-server-core": "^2.25.2", + "apollo-server-types": "^0.9.0", "body-parser": "^1.18.3", "cors": "^2.8.5", "express": "^4.17.1", @@ -5545,140 +5553,6 @@ "xss": "^1.0.8" } }, - "@graphql-tools/merge": { - "version": "8.3.0", - "resolved": "https://registry.npmjs.org/@graphql-tools/merge/-/merge-8.3.0.tgz", - "integrity": "sha512-xRa7RAQok/0DD2YnjuqikMrr7dUAxTpdGtZ7BkvUUGhYs3B3p7reCAfvOVr1DJAqVToP7hdlMk+S5+Ylk+AaqA==", - "requires": { - "@graphql-tools/utils": "8.8.0", - "tslib": "^2.4.0" - } - }, - "@graphql-tools/mock": { - "version": "8.7.0", - "resolved": "https://registry.npmjs.org/@graphql-tools/mock/-/mock-8.7.0.tgz", - "integrity": "sha512-K/hqP442mXAvW36v/3TmqFpNzRw14P86xlsJZod88OXwpDfb97X09z1QsaMcvSe8E7ijcKWLlTRk15/vDQSL2Q==", - "requires": { - "@graphql-tools/schema": "8.5.0", - "@graphql-tools/utils": "8.8.0", - "fast-json-stable-stringify": "^2.1.0", - "tslib": "^2.4.0" - } - }, - "@graphql-tools/schema": { - "version": "8.5.0", - "resolved": "https://registry.npmjs.org/@graphql-tools/schema/-/schema-8.5.0.tgz", - "integrity": "sha512-VeFtKjM3SA9/hCJJfr95aEdC3G0xIKM9z0Qdz4i+eC1g2fdZYnfWFt2ucW4IME+2TDd0enHlKzaV0qk2SLVUww==", - "requires": { - "@graphql-tools/merge": "8.3.0", - "@graphql-tools/utils": "8.8.0", - "tslib": "^2.4.0", - "value-or-promise": "1.0.11" - } - }, - "@graphql-tools/utils": { - "version": "8.8.0", - "resolved": "https://registry.npmjs.org/@graphql-tools/utils/-/utils-8.8.0.tgz", - "integrity": "sha512-KJrtx05uSM/cPYFdTnGAS1doL5bftJLAiFCDMZ8Vkifztz3BFn3gpFiy/o4wDtM8s39G46mxmt2Km/RmeltfGw==", - "requires": { - "tslib": "^2.4.0" - } - }, - "@types/node": { - "version": "10.17.60", - "resolved": "https://registry.npmjs.org/@types/node/-/node-10.17.60.tgz", - "integrity": "sha512-F0KIgDJfy2nA3zMLmWGKxcH2ZVEtCZXHHdOQs2gSaQ27+lNeEfGxzkIw90aXswATX7AZ33tahPbzy6KAfUreVw==" - }, - "apollo-reporting-protobuf": { - "version": "3.3.2", - "resolved": "https://registry.npmjs.org/apollo-reporting-protobuf/-/apollo-reporting-protobuf-3.3.2.tgz", - "integrity": "sha512-j1tx9tmkVdsLt1UPzBrvz90PdjAeKW157WxGn+aXlnnGfVjZLIRXX3x5t1NWtXvB7rVaAsLLILLtDHW382TSoQ==", - "requires": { - "@apollo/protobufjs": "1.2.4" - } - }, - "apollo-server-env": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/apollo-server-env/-/apollo-server-env-4.2.1.tgz", - "integrity": "sha512-vm/7c7ld+zFMxibzqZ7SSa5tBENc4B0uye9LTfjJwGoQFY5xsUPH5FpO5j0bMUDZ8YYNbrF9SNtzc5Cngcr90g==", - "requires": { - "node-fetch": "^2.6.7" - } - }, - "apollo-server-types": { - "version": "3.6.2", - "resolved": "https://registry.npmjs.org/apollo-server-types/-/apollo-server-types-3.6.2.tgz", - "integrity": "sha512-9Z54S7NB+qW1VV+kmiqwU2Q6jxWfX89HlSGCGOo3zrkrperh85LrzABgN9S92+qyeHYd72noMDg2aI039sF3dg==", - "requires": { - "@apollo/utils.keyvaluecache": "^1.0.1", - "@apollo/utils.logger": "^1.0.0", - "apollo-reporting-protobuf": "^3.3.2", - "apollo-server-env": "^4.2.1" - } - }, - "node-fetch": { - "version": "2.6.7", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz", - "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==", - "requires": { - "whatwg-url": "^5.0.0" - } - }, - "tslib": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz", - "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==" - }, - "uuid": { - "version": "8.3.2", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", - "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==" - }, - "value-or-promise": { - "version": "1.0.11", - "resolved": "https://registry.npmjs.org/value-or-promise/-/value-or-promise-1.0.11.tgz", - "integrity": "sha512-41BrgH+dIbCFXClcSapVs5M6GkENd3gQOJpEfPDNa71LsUGMXDL0jMWpI/Rh7WhX+Aalfz2TTS3Zt5pUsbnhLg==" - } - } - }, - "apollo-server-env": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/apollo-server-env/-/apollo-server-env-3.1.0.tgz", - "integrity": "sha512-iGdZgEOAuVop3vb0F2J3+kaBVi4caMoxefHosxmgzAbbSpvWehB8Y1QiSyyMeouYC38XNVk5wnZl+jdGSsWsIQ==", - "requires": { - "node-fetch": "^2.6.1", - "util.promisify": "^1.0.0" - } - }, - "apollo-server-errors": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/apollo-server-errors/-/apollo-server-errors-3.3.1.tgz", - "integrity": "sha512-xnZJ5QWs6FixHICXHxUfm+ZWqqxrNuPlQ+kj5m6RtEgIpekOPssH/SD9gf2B4HuWV0QozorrygwZnux8POvyPA==" - }, - "apollo-server-express": { - "version": "2.25.2", - "resolved": "https://registry.npmjs.org/apollo-server-express/-/apollo-server-express-2.25.2.tgz", - "integrity": "sha512-A2gF2e85vvDugPlajbhr0A14cDFDIGX0mteNOJ8P3Z3cIM0D4hwrWxJidI+SzobefDIyIHu1dynFedJVhV0euQ==", - "requires": { - "@apollographql/graphql-playground-html": "1.6.27", - "@types/accepts": "^1.3.5", - "@types/body-parser": "1.19.0", - "@types/cors": "2.8.10", - "@types/express": "^4.17.12", - "@types/express-serve-static-core": "^4.17.21", - "accepts": "^1.3.5", - "apollo-server-core": "^2.25.2", - "apollo-server-types": "^0.9.0", - "body-parser": "^1.18.3", - "cors": "^2.8.5", - "express": "^4.17.1", - "graphql-subscriptions": "^1.0.0", - "graphql-tools": "^4.0.8", - "parseurl": "^1.3.2", - "subscriptions-transport-ws": "^0.9.19", - "type-is": "^1.6.16" - }, - "dependencies": { "apollo-datasource": { "version": "0.10.0", "resolved": "https://registry.npmjs.org/apollo-datasource/-/apollo-datasource-0.10.0.tgz", @@ -5726,6 +5600,18 @@ "sha.js": "^2.4.11", "subscriptions-transport-ws": "^0.9.19", "uuid": "^8.0.0" + }, + "dependencies": { + "apollo-server-types": { + "version": "0.10.0", + "resolved": "https://registry.npmjs.org/apollo-server-types/-/apollo-server-types-0.10.0.tgz", + "integrity": "sha512-LsB3epw1X3Co/HGiKHCGtzWG35J59gG8Ypx0p22+wgdM9AVDm1ylsNGZy+osNIVJc1lUJf3nF5kZ90vA866K/w==", + "requires": { + "apollo-reporting-protobuf": "^0.8.0", + "apollo-server-caching": "^0.7.0", + "apollo-server-env": "^3.2.0" + } + } } }, "apollo-server-env": { @@ -5748,16 +5634,28 @@ "integrity": "sha512-nTNSFuBhZURGjtWptdVqwemYUOdsvABj/GSKzeNvepiEubiv4N0rt4Gvy1inHDiMbo98wQTdF/7XohNcB9A77g==", "requires": { "apollo-server-types": "^0.10.0" + }, + "dependencies": { + "apollo-server-types": { + "version": "0.10.0", + "resolved": "https://registry.npmjs.org/apollo-server-types/-/apollo-server-types-0.10.0.tgz", + "integrity": "sha512-LsB3epw1X3Co/HGiKHCGtzWG35J59gG8Ypx0p22+wgdM9AVDm1ylsNGZy+osNIVJc1lUJf3nF5kZ90vA866K/w==", + "requires": { + "apollo-reporting-protobuf": "^0.8.0", + "apollo-server-caching": "^0.7.0", + "apollo-server-env": "^3.2.0" + } + } } }, "apollo-server-types": { - "version": "0.10.0", - "resolved": "https://registry.npmjs.org/apollo-server-types/-/apollo-server-types-0.10.0.tgz", - "integrity": "sha512-LsB3epw1X3Co/HGiKHCGtzWG35J59gG8Ypx0p22+wgdM9AVDm1ylsNGZy+osNIVJc1lUJf3nF5kZ90vA866K/w==", + "version": "0.9.0", + "resolved": "https://registry.npmjs.org/apollo-server-types/-/apollo-server-types-0.9.0.tgz", + "integrity": "sha512-qk9tg4Imwpk732JJHBkhW0jzfG0nFsLqK2DY6UhvJf7jLnRePYsPxWfPiNkxni27pLE2tiNlCwoDFSeWqpZyBg==", "requires": { "apollo-reporting-protobuf": "^0.8.0", "apollo-server-caching": "^0.7.0", - "apollo-server-env": "^3.2.0" + "apollo-server-env": "^3.1.0" } }, "graphql-tools": { @@ -5803,6 +5701,16 @@ "@apollo/utils.logger": "^1.0.0", "apollo-reporting-protobuf": "^3.4.0", "apollo-server-env": "^4.2.1" + }, + "dependencies": { + "apollo-server-env": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/apollo-server-env/-/apollo-server-env-4.2.1.tgz", + "integrity": "sha512-vm/7c7ld+zFMxibzqZ7SSa5tBENc4B0uye9LTfjJwGoQFY5xsUPH5FpO5j0bMUDZ8YYNbrF9SNtzc5Cngcr90g==", + "requires": { + "node-fetch": "^2.6.7" + } + } } }, "apollo-tracing": { @@ -6180,11 +6088,25 @@ "integrity": "sha512-NmWvPnx0F1SfrQbYwOi7OeaNGokp9XhzNioJ/CSBs8Qa4vxug81mhJEAVZwxXuBmYB5KDRfMq/F3RR0BIU7sWg==" }, "axios": { - "version": "0.21.4", - "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz", - "integrity": "sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==", + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/axios/-/axios-0.28.0.tgz", + "integrity": "sha512-Tu7NYoGY4Yoc7I+Npf9HhUMtEEpV7ZiLH9yndTCoNhcpBH0kwcvFbzYN9/u5QKI5A6uefjsNNWaz5olJVYS62Q==", "requires": { - "follow-redirects": "^1.14.0" + "follow-redirects": "^1.15.0", + "form-data": "^4.0.0", + "proxy-from-env": "^1.1.0" + }, + "dependencies": { + "form-data": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz", + "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==", + "requires": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.8", + "mime-types": "^2.1.12" + } + } } }, "babel-plugin-syntax-trailing-function-commas": { @@ -6681,13 +6603,15 @@ "core-js": "^3.30.1", "lodash": "^4.17.21", "q": "^1.5.1" + }, + "dependencies": { + "cloudinary-core": { + "version": "2.13.0", + "resolved": "https://registry.npmjs.org/cloudinary-core/-/cloudinary-core-2.13.0.tgz", + "integrity": "sha512-Nt0Q5I2FtenmJghtC4YZ3MZZbGg1wLm84SsxcuVwZ83OyJqG9CNIGp86CiI6iDv3QobaqBUpOT7vg+HqY5HxEA==" + } } }, - "cloudinary-core": { - "version": "2.11.4", - "resolved": "https://registry.npmjs.org/cloudinary-core/-/cloudinary-core-2.11.4.tgz", - "integrity": "sha512-F1BZczD6f5mB73D0c8gl/iuacVQQO+UhckNZxeeS9ZIVeIHbsfqwWiAZMQmIvEb7Wti/9MLU0xVwaWOak2THHA==" - }, "code-point-at": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz", @@ -7364,6 +7288,28 @@ "typed-array-length": "^1.0.4", "unbox-primitive": "^1.0.2", "which-typed-array": "^1.1.10" + }, + "dependencies": { + "string.prototype.trimend": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.7.tgz", + "integrity": "sha512-Ni79DqeB72ZFq1uH/L6zJ+DKZTkOtPIHovb3YZHQViE+HDouuU4mBrLOLDn5Dde3RF8qw5qVETEjhu9locMLvA==", + "requires": { + "call-bind": "^1.0.2", + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1" + } + }, + "string.prototype.trimstart": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.7.tgz", + "integrity": "sha512-NGhtDFu3jCEm7B4Fy0DpLewdJQOZcQ0rGbwQ/+stjnrp2i+rlKeCvos9hOIeCmqwratM47OBxY7uFZzjxHXmrg==", + "requires": { + "call-bind": "^1.0.2", + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1" + } + } } }, "es-array-method-boxes-properly": { @@ -8949,11 +8895,6 @@ "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz", "integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==" }, - "has-own-prop": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/has-own-prop/-/has-own-prop-2.0.0.tgz", - "integrity": "sha512-Pq0h+hvsVm6dDEa8x82GnLSYHOzNDt7f0ddFa3FqcQlgzEiptPqL+XrOJNavjOzSYiYWIrgeVYYgGlLmnxwilQ==" - }, "has-symbols": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz", @@ -9758,6 +9699,14 @@ "proxy-from-env": "^1.1.0" }, "dependencies": { + "axios": { + "version": "0.21.4", + "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz", + "integrity": "sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==", + "requires": { + "follow-redirects": "^1.14.0" + } + }, "debug": { "version": "4.3.4", "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", @@ -11789,12 +11738,12 @@ "string-template": { "version": "0.2.1", "resolved": "https://registry.npmjs.org/string-template/-/string-template-0.2.1.tgz", - "integrity": "sha512-Yptehjogou2xm4UJbxJ4CxgZx12HBfeystp0y3x7s4Dj32ltVVG1Gg8YhKjHZkHicuKpZX/ffilA8505VbUbpw==" + "integrity": "sha1-QpMuWYo1LQH8IuwzZ9nYTuxsmt0=" }, "string-width": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", - "integrity": "sha512-0XsVpQLnVCXHJfyEs8tC0zpTVIr5PKKsQtkT29IwupnPTjtPmQ3xT/4yCREF9hYkV/3M3kzcUTSAZT6a6h81tw==", + "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -11811,59 +11760,6 @@ "es-abstract": "^1.20.4" } }, - "string.prototype.trimend": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz", - "integrity": "sha512-JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ==", - "requires": { - "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4" - } - }, - "string.prototype.trimstart": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.6.tgz", - "integrity": "sha512-omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA==", - "requires": { - "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4" - } - }, - "string-template": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/string-template/-/string-template-0.2.1.tgz", - "integrity": "sha1-QpMuWYo1LQH8IuwzZ9nYTuxsmt0=" - }, - "string-width": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", - "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", - "requires": { - "code-point-at": "^1.0.0", - "is-fullwidth-code-point": "^1.0.0", - "strip-ansi": "^3.0.0" - } - }, - "string.prototype.trimend": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz", - "integrity": "sha512-y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A==", - "requires": { - "call-bind": "^1.0.2", - "define-properties": "^1.1.3" - } - }, - "string.prototype.trimstart": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz", - "integrity": "sha512-jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw==", - "requires": { - "call-bind": "^1.0.2", - "define-properties": "^1.1.3" - } - }, "string_decoder": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", @@ -12832,4 +12728,4 @@ } } } -} \ No newline at end of file +} diff --git a/backend/package.json b/backend/package.json index 8c2650595..dcbc3dc49 100644 --- a/backend/package.json +++ b/backend/package.json @@ -29,7 +29,7 @@ "apollo-server-core": "^3.10.0", "apollo-server-express": "^2.19.0", "auth0": "^2.31.1", - "axios": "^0.21.1", + "axios": "^0.28.0", "bcrypt": "^5.0.0", "better-npm-run": "^0.1.1", "bluebird": "^3.7.2", From c4467923aa6a1861dc655bac5028c8c41ccabfad Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 22 Feb 2024 05:45:17 +0000 Subject: [PATCH 18/28] Bump ip from 1.1.8 to 1.1.9 in /frontend Bumps [ip](https://github.com/indutny/node-ip) from 1.1.8 to 1.1.9. - [Commits](https://github.com/indutny/node-ip/compare/v1.1.8...v1.1.9) --- updated-dependencies: - dependency-name: ip dependency-type: indirect ... Signed-off-by: dependabot[bot] --- frontend/package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/frontend/package-lock.json b/frontend/package-lock.json index 1e54e94c2..62366565b 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -10548,9 +10548,9 @@ } }, "ip": { - "version": "1.1.8", - "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.8.tgz", - "integrity": "sha512-PuExPYUiu6qMBQb4l06ecm6T6ujzhmh+MeJcW9wa89PoAz5pvd4zPgN5WJV104mb6S2T1AwNIAaB70JNrLQWhg==" + "version": "1.1.9", + "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.9.tgz", + "integrity": "sha512-cyRxvOEpNHNtchU3Ln9KC/auJgup87llfQpQ+t5ghoC/UhL16SWzbueiCsdTnWmqAWl7LadfuwhlqmtOaqMHdQ==" }, "ip-regex": { "version": "2.1.0", From 463bcbb504f41da952aed94b38648bd80117817b Mon Sep 17 00:00:00 2001 From: Javier Date: Tue, 27 Feb 2024 17:06:52 +0200 Subject: [PATCH 19/28] Bumped minimist from v1.2.5 to v1.2.8 --- package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index a45630485..7dfc137d3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4209,9 +4209,9 @@ } }, "minimist": { - "version": "1.2.5", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", - "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==" + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz", + "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==" }, "mixin-deep": { "version": "1.3.2", From 4e4dc1e57027843cd779bff36aac6e44238594a8 Mon Sep 17 00:00:00 2001 From: Javier Date: Tue, 27 Feb 2024 17:31:47 +0200 Subject: [PATCH 20/28] Updating minimist from 1.2.5 to 1.2.8 in shared --- shared/package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/shared/package-lock.json b/shared/package-lock.json index 12a0b97d7..10e7e4dce 100644 --- a/shared/package-lock.json +++ b/shared/package-lock.json @@ -1117,9 +1117,9 @@ } }, "minimist": { - "version": "1.2.5", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", - "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==", + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz", + "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==", "dev": true }, "mkdirp": { From 9457f34f6f42f2d0e9efd00604f81142aaac43e3 Mon Sep 17 00:00:00 2001 From: Javier Date: Fri, 22 Mar 2024 15:34:47 +0200 Subject: [PATCH 21/28] Updated Africa, Asia and UE pipelines to restart pm2 properly --- azure-pipelines-africa.yml | 257 ++++++++++++++++++------------------- azure-pipelines-asia.yml | 257 ++++++++++++++++++------------------- azure-pipelines-eu.yml | 257 ++++++++++++++++++------------------- 3 files changed, 381 insertions(+), 390 deletions(-) diff --git a/azure-pipelines-africa.yml b/azure-pipelines-africa.yml index d3810dd6c..fc589b1de 100644 --- a/azure-pipelines-africa.yml +++ b/azure-pipelines-africa.yml @@ -1,137 +1,134 @@ #Works trigger: -- none + - none pool: - vmImage: ubuntu-latest + vmImage: ubuntu-latest stages: - -- stage: Build_africa - displayName: Build stage africa - jobs: - - job: Build_africa - steps: - - - task: DownloadSecureFile@1 - displayName: 'download AFRICA backendend' - inputs: - secureFile: 'BACKEND_ENV_FILE_AFRICA' # string. Required. Secure File. - - - task: CopyFiles@2 - displayName: 'copy africa backendend' - inputs: - SourceFolder: '$(Agent.TempDirectory)' - Contents: BACKEND_ENV_FILE_AFRICA - TargetFolder: './backend' - - - script: mv ./backend/BACKEND_ENV_FILE_AFRICA ./backend/.env - displayName: 'rename africa .env' - - task: DownloadSecureFile@1 - displayName: 'download africa frontend' - inputs: - secureFile: 'FRONTEND_ENV_FILE_AFRICA' # string. Required. Secure File. - - - task: CopyFiles@2 - displayName: 'copy africa frontend' - inputs: - SourceFolder: '$(Agent.TempDirectory)' - Contents: FRONTEND_ENV_FILE_AFRICA - TargetFolder: './frontend' - - - script: mv ./frontend/FRONTEND_ENV_FILE_AFRICA ./frontend/.env - displayName: 'rename africa .env' - - - script: ls -a ./frontend - displayName: 'ls' - - - script: ls -Rn - displayName: 'ls' - - - task: NodeTool@0 - inputs: - versionSpec: '12.20.1' - displayName: 'Install Node.js' - - - task: Bash@3 - inputs: - targetType: 'inline' - script: | - node -v - npm -v - npm install - npm run build - - - task: ArchiveFiles@2 - displayName: 'Archive files' - inputs: - rootFolderOrFile: '$(System.DefaultWorkingDirectory)' - includeRootFolder: false - archiveType: zip - archiveFile: $(Build.ArtifactStagingDirectory)/$(Build.BuildId).zip - replaceExistingArchive: true - - upload: $(Build.ArtifactStagingDirectory)/$(Build.BuildId).zip - artifact: drop_africa - - - deployment: VMDeploy_AFRICA - dependsOn: Build_africa - displayName: DEPLOY AFRICA - environment: - name: PROD - resourceType: VirtualMachine - tags: africa - strategy: - runOnce: - preDeploy: - steps: - - task: DownloadPipelineArtifact@2 - inputs: - buildType: 'current' - artifactName: drop_africa - targetPath: '$(Pipeline.Workspace)/drop_africa' - - - script: echo initialize, cleanup, backup, install certs - - deploy: - steps: - - task: Bash@3 - inputs: - targetType: 'inline' - script: | - # Modify deployment script based on the app type - echo "Starting deployment script run" - - - - task: ExtractFiles@1 - inputs: - archiveFilePatterns: '$(Pipeline.Workspace)/drop_africa/$(Build.BuildId).zip' - destinationFolder: '$(Pipeline.Workspace)/japp' - cleanDestinationFolder: true - overwriteExistingFiles: true - - - task: DeleteFiles@1 - inputs: - SourceFolder: '$(Pipeline.Workspace)/drop_africa' - Contents: '$(Build.BuildId).zip' - - - task: Bash@3 - inputs: - targetType: 'inline' - script: | - cd /home/azureuser/azagent/_work/2/japp - pm2 restart index - sudo systemctl restart nginx - - routeTraffic: - steps: - - script: echo routing traffic - postRouteTraffic: - steps: - - script: echo health check post-route traffic - on: - failure: - steps: - - script: echo Restore from backup! This is on failure - success: + - stage: Build_africa + displayName: Build stage africa + jobs: + - job: Build_africa steps: - - script: echo Notify! This is on success + - task: DownloadSecureFile@1 + displayName: 'download AFRICA backendend' + inputs: + secureFile: 'BACKEND_ENV_FILE_AFRICA' # string. Required. Secure File. + + - task: CopyFiles@2 + displayName: 'copy africa backendend' + inputs: + SourceFolder: '$(Agent.TempDirectory)' + Contents: BACKEND_ENV_FILE_AFRICA + TargetFolder: './backend' + + - script: mv ./backend/BACKEND_ENV_FILE_AFRICA ./backend/.env + displayName: 'rename africa .env' + - task: DownloadSecureFile@1 + displayName: 'download africa frontend' + inputs: + secureFile: 'FRONTEND_ENV_FILE_AFRICA' # string. Required. Secure File. + + - task: CopyFiles@2 + displayName: 'copy africa frontend' + inputs: + SourceFolder: '$(Agent.TempDirectory)' + Contents: FRONTEND_ENV_FILE_AFRICA + TargetFolder: './frontend' + + - script: mv ./frontend/FRONTEND_ENV_FILE_AFRICA ./frontend/.env + displayName: 'rename africa .env' + + - script: ls -a ./frontend + displayName: 'ls' + + - script: ls -Rn + displayName: 'ls' + + - task: NodeTool@0 + inputs: + versionSpec: '12.20.1' + displayName: 'Install Node.js' + + - task: Bash@3 + inputs: + targetType: 'inline' + script: | + node -v + npm -v + npm install + npm run build + + - task: ArchiveFiles@2 + displayName: 'Archive files' + inputs: + rootFolderOrFile: '$(System.DefaultWorkingDirectory)' + includeRootFolder: false + archiveType: zip + archiveFile: $(Build.ArtifactStagingDirectory)/$(Build.BuildId).zip + replaceExistingArchive: true + - upload: $(Build.ArtifactStagingDirectory)/$(Build.BuildId).zip + artifact: drop_africa + + - deployment: VMDeploy_AFRICA + dependsOn: Build_africa + displayName: DEPLOY AFRICA + environment: + name: PROD + resourceType: VirtualMachine + tags: africa + strategy: + runOnce: + preDeploy: + steps: + - task: DownloadPipelineArtifact@2 + inputs: + buildType: 'current' + artifactName: drop_africa + targetPath: '$(Pipeline.Workspace)/drop_africa' + + - script: echo initialize, cleanup, backup, install certs + + deploy: + steps: + - task: Bash@3 + inputs: + targetType: 'inline' + script: | + # Modify deployment script based on the app type + echo "Starting deployment script run" + + - task: ExtractFiles@1 + inputs: + archiveFilePatterns: '$(Pipeline.Workspace)/drop_africa/$(Build.BuildId).zip' + destinationFolder: '$(Pipeline.Workspace)/japp' + cleanDestinationFolder: true + overwriteExistingFiles: true + + - task: DeleteFiles@1 + inputs: + SourceFolder: '$(Pipeline.Workspace)/drop_africa' + Contents: '$(Build.BuildId).zip' + + - task: Bash@3 + inputs: + targetType: 'inline' + script: | + cd /home/azureuser/azagent/_work/3/japp + pm2 restart index + sudo systemctl restart nginx + + routeTraffic: + steps: + - script: echo routing traffic + postRouteTraffic: + steps: + - script: echo health check post-route traffic + on: + failure: + steps: + - script: echo Restore from backup! This is on failure + success: + steps: + - script: echo Notify! This is on success diff --git a/azure-pipelines-asia.yml b/azure-pipelines-asia.yml index 8f78cdb7a..bfe825e8b 100644 --- a/azure-pipelines-asia.yml +++ b/azure-pipelines-asia.yml @@ -1,137 +1,134 @@ # Works trigger: -- none + - none pool: - vmImage: ubuntu-latest + vmImage: ubuntu-latest stages: - -- stage: Build_asia - displayName: Build stage asia - jobs: - - job: Build_asia - steps: - - - task: DownloadSecureFile@1 - displayName: 'download ASIA backendend' - inputs: - secureFile: 'BACKEND_ENV_FILE_ASIA' # string. Required. Secure File. - - - task: CopyFiles@2 - displayName: 'copy asia backendend' - inputs: - SourceFolder: '$(Agent.TempDirectory)' - Contents: BACKEND_ENV_FILE_ASIA - TargetFolder: './backend' - - - script: mv ./backend/BACKEND_ENV_FILE_ASIA ./backend/.env - displayName: 'rename asia .env' - - task: DownloadSecureFile@1 - displayName: 'download asia frontend' - inputs: - secureFile: 'FRONTEND_ENV_FILE_ASIA' # string. Required. Secure File. - - - task: CopyFiles@2 - displayName: 'copy asia frontend' - inputs: - SourceFolder: '$(Agent.TempDirectory)' - Contents: FRONTEND_ENV_FILE_ASIA - TargetFolder: './frontend' - - - script: mv ./frontend/FRONTEND_ENV_FILE_ASIA ./frontend/.env - displayName: 'rename asia .env' - - - script: ls -a ./frontend - displayName: 'ls' - - - script: ls -Rn - displayName: 'ls' - - - task: NodeTool@0 - inputs: - versionSpec: '12.20.1' - displayName: 'Install Node.js' - - - task: Bash@3 - inputs: - targetType: 'inline' - script: | - node -v - npm -v - npm install - npm run build - - - task: ArchiveFiles@2 - displayName: 'Archive files' - inputs: - rootFolderOrFile: '$(System.DefaultWorkingDirectory)' - includeRootFolder: false - archiveType: zip - archiveFile: $(Build.ArtifactStagingDirectory)/$(Build.BuildId).zip - replaceExistingArchive: true - - upload: $(Build.ArtifactStagingDirectory)/$(Build.BuildId).zip - artifact: drop_asia - - - deployment: VMDeploy_ASIA - dependsOn: Build_asia - displayName: DEPLOY ASIA - environment: - name: PROD - resourceType: VirtualMachine - tags: asia - strategy: - runOnce: - preDeploy: - steps: - - task: DownloadPipelineArtifact@2 - inputs: - buildType: 'current' - artifactName: drop_asia - targetPath: '$(Pipeline.Workspace)/drop' - - - script: echo initialize, cleanup, backup, install certs - - deploy: - steps: - - task: Bash@3 - inputs: - targetType: 'inline' - script: | - # Modify deployment script based on the app type - echo "Starting deployment script run" - - - - task: ExtractFiles@1 - inputs: - archiveFilePatterns: '$(Pipeline.Workspace)/drop_asia/$(Build.BuildId).zip' - destinationFolder: '$(Pipeline.Workspace)/japp' - cleanDestinationFolder: true - overwriteExistingFiles: true - - - task: DeleteFiles@1 - inputs: - SourceFolder: '$(Pipeline.Workspace)/drop_asia' - Contents: '$(Build.BuildId).zip' - - - task: Bash@3 - inputs: - targetType: 'inline' - script: | - cd /home/azureuser/azagent/_work/1/japp - pm2 restart index - sudo systemctl restart nginx - - routeTraffic: - steps: - - script: echo routing traffic - postRouteTraffic: - steps: - - script: echo health check post-route traffic - on: - failure: - steps: - - script: echo Restore from backup! This is on failure - success: + - stage: Build_asia + displayName: Build stage asia + jobs: + - job: Build_asia steps: - - script: echo Notify! This is on success \ No newline at end of file + - task: DownloadSecureFile@1 + displayName: 'download ASIA backendend' + inputs: + secureFile: 'BACKEND_ENV_FILE_ASIA' # string. Required. Secure File. + + - task: CopyFiles@2 + displayName: 'copy asia backendend' + inputs: + SourceFolder: '$(Agent.TempDirectory)' + Contents: BACKEND_ENV_FILE_ASIA + TargetFolder: './backend' + + - script: mv ./backend/BACKEND_ENV_FILE_ASIA ./backend/.env + displayName: 'rename asia .env' + - task: DownloadSecureFile@1 + displayName: 'download asia frontend' + inputs: + secureFile: 'FRONTEND_ENV_FILE_ASIA' # string. Required. Secure File. + + - task: CopyFiles@2 + displayName: 'copy asia frontend' + inputs: + SourceFolder: '$(Agent.TempDirectory)' + Contents: FRONTEND_ENV_FILE_ASIA + TargetFolder: './frontend' + + - script: mv ./frontend/FRONTEND_ENV_FILE_ASIA ./frontend/.env + displayName: 'rename asia .env' + + - script: ls -a ./frontend + displayName: 'ls' + + - script: ls -Rn + displayName: 'ls' + + - task: NodeTool@0 + inputs: + versionSpec: '12.20.1' + displayName: 'Install Node.js' + + - task: Bash@3 + inputs: + targetType: 'inline' + script: | + node -v + npm -v + npm install + npm run build + + - task: ArchiveFiles@2 + displayName: 'Archive files' + inputs: + rootFolderOrFile: '$(System.DefaultWorkingDirectory)' + includeRootFolder: false + archiveType: zip + archiveFile: $(Build.ArtifactStagingDirectory)/$(Build.BuildId).zip + replaceExistingArchive: true + - upload: $(Build.ArtifactStagingDirectory)/$(Build.BuildId).zip + artifact: drop_asia + + - deployment: VMDeploy_ASIA + dependsOn: Build_asia + displayName: DEPLOY ASIA + environment: + name: PROD + resourceType: VirtualMachine + tags: asia + strategy: + runOnce: + preDeploy: + steps: + - task: DownloadPipelineArtifact@2 + inputs: + buildType: 'current' + artifactName: drop_asia + targetPath: '$(Pipeline.Workspace)/drop' + + - script: echo initialize, cleanup, backup, install certs + + deploy: + steps: + - task: Bash@3 + inputs: + targetType: 'inline' + script: | + # Modify deployment script based on the app type + echo "Starting deployment script run" + + - task: ExtractFiles@1 + inputs: + archiveFilePatterns: '$(Pipeline.Workspace)/drop_asia/$(Build.BuildId).zip' + destinationFolder: '$(Pipeline.Workspace)/japp' + cleanDestinationFolder: true + overwriteExistingFiles: true + + - task: DeleteFiles@1 + inputs: + SourceFolder: '$(Pipeline.Workspace)/drop_asia' + Contents: '$(Build.BuildId).zip' + + - task: Bash@3 + inputs: + targetType: 'inline' + script: | + cd /home/azureuser/azagent/_work/3/japp + pm2 restart index + sudo systemctl restart nginx + + routeTraffic: + steps: + - script: echo routing traffic + postRouteTraffic: + steps: + - script: echo health check post-route traffic + on: + failure: + steps: + - script: echo Restore from backup! This is on failure + success: + steps: + - script: echo Notify! This is on success diff --git a/azure-pipelines-eu.yml b/azure-pipelines-eu.yml index 747936acb..1ec473cd3 100644 --- a/azure-pipelines-eu.yml +++ b/azure-pipelines-eu.yml @@ -1,136 +1,133 @@ trigger: -- none + - none pool: - vmImage: ubuntu-latest + vmImage: ubuntu-latest stages: - -- stage: Build_africa - displayName: Build stage africa - jobs: - - job: Build_africa - steps: - - - task: DownloadSecureFile@1 - displayName: 'download AFRICA backendend' - inputs: - secureFile: 'BACKEND_ENV_FILE_AFRICA' # string. Required. Secure File. - - - task: CopyFiles@2 - displayName: 'copy africa backendend' - inputs: - SourceFolder: '$(Agent.TempDirectory)' - Contents: BACKEND_ENV_FILE_AFRICA - TargetFolder: './backend' - - - script: mv ./backend/BACKEND_ENV_FILE_AFRICA ./backend/.env - displayName: 'rename africa .env' - - task: DownloadSecureFile@1 - displayName: 'download africa frontend' - inputs: - secureFile: 'FRONTEND_ENV_FILE_AFRICA' # string. Required. Secure File. - - - task: CopyFiles@2 - displayName: 'copy africa frontend' - inputs: - SourceFolder: '$(Agent.TempDirectory)' - Contents: FRONTEND_ENV_FILE_AFRICA - TargetFolder: './frontend' - - - script: mv ./frontend/FRONTEND_ENV_FILE_AFRICA ./frontend/.env - displayName: 'rename africa .env' - - - script: ls -a ./frontend - displayName: 'ls' - - - script: ls -Rn - displayName: 'ls' - - - task: NodeTool@0 - inputs: - versionSpec: '12.20.1' - displayName: 'Install Node.js' - - - task: Bash@3 - inputs: - targetType: 'inline' - script: | - node -v - npm -v - npm install - npm run build - - - task: ArchiveFiles@2 - displayName: 'Archive files' - inputs: - rootFolderOrFile: '$(System.DefaultWorkingDirectory)' - includeRootFolder: false - archiveType: zip - archiveFile: $(Build.ArtifactStagingDirectory)/$(Build.BuildId).zip - replaceExistingArchive: true - - upload: $(Build.ArtifactStagingDirectory)/$(Build.BuildId).zip - artifact: drop_africa - - - deployment: VMDeploy_AFRICA - dependsOn: Build_africa - displayName: DEPLOY AFRICA - environment: - name: PROD - resourceType: VirtualMachine - tags: africa - strategy: - runOnce: - preDeploy: - steps: - - task: DownloadPipelineArtifact@2 - inputs: - buildType: 'current' - artifactName: drop_africa - targetPath: '$(Pipeline.Workspace)/drop' - - - script: echo initialize, cleanup, backup, install certs - - deploy: - steps: - - task: Bash@3 - inputs: - targetType: 'inline' - script: | - # Modify deployment script based on the app type - echo "Starting deployment script run" - - - - task: ExtractFiles@1 - inputs: - archiveFilePatterns: '$(Pipeline.Workspace)/drop_africa/$(Build.BuildId).zip' - destinationFolder: '$(Pipeline.Workspace)/japp' - cleanDestinationFolder: true - overwriteExistingFiles: true - - - task: DeleteFiles@1 - inputs: - SourceFolder: '$(Pipeline.Workspace)/drop_africa' - Contents: '$(Build.BuildId).zip' - - - task: Bash@3 - inputs: - targetType: 'inline' - script: | - cd /home/azureuser/azagent/_work/1/japp - pm2 restart index - sudo systemctl restart nginx - - routeTraffic: - steps: - - script: echo routing traffic - postRouteTraffic: - steps: - - script: echo health check post-route traffic - on: - failure: - steps: - - script: echo Restore from backup! This is on failure - success: + - stage: Build_africa + displayName: Build stage africa + jobs: + - job: Build_africa steps: - - script: echo Notify! This is on success + - task: DownloadSecureFile@1 + displayName: 'download AFRICA backendend' + inputs: + secureFile: 'BACKEND_ENV_FILE_AFRICA' # string. Required. Secure File. + + - task: CopyFiles@2 + displayName: 'copy africa backendend' + inputs: + SourceFolder: '$(Agent.TempDirectory)' + Contents: BACKEND_ENV_FILE_AFRICA + TargetFolder: './backend' + + - script: mv ./backend/BACKEND_ENV_FILE_AFRICA ./backend/.env + displayName: 'rename africa .env' + - task: DownloadSecureFile@1 + displayName: 'download africa frontend' + inputs: + secureFile: 'FRONTEND_ENV_FILE_AFRICA' # string. Required. Secure File. + + - task: CopyFiles@2 + displayName: 'copy africa frontend' + inputs: + SourceFolder: '$(Agent.TempDirectory)' + Contents: FRONTEND_ENV_FILE_AFRICA + TargetFolder: './frontend' + + - script: mv ./frontend/FRONTEND_ENV_FILE_AFRICA ./frontend/.env + displayName: 'rename africa .env' + + - script: ls -a ./frontend + displayName: 'ls' + + - script: ls -Rn + displayName: 'ls' + + - task: NodeTool@0 + inputs: + versionSpec: '12.20.1' + displayName: 'Install Node.js' + + - task: Bash@3 + inputs: + targetType: 'inline' + script: | + node -v + npm -v + npm install + npm run build + + - task: ArchiveFiles@2 + displayName: 'Archive files' + inputs: + rootFolderOrFile: '$(System.DefaultWorkingDirectory)' + includeRootFolder: false + archiveType: zip + archiveFile: $(Build.ArtifactStagingDirectory)/$(Build.BuildId).zip + replaceExistingArchive: true + - upload: $(Build.ArtifactStagingDirectory)/$(Build.BuildId).zip + artifact: drop_africa + + - deployment: VMDeploy_AFRICA + dependsOn: Build_africa + displayName: DEPLOY AFRICA + environment: + name: PROD + resourceType: VirtualMachine + tags: africa + strategy: + runOnce: + preDeploy: + steps: + - task: DownloadPipelineArtifact@2 + inputs: + buildType: 'current' + artifactName: drop_africa + targetPath: '$(Pipeline.Workspace)/drop' + + - script: echo initialize, cleanup, backup, install certs + + deploy: + steps: + - task: Bash@3 + inputs: + targetType: 'inline' + script: | + # Modify deployment script based on the app type + echo "Starting deployment script run" + + - task: ExtractFiles@1 + inputs: + archiveFilePatterns: '$(Pipeline.Workspace)/drop_africa/$(Build.BuildId).zip' + destinationFolder: '$(Pipeline.Workspace)/japp' + cleanDestinationFolder: true + overwriteExistingFiles: true + + - task: DeleteFiles@1 + inputs: + SourceFolder: '$(Pipeline.Workspace)/drop_africa' + Contents: '$(Build.BuildId).zip' + + - task: Bash@3 + inputs: + targetType: 'inline' + script: | + cd /home/azureuser/azagent/_work/2/japp + pm2 restart index + sudo systemctl restart nginx + + routeTraffic: + steps: + - script: echo routing traffic + postRouteTraffic: + steps: + - script: echo health check post-route traffic + on: + failure: + steps: + - script: echo Restore from backup! This is on failure + success: + steps: + - script: echo Notify! This is on success From 490119935f1cad8647884d2f7c89593041b43fc0 Mon Sep 17 00:00:00 2001 From: Javier Date: Fri, 22 Mar 2024 18:47:08 +0200 Subject: [PATCH 22/28] Modified challenge validations --- .../edit/challenges/ChallengesForm.js | 22 ++++++++++++------- shared/schemas/Challenge.js | 2 +- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/frontend/src/pages/_dashboard/renderDashboard/organiser/edit/challenges/ChallengesForm.js b/frontend/src/pages/_dashboard/renderDashboard/organiser/edit/challenges/ChallengesForm.js index 62493f2d6..e61443285 100644 --- a/frontend/src/pages/_dashboard/renderDashboard/organiser/edit/challenges/ChallengesForm.js +++ b/frontend/src/pages/_dashboard/renderDashboard/organiser/edit/challenges/ChallengesForm.js @@ -203,6 +203,12 @@ export default ({ value, onChange }) => { ) } + const styling = { + challengeNameMaxLength: 200, + challengeSlugMaxLength: 200, + textAreaMaxLength: styling.textAreaMaxLength, + } + const renderForm = () => ( <> @@ -210,7 +216,7 @@ export default ({ value, onChange }) => { label="Challenge name" value={name} onChange={handleNameChange} - maxLength={50} + maxLength={styling.challengeNameMaxLength} /> The unique publicly visible name of the challenge. @@ -221,7 +227,7 @@ export default ({ value, onChange }) => { label="Unique slug" value={slug} onChange={setSlug} - maxLength={50} + maxLength={styling.challengeSlugMaxLength} /> A unique slug for the challenge. This will be used in e.g. @@ -280,7 +286,7 @@ export default ({ value, onChange }) => { value={description} onChange={setDescription} placeholder="Description goes here" - maxLength={1000} + maxLength={styling.textAreaMaxLength} /> Challenge description. @@ -293,7 +299,7 @@ export default ({ value, onChange }) => { value={insights} onChange={setInsights} placeholder="Insights go here" - maxLength={1000} + maxLength={styling.textAreaMaxLength} /> Challenge insights. @@ -304,7 +310,7 @@ export default ({ value, onChange }) => { value={resources} onChange={setResources} placeholder="Resource go here" - maxLength={1000} + maxLength={styling.textAreaMaxLength} /> Challenge resources. @@ -315,7 +321,7 @@ export default ({ value, onChange }) => { value={prizes} onChange={setPrizes} placeholder="Prizes go here" - maxLength={1000} + maxLength={styling.textAreaMaxLength} /> Challenge Prizes. @@ -326,7 +332,7 @@ export default ({ value, onChange }) => { value={criteria} onChange={setCriteria} placeholder="Criteria go here" - maxLength={1000} + maxLength={styling.textAreaMaxLength} /> Challenge criteria. @@ -337,7 +343,7 @@ export default ({ value, onChange }) => { value={companyInfo} onChange={setCompanyInfo} placeholder="Company info goes here" - maxLength={1000} + maxLength={styling.textAreaMaxLength} /> Company Info diff --git a/shared/schemas/Challenge.js b/shared/schemas/Challenge.js index ee6bdd2e2..397607fb1 100644 --- a/shared/schemas/Challenge.js +++ b/shared/schemas/Challenge.js @@ -11,7 +11,7 @@ const ChallengeSchema = new mongoose.Schema({ name: { type: String, required: true, - length: 50, + length: 200, }, partner: { type: String, From f26a4a004fd8e6eeef83c4c5f127eee4836849b9 Mon Sep 17 00:00:00 2001 From: Javier Date: Fri, 22 Mar 2024 19:10:57 +0200 Subject: [PATCH 23/28] Fixed typo on challenge page validation --- .../renderDashboard/organiser/edit/challenges/ChallengesForm.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/pages/_dashboard/renderDashboard/organiser/edit/challenges/ChallengesForm.js b/frontend/src/pages/_dashboard/renderDashboard/organiser/edit/challenges/ChallengesForm.js index e61443285..12dceaef3 100644 --- a/frontend/src/pages/_dashboard/renderDashboard/organiser/edit/challenges/ChallengesForm.js +++ b/frontend/src/pages/_dashboard/renderDashboard/organiser/edit/challenges/ChallengesForm.js @@ -206,7 +206,7 @@ export default ({ value, onChange }) => { const styling = { challengeNameMaxLength: 200, challengeSlugMaxLength: 200, - textAreaMaxLength: styling.textAreaMaxLength, + textAreaMaxLength: 3000, } const renderForm = () => ( From a1c20147afec4bac08d8d7ca3fdfc14fffef130c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 10 Apr 2024 14:06:46 +0000 Subject: [PATCH 24/28] Bump loader-utils from 1.4.0 to 1.4.2 Dependabot couldn't find the original pull request head commit, 47c1939141751792048c867d61184525add70319. --- package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index db1a0d270..6f5acf6fa 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3935,9 +3935,9 @@ } }, "loader-utils": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz", - "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==", + "version": "1.4.2", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.2.tgz", + "integrity": "sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==", "requires": { "big.js": "^5.2.2", "emojis-list": "^3.0.0", From 7093682701820910c683b53ec968097a34bb55b6 Mon Sep 17 00:00:00 2001 From: Javier Date: Fri, 12 Apr 2024 18:31:48 +0300 Subject: [PATCH 25/28] Rolled back to latest working commit --- frontend/package-lock.json | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/frontend/package-lock.json b/frontend/package-lock.json index 8f3a7f408..4a915b1b3 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -4196,16 +4196,6 @@ "requires": { "legacy-swc-helpers": "npm:@swc/helpers@=0.4.14", "tslib": "^2.4.0" - }, - "dependencies": { - "legacy-swc-helpers": { - "version": "npm:@swc/helpers@0.4.14", - "resolved": "https://registry.npmjs.org/@swc/helpers/-/helpers-0.4.14.tgz", - "integrity": "sha512-4C7nX/dvpzB7za4Ql9K81xK3HPxCpHMgwTZVyf+9JQ6VUbn9jjZVN7/Nkdz/Ugzs2CSjqnL/UPXroiVBVHUWUw==", - "requires": { - "tslib": "^2.4.0" - } - } } }, "@types/babel__core": { @@ -11960,6 +11950,14 @@ "resolved": "https://registry.npmjs.org/left-pad/-/left-pad-1.3.0.tgz", "integrity": "sha512-XI5MPzVNApjAyhQzphX8BkmKsKUxD4LdyK24iZeQGinBN9yTQT3bFlCBy/aVx2HrNcqQGsdot8ghrjyrvMCoEA==" }, + "legacy-swc-helpers": { + "version": "npm:@swc/helpers@0.4.14", + "resolved": "https://registry.npmjs.org/@swc/helpers/-/helpers-0.4.14.tgz", + "integrity": "sha512-4C7nX/dvpzB7za4Ql9K81xK3HPxCpHMgwTZVyf+9JQ6VUbn9jjZVN7/Nkdz/Ugzs2CSjqnL/UPXroiVBVHUWUw==", + "requires": { + "tslib": "^2.4.0" + } + }, "leven": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz", From 498f9672356b2e7647085b12000612dfa39fe0b0 Mon Sep 17 00:00:00 2001 From: Javier Date: Mon, 15 Apr 2024 12:55:57 +0300 Subject: [PATCH 26/28] first commit --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index 8d2ff19a7..19c259b08 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,6 @@ We want to provide the best tools for organizing hackathons, so we have developed a platform that anybody can use. Junction App provides an all-in-one platform for hackathon organizing from custom event creation to project judging. - ### Features * Custom event configuration From 30e4d221295f88bc5b3819d77c4d0000ee8884b0 Mon Sep 17 00:00:00 2001 From: Javier Date: Mon, 15 Apr 2024 13:48:48 +0300 Subject: [PATCH 27/28] rolled back pipelines --- azure-pipelines-africa.yml | 257 +++++++++++++++++++------------------ azure-pipelines-asia.yml | 257 +++++++++++++++++++------------------ azure-pipelines-eu.yml | 6 +- 3 files changed, 263 insertions(+), 257 deletions(-) diff --git a/azure-pipelines-africa.yml b/azure-pipelines-africa.yml index fc589b1de..d3810dd6c 100644 --- a/azure-pipelines-africa.yml +++ b/azure-pipelines-africa.yml @@ -1,134 +1,137 @@ #Works trigger: - - none +- none pool: - vmImage: ubuntu-latest + vmImage: ubuntu-latest stages: - - stage: Build_africa - displayName: Build stage africa - jobs: - - job: Build_africa + +- stage: Build_africa + displayName: Build stage africa + jobs: + - job: Build_africa + steps: + + - task: DownloadSecureFile@1 + displayName: 'download AFRICA backendend' + inputs: + secureFile: 'BACKEND_ENV_FILE_AFRICA' # string. Required. Secure File. + + - task: CopyFiles@2 + displayName: 'copy africa backendend' + inputs: + SourceFolder: '$(Agent.TempDirectory)' + Contents: BACKEND_ENV_FILE_AFRICA + TargetFolder: './backend' + + - script: mv ./backend/BACKEND_ENV_FILE_AFRICA ./backend/.env + displayName: 'rename africa .env' + - task: DownloadSecureFile@1 + displayName: 'download africa frontend' + inputs: + secureFile: 'FRONTEND_ENV_FILE_AFRICA' # string. Required. Secure File. + + - task: CopyFiles@2 + displayName: 'copy africa frontend' + inputs: + SourceFolder: '$(Agent.TempDirectory)' + Contents: FRONTEND_ENV_FILE_AFRICA + TargetFolder: './frontend' + + - script: mv ./frontend/FRONTEND_ENV_FILE_AFRICA ./frontend/.env + displayName: 'rename africa .env' + + - script: ls -a ./frontend + displayName: 'ls' + + - script: ls -Rn + displayName: 'ls' + + - task: NodeTool@0 + inputs: + versionSpec: '12.20.1' + displayName: 'Install Node.js' + + - task: Bash@3 + inputs: + targetType: 'inline' + script: | + node -v + npm -v + npm install + npm run build + + - task: ArchiveFiles@2 + displayName: 'Archive files' + inputs: + rootFolderOrFile: '$(System.DefaultWorkingDirectory)' + includeRootFolder: false + archiveType: zip + archiveFile: $(Build.ArtifactStagingDirectory)/$(Build.BuildId).zip + replaceExistingArchive: true + - upload: $(Build.ArtifactStagingDirectory)/$(Build.BuildId).zip + artifact: drop_africa + + - deployment: VMDeploy_AFRICA + dependsOn: Build_africa + displayName: DEPLOY AFRICA + environment: + name: PROD + resourceType: VirtualMachine + tags: africa + strategy: + runOnce: + preDeploy: + steps: + - task: DownloadPipelineArtifact@2 + inputs: + buildType: 'current' + artifactName: drop_africa + targetPath: '$(Pipeline.Workspace)/drop_africa' + + - script: echo initialize, cleanup, backup, install certs + + deploy: + steps: + - task: Bash@3 + inputs: + targetType: 'inline' + script: | + # Modify deployment script based on the app type + echo "Starting deployment script run" + + + - task: ExtractFiles@1 + inputs: + archiveFilePatterns: '$(Pipeline.Workspace)/drop_africa/$(Build.BuildId).zip' + destinationFolder: '$(Pipeline.Workspace)/japp' + cleanDestinationFolder: true + overwriteExistingFiles: true + + - task: DeleteFiles@1 + inputs: + SourceFolder: '$(Pipeline.Workspace)/drop_africa' + Contents: '$(Build.BuildId).zip' + + - task: Bash@3 + inputs: + targetType: 'inline' + script: | + cd /home/azureuser/azagent/_work/2/japp + pm2 restart index + sudo systemctl restart nginx + + routeTraffic: + steps: + - script: echo routing traffic + postRouteTraffic: + steps: + - script: echo health check post-route traffic + on: + failure: + steps: + - script: echo Restore from backup! This is on failure + success: steps: - - task: DownloadSecureFile@1 - displayName: 'download AFRICA backendend' - inputs: - secureFile: 'BACKEND_ENV_FILE_AFRICA' # string. Required. Secure File. - - - task: CopyFiles@2 - displayName: 'copy africa backendend' - inputs: - SourceFolder: '$(Agent.TempDirectory)' - Contents: BACKEND_ENV_FILE_AFRICA - TargetFolder: './backend' - - - script: mv ./backend/BACKEND_ENV_FILE_AFRICA ./backend/.env - displayName: 'rename africa .env' - - task: DownloadSecureFile@1 - displayName: 'download africa frontend' - inputs: - secureFile: 'FRONTEND_ENV_FILE_AFRICA' # string. Required. Secure File. - - - task: CopyFiles@2 - displayName: 'copy africa frontend' - inputs: - SourceFolder: '$(Agent.TempDirectory)' - Contents: FRONTEND_ENV_FILE_AFRICA - TargetFolder: './frontend' - - - script: mv ./frontend/FRONTEND_ENV_FILE_AFRICA ./frontend/.env - displayName: 'rename africa .env' - - - script: ls -a ./frontend - displayName: 'ls' - - - script: ls -Rn - displayName: 'ls' - - - task: NodeTool@0 - inputs: - versionSpec: '12.20.1' - displayName: 'Install Node.js' - - - task: Bash@3 - inputs: - targetType: 'inline' - script: | - node -v - npm -v - npm install - npm run build - - - task: ArchiveFiles@2 - displayName: 'Archive files' - inputs: - rootFolderOrFile: '$(System.DefaultWorkingDirectory)' - includeRootFolder: false - archiveType: zip - archiveFile: $(Build.ArtifactStagingDirectory)/$(Build.BuildId).zip - replaceExistingArchive: true - - upload: $(Build.ArtifactStagingDirectory)/$(Build.BuildId).zip - artifact: drop_africa - - - deployment: VMDeploy_AFRICA - dependsOn: Build_africa - displayName: DEPLOY AFRICA - environment: - name: PROD - resourceType: VirtualMachine - tags: africa - strategy: - runOnce: - preDeploy: - steps: - - task: DownloadPipelineArtifact@2 - inputs: - buildType: 'current' - artifactName: drop_africa - targetPath: '$(Pipeline.Workspace)/drop_africa' - - - script: echo initialize, cleanup, backup, install certs - - deploy: - steps: - - task: Bash@3 - inputs: - targetType: 'inline' - script: | - # Modify deployment script based on the app type - echo "Starting deployment script run" - - - task: ExtractFiles@1 - inputs: - archiveFilePatterns: '$(Pipeline.Workspace)/drop_africa/$(Build.BuildId).zip' - destinationFolder: '$(Pipeline.Workspace)/japp' - cleanDestinationFolder: true - overwriteExistingFiles: true - - - task: DeleteFiles@1 - inputs: - SourceFolder: '$(Pipeline.Workspace)/drop_africa' - Contents: '$(Build.BuildId).zip' - - - task: Bash@3 - inputs: - targetType: 'inline' - script: | - cd /home/azureuser/azagent/_work/3/japp - pm2 restart index - sudo systemctl restart nginx - - routeTraffic: - steps: - - script: echo routing traffic - postRouteTraffic: - steps: - - script: echo health check post-route traffic - on: - failure: - steps: - - script: echo Restore from backup! This is on failure - success: - steps: - - script: echo Notify! This is on success + - script: echo Notify! This is on success diff --git a/azure-pipelines-asia.yml b/azure-pipelines-asia.yml index bfe825e8b..8f78cdb7a 100644 --- a/azure-pipelines-asia.yml +++ b/azure-pipelines-asia.yml @@ -1,134 +1,137 @@ # Works trigger: - - none +- none pool: - vmImage: ubuntu-latest + vmImage: ubuntu-latest stages: - - stage: Build_asia - displayName: Build stage asia - jobs: - - job: Build_asia + +- stage: Build_asia + displayName: Build stage asia + jobs: + - job: Build_asia + steps: + + - task: DownloadSecureFile@1 + displayName: 'download ASIA backendend' + inputs: + secureFile: 'BACKEND_ENV_FILE_ASIA' # string. Required. Secure File. + + - task: CopyFiles@2 + displayName: 'copy asia backendend' + inputs: + SourceFolder: '$(Agent.TempDirectory)' + Contents: BACKEND_ENV_FILE_ASIA + TargetFolder: './backend' + + - script: mv ./backend/BACKEND_ENV_FILE_ASIA ./backend/.env + displayName: 'rename asia .env' + - task: DownloadSecureFile@1 + displayName: 'download asia frontend' + inputs: + secureFile: 'FRONTEND_ENV_FILE_ASIA' # string. Required. Secure File. + + - task: CopyFiles@2 + displayName: 'copy asia frontend' + inputs: + SourceFolder: '$(Agent.TempDirectory)' + Contents: FRONTEND_ENV_FILE_ASIA + TargetFolder: './frontend' + + - script: mv ./frontend/FRONTEND_ENV_FILE_ASIA ./frontend/.env + displayName: 'rename asia .env' + + - script: ls -a ./frontend + displayName: 'ls' + + - script: ls -Rn + displayName: 'ls' + + - task: NodeTool@0 + inputs: + versionSpec: '12.20.1' + displayName: 'Install Node.js' + + - task: Bash@3 + inputs: + targetType: 'inline' + script: | + node -v + npm -v + npm install + npm run build + + - task: ArchiveFiles@2 + displayName: 'Archive files' + inputs: + rootFolderOrFile: '$(System.DefaultWorkingDirectory)' + includeRootFolder: false + archiveType: zip + archiveFile: $(Build.ArtifactStagingDirectory)/$(Build.BuildId).zip + replaceExistingArchive: true + - upload: $(Build.ArtifactStagingDirectory)/$(Build.BuildId).zip + artifact: drop_asia + + - deployment: VMDeploy_ASIA + dependsOn: Build_asia + displayName: DEPLOY ASIA + environment: + name: PROD + resourceType: VirtualMachine + tags: asia + strategy: + runOnce: + preDeploy: + steps: + - task: DownloadPipelineArtifact@2 + inputs: + buildType: 'current' + artifactName: drop_asia + targetPath: '$(Pipeline.Workspace)/drop' + + - script: echo initialize, cleanup, backup, install certs + + deploy: + steps: + - task: Bash@3 + inputs: + targetType: 'inline' + script: | + # Modify deployment script based on the app type + echo "Starting deployment script run" + + + - task: ExtractFiles@1 + inputs: + archiveFilePatterns: '$(Pipeline.Workspace)/drop_asia/$(Build.BuildId).zip' + destinationFolder: '$(Pipeline.Workspace)/japp' + cleanDestinationFolder: true + overwriteExistingFiles: true + + - task: DeleteFiles@1 + inputs: + SourceFolder: '$(Pipeline.Workspace)/drop_asia' + Contents: '$(Build.BuildId).zip' + + - task: Bash@3 + inputs: + targetType: 'inline' + script: | + cd /home/azureuser/azagent/_work/1/japp + pm2 restart index + sudo systemctl restart nginx + + routeTraffic: + steps: + - script: echo routing traffic + postRouteTraffic: + steps: + - script: echo health check post-route traffic + on: + failure: + steps: + - script: echo Restore from backup! This is on failure + success: steps: - - task: DownloadSecureFile@1 - displayName: 'download ASIA backendend' - inputs: - secureFile: 'BACKEND_ENV_FILE_ASIA' # string. Required. Secure File. - - - task: CopyFiles@2 - displayName: 'copy asia backendend' - inputs: - SourceFolder: '$(Agent.TempDirectory)' - Contents: BACKEND_ENV_FILE_ASIA - TargetFolder: './backend' - - - script: mv ./backend/BACKEND_ENV_FILE_ASIA ./backend/.env - displayName: 'rename asia .env' - - task: DownloadSecureFile@1 - displayName: 'download asia frontend' - inputs: - secureFile: 'FRONTEND_ENV_FILE_ASIA' # string. Required. Secure File. - - - task: CopyFiles@2 - displayName: 'copy asia frontend' - inputs: - SourceFolder: '$(Agent.TempDirectory)' - Contents: FRONTEND_ENV_FILE_ASIA - TargetFolder: './frontend' - - - script: mv ./frontend/FRONTEND_ENV_FILE_ASIA ./frontend/.env - displayName: 'rename asia .env' - - - script: ls -a ./frontend - displayName: 'ls' - - - script: ls -Rn - displayName: 'ls' - - - task: NodeTool@0 - inputs: - versionSpec: '12.20.1' - displayName: 'Install Node.js' - - - task: Bash@3 - inputs: - targetType: 'inline' - script: | - node -v - npm -v - npm install - npm run build - - - task: ArchiveFiles@2 - displayName: 'Archive files' - inputs: - rootFolderOrFile: '$(System.DefaultWorkingDirectory)' - includeRootFolder: false - archiveType: zip - archiveFile: $(Build.ArtifactStagingDirectory)/$(Build.BuildId).zip - replaceExistingArchive: true - - upload: $(Build.ArtifactStagingDirectory)/$(Build.BuildId).zip - artifact: drop_asia - - - deployment: VMDeploy_ASIA - dependsOn: Build_asia - displayName: DEPLOY ASIA - environment: - name: PROD - resourceType: VirtualMachine - tags: asia - strategy: - runOnce: - preDeploy: - steps: - - task: DownloadPipelineArtifact@2 - inputs: - buildType: 'current' - artifactName: drop_asia - targetPath: '$(Pipeline.Workspace)/drop' - - - script: echo initialize, cleanup, backup, install certs - - deploy: - steps: - - task: Bash@3 - inputs: - targetType: 'inline' - script: | - # Modify deployment script based on the app type - echo "Starting deployment script run" - - - task: ExtractFiles@1 - inputs: - archiveFilePatterns: '$(Pipeline.Workspace)/drop_asia/$(Build.BuildId).zip' - destinationFolder: '$(Pipeline.Workspace)/japp' - cleanDestinationFolder: true - overwriteExistingFiles: true - - - task: DeleteFiles@1 - inputs: - SourceFolder: '$(Pipeline.Workspace)/drop_asia' - Contents: '$(Build.BuildId).zip' - - - task: Bash@3 - inputs: - targetType: 'inline' - script: | - cd /home/azureuser/azagent/_work/3/japp - pm2 restart index - sudo systemctl restart nginx - - routeTraffic: - steps: - - script: echo routing traffic - postRouteTraffic: - steps: - - script: echo health check post-route traffic - on: - failure: - steps: - - script: echo Restore from backup! This is on failure - success: - steps: - - script: echo Notify! This is on success + - script: echo Notify! This is on success \ No newline at end of file diff --git a/azure-pipelines-eu.yml b/azure-pipelines-eu.yml index 8a9f8c093..fcdda4e0f 100644 --- a/azure-pipelines-eu.yml +++ b/azure-pipelines-eu.yml @@ -1,9 +1,9 @@ # Works trigger: - - none +- none pool: - vmImage: ubuntu-latest + vmImage: ubuntu-latest stages: @@ -134,4 +134,4 @@ stages: - script: echo Restore from backup! This is on failure success: steps: - - script: echo Notify! This is on success + - script: echo Notify! This is on success \ No newline at end of file From a71981fa9efceabf6cafb49311614b13c83ef7f0 Mon Sep 17 00:00:00 2001 From: Javier Date: Mon, 15 Apr 2024 14:14:53 +0300 Subject: [PATCH 28/28] Updated frontend package-lock --- frontend/package-lock.json | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/frontend/package-lock.json b/frontend/package-lock.json index 4a915b1b3..8f3a7f408 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -4196,6 +4196,16 @@ "requires": { "legacy-swc-helpers": "npm:@swc/helpers@=0.4.14", "tslib": "^2.4.0" + }, + "dependencies": { + "legacy-swc-helpers": { + "version": "npm:@swc/helpers@0.4.14", + "resolved": "https://registry.npmjs.org/@swc/helpers/-/helpers-0.4.14.tgz", + "integrity": "sha512-4C7nX/dvpzB7za4Ql9K81xK3HPxCpHMgwTZVyf+9JQ6VUbn9jjZVN7/Nkdz/Ugzs2CSjqnL/UPXroiVBVHUWUw==", + "requires": { + "tslib": "^2.4.0" + } + } } }, "@types/babel__core": { @@ -11950,14 +11960,6 @@ "resolved": "https://registry.npmjs.org/left-pad/-/left-pad-1.3.0.tgz", "integrity": "sha512-XI5MPzVNApjAyhQzphX8BkmKsKUxD4LdyK24iZeQGinBN9yTQT3bFlCBy/aVx2HrNcqQGsdot8ghrjyrvMCoEA==" }, - "legacy-swc-helpers": { - "version": "npm:@swc/helpers@0.4.14", - "resolved": "https://registry.npmjs.org/@swc/helpers/-/helpers-0.4.14.tgz", - "integrity": "sha512-4C7nX/dvpzB7za4Ql9K81xK3HPxCpHMgwTZVyf+9JQ6VUbn9jjZVN7/Nkdz/Ugzs2CSjqnL/UPXroiVBVHUWUw==", - "requires": { - "tslib": "^2.4.0" - } - }, "leven": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz",