From c688af527fe0d931d023acbc4c7cd6ed300259c5 Mon Sep 17 00:00:00 2001 From: MlondiMchunu Date: Wed, 30 Oct 2024 15:33:25 +0200 Subject: [PATCH 01/67] lint code --- .eslintrc.js | 72 ++++++++++++++++++++++++++-------------------------- app.js | 12 ++++----- package.json | 3 ++- 3 files changed, 44 insertions(+), 43 deletions(-) diff --git a/.eslintrc.js b/.eslintrc.js index 8a182fff92..5fad8125aa 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -1,49 +1,49 @@ module.exports = { - "env": { - "browser": true, - "es6": true, - "jest/globals": true + 'env': { + 'browser': true, + 'es6': true, + 'jest/globals': true }, - "extends": [ - "eslint:recommended", - "plugin:react/recommended" + 'extends': [ + 'eslint:recommended', + 'plugin:react/recommended' ], - "parserOptions": { - "ecmaFeatures": { - "jsx": true + 'parserOptions': { + 'ecmaFeatures': { + 'jsx': true }, - "ecmaVersion": 2018, - "sourceType": "module" + 'ecmaVersion': 2018, + 'sourceType': 'module' }, - "plugins": [ - "react", "jest" + 'plugins': [ + 'react', 'jest' ], - "rules": { - "indent": [ - "error", - 2 - ], - "linebreak-style": [ - "error", - "unix" + 'rules': { + 'indent': [ + 'error', + 2 ], - "quotes": [ - "error", - "single" + 'linebreak-style': [ + 'error', + 'unix' ], - "semi": [ - "error", - "never" + 'quotes': [ + 'error', + 'single' ], - "eqeqeq": "error", - "no-trailing-spaces": "error", - "object-curly-spacing": [ - "error", "always" + 'semi': [ + 'error', + 'never' ], - "arrow-spacing": [ - "error", { "before": true, "after": true } + 'eqeqeq': 'error', + 'no-trailing-spaces': 'error', + 'object-curly-spacing': [ + 'error', 'always' ], - "no-console": "error", - "react/prop-types": 0 + 'arrow-spacing': [ + 'error', { 'before': true, 'after': true } + ], + 'no-console': 'error', + 'react/prop-types': 0 } } diff --git a/app.js b/app.js index 0b172aece0..32cdedac65 100644 --- a/app.js +++ b/app.js @@ -1,11 +1,11 @@ -const express = require("express"); -const app = express(); +const express = require('express') +const app = express() // get the port from env variable -const PORT = process.env.PORT || 5000; +const PORT = process.env.PORT || 5000 -app.use(express.static("dist")); +app.use(express.static('dist')) app.listen(PORT, () => { - console.log(`server started on port ${PORT}`); -}); + console.log(`server started on port ${PORT}`) +}) diff --git a/package.json b/package.json index d7c454f137..c0f5a8b7b0 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,8 @@ "start-prod": "node app.js", "test": "jest", "eslint": "eslint './**/*.{js,jsx}'", - "build": "webpack --mode production" + "build": "webpack --mode production", + "dev":"nodemon node app.js" }, "repository": { "type": "git", From 89267b89aa9364148aeeca31611ee813c83bb674 Mon Sep 17 00:00:00 2001 From: MlondiMchunu Date: Wed, 30 Oct 2024 21:36:14 +0200 Subject: [PATCH 02/67] commit workflows --- .github/workflows/hello.yml | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 .github/workflows/hello.yml diff --git a/.github/workflows/hello.yml b/.github/workflows/hello.yml new file mode 100644 index 0000000000..e69de29bb2 From 7426a1bdbbaf6886132d8a114bc63daee3a96668 Mon Sep 17 00:00:00 2001 From: "mlo.dev" <68140202+MlondiMchunu@users.noreply.github.com> Date: Wed, 30 Oct 2024 21:41:44 +0200 Subject: [PATCH 03/67] Delete .github/workflows/hello.yml --- .github/workflows/hello.yml | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 .github/workflows/hello.yml diff --git a/.github/workflows/hello.yml b/.github/workflows/hello.yml deleted file mode 100644 index e69de29bb2..0000000000 From 1d6d3fec8457e0aa580f4e6d4969b2098faa99e4 Mon Sep 17 00:00:00 2001 From: MlondiMchunu Date: Wed, 30 Oct 2024 21:45:02 +0200 Subject: [PATCH 04/67] workflows --- hello.yml | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 hello.yml diff --git a/hello.yml b/hello.yml new file mode 100644 index 0000000000..e69de29bb2 From b5797010faa97a8526cd0318eb47d0ad25c043a2 Mon Sep 17 00:00:00 2001 From: "mlo.dev" <68140202+MlondiMchunu@users.noreply.github.com> Date: Wed, 30 Oct 2024 21:55:14 +0200 Subject: [PATCH 05/67] Update hello.yml --- hello.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/hello.yml b/hello.yml index e69de29bb2..03e0a38e1a 100644 --- a/hello.yml +++ b/hello.yml @@ -0,0 +1,14 @@ +name: Hello World! + +on: + push: + branches: + - main + +jobs: + hello_world_job: + runs-on: ubuntu-20.04 + steps: + - name: Say hello + run: | + echo "Hello World!" From 25fc51ce1c772c0634a62829ed1aff32a175801a Mon Sep 17 00:00:00 2001 From: "mlo.dev" <68140202+MlondiMchunu@users.noreply.github.com> Date: Wed, 30 Oct 2024 22:01:44 +0200 Subject: [PATCH 06/67] Create hello.yml --- .github/workflows/hello.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 .github/workflows/hello.yml diff --git a/.github/workflows/hello.yml b/.github/workflows/hello.yml new file mode 100644 index 0000000000..425ad9ca4b --- /dev/null +++ b/.github/workflows/hello.yml @@ -0,0 +1,14 @@ +name: Hello World! + +on: + push: + branches: + - main + +jobs: + hello_world_job: + runs-on: ubuntu-20.04 + steps: + - name: Say hello + run: | + echo "Hello World!" From b641b23b76b24ae65fddde92728d718c8c8700f8 Mon Sep 17 00:00:00 2001 From: MlondiMchunu Date: Wed, 30 Oct 2024 22:03:41 +0200 Subject: [PATCH 07/67] deleted edundant workflow file --- hello.yml | 14 -------------- 1 file changed, 14 deletions(-) delete mode 100644 hello.yml diff --git a/hello.yml b/hello.yml deleted file mode 100644 index 03e0a38e1a..0000000000 --- a/hello.yml +++ /dev/null @@ -1,14 +0,0 @@ -name: Hello World! - -on: - push: - branches: - - main - -jobs: - hello_world_job: - runs-on: ubuntu-20.04 - steps: - - name: Say hello - run: | - echo "Hello World!" From 521b83048744d8a63df97269e5a3f8594ae4ad9d Mon Sep 17 00:00:00 2001 From: MlondiMchunu Date: Thu, 5 Dec 2024 15:13:04 +0200 Subject: [PATCH 08/67] commit homepage changes --- public/index.html | 1 + 1 file changed, 1 insertion(+) diff --git a/public/index.html b/public/index.html index 06fff788da..9f307578f7 100644 --- a/public/index.html +++ b/public/index.html @@ -5,6 +5,7 @@ Pokemon +

Pokemon Game

Pokémon and Pokémon character names are trademarks of Nintendo.
From d22ac60f6cfb27407d01f06da42f9cf85887ffff Mon Sep 17 00:00:00 2001 From: "mlo.dev" <68140202+MlondiMchunu@users.noreply.github.com> Date: Fri, 6 Dec 2024 10:15:55 +0200 Subject: [PATCH 09/67] Delete .github/workflows/hello.yml --- .github/workflows/hello.yml | 14 -------------- 1 file changed, 14 deletions(-) delete mode 100644 .github/workflows/hello.yml diff --git a/.github/workflows/hello.yml b/.github/workflows/hello.yml deleted file mode 100644 index 425ad9ca4b..0000000000 --- a/.github/workflows/hello.yml +++ /dev/null @@ -1,14 +0,0 @@ -name: Hello World! - -on: - push: - branches: - - main - -jobs: - hello_world_job: - runs-on: ubuntu-20.04 - steps: - - name: Say hello - run: | - echo "Hello World!" From 72c025a5d25dc856afd410c9d59107c24ca8669a Mon Sep 17 00:00:00 2001 From: "mlo.dev" <68140202+MlondiMchunu@users.noreply.github.com> Date: Fri, 6 Dec 2024 10:16:58 +0200 Subject: [PATCH 10/67] Create workflows --- .github/workflows | 1 + 1 file changed, 1 insertion(+) create mode 100644 .github/workflows diff --git a/.github/workflows b/.github/workflows new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/.github/workflows @@ -0,0 +1 @@ + From a1e40fee6ea20b22d596a75cc285a99a93ce44a3 Mon Sep 17 00:00:00 2001 From: "mlo.dev" <68140202+MlondiMchunu@users.noreply.github.com> Date: Fri, 6 Dec 2024 10:17:36 +0200 Subject: [PATCH 11/67] Delete .github directory --- .github/workflows | 1 - 1 file changed, 1 deletion(-) delete mode 100644 .github/workflows diff --git a/.github/workflows b/.github/workflows deleted file mode 100644 index 8b13789179..0000000000 --- a/.github/workflows +++ /dev/null @@ -1 +0,0 @@ - From f66dbbba4e9fc099a5cb2ee4600f2a0aec13edfd Mon Sep 17 00:00:00 2001 From: "mlo.dev" <68140202+MlondiMchunu@users.noreply.github.com> Date: Fri, 6 Dec 2024 10:18:03 +0200 Subject: [PATCH 12/67] Create workflows --- .github/workflows | 1 + 1 file changed, 1 insertion(+) create mode 100644 .github/workflows diff --git a/.github/workflows b/.github/workflows new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/.github/workflows @@ -0,0 +1 @@ + From 76787d10724d4f849c4739c8bcc81b9622240951 Mon Sep 17 00:00:00 2001 From: "mlo.dev" <68140202+MlondiMchunu@users.noreply.github.com> Date: Fri, 6 Dec 2024 10:20:17 +0200 Subject: [PATCH 13/67] Delete .github/workflows --- .github/workflows | 1 - 1 file changed, 1 deletion(-) delete mode 100644 .github/workflows diff --git a/.github/workflows b/.github/workflows deleted file mode 100644 index 8b13789179..0000000000 --- a/.github/workflows +++ /dev/null @@ -1 +0,0 @@ - From ba6ba492fe5b28727c4888e06c85459b9e622d42 Mon Sep 17 00:00:00 2001 From: "mlo.dev" <68140202+MlondiMchunu@users.noreply.github.com> Date: Fri, 6 Dec 2024 10:20:54 +0200 Subject: [PATCH 14/67] Create hello.yml --- .github/workflows/hello.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 .github/workflows/hello.yml diff --git a/.github/workflows/hello.yml b/.github/workflows/hello.yml new file mode 100644 index 0000000000..425ad9ca4b --- /dev/null +++ b/.github/workflows/hello.yml @@ -0,0 +1,14 @@ +name: Hello World! + +on: + push: + branches: + - main + +jobs: + hello_world_job: + runs-on: ubuntu-20.04 + steps: + - name: Say hello + run: | + echo "Hello World!" From 9866772446b6ecb17345aa7f22ce38ef603fdae6 Mon Sep 17 00:00:00 2001 From: MlondiMchunu Date: Fri, 6 Dec 2024 10:23:35 +0200 Subject: [PATCH 15/67] latest --- public/index.html | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/public/index.html b/public/index.html index 9f307578f7..764bbaf9c1 100644 --- a/public/index.html +++ b/public/index.html @@ -1,12 +1,15 @@ + Pokemon +

Pokemon Game

-
-
Pokémon and Pokémon character names are trademarks of Nintendo.
+
+
Pokémon and Pokémon character names are trademarks of Nintendo.
- + + \ No newline at end of file From b8508601543314b22244c5208228652ed03dd912 Mon Sep 17 00:00:00 2001 From: "mlo.dev" <68140202+MlondiMchunu@users.noreply.github.com> Date: Fri, 6 Dec 2024 10:26:57 +0200 Subject: [PATCH 16/67] Update hello.yml --- .github/workflows/hello.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/hello.yml b/.github/workflows/hello.yml index 425ad9ca4b..c1c0233060 100644 --- a/.github/workflows/hello.yml +++ b/.github/workflows/hello.yml @@ -3,7 +3,7 @@ name: Hello World! on: push: branches: - - main + - mai jobs: hello_world_job: From 39cf76e07684c5e50ace87bd06e174b5085d3477 Mon Sep 17 00:00:00 2001 From: "mlo.dev" <68140202+MlondiMchunu@users.noreply.github.com> Date: Fri, 6 Dec 2024 10:35:21 +0200 Subject: [PATCH 17/67] Update hello.yml --- .github/workflows/hello.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/hello.yml b/.github/workflows/hello.yml index c1c0233060..2de47cd28b 100644 --- a/.github/workflows/hello.yml +++ b/.github/workflows/hello.yml @@ -1,9 +1,10 @@ name: Hello World! +run-name: ${{github.actor }} is starting GitHub Actions on: push: branches: - - mai + - main jobs: hello_world_job: From 12c6326a3b9f7fc933b327d82f08f1bd28442c2c Mon Sep 17 00:00:00 2001 From: "mlo.dev" <68140202+MlondiMchunu@users.noreply.github.com> Date: Fri, 6 Dec 2024 11:06:56 +0200 Subject: [PATCH 18/67] Update hello.yml --- .github/workflows/hello.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/hello.yml b/.github/workflows/hello.yml index 2de47cd28b..460bb48431 100644 --- a/.github/workflows/hello.yml +++ b/.github/workflows/hello.yml @@ -13,3 +13,6 @@ jobs: - name: Say hello run: | echo "Hello World!" + - name: Print date + run: | + echo date From 36a899fbbb9c1d49628ec4c37a3def324b7a1929 Mon Sep 17 00:00:00 2001 From: "mlo.dev" <68140202+MlondiMchunu@users.noreply.github.com> Date: Fri, 6 Dec 2024 11:08:27 +0200 Subject: [PATCH 19/67] Update hello.yml --- .github/workflows/hello.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/hello.yml b/.github/workflows/hello.yml index 460bb48431..509543710e 100644 --- a/.github/workflows/hello.yml +++ b/.github/workflows/hello.yml @@ -1,5 +1,5 @@ name: Hello World! -run-name: ${{github.actor }} is starting GitHub Actions +run-name: ${{github.actor }} is running GitHub Actions on: push: From 2b1e5678e8081a98d8fa9ccdc83424d5c969a196 Mon Sep 17 00:00:00 2001 From: "mlo.dev" <68140202+MlondiMchunu@users.noreply.github.com> Date: Fri, 6 Dec 2024 11:10:19 +0200 Subject: [PATCH 20/67] Update hello.yml --- .github/workflows/hello.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/hello.yml b/.github/workflows/hello.yml index 509543710e..54d7b1b370 100644 --- a/.github/workflows/hello.yml +++ b/.github/workflows/hello.yml @@ -15,4 +15,4 @@ jobs: echo "Hello World!" - name: Print date run: | - echo date + echo date[MMDDhhmm[[CC]YY][.ss]] From 103c5e1e451cec8a2dcd0df69492d2b31618f790 Mon Sep 17 00:00:00 2001 From: "mlo.dev" <68140202+MlondiMchunu@users.noreply.github.com> Date: Fri, 6 Dec 2024 11:12:46 +0200 Subject: [PATCH 21/67] Update hello.yml --- .github/workflows/hello.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/hello.yml b/.github/workflows/hello.yml index 54d7b1b370..97ed54add3 100644 --- a/.github/workflows/hello.yml +++ b/.github/workflows/hello.yml @@ -15,4 +15,4 @@ jobs: echo "Hello World!" - name: Print date run: | - echo date[MMDDhhmm[[CC]YY][.ss]] + echo ls From 19b907c23257358302fa51047089ae6acb4b5224 Mon Sep 17 00:00:00 2001 From: "mlo.dev" <68140202+MlondiMchunu@users.noreply.github.com> Date: Fri, 6 Dec 2024 11:14:54 +0200 Subject: [PATCH 22/67] Update hello.yml --- .github/workflows/hello.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/hello.yml b/.github/workflows/hello.yml index 97ed54add3..4ebbd7f657 100644 --- a/.github/workflows/hello.yml +++ b/.github/workflows/hello.yml @@ -15,4 +15,4 @@ jobs: echo "Hello World!" - name: Print date run: | - echo ls + echo ls -a From ed9428f099c3096746bee565c10570368012e539 Mon Sep 17 00:00:00 2001 From: "mlo.dev" <68140202+MlondiMchunu@users.noreply.github.com> Date: Fri, 6 Dec 2024 11:18:01 +0200 Subject: [PATCH 23/67] Update hello.yml --- .github/workflows/hello.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/hello.yml b/.github/workflows/hello.yml index 4ebbd7f657..929179bb35 100644 --- a/.github/workflows/hello.yml +++ b/.github/workflows/hello.yml @@ -15,4 +15,8 @@ jobs: echo "Hello World!" - name: Print date run: | - echo ls -a + date + - name: Print directory + run: | + ls -a + From 6d5ddc38911cb87ab2aef2bb11f59fc369a8aaac Mon Sep 17 00:00:00 2001 From: "mlo.dev" <68140202+MlondiMchunu@users.noreply.github.com> Date: Fri, 6 Dec 2024 11:42:47 +0200 Subject: [PATCH 24/67] Create pipeline.yml --- .github/workflows/pipeline.yml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 .github/workflows/pipeline.yml diff --git a/.github/workflows/pipeline.yml b/.github/workflows/pipeline.yml new file mode 100644 index 0000000000..f1c5484142 --- /dev/null +++ b/.github/workflows/pipeline.yml @@ -0,0 +1,16 @@ +name: Deployment pipeline + +on: + push: + branches: + - main +jobs: + simple_deployment_pipeline: + runs-on: ubuntu-20.04 + steps: + - uses: actions/checkout@v4 + - uses: actions/setup-node@v4 + with: + node-version: '20' + - name: Install dependencies + run: npm install From 9cb38c6c6e21c9bbf4e8feb7798f9736b464ce8f Mon Sep 17 00:00:00 2001 From: "mlo.dev" <68140202+MlondiMchunu@users.noreply.github.com> Date: Fri, 6 Dec 2024 11:49:55 +0200 Subject: [PATCH 25/67] Update pipeline.yml --- .github/workflows/pipeline.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pipeline.yml b/.github/workflows/pipeline.yml index f1c5484142..b6d55fa20c 100644 --- a/.github/workflows/pipeline.yml +++ b/.github/workflows/pipeline.yml @@ -10,7 +10,7 @@ jobs: steps: - uses: actions/checkout@v4 - uses: actions/setup-node@v4 - with: - node-version: '20' + with: + node-version: '20' - name: Install dependencies run: npm install From cb8497668f064cc5da53897a902406e934181839 Mon Sep 17 00:00:00 2001 From: "mlo.dev" <68140202+MlondiMchunu@users.noreply.github.com> Date: Fri, 6 Dec 2024 11:53:24 +0200 Subject: [PATCH 26/67] Update pipeline.yml --- .github/workflows/pipeline.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/pipeline.yml b/.github/workflows/pipeline.yml index b6d55fa20c..cdc0121f59 100644 --- a/.github/workflows/pipeline.yml +++ b/.github/workflows/pipeline.yml @@ -14,3 +14,5 @@ jobs: node-version: '20' - name: Install dependencies run: npm install + - name: Check style + run: npm run eslint From 10e7531941c3524d2625970130ee5ee2f612971e Mon Sep 17 00:00:00 2001 From: "mlo.dev" <68140202+MlondiMchunu@users.noreply.github.com> Date: Fri, 6 Dec 2024 11:59:23 +0200 Subject: [PATCH 27/67] Update pipeline.yml --- .github/workflows/pipeline.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pipeline.yml b/.github/workflows/pipeline.yml index cdc0121f59..41547d21f5 100644 --- a/.github/workflows/pipeline.yml +++ b/.github/workflows/pipeline.yml @@ -15,4 +15,4 @@ jobs: - name: Install dependencies run: npm install - name: Check style - run: npm run eslint + run: npm run eslint From c2f7458b3b5e0d3cbf7b88f46bfafe9d847274b1 Mon Sep 17 00:00:00 2001 From: "mlo.dev" <68140202+MlondiMchunu@users.noreply.github.com> Date: Fri, 6 Dec 2024 12:00:44 +0200 Subject: [PATCH 28/67] Update pipeline.yml --- .github/workflows/pipeline.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/pipeline.yml b/.github/workflows/pipeline.yml index 41547d21f5..f17ded435f 100644 --- a/.github/workflows/pipeline.yml +++ b/.github/workflows/pipeline.yml @@ -7,12 +7,12 @@ on: jobs: simple_deployment_pipeline: runs-on: ubuntu-20.04 - steps: + steps: - uses: actions/checkout@v4 - uses: actions/setup-node@v4 - with: + with: node-version: '20' - - name: Install dependencies - run: npm install + - name: Install dependencies + run: npm install - name: Check style run: npm run eslint From 85e1a8b2bf7306424cc998a682dec71fa5074aec Mon Sep 17 00:00:00 2001 From: "mlo.dev" <68140202+MlondiMchunu@users.noreply.github.com> Date: Fri, 6 Dec 2024 12:02:28 +0200 Subject: [PATCH 29/67] Update pipeline.yml --- .github/workflows/pipeline.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pipeline.yml b/.github/workflows/pipeline.yml index f17ded435f..2d27cdd4ed 100644 --- a/.github/workflows/pipeline.yml +++ b/.github/workflows/pipeline.yml @@ -13,6 +13,5 @@ jobs: with: node-version: '20' - name: Install dependencies - run: npm install - - name: Check style - run: npm run eslint + run: npm install + - run: npm run eslint From af5b5413d6edc6dc07432a4dad632327c1f9bee5 Mon Sep 17 00:00:00 2001 From: "mlo.dev" <68140202+MlondiMchunu@users.noreply.github.com> Date: Fri, 6 Dec 2024 12:42:54 +0200 Subject: [PATCH 30/67] Update pipeline.yml --- .github/workflows/pipeline.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/pipeline.yml b/.github/workflows/pipeline.yml index 2d27cdd4ed..0d095d762d 100644 --- a/.github/workflows/pipeline.yml +++ b/.github/workflows/pipeline.yml @@ -14,4 +14,7 @@ jobs: node-version: '20' - name: Install dependencies run: npm install + - run: npm install eslint @eslint/js --save-dev + - run: npx eslint --init - run: npm run eslint + From 89e50e7d3ec18e5f733027d0f0e9150ec2370c57 Mon Sep 17 00:00:00 2001 From: "mlo.dev" <68140202+MlondiMchunu@users.noreply.github.com> Date: Fri, 6 Dec 2024 12:57:31 +0200 Subject: [PATCH 31/67] Update package.json --- package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index c0f5a8b7b0..ff3b447a8e 100644 --- a/package.json +++ b/package.json @@ -56,5 +56,6 @@ }, "jest": { "testEnvironment": "jsdom" - } + }, + "type":"module" } From 75af046bcac8d63fb3ec5694720343658096a3e9 Mon Sep 17 00:00:00 2001 From: "mlo.dev" <68140202+MlondiMchunu@users.noreply.github.com> Date: Fri, 6 Dec 2024 12:58:23 +0200 Subject: [PATCH 32/67] Update pipeline.yml From 19f3c1a4dc4c1174f8513ca733e4179265e21720 Mon Sep 17 00:00:00 2001 From: "mlo.dev" <68140202+MlondiMchunu@users.noreply.github.com> Date: Fri, 6 Dec 2024 13:01:24 +0200 Subject: [PATCH 33/67] Update package.json --- package.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package.json b/package.json index ff3b447a8e..c0f5a8b7b0 100644 --- a/package.json +++ b/package.json @@ -56,6 +56,5 @@ }, "jest": { "testEnvironment": "jsdom" - }, - "type":"module" + } } From e97c44cd8ae31cfa08dd8bee0b0aaccac422c831 Mon Sep 17 00:00:00 2001 From: "mlo.dev" <68140202+MlondiMchunu@users.noreply.github.com> Date: Fri, 6 Dec 2024 13:01:50 +0200 Subject: [PATCH 34/67] Update pipeline.yml From 63ba5cc68f0c9880aa9db966d717aeb6af990780 Mon Sep 17 00:00:00 2001 From: "mlo.dev" <68140202+MlondiMchunu@users.noreply.github.com> Date: Fri, 6 Dec 2024 13:09:20 +0200 Subject: [PATCH 35/67] Update .eslintrc.js --- .eslintrc.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.eslintrc.js b/.eslintrc.js index 5fad8125aa..143d86fffa 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -1,4 +1,6 @@ -module.exports = { +import globals from 'globals' + +export default [ { 'env': { 'browser': true, 'es6': true, @@ -46,4 +48,4 @@ module.exports = { 'no-console': 'error', 'react/prop-types': 0 } -} +}] From e046b846620e3e2f33a5718b1b2052a8a135980c Mon Sep 17 00:00:00 2001 From: "mlo.dev" <68140202+MlondiMchunu@users.noreply.github.com> Date: Fri, 6 Dec 2024 13:09:59 +0200 Subject: [PATCH 36/67] Update pipeline.yml From 230f43a0ca951d58d1e8a274cb02c0d4bfa15bbf Mon Sep 17 00:00:00 2001 From: "mlo.dev" <68140202+MlondiMchunu@users.noreply.github.com> Date: Fri, 6 Dec 2024 13:11:40 +0200 Subject: [PATCH 37/67] Update .eslintrc.js --- .eslintrc.js | 1 - 1 file changed, 1 deletion(-) diff --git a/.eslintrc.js b/.eslintrc.js index 143d86fffa..7181625eb1 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -1,4 +1,3 @@ -import globals from 'globals' export default [ { 'env': { From bb2e57314f335b01143c6428d1cb1b3697919d17 Mon Sep 17 00:00:00 2001 From: "mlo.dev" <68140202+MlondiMchunu@users.noreply.github.com> Date: Fri, 6 Dec 2024 13:12:05 +0200 Subject: [PATCH 38/67] Update pipeline.yml From e5edbe126043beb2f456bbae0a9330578bf066ca Mon Sep 17 00:00:00 2001 From: "mlo.dev" <68140202+MlondiMchunu@users.noreply.github.com> Date: Fri, 6 Dec 2024 13:13:55 +0200 Subject: [PATCH 39/67] Update .eslintrc.js --- .eslintrc.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.eslintrc.js b/.eslintrc.js index 7181625eb1..5fad8125aa 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -1,5 +1,4 @@ - -export default [ { +module.exports = { 'env': { 'browser': true, 'es6': true, @@ -47,4 +46,4 @@ export default [ { 'no-console': 'error', 'react/prop-types': 0 } -}] +} From fb8b47e2003b132b54db12677580f05a76fa5a17 Mon Sep 17 00:00:00 2001 From: "mlo.dev" <68140202+MlondiMchunu@users.noreply.github.com> Date: Fri, 6 Dec 2024 13:19:45 +0200 Subject: [PATCH 40/67] Update and rename .eslintrc.js to eslint.config.mjs --- .eslintrc.js => eslint.config.mjs | 2 ++ 1 file changed, 2 insertions(+) rename .eslintrc.js => eslint.config.mjs (96%) diff --git a/.eslintrc.js b/eslint.config.mjs similarity index 96% rename from .eslintrc.js rename to eslint.config.mjs index 5fad8125aa..244de4dd69 100644 --- a/.eslintrc.js +++ b/eslint.config.mjs @@ -1,3 +1,5 @@ +import globals from 'globals' + module.exports = { 'env': { 'browser': true, From bce8e4b7c427eacee1002b1c54cc0d2c91f15e38 Mon Sep 17 00:00:00 2001 From: "mlo.dev" <68140202+MlondiMchunu@users.noreply.github.com> Date: Fri, 6 Dec 2024 13:20:09 +0200 Subject: [PATCH 41/67] Update pipeline.yml From c4d30fac8ee1b46f3a3e9dce55ce95479a784903 Mon Sep 17 00:00:00 2001 From: "mlo.dev" <68140202+MlondiMchunu@users.noreply.github.com> Date: Fri, 6 Dec 2024 13:30:24 +0200 Subject: [PATCH 42/67] Update eslint.config.mjs --- eslint.config.mjs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/eslint.config.mjs b/eslint.config.mjs index 244de4dd69..70e5ab8b80 100644 --- a/eslint.config.mjs +++ b/eslint.config.mjs @@ -1,6 +1,7 @@ import globals from 'globals' -module.exports = { +export default[ + { 'env': { 'browser': true, 'es6': true, @@ -49,3 +50,4 @@ module.exports = { 'react/prop-types': 0 } } + ] From 145178ba516a5472ed18fec7709cc26a778384d3 Mon Sep 17 00:00:00 2001 From: "mlo.dev" <68140202+MlondiMchunu@users.noreply.github.com> Date: Fri, 6 Dec 2024 13:30:54 +0200 Subject: [PATCH 43/67] Update pipeline.yml From 9878b31e9aaa0f94cf6cabe012338f5158a0486b Mon Sep 17 00:00:00 2001 From: "mlo.dev" <68140202+MlondiMchunu@users.noreply.github.com> Date: Fri, 6 Dec 2024 13:33:05 +0200 Subject: [PATCH 44/67] Rename eslint.config.mjs to eslint.config.js --- eslint.config.mjs => eslint.config.js | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename eslint.config.mjs => eslint.config.js (100%) diff --git a/eslint.config.mjs b/eslint.config.js similarity index 100% rename from eslint.config.mjs rename to eslint.config.js From f24fbf8738c77c30c0050b0ff3d6216592e17eb7 Mon Sep 17 00:00:00 2001 From: "mlo.dev" <68140202+MlondiMchunu@users.noreply.github.com> Date: Fri, 6 Dec 2024 13:33:25 +0200 Subject: [PATCH 45/67] Update pipeline.yml From 581046e62272c4c66046ded90d1059ff3ce1bedd Mon Sep 17 00:00:00 2001 From: "mlo.dev" <68140202+MlondiMchunu@users.noreply.github.com> Date: Fri, 6 Dec 2024 13:38:30 +0200 Subject: [PATCH 46/67] Update and rename eslint.config.js to eslintrc.js --- eslint.config.js => eslintrc.js | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) rename eslint.config.js => eslintrc.js (94%) diff --git a/eslint.config.js b/eslintrc.js similarity index 94% rename from eslint.config.js rename to eslintrc.js index 70e5ab8b80..de4de5cf35 100644 --- a/eslint.config.js +++ b/eslintrc.js @@ -1,6 +1,4 @@ -import globals from 'globals' - -export default[ +module.exports { 'env': { 'browser': true, @@ -50,4 +48,3 @@ export default[ 'react/prop-types': 0 } } - ] From eaab69e84ab39dd12d2603fa3a03aae53cc492ca Mon Sep 17 00:00:00 2001 From: "mlo.dev" <68140202+MlondiMchunu@users.noreply.github.com> Date: Fri, 6 Dec 2024 13:39:01 +0200 Subject: [PATCH 47/67] Update eslintrc.js --- eslintrc.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/eslintrc.js b/eslintrc.js index de4de5cf35..5fad8125aa 100644 --- a/eslintrc.js +++ b/eslintrc.js @@ -1,5 +1,4 @@ -module.exports - { +module.exports = { 'env': { 'browser': true, 'es6': true, From 8e2b3925be31926b9e13e884ee8b88c30d04894f Mon Sep 17 00:00:00 2001 From: "mlo.dev" <68140202+MlondiMchunu@users.noreply.github.com> Date: Fri, 6 Dec 2024 13:39:30 +0200 Subject: [PATCH 48/67] Update pipeline.yml From ac189a294a1aeadeed2af3ef0a18a5e89ee4a8ff Mon Sep 17 00:00:00 2001 From: "mlo.dev" <68140202+MlondiMchunu@users.noreply.github.com> Date: Fri, 6 Dec 2024 13:44:26 +0200 Subject: [PATCH 49/67] Rename eslintrc.js to .eslintrc.js --- eslintrc.js => .eslintrc.js | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename eslintrc.js => .eslintrc.js (100%) diff --git a/eslintrc.js b/.eslintrc.js similarity index 100% rename from eslintrc.js rename to .eslintrc.js From dc4214be53b942ac33dc1bf4f95d2ba2a6cece21 Mon Sep 17 00:00:00 2001 From: "mlo.dev" <68140202+MlondiMchunu@users.noreply.github.com> Date: Fri, 6 Dec 2024 13:44:54 +0200 Subject: [PATCH 50/67] Update pipeline.yml --- .github/workflows/pipeline.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/pipeline.yml b/.github/workflows/pipeline.yml index 0d095d762d..b951864029 100644 --- a/.github/workflows/pipeline.yml +++ b/.github/workflows/pipeline.yml @@ -4,6 +4,7 @@ on: push: branches: - main + jobs: simple_deployment_pipeline: runs-on: ubuntu-20.04 From f06c60190b2e46f8ab8ac17f2a51e604af7f8524 Mon Sep 17 00:00:00 2001 From: "mlo.dev" <68140202+MlondiMchunu@users.noreply.github.com> Date: Fri, 6 Dec 2024 13:49:24 +0200 Subject: [PATCH 51/67] Update .eslintrc.js --- .eslintrc.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.eslintrc.js b/.eslintrc.js index 5fad8125aa..5616c1a314 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -2,7 +2,8 @@ module.exports = { 'env': { 'browser': true, 'es6': true, - 'jest/globals': true + 'jest/globals': true, + 'node':true }, 'extends': [ 'eslint:recommended', From e990da3be85441a5d8d978ad45409f3cdb6484e6 Mon Sep 17 00:00:00 2001 From: "mlo.dev" <68140202+MlondiMchunu@users.noreply.github.com> Date: Fri, 6 Dec 2024 13:49:46 +0200 Subject: [PATCH 52/67] Update pipeline.yml From de345bd33ee53d0101bfc049f72731d268eb6aa6 Mon Sep 17 00:00:00 2001 From: "mlo.dev" <68140202+MlondiMchunu@users.noreply.github.com> Date: Fri, 6 Dec 2024 13:55:38 +0200 Subject: [PATCH 53/67] Update .eslintrc.js --- .eslintrc.js | 1 + 1 file changed, 1 insertion(+) diff --git a/.eslintrc.js b/.eslintrc.js index 5616c1a314..8d9dc03a36 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -20,6 +20,7 @@ module.exports = { 'react', 'jest' ], 'rules': { + 'no-console':'off', 'indent': [ 'error', 2 From 3969d504cb52c7c1fdf3d47f47c4087d2938d5e7 Mon Sep 17 00:00:00 2001 From: "mlo.dev" <68140202+MlondiMchunu@users.noreply.github.com> Date: Fri, 6 Dec 2024 13:55:58 +0200 Subject: [PATCH 54/67] Update pipeline.yml From 90742ea46ec562452c196a9fb73ef264a01af9f9 Mon Sep 17 00:00:00 2001 From: "mlo.dev" <68140202+MlondiMchunu@users.noreply.github.com> Date: Fri, 6 Dec 2024 13:58:06 +0200 Subject: [PATCH 55/67] Update .eslintrc.js --- .eslintrc.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.eslintrc.js b/.eslintrc.js index 8d9dc03a36..f435ad7344 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -20,7 +20,6 @@ module.exports = { 'react', 'jest' ], 'rules': { - 'no-console':'off', 'indent': [ 'error', 2 @@ -45,7 +44,7 @@ module.exports = { 'arrow-spacing': [ 'error', { 'before': true, 'after': true } ], - 'no-console': 'error', + 'no-console': 'off', 'react/prop-types': 0 } } From 84df30be0ac0906a00bcf25eec58b9426e801a66 Mon Sep 17 00:00:00 2001 From: "mlo.dev" <68140202+MlondiMchunu@users.noreply.github.com> Date: Fri, 6 Dec 2024 13:58:36 +0200 Subject: [PATCH 56/67] Update pipeline.yml From ec4fa7644a621bc613e9122eac9783e1a09e244c Mon Sep 17 00:00:00 2001 From: "mlo.dev" <68140202+MlondiMchunu@users.noreply.github.com> Date: Fri, 6 Dec 2024 14:04:27 +0200 Subject: [PATCH 57/67] Update .eslintrc.js --- .eslintrc.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.eslintrc.js b/.eslintrc.js index f435ad7344..4aef4656d6 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -45,6 +45,7 @@ module.exports = { 'error', { 'before': true, 'after': true } ], 'no-console': 'off', - 'react/prop-types': 0 + 'react/prop-types': 0, + 'no-unused-vars':'warn } } From c3974d41acdce26472ccf0521b00b1b2a9bab4a0 Mon Sep 17 00:00:00 2001 From: "mlo.dev" <68140202+MlondiMchunu@users.noreply.github.com> Date: Fri, 6 Dec 2024 14:05:45 +0200 Subject: [PATCH 58/67] Update .eslintrc.js --- .eslintrc.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.eslintrc.js b/.eslintrc.js index 4aef4656d6..e57cad25e4 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -46,6 +46,6 @@ module.exports = { ], 'no-console': 'off', 'react/prop-types': 0, - 'no-unused-vars':'warn + 'no-unused-vars':'warn' } } From d08120840a58c82a11f2fa5ce27d640566565760 Mon Sep 17 00:00:00 2001 From: "mlo.dev" <68140202+MlondiMchunu@users.noreply.github.com> Date: Fri, 6 Dec 2024 14:11:04 +0200 Subject: [PATCH 59/67] Update .eslintrc.js --- .eslintrc.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.eslintrc.js b/.eslintrc.js index e57cad25e4..22f2434a0f 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -37,7 +37,7 @@ module.exports = { 'never' ], 'eqeqeq': 'error', - 'no-trailing-spaces': 'error', + 'no-trailing-spaces': 'warn', 'object-curly-spacing': [ 'error', 'always' ], From 5d7c57a4876e07c39544523552b78ef4ca56ad2b Mon Sep 17 00:00:00 2001 From: "mlo.dev" <68140202+MlondiMchunu@users.noreply.github.com> Date: Fri, 6 Dec 2024 14:13:18 +0200 Subject: [PATCH 60/67] Update .eslintrc.js --- .eslintrc.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.eslintrc.js b/.eslintrc.js index 22f2434a0f..6fd20adb16 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -37,7 +37,7 @@ module.exports = { 'never' ], 'eqeqeq': 'error', - 'no-trailing-spaces': 'warn', + 'no-trailing-spaces': 'off', 'object-curly-spacing': [ 'error', 'always' ], From 287b115d7152cb7e03ce2d0c7184ab306e362aea Mon Sep 17 00:00:00 2001 From: "mlo.dev" <68140202+MlondiMchunu@users.noreply.github.com> Date: Fri, 6 Dec 2024 14:15:38 +0200 Subject: [PATCH 61/67] Update .eslintrc.js --- .eslintrc.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.eslintrc.js b/.eslintrc.js index 6fd20adb16..e57cad25e4 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -37,7 +37,7 @@ module.exports = { 'never' ], 'eqeqeq': 'error', - 'no-trailing-spaces': 'off', + 'no-trailing-spaces': 'error', 'object-curly-spacing': [ 'error', 'always' ], From 22667f299bb8363a396f9454fe1ce62c705bf534 Mon Sep 17 00:00:00 2001 From: "mlo.dev" <68140202+MlondiMchunu@users.noreply.github.com> Date: Fri, 6 Dec 2024 14:16:17 +0200 Subject: [PATCH 62/67] Update pipeline.yml --- .github/workflows/pipeline.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pipeline.yml b/.github/workflows/pipeline.yml index b951864029..ba3ad4f318 100644 --- a/.github/workflows/pipeline.yml +++ b/.github/workflows/pipeline.yml @@ -17,5 +17,5 @@ jobs: run: npm install - run: npm install eslint @eslint/js --save-dev - run: npx eslint --init - - run: npm run eslint + - run: npm run eslint -- --fix From 1c7eb758cf2849ad5e01ba317dab093a54733c16 Mon Sep 17 00:00:00 2001 From: "mlo.dev" <68140202+MlondiMchunu@users.noreply.github.com> Date: Fri, 6 Dec 2024 14:18:03 +0200 Subject: [PATCH 63/67] Update pipeline.yml --- .github/workflows/pipeline.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pipeline.yml b/.github/workflows/pipeline.yml index ba3ad4f318..fb08df5fad 100644 --- a/.github/workflows/pipeline.yml +++ b/.github/workflows/pipeline.yml @@ -17,5 +17,5 @@ jobs: run: npm install - run: npm install eslint @eslint/js --save-dev - run: npx eslint --init - - run: npm run eslint -- --fix + - run: npm run eslint --fix From f90f7f86ff5347fc4a4e0271b0c302f29bcdceb4 Mon Sep 17 00:00:00 2001 From: "mlo.dev" <68140202+MlondiMchunu@users.noreply.github.com> Date: Fri, 6 Dec 2024 14:19:21 +0200 Subject: [PATCH 64/67] Update .eslintrc.js --- .eslintrc.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.eslintrc.js b/.eslintrc.js index e57cad25e4..22f2434a0f 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -37,7 +37,7 @@ module.exports = { 'never' ], 'eqeqeq': 'error', - 'no-trailing-spaces': 'error', + 'no-trailing-spaces': 'warn', 'object-curly-spacing': [ 'error', 'always' ], From 805396f7dec2c2ad1a86b5466f6e420da874f3fc Mon Sep 17 00:00:00 2001 From: "mlo.dev" <68140202+MlondiMchunu@users.noreply.github.com> Date: Fri, 6 Dec 2024 14:19:38 +0200 Subject: [PATCH 65/67] Update pipeline.yml --- .github/workflows/pipeline.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pipeline.yml b/.github/workflows/pipeline.yml index fb08df5fad..b951864029 100644 --- a/.github/workflows/pipeline.yml +++ b/.github/workflows/pipeline.yml @@ -17,5 +17,5 @@ jobs: run: npm install - run: npm install eslint @eslint/js --save-dev - run: npx eslint --init - - run: npm run eslint --fix + - run: npm run eslint From 39c40c46b6a32412cdb0b29bcc7c6db603af7721 Mon Sep 17 00:00:00 2001 From: "mlo.dev" <68140202+MlondiMchunu@users.noreply.github.com> Date: Fri, 6 Dec 2024 14:30:30 +0200 Subject: [PATCH 66/67] Update pipeline.yml --- .github/workflows/pipeline.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/pipeline.yml b/.github/workflows/pipeline.yml index b951864029..3b932928f3 100644 --- a/.github/workflows/pipeline.yml +++ b/.github/workflows/pipeline.yml @@ -18,4 +18,8 @@ jobs: - run: npm install eslint @eslint/js --save-dev - run: npx eslint --init - run: npm run eslint + - name: build + run: npm run build + - name: test + run: npm run test From 1ce21f01c78c917b434390e0e3fc6d6fe9343f65 Mon Sep 17 00:00:00 2001 From: "mlo.dev" <68140202+MlondiMchunu@users.noreply.github.com> Date: Fri, 6 Dec 2024 15:06:25 +0200 Subject: [PATCH 67/67] Update PokemonPage.jsx --- src/PokemonPage.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/PokemonPage.jsx b/src/PokemonPage.jsx index a37849fb4d..02eeed87a1 100644 --- a/src/PokemonPage.jsx +++ b/src/PokemonPage.jsx @@ -32,7 +32,7 @@ const PokemonPage = ({ previous, next }) => {
{previous && Previous} Home - {next && Next} + {next && Next}