From c31a70f445c3b5f9264521636aa5599291d3b777 Mon Sep 17 00:00:00 2001 From: koufan Date: Tue, 5 Mar 2024 13:54:49 +0100 Subject: [PATCH 01/17] feat(CI/CD):testing CI/CD pipeline for deployment of frontend 1 --- .github/workflows/build-and-deploy-pwa.yaml | 43 +++++++++++++++++++++ power-pay-frontend/package.json | 5 +++ power-pay-frontend/vite.config.ts | 3 +- 3 files changed, 50 insertions(+), 1 deletion(-) create mode 100644 .github/workflows/build-and-deploy-pwa.yaml diff --git a/.github/workflows/build-and-deploy-pwa.yaml b/.github/workflows/build-and-deploy-pwa.yaml new file mode 100644 index 00000000..65bbee8a --- /dev/null +++ b/.github/workflows/build-and-deploy-pwa.yaml @@ -0,0 +1,43 @@ +name: Build and deploy frontend +on: push + +jobs: + # Build Job + build: + runs-on: ubuntu-latest + steps: + - name: Checkout Code + uses: actions/checkout@v3 + - name: Install Node + uses: actions/setup-node@v3 + with: + node-version: 18 + - name: Install Dependencies + run: cd power-pay-frontend && npm ci + + - name: Build Project + run: cd power-pay-frontend && npm run build + + - name: Upload artifact to enable deployment + uses: actions/upload-artifact@v3 + with: + name: production-files + path: ./dist + + # Deploy Job + deploy: + # Add a dependency to the build job + needs: build + # Specify runner + deployment step + runs-on: ubuntu-latest + steps: + - name: Download artifact + uses: actions/download-artifact@v3 + with: + name: production-files + path: power-pay-frontend/dist + - name: Deploy to GitHub Pages + uses: peaceiris/actions-gh-pages@v3 + with: + github_token: ${{ secrets.DEPLOYTOKEN }} + publish_dir: ./dist \ No newline at end of file diff --git a/power-pay-frontend/package.json b/power-pay-frontend/package.json index 944f9f3b..8742a696 100644 --- a/power-pay-frontend/package.json +++ b/power-pay-frontend/package.json @@ -1,9 +1,13 @@ { "name": "power-pay-frontend", "private": true, + "homepage": "https://Koufan-De-King.github.io/e2e-banking-app", "version": "0.0.0", "type": "module", "scripts": { + "predeploy": "npm run build", + "deploy": "gh-pages -d build", + "build-for-gh": "vite build --base=/e2e-banking-app", "dev": "vite", "build": "tsc && vite build", "lint": "eslint . --ext ts,tsx --report-unused-disable-directives --max-warnings 0", @@ -22,6 +26,7 @@ "eslint": "^8.56.0", "eslint-plugin-react-hooks": "^4.6.0", "eslint-plugin-react-refresh": "^0.4.5", + "gh-pages": "^6.1.1", "typescript": "^5.2.2", "vite": "^5.1.4" } diff --git a/power-pay-frontend/vite.config.ts b/power-pay-frontend/vite.config.ts index 5a33944a..17232bfa 100644 --- a/power-pay-frontend/vite.config.ts +++ b/power-pay-frontend/vite.config.ts @@ -4,4 +4,5 @@ import react from '@vitejs/plugin-react' // https://vitejs.dev/config/ export default defineConfig({ plugins: [react()], -}) + base: "/e2e-banking-app/" +}); From 60eb7e4596864efce0a02893a83a89e714535b2c Mon Sep 17 00:00:00 2001 From: koufan Date: Tue, 5 Mar 2024 14:01:05 +0100 Subject: [PATCH 02/17] feat(CI/CD):testing CI/CD pipeline for deployment of frontend 2 --- docker-compose.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index f4bd6c2d..5e214a52 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -1,4 +1,4 @@ -version: '4.1' +version: '3.7' services: api: From 4645c8292191aec72440512772ec6ff4a239422e Mon Sep 17 00:00:00 2001 From: koufan Date: Tue, 5 Mar 2024 14:08:07 +0100 Subject: [PATCH 03/17] feat(CI/CD):testing CI/CD pipeline for deployment of frontend 3 --- power-pay-frontend/package-lock.json | 331 +++++++++++++++++++++++++++ 1 file changed, 331 insertions(+) diff --git a/power-pay-frontend/package-lock.json b/power-pay-frontend/package-lock.json index 9d0ed1bd..12fc9d87 100644 --- a/power-pay-frontend/package-lock.json +++ b/power-pay-frontend/package-lock.json @@ -20,6 +20,7 @@ "eslint": "^8.56.0", "eslint-plugin-react-hooks": "^4.6.0", "eslint-plugin-react-refresh": "^0.4.5", + "gh-pages": "^6.1.1", "typescript": "^5.2.2", "vite": "^5.1.4" } @@ -1538,6 +1539,21 @@ "node": ">=8" } }, + "node_modules/array-uniq": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz", + "integrity": "sha512-MNha4BWQ6JbwhFhj03YK552f7cb3AzoE8SzeljgChvL1dl3IcvggXVz1DilzySZkCja+CXuZbdW7yATchWn8/Q==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/async": { + "version": "3.2.5", + "resolved": "https://registry.npmjs.org/async/-/async-3.2.5.tgz", + "integrity": "sha512-baNZyqaaLhyLVKm/DlvdW051MSgO6b8eVfIezl9E5PqWxFgzLm/wQntEW4zOytVburDEr0JlALEpdOFwvErLsg==", + "dev": true + }, "node_modules/balanced-match": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", @@ -1655,6 +1671,21 @@ "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==", "dev": true }, + "node_modules/commander": { + "version": "11.1.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-11.1.0.tgz", + "integrity": "sha512-yPVavfyCcRhmorC7rWlkHn15b4wDVgVmBA7kV4QVBsF7kv/9TKJAbAXVTxvTnwP8HHKjRCJDClKbciiYS7p0DQ==", + "dev": true, + "engines": { + "node": ">=16" + } + }, + "node_modules/commondir": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz", + "integrity": "sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg==", + "dev": true + }, "node_modules/concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", @@ -1740,6 +1771,12 @@ "integrity": "sha512-+2OAGjUx68xElQhydpcbqH50hE8Vs2K6TkAeLhICYfndb67CVH0UsZaijmRUE3rHlIxU1u0jxwhgVe6fK3YANA==", "dev": true }, + "node_modules/email-addresses": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/email-addresses/-/email-addresses-5.0.0.tgz", + "integrity": "sha512-4OIPYlA6JXqtVn8zpHpGiI7vE6EQOAg16aGnDMIAlZVinnoZ8208tW1hAbjWydgN/4PLTT9q+O1K6AH/vALJGw==", + "dev": true + }, "node_modules/esbuild": { "version": "0.19.12", "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.19.12.tgz", @@ -2145,6 +2182,32 @@ "node": "^10.12.0 || >=12.0.0" } }, + "node_modules/filename-reserved-regex": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/filename-reserved-regex/-/filename-reserved-regex-2.0.0.tgz", + "integrity": "sha512-lc1bnsSr4L4Bdif8Xb/qrtokGbq5zlsms/CYH8PP+WtCkGNF65DPiQY8vG3SakEdRn8Dlnm+gW/qWKKjS5sZzQ==", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/filenamify": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/filenamify/-/filenamify-4.3.0.tgz", + "integrity": "sha512-hcFKyUG57yWGAzu1CMt/dPzYZuv+jAJUT85bL8mrXvNe6hWj6yEHEc4EdcgiA6Z3oi1/9wXJdZPXF2dZNgwgOg==", + "dev": true, + "dependencies": { + "filename-reserved-regex": "^2.0.0", + "strip-outer": "^1.0.1", + "trim-repeated": "^1.0.0" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/fill-range": { "version": "7.0.1", "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", @@ -2157,6 +2220,23 @@ "node": ">=8" } }, + "node_modules/find-cache-dir": { + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.2.tgz", + "integrity": "sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig==", + "dev": true, + "dependencies": { + "commondir": "^1.0.1", + "make-dir": "^3.0.2", + "pkg-dir": "^4.1.0" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/avajs/find-cache-dir?sponsor=1" + } + }, "node_modules/find-up": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", @@ -2193,6 +2273,20 @@ "integrity": "sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==", "dev": true }, + "node_modules/fs-extra": { + "version": "11.2.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.2.0.tgz", + "integrity": "sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==", + "dev": true, + "dependencies": { + "graceful-fs": "^4.2.0", + "jsonfile": "^6.0.1", + "universalify": "^2.0.0" + }, + "engines": { + "node": ">=14.14" + } + }, "node_modules/fs.realpath": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", @@ -2222,6 +2316,56 @@ "node": ">=6.9.0" } }, + "node_modules/gh-pages": { + "version": "6.1.1", + "resolved": "https://registry.npmjs.org/gh-pages/-/gh-pages-6.1.1.tgz", + "integrity": "sha512-upnohfjBwN5hBP9w2dPE7HO5JJTHzSGMV1JrLrHvNuqmjoYHg6TBrCcnEoorjG/e0ejbuvnwyKMdTyM40PEByw==", + "dev": true, + "dependencies": { + "async": "^3.2.4", + "commander": "^11.0.0", + "email-addresses": "^5.0.0", + "filenamify": "^4.3.0", + "find-cache-dir": "^3.3.1", + "fs-extra": "^11.1.1", + "globby": "^6.1.0" + }, + "bin": { + "gh-pages": "bin/gh-pages.js", + "gh-pages-clean": "bin/gh-pages-clean.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/gh-pages/node_modules/array-union": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz", + "integrity": "sha512-Dxr6QJj/RdU/hCaBjOfxW+q6lyuVE6JFWIrAUpuOOhoJJoQ99cUn3igRaHVB5P9WrgFVN0FfArM3x0cueOU8ng==", + "dev": true, + "dependencies": { + "array-uniq": "^1.0.1" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/gh-pages/node_modules/globby": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz", + "integrity": "sha512-KVbFv2TQtbzCoxAnfD6JcHZTYCzyliEaaeM/gH8qQdkKr5s0OP9scEgvdcngyk7AVdY6YVW/TJHd+lQ/Df3Daw==", + "dev": true, + "dependencies": { + "array-union": "^1.0.1", + "glob": "^7.0.3", + "object-assign": "^4.0.1", + "pify": "^2.0.0", + "pinkie-promise": "^2.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/glob": { "version": "7.2.3", "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", @@ -2305,6 +2449,12 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/graceful-fs": { + "version": "4.2.11", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz", + "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==", + "dev": true + }, "node_modules/graphemer": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz", @@ -2474,6 +2624,18 @@ "node": ">=6" } }, + "node_modules/jsonfile": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", + "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", + "dev": true, + "dependencies": { + "universalify": "^2.0.0" + }, + "optionalDependencies": { + "graceful-fs": "^4.1.6" + } + }, "node_modules/keyv": { "version": "4.5.4", "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz", @@ -2537,6 +2699,30 @@ "yallist": "^3.0.2" } }, + "node_modules/make-dir": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz", + "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==", + "dev": true, + "dependencies": { + "semver": "^6.0.0" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/make-dir/node_modules/semver": { + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", + "dev": true, + "bin": { + "semver": "bin/semver.js" + } + }, "node_modules/merge2": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz", @@ -2610,6 +2796,15 @@ "integrity": "sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw==", "dev": true }, + "node_modules/object-assign": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", + "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/once": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", @@ -2666,6 +2861,15 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/p-try": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", + "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", + "dev": true, + "engines": { + "node": ">=6" + } + }, "node_modules/parent-module": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", @@ -2732,6 +2936,100 @@ "url": "https://github.com/sponsors/jonschlinkert" } }, + "node_modules/pify": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", + "integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/pinkie": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz", + "integrity": "sha512-MnUuEycAemtSaeFSjXKW/aroV7akBbY+Sv+RkyqFjgAe73F+MR0TBWKBRDkmfWq/HiFmdavfZ1G7h4SPZXaCSg==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/pinkie-promise": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz", + "integrity": "sha512-0Gni6D4UcLTbv9c57DfxDGdr41XfgUjqWZu492f0cIGr16zDU06BWP/RAEvOuo7CQ0CNjHaLlM59YJJFm3NWlw==", + "dev": true, + "dependencies": { + "pinkie": "^2.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/pkg-dir": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz", + "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==", + "dev": true, + "dependencies": { + "find-up": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/pkg-dir/node_modules/find-up": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", + "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", + "dev": true, + "dependencies": { + "locate-path": "^5.0.0", + "path-exists": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/pkg-dir/node_modules/locate-path": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", + "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", + "dev": true, + "dependencies": { + "p-locate": "^4.1.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/pkg-dir/node_modules/p-limit": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", + "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", + "dev": true, + "dependencies": { + "p-try": "^2.0.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/pkg-dir/node_modules/p-locate": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", + "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", + "dev": true, + "dependencies": { + "p-limit": "^2.2.0" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/postcss": { "version": "8.4.35", "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.35.tgz", @@ -3023,6 +3321,18 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/strip-outer": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/strip-outer/-/strip-outer-1.0.1.tgz", + "integrity": "sha512-k55yxKHwaXnpYGsOzg4Vl8+tDrWylxDEpknGjhTiZB8dFRU5rTo9CAzeycivxV3s+zlTKwrs6WxMxR95n26kwg==", + "dev": true, + "dependencies": { + "escape-string-regexp": "^1.0.2" + }, + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/supports-color": { "version": "5.5.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", @@ -3062,6 +3372,18 @@ "node": ">=8.0" } }, + "node_modules/trim-repeated": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/trim-repeated/-/trim-repeated-1.0.0.tgz", + "integrity": "sha512-pkonvlKk8/ZuR0D5tLW8ljt5I8kmxp2XKymhepUeOdCEfKpZaktSArkLHZt76OB1ZvO9bssUsDty4SWhLvZpLg==", + "dev": true, + "dependencies": { + "escape-string-regexp": "^1.0.2" + }, + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/ts-api-utils": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-1.2.1.tgz", @@ -3111,6 +3433,15 @@ "node": ">=14.17" } }, + "node_modules/universalify": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz", + "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==", + "dev": true, + "engines": { + "node": ">= 10.0.0" + } + }, "node_modules/update-browserslist-db": { "version": "1.0.13", "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz", From 82faf714ab8f3b21dbb9a8d9763357336d81802f Mon Sep 17 00:00:00 2001 From: koufan Date: Tue, 5 Mar 2024 14:12:49 +0100 Subject: [PATCH 04/17] feat(CI/CD):testing CI/CD pipeline for deployment of frontend 4 --- .github/workflows/build-and-deploy-pwa.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-and-deploy-pwa.yaml b/.github/workflows/build-and-deploy-pwa.yaml index 65bbee8a..56c9343e 100644 --- a/.github/workflows/build-and-deploy-pwa.yaml +++ b/.github/workflows/build-and-deploy-pwa.yaml @@ -22,8 +22,8 @@ jobs: uses: actions/upload-artifact@v3 with: name: production-files - path: ./dist - + path: power-pay-frontend/dist + # Deploy Job deploy: # Add a dependency to the build job From f9ff792ad8b5306718a1ac0f363ab713523b8e93 Mon Sep 17 00:00:00 2001 From: koufan Date: Tue, 5 Mar 2024 14:22:59 +0100 Subject: [PATCH 05/17] feat(CI/CD):testing CI/CD pipeline for deployment of frontend 5 --- power-pay-frontend/vite.config.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/power-pay-frontend/vite.config.ts b/power-pay-frontend/vite.config.ts index 17232bfa..44af49cf 100644 --- a/power-pay-frontend/vite.config.ts +++ b/power-pay-frontend/vite.config.ts @@ -4,5 +4,5 @@ import react from '@vitejs/plugin-react' // https://vitejs.dev/config/ export default defineConfig({ plugins: [react()], - base: "/e2e-banking-app/" + }); From 597908715263f0a9d2cac63d1831c57816202f66 Mon Sep 17 00:00:00 2001 From: koufan Date: Tue, 5 Mar 2024 14:37:19 +0100 Subject: [PATCH 06/17] feat(CI/CD):testing CI/CD pipeline for deployment of frontend 6 --- .github/workflows/build-and-deploy-pwa.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-and-deploy-pwa.yaml b/.github/workflows/build-and-deploy-pwa.yaml index 56c9343e..f5c96b60 100644 --- a/.github/workflows/build-and-deploy-pwa.yaml +++ b/.github/workflows/build-and-deploy-pwa.yaml @@ -22,8 +22,8 @@ jobs: uses: actions/upload-artifact@v3 with: name: production-files - path: power-pay-frontend/dist - + path: power-pay-frontend + # Deploy Job deploy: # Add a dependency to the build job @@ -35,7 +35,7 @@ jobs: uses: actions/download-artifact@v3 with: name: production-files - path: power-pay-frontend/dist + path: power-pay-frontend - name: Deploy to GitHub Pages uses: peaceiris/actions-gh-pages@v3 with: From a905263ffdf2da60f92e700d3572bf75c2ba682c Mon Sep 17 00:00:00 2001 From: koufan Date: Tue, 5 Mar 2024 17:09:24 +0100 Subject: [PATCH 07/17] feat(CI/CD):testing CI/CD pipeline for deployment of frontend 7 --- .github/workflows/build-and-deploy-pwa.yaml | 6 +++++- power-pay-frontend/index.html | 4 ++-- power-pay-frontend/vite.config.ts | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-and-deploy-pwa.yaml b/.github/workflows/build-and-deploy-pwa.yaml index f5c96b60..3fcdbae7 100644 --- a/.github/workflows/build-and-deploy-pwa.yaml +++ b/.github/workflows/build-and-deploy-pwa.yaml @@ -1,5 +1,9 @@ name: Build and deploy frontend -on: push + +on: + push: + branches: + - main jobs: # Build Job diff --git a/power-pay-frontend/index.html b/power-pay-frontend/index.html index e4b78eae..edd09c86 100644 --- a/power-pay-frontend/index.html +++ b/power-pay-frontend/index.html @@ -2,12 +2,12 @@ - + Vite + React + TS
- + diff --git a/power-pay-frontend/vite.config.ts b/power-pay-frontend/vite.config.ts index 44af49cf..17232bfa 100644 --- a/power-pay-frontend/vite.config.ts +++ b/power-pay-frontend/vite.config.ts @@ -4,5 +4,5 @@ import react from '@vitejs/plugin-react' // https://vitejs.dev/config/ export default defineConfig({ plugins: [react()], - + base: "/e2e-banking-app/" }); From 8e544ad332aa0e874b1742d40195f02caf14513d Mon Sep 17 00:00:00 2001 From: koufan Date: Tue, 5 Mar 2024 18:18:32 +0100 Subject: [PATCH 08/17] feat(CI/CD):testing CI/CD pipeline for deployment of frontend 7 --- .github/workflows/build-and-deploy-pwa.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-and-deploy-pwa.yaml b/.github/workflows/build-and-deploy-pwa.yaml index 3fcdbae7..8c944ac0 100644 --- a/.github/workflows/build-and-deploy-pwa.yaml +++ b/.github/workflows/build-and-deploy-pwa.yaml @@ -15,7 +15,7 @@ jobs: - name: Install Node uses: actions/setup-node@v3 with: - node-version: 18 + node-version: 20 - name: Install Dependencies run: cd power-pay-frontend && npm ci @@ -26,7 +26,7 @@ jobs: uses: actions/upload-artifact@v3 with: name: production-files - path: power-pay-frontend + path: ../../power-pay-frontend # Deploy Job deploy: @@ -39,9 +39,9 @@ jobs: uses: actions/download-artifact@v3 with: name: production-files - path: power-pay-frontend + path: ../../power-pay-frontend - name: Deploy to GitHub Pages uses: peaceiris/actions-gh-pages@v3 with: github_token: ${{ secrets.DEPLOYTOKEN }} - publish_dir: ./dist \ No newline at end of file + publish_dir: ../../power-pay-frontend \ No newline at end of file From f5da93271b5221b3973d772b079761ea3388c7bf Mon Sep 17 00:00:00 2001 From: koufan Date: Tue, 5 Mar 2024 18:41:48 +0100 Subject: [PATCH 09/17] feat(CI/CD):testing CI/CD pipeline for deployment of frontend 7 --- .github/workflows/build-and-deploy-pwa.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-and-deploy-pwa.yaml b/.github/workflows/build-and-deploy-pwa.yaml index 8c944ac0..89f87400 100644 --- a/.github/workflows/build-and-deploy-pwa.yaml +++ b/.github/workflows/build-and-deploy-pwa.yaml @@ -26,7 +26,7 @@ jobs: uses: actions/upload-artifact@v3 with: name: production-files - path: ../../power-pay-frontend + path: power-pay-frontend # Deploy Job deploy: @@ -39,9 +39,9 @@ jobs: uses: actions/download-artifact@v3 with: name: production-files - path: ../../power-pay-frontend + path: power-pay-frontend - name: Deploy to GitHub Pages uses: peaceiris/actions-gh-pages@v3 with: github_token: ${{ secrets.DEPLOYTOKEN }} - publish_dir: ../../power-pay-frontend \ No newline at end of file + publish_dir: power-pay-frontend \ No newline at end of file From 94cbf8ac87ed808cb74e56f4ad1692b776f49629 Mon Sep 17 00:00:00 2001 From: koufan Date: Tue, 5 Mar 2024 19:22:53 +0100 Subject: [PATCH 10/17] feat(CI/CD):testing CI/CD pipeline for deployment of frontend 7 --- power-pay-frontend/src/App.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/power-pay-frontend/src/App.tsx b/power-pay-frontend/src/App.tsx index afe48ac7..879cafc3 100644 --- a/power-pay-frontend/src/App.tsx +++ b/power-pay-frontend/src/App.tsx @@ -1,6 +1,6 @@ import { useState } from 'react' import reactLogo from './assets/react.svg' -import viteLogo from '/vite.svg' +import viteLogo from '../public/vite.svg' import './App.css' function App() { From d2fb1af29b11715b56889a16da2583053e1e2975 Mon Sep 17 00:00:00 2001 From: koufan Date: Tue, 5 Mar 2024 20:04:34 +0100 Subject: [PATCH 11/17] feat(CI/CD):testing CI/CD pipeline for deployment of frontend 11 --- power-pay-frontend/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/power-pay-frontend/index.html b/power-pay-frontend/index.html index edd09c86..f7436285 100644 --- a/power-pay-frontend/index.html +++ b/power-pay-frontend/index.html @@ -8,6 +8,6 @@
- + From 237493d6810f3bcb3e7bd382266e96082337ad18 Mon Sep 17 00:00:00 2001 From: koufan Date: Tue, 5 Mar 2024 20:11:39 +0100 Subject: [PATCH 12/17] feat(CI/CD):testing CI/CD pipeline for deployment of frontend 11 --- power-pay-frontend/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/power-pay-frontend/index.html b/power-pay-frontend/index.html index f7436285..895d5759 100644 --- a/power-pay-frontend/index.html +++ b/power-pay-frontend/index.html @@ -8,6 +8,6 @@
- + From 57ac7c63f5fef0af0ca4fe7257a91620ad135d34 Mon Sep 17 00:00:00 2001 From: koufan Date: Tue, 5 Mar 2024 20:37:40 +0100 Subject: [PATCH 13/17] feat(CI/CD):testing CI/CD pipeline for deployment of frontend 13 --- power-pay-frontend/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/power-pay-frontend/index.html b/power-pay-frontend/index.html index 895d5759..edd09c86 100644 --- a/power-pay-frontend/index.html +++ b/power-pay-frontend/index.html @@ -8,6 +8,6 @@
- + From ce53d95be40320da5039b42dccd82b9fad9f6b97 Mon Sep 17 00:00:00 2001 From: koufan Date: Tue, 5 Mar 2024 21:39:31 +0100 Subject: [PATCH 14/17] feat(CI/CD):added CI/CD pipeline for deployment of frontend --- power-pay-frontend/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/power-pay-frontend/package.json b/power-pay-frontend/package.json index 8742a696..736dc803 100644 --- a/power-pay-frontend/package.json +++ b/power-pay-frontend/package.json @@ -1,7 +1,7 @@ { "name": "power-pay-frontend", "private": true, - "homepage": "https://Koufan-De-King.github.io/e2e-banking-app", + "homepage": "https://ADORSYS-GIS.github.io/e2e-banking-app", "version": "0.0.0", "type": "module", "scripts": { From d50f49bf7dd60099bc9631f32df6674057e5e5ab Mon Sep 17 00:00:00 2001 From: koufan Date: Wed, 6 Mar 2024 08:20:20 +0100 Subject: [PATCH 15/17] fix(CI/CD):properly configured files for frontend deployment --- .github/workflows/build-and-deploy-pwa.yaml | 2 +- docker-compose.yaml | 2 +- power-pay-frontend/index.html | 4 ++-- power-pay-frontend/src/App.tsx | 2 +- power-pay-frontend/vite.config.ts | 3 +-- 5 files changed, 6 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build-and-deploy-pwa.yaml b/.github/workflows/build-and-deploy-pwa.yaml index 89f87400..0f41f097 100644 --- a/.github/workflows/build-and-deploy-pwa.yaml +++ b/.github/workflows/build-and-deploy-pwa.yaml @@ -20,7 +20,7 @@ jobs: run: cd power-pay-frontend && npm ci - name: Build Project - run: cd power-pay-frontend && npm run build + run: cd power-pay-frontend && npm run build-for-gh - name: Upload artifact to enable deployment uses: actions/upload-artifact@v3 diff --git a/docker-compose.yaml b/docker-compose.yaml index 5e214a52..f4bd6c2d 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -1,4 +1,4 @@ -version: '3.7' +version: '4.1' services: api: diff --git a/power-pay-frontend/index.html b/power-pay-frontend/index.html index edd09c86..e4b78eae 100644 --- a/power-pay-frontend/index.html +++ b/power-pay-frontend/index.html @@ -2,12 +2,12 @@ - + Vite + React + TS
- + diff --git a/power-pay-frontend/src/App.tsx b/power-pay-frontend/src/App.tsx index 879cafc3..afe48ac7 100644 --- a/power-pay-frontend/src/App.tsx +++ b/power-pay-frontend/src/App.tsx @@ -1,6 +1,6 @@ import { useState } from 'react' import reactLogo from './assets/react.svg' -import viteLogo from '../public/vite.svg' +import viteLogo from '/vite.svg' import './App.css' function App() { diff --git a/power-pay-frontend/vite.config.ts b/power-pay-frontend/vite.config.ts index 17232bfa..5a33944a 100644 --- a/power-pay-frontend/vite.config.ts +++ b/power-pay-frontend/vite.config.ts @@ -4,5 +4,4 @@ import react from '@vitejs/plugin-react' // https://vitejs.dev/config/ export default defineConfig({ plugins: [react()], - base: "/e2e-banking-app/" -}); +}) From d196e4bd95dad66df62b6e30fab0249b4b72d09a Mon Sep 17 00:00:00 2001 From: koufan Date: Wed, 6 Mar 2024 09:16:10 +0100 Subject: [PATCH 16/17] fix(CI/CD):properly configured files for frontend deployment --- .github/workflows/build-and-deploy-pwa.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-and-deploy-pwa.yaml b/.github/workflows/build-and-deploy-pwa.yaml index 0f41f097..424c036b 100644 --- a/.github/workflows/build-and-deploy-pwa.yaml +++ b/.github/workflows/build-and-deploy-pwa.yaml @@ -26,7 +26,7 @@ jobs: uses: actions/upload-artifact@v3 with: name: production-files - path: power-pay-frontend + path: power-pay-frontend/build # Deploy Job deploy: From 34101e2f0277118c97944c3fc833a0d9f2e3bd84 Mon Sep 17 00:00:00 2001 From: koufan Date: Wed, 6 Mar 2024 09:54:41 +0100 Subject: [PATCH 17/17] fix(CI/CD):properly configured files for frontend deployment --- .github/workflows/build-and-deploy-pwa.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-and-deploy-pwa.yaml b/.github/workflows/build-and-deploy-pwa.yaml index 424c036b..30264481 100644 --- a/.github/workflows/build-and-deploy-pwa.yaml +++ b/.github/workflows/build-and-deploy-pwa.yaml @@ -26,7 +26,7 @@ jobs: uses: actions/upload-artifact@v3 with: name: production-files - path: power-pay-frontend/build + path: power-pay-frontend/dist # Deploy Job deploy: