From ef269ee3d789d20471d45bef24a7fb7913618e43 Mon Sep 17 00:00:00 2001 From: Sabeerwaqas Date: Sun, 5 Oct 2025 16:39:06 +0500 Subject: [PATCH 01/10] fix: build fail issue mentioned in #1607 --- .husky/pre-commit | 6 +++--- package.json | 1 + src/common/home/Home.jsx | 6 ++---- src/plays/Selection-Sort-Visualizer/App.js | 2 +- src/plays/zoomlogin/MainPage.js | 4 +--- 5 files changed, 8 insertions(+), 11 deletions(-) diff --git a/.husky/pre-commit b/.husky/pre-commit index 7e2936624c..c37466e2b3 100755 --- a/.husky/pre-commit +++ b/.husky/pre-commit @@ -1,4 +1,4 @@ -#!/usr/bin/env sh -. "$(dirname -- "$0")/_/husky.sh" +#!/bin/sh +. "$(dirname "$0")/_/husky.sh" -yarn pre-commit \ No newline at end of file +npx lint-staged \ No newline at end of file diff --git a/package.json b/package.json index 8d98545d6b..b93fd03b76 100644 --- a/package.json +++ b/package.json @@ -137,6 +137,7 @@ "@types/react-dom": "^18.2.18", "@typescript-eslint/eslint-plugin": "6.4.0", "@typescript-eslint/parser": "^6.19.1", + "ajv": "^8.17.1", "autoprefixer": "^10.4.17", "eslint": "^8.56.0", "eslint-config-prettier": "^9.1.0", diff --git a/src/common/home/Home.jsx b/src/common/home/Home.jsx index 41307e776b..f540468964 100644 --- a/src/common/home/Home.jsx +++ b/src/common/home/Home.jsx @@ -1,7 +1,5 @@ import ExtendedFooter from 'common/footer/ExtendedFooter'; import React from 'react'; -import HomeBanner from './HomeBanner'; -import HomeContent from './HomeContent'; import HomeContributors from './HomeContributors'; import HomeFeatures from './HomeFeatures'; import HomeIdeas from './HomeIdeas'; @@ -9,13 +7,13 @@ import HomePlays from './HomePlays'; import HomeSponsors from './HomeSponsors'; import HomeTestimonials from './HomeTestimonials'; import './home.css'; +import DefaultBanner from 'common/defaultBanner/DefaultBanner'; const Home = () => { return (
- - +
diff --git a/src/plays/Selection-Sort-Visualizer/App.js b/src/plays/Selection-Sort-Visualizer/App.js index 61f0fe4f6f..6c7d9357df 100644 --- a/src/plays/Selection-Sort-Visualizer/App.js +++ b/src/plays/Selection-Sort-Visualizer/App.js @@ -1,5 +1,5 @@ import React from 'react'; -import './App.css'; +import './select.css'; import SelectionSortVisualizer from './SelectionSortVisualizer'; function App() { diff --git a/src/plays/zoomlogin/MainPage.js b/src/plays/zoomlogin/MainPage.js index f51c7ee692..e1c9acdfd9 100644 --- a/src/plays/zoomlogin/MainPage.js +++ b/src/plays/zoomlogin/MainPage.js @@ -1,7 +1,6 @@ import { BrowserRouter, Route, Routes } from 'react-router-dom'; import App from './components/App'; -import HomePage from './components/HomePage'; -import LinkedinPage from './components/Linkedin/LinkedinPage'; +import HomePage from '../../common/home/Home'; import ZoomPage from './components/Zoom/ZoomPage'; export function MainPage() { @@ -10,7 +9,6 @@ export function MainPage() { } path="/" /> - } path="/linkedin" /> } path="/zoom" /> From 57dcdfd1b8d334077d6f0232589230d712ca47ce Mon Sep 17 00:00:00 2001 From: Sabeerwaqas Date: Sun, 5 Oct 2025 19:50:33 +0500 Subject: [PATCH 02/10] fix: github flow fail issue --- .github/workflows/label-hacktoberfest.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/label-hacktoberfest.yml b/.github/workflows/label-hacktoberfest.yml index aae5fa5158..bf4108f757 100644 --- a/.github/workflows/label-hacktoberfest.yml +++ b/.github/workflows/label-hacktoberfest.yml @@ -1,8 +1,8 @@ name: Label Hacktoberfest PRs on: - pull_request: - types: [opened, synchronize, reopened, edited] + pull_request_target: + types: [opened, reopened, edited] permissions: pull-requests: write @@ -14,8 +14,10 @@ jobs: runs-on: ubuntu-latest steps: - - name: Check out the repository + - name: Check out PR code (safe) uses: actions/checkout@v3 + with: + ref: ${{ github.event.pull_request.head.sha }} - name: Get linked issue number from PR body id: issue-number From 03c9b1a22f6e6703098ae4135563d6e11afa4d29 Mon Sep 17 00:00:00 2001 From: Sabeerwaqas Date: Mon, 6 Oct 2025 21:13:48 +0500 Subject: [PATCH 03/10] chore: make requested changes in PR. --- .github/workflows/label-hacktoberfest.yml | 10 +++---- .husky/pre-commit | 6 ++-- src/plays/zoomlogin/Zoomlogin.js | 36 ++++++++++------------- 3 files changed, 23 insertions(+), 29 deletions(-) diff --git a/.github/workflows/label-hacktoberfest.yml b/.github/workflows/label-hacktoberfest.yml index bf4108f757..ead5d8403e 100644 --- a/.github/workflows/label-hacktoberfest.yml +++ b/.github/workflows/label-hacktoberfest.yml @@ -1,8 +1,8 @@ name: Label Hacktoberfest PRs on: - pull_request_target: - types: [opened, reopened, edited] + pull_request: + types: [opened, synchronize, reopened, edited] permissions: pull-requests: write @@ -14,10 +14,8 @@ jobs: runs-on: ubuntu-latest steps: - - name: Check out PR code (safe) + - name: Check out the repository uses: actions/checkout@v3 - with: - ref: ${{ github.event.pull_request.head.sha }} - name: Get linked issue number from PR body id: issue-number @@ -51,4 +49,4 @@ jobs: with: labels: hacktoberfest env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file diff --git a/.husky/pre-commit b/.husky/pre-commit index c37466e2b3..7e2936624c 100755 --- a/.husky/pre-commit +++ b/.husky/pre-commit @@ -1,4 +1,4 @@ -#!/bin/sh -. "$(dirname "$0")/_/husky.sh" +#!/usr/bin/env sh +. "$(dirname -- "$0")/_/husky.sh" -npx lint-staged \ No newline at end of file +yarn pre-commit \ No newline at end of file diff --git a/src/plays/zoomlogin/Zoomlogin.js b/src/plays/zoomlogin/Zoomlogin.js index a16ba5b769..b6c2fa368c 100644 --- a/src/plays/zoomlogin/Zoomlogin.js +++ b/src/plays/zoomlogin/Zoomlogin.js @@ -1,24 +1,20 @@ -import PlayHeader from 'common/playlists/PlayHeader'; -import './styles.css'; - -import App from 'plays/zoomlogin/components/App'; - -// WARNING: Do not change the entry componenet name -function Zoomlogin(props) { - // Your Code Start below. +import { BrowserRouter, Route, Routes } from 'react-router-dom'; +import App from './components/App'; +import HomePage from './components/HomePage'; +import LinkedinPage from './components/Linkedin/LinkedinPage'; +import ZoomPage from './components/Zoom/ZoomPage'; +export function MainPage() { return ( - <> -
- -
- {/* Your Code Starts Here */} - - {/* Your Code Ends Here */} -
-
- + + + + } path="/" /> + } path="/linkedin" /> + } path="/zoom" /> + + + ); } - -export default Zoomlogin; +export default MainPage; \ No newline at end of file From c46b985843736de30b266aa338c949641cc8dcc1 Mon Sep 17 00:00:00 2001 From: Sabeerwaqas Date: Mon, 6 Oct 2025 21:17:16 +0500 Subject: [PATCH 04/10] fix: Zoomlogin component replaced code --- src/plays/zoomlogin/Zoomlogin.js | 36 ++++++++++++++++++-------------- 1 file changed, 20 insertions(+), 16 deletions(-) diff --git a/src/plays/zoomlogin/Zoomlogin.js b/src/plays/zoomlogin/Zoomlogin.js index b6c2fa368c..97a6266dd1 100644 --- a/src/plays/zoomlogin/Zoomlogin.js +++ b/src/plays/zoomlogin/Zoomlogin.js @@ -1,20 +1,24 @@ -import { BrowserRouter, Route, Routes } from 'react-router-dom'; -import App from './components/App'; -import HomePage from './components/HomePage'; -import LinkedinPage from './components/Linkedin/LinkedinPage'; -import ZoomPage from './components/Zoom/ZoomPage'; +import PlayHeader from 'common/playlists/PlayHeader'; +import './styles.css'; + +import App from 'plays/zoomlogin/components/App'; + +// WARNING: Do not change the entry componenet name +function Zoomlogin(props) { + // Your Code Start below. -export function MainPage() { return ( - - - - } path="/" /> - } path="/linkedin" /> - } path="/zoom" /> - - - + <> +
+ +
+ {/* Your Code Starts Here */} + + {/* Your Code Ends Here */} +
+
+ ); } -export default MainPage; \ No newline at end of file + +export default Zoomlogin; \ No newline at end of file From 8198b6bba33e8311afa85560bfb2e47207589542 Mon Sep 17 00:00:00 2001 From: Sabeerwaqas Date: Mon, 6 Oct 2025 21:18:36 +0500 Subject: [PATCH 05/10] fix: import path --- src/plays/zoomlogin/MainPage.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plays/zoomlogin/MainPage.js b/src/plays/zoomlogin/MainPage.js index e1c9acdfd9..2dbdc709d1 100644 --- a/src/plays/zoomlogin/MainPage.js +++ b/src/plays/zoomlogin/MainPage.js @@ -1,6 +1,6 @@ import { BrowserRouter, Route, Routes } from 'react-router-dom'; import App from './components/App'; -import HomePage from '../../common/home/Home'; +import HomePage from './components/MainPage'; import ZoomPage from './components/Zoom/ZoomPage'; export function MainPage() { From 7e3318e504a3f3a6bc63d6a82c6fdbaf8e84e1ce Mon Sep 17 00:00:00 2001 From: Sabeerwaqas Date: Mon, 6 Oct 2025 21:23:36 +0500 Subject: [PATCH 06/10] fix: PR requested changes --- src/plays/zoomlogin/MainPage.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/plays/zoomlogin/MainPage.js b/src/plays/zoomlogin/MainPage.js index 2dbdc709d1..b6c2fa368c 100644 --- a/src/plays/zoomlogin/MainPage.js +++ b/src/plays/zoomlogin/MainPage.js @@ -1,6 +1,7 @@ import { BrowserRouter, Route, Routes } from 'react-router-dom'; import App from './components/App'; -import HomePage from './components/MainPage'; +import HomePage from './components/HomePage'; +import LinkedinPage from './components/Linkedin/LinkedinPage'; import ZoomPage from './components/Zoom/ZoomPage'; export function MainPage() { @@ -9,10 +10,11 @@ export function MainPage() { } path="/" /> + } path="/linkedin" /> } path="/zoom" /> ); } -export default MainPage; +export default MainPage; \ No newline at end of file From a83c3b5cc276d816b168a0fede54989b988e2a1d Mon Sep 17 00:00:00 2001 From: Priyankar Pal <88102392+priyankarpal@users.noreply.github.com> Date: Mon, 6 Oct 2025 22:40:00 +0530 Subject: [PATCH 07/10] fix: import for HomePage component Signed-off-by: Priyankar Pal <88102392+priyankarpal@users.noreply.github.com> --- src/plays/zoomlogin/MainPage.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plays/zoomlogin/MainPage.js b/src/plays/zoomlogin/MainPage.js index b6c2fa368c..330c3e2df2 100644 --- a/src/plays/zoomlogin/MainPage.js +++ b/src/plays/zoomlogin/MainPage.js @@ -1,6 +1,6 @@ import { BrowserRouter, Route, Routes } from 'react-router-dom'; import App from './components/App'; -import HomePage from './components/HomePage'; +import HomePage from './components/MainPage'; import LinkedinPage from './components/Linkedin/LinkedinPage'; import ZoomPage from './components/Zoom/ZoomPage'; @@ -17,4 +17,4 @@ export function MainPage() { ); } -export default MainPage; \ No newline at end of file +export default MainPage; From 369205262d56843ec7b141712168ec977f66963b Mon Sep 17 00:00:00 2001 From: Priyankar Pal <88102392+priyankarpal@users.noreply.github.com> Date: Mon, 6 Oct 2025 22:49:16 +0530 Subject: [PATCH 08/10] Refactor MainPage to comment out unused routes Comment out unused route components in MainPage. Signed-off-by: Priyankar Pal <88102392+priyankarpal@users.noreply.github.com> --- src/plays/zoomlogin/MainPage.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/plays/zoomlogin/MainPage.js b/src/plays/zoomlogin/MainPage.js index 330c3e2df2..0f7745905a 100644 --- a/src/plays/zoomlogin/MainPage.js +++ b/src/plays/zoomlogin/MainPage.js @@ -1,17 +1,17 @@ -import { BrowserRouter, Route, Routes } from 'react-router-dom'; +import { BrowserRouter, Routes } from 'react-router-dom'; import App from './components/App'; -import HomePage from './components/MainPage'; -import LinkedinPage from './components/Linkedin/LinkedinPage'; -import ZoomPage from './components/Zoom/ZoomPage'; +// import LinkedinPage from './components/Linkedin/LinkedinPage'; +// import HomePage from './components/MainPage'; +// import ZoomPage from './components/Zoom/ZoomPage'; export function MainPage() { return ( - } path="/" /> + {/* } path="/" /> } path="/linkedin" /> - } path="/zoom" /> + } path="/zoom" /> */} From 1ae0d637887e4d3ddbee118be02e7a86deeb0c23 Mon Sep 17 00:00:00 2001 From: Priyankar Pal <88102392+priyankarpal@users.noreply.github.com> Date: Mon, 6 Oct 2025 22:54:01 +0530 Subject: [PATCH 09/10] Fix export statement formatting in Zoomlogin.js Signed-off-by: Priyankar Pal <88102392+priyankarpal@users.noreply.github.com> --- src/plays/zoomlogin/Zoomlogin.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plays/zoomlogin/Zoomlogin.js b/src/plays/zoomlogin/Zoomlogin.js index 97a6266dd1..a16ba5b769 100644 --- a/src/plays/zoomlogin/Zoomlogin.js +++ b/src/plays/zoomlogin/Zoomlogin.js @@ -21,4 +21,4 @@ function Zoomlogin(props) { ); } -export default Zoomlogin; \ No newline at end of file +export default Zoomlogin; From 1c2dbefe3b4792f66e588d98ee35fe49ed20b7b4 Mon Sep 17 00:00:00 2001 From: Priyankar Pal <88102392+priyankarpal@users.noreply.github.com> Date: Mon, 6 Oct 2025 22:54:46 +0530 Subject: [PATCH 10/10] Delete .github/workflows/label-hacktoberfest.yml Signed-off-by: Priyankar Pal <88102392+priyankarpal@users.noreply.github.com> --- .github/workflows/label-hacktoberfest.yml | 52 ----------------------- 1 file changed, 52 deletions(-) delete mode 100644 .github/workflows/label-hacktoberfest.yml diff --git a/.github/workflows/label-hacktoberfest.yml b/.github/workflows/label-hacktoberfest.yml deleted file mode 100644 index ead5d8403e..0000000000 --- a/.github/workflows/label-hacktoberfest.yml +++ /dev/null @@ -1,52 +0,0 @@ -name: Label Hacktoberfest PRs - -on: - pull_request: - types: [opened, synchronize, reopened, edited] - -permissions: - pull-requests: write - issues: write - contents: write - -jobs: - label-hacktoberfest: - runs-on: ubuntu-latest - - steps: - - name: Check out the repository - uses: actions/checkout@v3 - - - name: Get linked issue number from PR body - id: issue-number - run: | - issue_number=$(echo "${{ github.event.pull_request.body }}" | grep -oE '#[0-9]+' | head -n 1 | tr -d '#') - echo "Linked issue number: $issue_number" - echo "issue_number=$issue_number" >> $GITHUB_ENV - - - name: Check if linked issue has "hacktoberfest" label - id: check-hacktoberfest-label - run: | - if [ -n "${{ env.issue_number }}" ]; then - labels=$(gh issue view ${{ env.issue_number }} --json labels --jq '.labels[].name') - echo "Labels on linked issue: $labels" - if [[ "$labels" == *"hacktoberfest"* ]]; then - echo "Linked issue has 'hacktoberfest' label" - echo "label-hacktoberfest=true" >> $GITHUB_ENV - else - echo "label-hacktoberfest=false" >> $GITHUB_ENV - fi - else - echo "No linked issue found" - echo "label-hacktoberfest=false" >> $GITHUB_ENV - fi - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - - name: Add "hacktoberfest" label to PR if linked issue has it - if: env.label-hacktoberfest == 'true' - uses: actions-ecosystem/action-add-labels@v1 - with: - labels: hacktoberfest - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file