From 9b7ffc32a030ce4bdac4e2124df5573945c1b1c7 Mon Sep 17 00:00:00 2001 From: daxoron Date: Sun, 17 Oct 2021 00:56:07 +0530 Subject: [PATCH 01/14] Added Hyperlinks in Ways to Contribute Section --- package.json | 1 + src/Components/Home/index.js | 3 ++- src/content/home.js | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 62cd4556..61328d51 100644 --- a/package.json +++ b/package.json @@ -8,6 +8,7 @@ "@testing-library/jest-dom": "^4.2.4", "@testing-library/user-event": "^7.1.2", "dayjs": "^1.9.3", + "html-react-parser": "^1.4.0", "react": "^16.13.1", "react-dom": "^16.13.1", "react-native-hyperlink": "0.0.19", diff --git a/src/Components/Home/index.js b/src/Components/Home/index.js index fd14fdb3..93139ecb 100644 --- a/src/Components/Home/index.js +++ b/src/Components/Home/index.js @@ -5,6 +5,7 @@ import SectionSubheader from './../SectionSubheader'; import { getHome } from './../../content/home'; import { Box, Content, Description } from './styles'; import ContributionSection from './contribution/ContributionSection'; +import HTMLReactParser from "html-react-parser"; function Home() { const content = getHome(); @@ -13,7 +14,7 @@ function Home() { {section.content.map((content, indx) => { - return {content.par}; + return {HTMLReactParser(content.par)}; })} ); diff --git a/src/content/home.js b/src/content/home.js index 8b90f36a..e092c484 100644 --- a/src/content/home.js +++ b/src/content/home.js @@ -28,11 +28,11 @@ const home = { content: [ { par: - 'You can start contributing to our various open source projects by- \n\n1) Creating issues on Github regarding the project \n2) Debugging the issues \n3) Creating pull requests, testing pull requests \n4) Create mockups for new applications or redesign the current features \n5) Research about UI/UX improvements and accessibility features. \n6) Create app walk through with documents or videos, UI testing once the PR is submitted for the UI issue', + 'You can start contributing to our various open source projects by- \n\n1) Creating issues on Github regarding the project \n2) Debugging the issues \n3) Creating pull requests, testing pull requests \n4) Create mockups for new applications or redesign the current features \n5) Research about UI/UX improvements and accessibility features. \n6) Create app walk through with documents or videos, UI testing once the PR is submitted for the UI issue', }, { par: - "Each active repository has a stream to direct questions. \nIssues labeled as 'First Timers Only' are meant for contributors who have not contributed to the project yet. Please choose other issues to contribute to, if you have already contributed to these type of issues. \nMake sure to follow the Commit Message Style Guide when submitting PRs which will require review by at least one maintainer to be merged to the main code.", + 'Each active repository has a stream to direct questions. \nIssues labeled as First Timers Only are meant for contributors who have not contributed to the project yet. Please choose other issues to contribute to, if you have already contributed to these type of issues. \nMake sure to follow the Commit Message Style Guide when submitting PRs which will require review by at least one maintainer to be merged to the main code.', }, ], }, From e14822f2080c9f7deb879903b7f61351cd32aca0 Mon Sep 17 00:00:00 2001 From: daxoron Date: Sun, 17 Oct 2021 23:12:34 +0530 Subject: [PATCH 02/14] First Timers Text Changed --- src/content/home.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/content/home.js b/src/content/home.js index 001d4d9e..91eb8599 100644 --- a/src/content/home.js +++ b/src/content/home.js @@ -29,7 +29,7 @@ const home = { }, { par: - 'Each active repository has a stream to direct questions. \nIssues labeled as First Timers Only are meant for contributors who have not contributed to the project yet. Please choose other issues to contribute to, if you have already contributed to these type of issues. \nMake sure to follow the Commit Message Style Guide when submitting PRs which will require review by at least one maintainer to be merged to the main code.', + 'Each active repository has a stream to direct questions. \nIssues labeled as First Timers Only are meant for contributors who have not contributed to the project yet. Please choose other issues to contribute to, if you have already contributed to these type of issues. \nMake sure to follow the Commit Message Style Guide when submitting PRs which will require review by at least one maintainer to be merged to the main code.', }, ], }, From 72541957ad457729de021f9ff4ae2c4518c13997 Mon Sep 17 00:00:00 2001 From: daxoron Date: Mon, 18 Oct 2021 04:11:30 +0530 Subject: [PATCH 03/14] Code Modified based on Prettier --- src/Components/Home/index.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/Components/Home/index.js b/src/Components/Home/index.js index 95a8e86f..5de09a0f 100644 --- a/src/Components/Home/index.js +++ b/src/Components/Home/index.js @@ -5,7 +5,7 @@ import SectionSubheader from './../SectionSubheader'; import { getHome } from './../../content/home'; import { Box, Content, Description } from './styles'; import ContributionSection from './contribution/ContributionSection'; -import HTMLReactParser from "html-react-parser"; +import HTMLReactParser from 'html-react-parser'; function Home() { const content = getHome(); @@ -14,7 +14,9 @@ function Home() { {section.content.map((content, indx) => { - return {HTMLReactParser(content.par)}; + return ( + {HTMLReactParser(content.par)} + ); })} ); From c6d2d9a50c8a921e685d263f8c88c09ec27cc9e7 Mon Sep 17 00:00:00 2001 From: daxoron Date: Mon, 18 Oct 2021 04:30:30 +0530 Subject: [PATCH 04/14] deploy.yaml Changes - Testing --- .github/workflows/deploy.yml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 516fdf9f..9e0bd7d8 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -20,9 +20,18 @@ jobs: steps: - name: Checkout uses: actions/checkout@v2 + with: + # Make sure the actual branch is checked out when running on pull requests + ref: ${{ github.event.pull_request.base.ref }} + + # This is important to fetch the changes to the previous commit + fetch-depth: 0 - name: Prettify code uses: creyD/prettier_action@v4.0 + with: + prettier_options: --write src/*/.{js,json,md} + only_changed: True build: # The type of runner that the job will run on if: github.event_name != 'pull_request' @@ -47,4 +56,4 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} BRANCH: master # The branch the action should deploy to. FOLDER: build # The folder the action should deploy. - CLEAN: true # Automatically remove deleted files from the deploy branch + CLEAN: true # Automatically remove deleted files from the deploy branch \ No newline at end of file From fd5a87454382fa8e33cfd9221bf338f9d5c43926 Mon Sep 17 00:00:00 2001 From: daxoron Date: Mon, 18 Oct 2021 04:46:03 +0530 Subject: [PATCH 05/14] deploy.yaml Changes - Testing --- .github/workflows/deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 9e0bd7d8..8319f0ad 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -30,7 +30,7 @@ jobs: - name: Prettify code uses: creyD/prettier_action@v4.0 with: - prettier_options: --write src/*/.{js,json,md} + prettier_options: --write "**/*.{ts,jsx,js,css,html}" only_changed: True build: # The type of runner that the job will run on From 12d9da8f2700ca3e6e17597f9059233c1b825048 Mon Sep 17 00:00:00 2001 From: daxoron Date: Mon, 18 Oct 2021 04:48:17 +0530 Subject: [PATCH 06/14] deploy.yaml Changes - Testing --- .github/workflows/deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 8319f0ad..3bf50512 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -30,7 +30,7 @@ jobs: - name: Prettify code uses: creyD/prettier_action@v4.0 with: - prettier_options: --write "**/*.{ts,jsx,js,css,html}" + prettier_options: --write **/*.{js} only_changed: True build: # The type of runner that the job will run on From ae394a8aeca0e6ba5ef829de5fb339a79ef5562c Mon Sep 17 00:00:00 2001 From: daxoron Date: Mon, 18 Oct 2021 04:58:07 +0530 Subject: [PATCH 07/14] Reverted deploy.yml --- .github/workflows/deploy.yml | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 3bf50512..516fdf9f 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -20,18 +20,9 @@ jobs: steps: - name: Checkout uses: actions/checkout@v2 - with: - # Make sure the actual branch is checked out when running on pull requests - ref: ${{ github.event.pull_request.base.ref }} - - # This is important to fetch the changes to the previous commit - fetch-depth: 0 - name: Prettify code uses: creyD/prettier_action@v4.0 - with: - prettier_options: --write **/*.{js} - only_changed: True build: # The type of runner that the job will run on if: github.event_name != 'pull_request' @@ -56,4 +47,4 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} BRANCH: master # The branch the action should deploy to. FOLDER: build # The folder the action should deploy. - CLEAN: true # Automatically remove deleted files from the deploy branch \ No newline at end of file + CLEAN: true # Automatically remove deleted files from the deploy branch From b0a1d41067fbc34e2daf66aac266f2625d00724a Mon Sep 17 00:00:00 2001 From: daxoron Date: Mon, 18 Oct 2021 04:58:38 +0530 Subject: [PATCH 08/14] homepage Snapshot Updated --- src/test/__snapshots__/Home.test.js.snap | 27 +++++++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) diff --git a/src/test/__snapshots__/Home.test.js.snap b/src/test/__snapshots__/Home.test.js.snap index 418a47a2..90725140 100644 --- a/src/test/__snapshots__/Home.test.js.snap +++ b/src/test/__snapshots__/Home.test.js.snap @@ -132,7 +132,14 @@ If you are subject to or witness unacceptable behavior, or have any other concer > You can start contributing to our various open source projects by- -1) Creating issues on Github regarding the project +1) + + Creating issues on Github + + regarding the project 2) Debugging the issues 3) Creating pull requests, testing pull requests 4) Create mockups for new applications or redesign the current features @@ -145,8 +152,22 @@ If you are subject to or witness unacceptable behavior, or have any other concer style="font-size: 18px; font-weight: 200; text-align: left;" > Each active repository has a stream to direct questions. -Issues labeled as 'First Timers Only' are meant for contributors who have not contributed to the project yet. Please choose other issues to contribute to, if you have already contributed to these type of issues. -Make sure to follow the Commit Message Style Guide when submitting PRs which will require review by at least one maintainer to be merged to the main code. +Issues labeled as + + First Timers Only + + are meant for contributors who have not contributed to the project yet. Please choose other issues to contribute to, if you have already contributed to these type of issues. +Make sure to follow the + + Commit Message Style Guide + + when submitting PRs which will require review by at least one maintainer to be merged to the main code. From 547dfd30eadb8718780862c532f9b1ea285abdac Mon Sep 17 00:00:00 2001 From: daxoron Date: Mon, 18 Oct 2021 05:02:34 +0530 Subject: [PATCH 09/14] deploy.yml Changes - Testing --- .github/workflows/deploy.yml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 516fdf9f..9e0bd7d8 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -20,9 +20,18 @@ jobs: steps: - name: Checkout uses: actions/checkout@v2 + with: + # Make sure the actual branch is checked out when running on pull requests + ref: ${{ github.event.pull_request.base.ref }} + + # This is important to fetch the changes to the previous commit + fetch-depth: 0 - name: Prettify code uses: creyD/prettier_action@v4.0 + with: + prettier_options: --write src/*/.{js,json,md} + only_changed: True build: # The type of runner that the job will run on if: github.event_name != 'pull_request' @@ -47,4 +56,4 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} BRANCH: master # The branch the action should deploy to. FOLDER: build # The folder the action should deploy. - CLEAN: true # Automatically remove deleted files from the deploy branch + CLEAN: true # Automatically remove deleted files from the deploy branch \ No newline at end of file From 311752962ac56adcd0b5eb3637c8d5b17e97e45e Mon Sep 17 00:00:00 2001 From: daxoron Date: Mon, 18 Oct 2021 05:04:53 +0530 Subject: [PATCH 10/14] deploy.yml Changes - Testing --- .github/workflows/deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 9e0bd7d8..96f09c7f 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -30,7 +30,7 @@ jobs: - name: Prettify code uses: creyD/prettier_action@v4.0 with: - prettier_options: --write src/*/.{js,json,md} + prettier_options: src/*/.{js,json,md} --write only_changed: True build: # The type of runner that the job will run on From 4759b6b888a563c353834119197140b633d8c846 Mon Sep 17 00:00:00 2001 From: daxoron Date: Mon, 18 Oct 2021 05:06:31 +0530 Subject: [PATCH 11/14] deploy.yml Changes - Testing --- .github/workflows/deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 96f09c7f..31a4b779 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -30,7 +30,7 @@ jobs: - name: Prettify code uses: creyD/prettier_action@v4.0 with: - prettier_options: src/*/.{js,json,md} --write + prettier_options: "**/*.{ts,jsx,js,css,html}" --write only_changed: True build: # The type of runner that the job will run on From 41fe44586c36cdc836c230a9ba3a4fc76b263eda Mon Sep 17 00:00:00 2001 From: daxoron Date: Mon, 18 Oct 2021 05:11:17 +0530 Subject: [PATCH 12/14] deploy.yml Changes - Testing --- .github/workflows/deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 31a4b779..9e0bd7d8 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -30,7 +30,7 @@ jobs: - name: Prettify code uses: creyD/prettier_action@v4.0 with: - prettier_options: "**/*.{ts,jsx,js,css,html}" --write + prettier_options: --write src/*/.{js,json,md} only_changed: True build: # The type of runner that the job will run on From c64fa1f0562a9f987db0a687534fd885c20314f0 Mon Sep 17 00:00:00 2001 From: daxoron Date: Mon, 18 Oct 2021 05:18:02 +0530 Subject: [PATCH 13/14] deploy.yml Changes - Final --- .github/workflows/deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 9e0bd7d8..d17bdb35 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -30,7 +30,7 @@ jobs: - name: Prettify code uses: creyD/prettier_action@v4.0 with: - prettier_options: --write src/*/.{js,json,md} + prettier_options: "**/*.{ts,jsx,js,css,html,json,md}" --write only_changed: True build: # The type of runner that the job will run on From 98afe386698abef517ea1a9672d17a5fe6718727 Mon Sep 17 00:00:00 2001 From: daxoron Date: Mon, 18 Oct 2021 19:09:41 +0530 Subject: [PATCH 14/14] Deploy.yml Reverted Back Draft --- .github/workflows/deploy.yml | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index d17bdb35..516fdf9f 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -20,18 +20,9 @@ jobs: steps: - name: Checkout uses: actions/checkout@v2 - with: - # Make sure the actual branch is checked out when running on pull requests - ref: ${{ github.event.pull_request.base.ref }} - - # This is important to fetch the changes to the previous commit - fetch-depth: 0 - name: Prettify code uses: creyD/prettier_action@v4.0 - with: - prettier_options: "**/*.{ts,jsx,js,css,html,json,md}" --write - only_changed: True build: # The type of runner that the job will run on if: github.event_name != 'pull_request' @@ -56,4 +47,4 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} BRANCH: master # The branch the action should deploy to. FOLDER: build # The folder the action should deploy. - CLEAN: true # Automatically remove deleted files from the deploy branch \ No newline at end of file + CLEAN: true # Automatically remove deleted files from the deploy branch