From c64f01716b3314c611853a1be27c221e4b129c17 Mon Sep 17 00:00:00 2001 From: Ammaar Aslam Date: Sat, 24 Jun 2023 17:07:56 +0530 Subject: [PATCH 01/15] Installed initial deps --- package.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 0ef9ce8ab2..6c36c36ed4 100644 --- a/package.json +++ b/package.json @@ -112,6 +112,7 @@ "devDependencies": { "@typescript-eslint/eslint-plugin": "^5.0.0", "@typescript-eslint/parser": "^5.41.0", + "@vitejs/plugin-react": "^4.0.1", "autoprefixer": "^10.4.7", "cypress": "^10.6.0", "eslint": "^8.0.1", @@ -130,6 +131,9 @@ "react-snap": "^1.23.0", "tailwind-scrollbar": "^2.1.0", "tailwindcss": "^3.0.24", - "typescript": "*" + "typescript": "*", + "vite": "^4.3.9", + "vite-plugin-svgr": "^3.2.0", + "vite-tsconfig-paths": "^4.2.0" } } From 40add94826d172ec699918da04d583e2568b2ff6 Mon Sep 17 00:00:00 2001 From: Ammaar Aslam Date: Sat, 24 Jun 2023 17:08:45 +0530 Subject: [PATCH 02/15] moved html to root and modified to combine object --- index.html | 56 +++++++++++++++++++++++++++++++++++++++++++++++ public/index.html | 55 ---------------------------------------------- 2 files changed, 56 insertions(+), 55 deletions(-) delete mode 100644 public/index.html diff --git a/index.html b/index.html index f7df122d4c..b9a05516e1 100644 --- a/index.html +++ b/index.html @@ -1,4 +1,60 @@ + + + + + + + + + + + + + + + + + + + + ReactPlay - One app to learn, create, and share ReactJS projects. + + + + +
+ + + + - - - - - - - - - - - - - - - - - - - ReactPlay - One app to learn, create, and share ReactJS projects. - - - - -
- - - From 50bb6600a4d1b4f39b986b0b9dd1588bdcafc3f9 Mon Sep 17 00:00:00 2001 From: Ammaar Aslam Date: Sat, 24 Jun 2023 17:08:56 +0530 Subject: [PATCH 03/15] added vite.config.ts --- vite.config.ts | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 vite.config.ts diff --git a/vite.config.ts b/vite.config.ts new file mode 100644 index 0000000000..dd4f495bd2 --- /dev/null +++ b/vite.config.ts @@ -0,0 +1,9 @@ +import { defineConfig } from 'vite'; +import react from '@vitejs/plugin-react'; +import viteTsconfigPaths from 'vite-tsconfig-paths'; +import svgrPlugin from 'vite-plugin-svgr'; + +// https://vitejs.dev/config/ +export default defineConfig({ + plugins: [react(), viteTsconfigPaths(), svgrPlugin()] +}); From b54e3005596a151e8578fe818e2a07ea343c8ce5 Mon Sep 17 00:00:00 2001 From: Ammaar Aslam Date: Sat, 24 Jun 2023 17:10:46 +0530 Subject: [PATCH 04/15] adde d vite-env.d.ts --- src/vite-env.d.ts | 1 + 1 file changed, 1 insertion(+) create mode 100644 src/vite-env.d.ts diff --git a/src/vite-env.d.ts b/src/vite-env.d.ts new file mode 100644 index 0000000000..11f02fe2a0 --- /dev/null +++ b/src/vite-env.d.ts @@ -0,0 +1 @@ +/// From 662fcb3028ca9a3ecbc8f97d5b69ae7833d50832 Mon Sep 17 00:00:00 2001 From: Ammaar Aslam Date: Sat, 24 Jun 2023 17:43:10 +0530 Subject: [PATCH 05/15] updated scripts for using vite & removed test,eject scripts (for now) --- package.json | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 6c36c36ed4..c64ff80d03 100644 --- a/package.json +++ b/package.json @@ -58,7 +58,6 @@ "react-qr-code": "^2.0.7", "react-redux": "^8.0.1", "react-router-dom": "^6.4.0", - "react-scripts": "5.0.0", "react-shimmer-effect": "^1.0.9", "react-simple-maps": "^2.3.0", "react-toastify": "^9.0.8", @@ -79,12 +78,10 @@ "workbox-window": "^6.5.4" }, "scripts": { - "start:nolint": "npx --yes create-react-play@latest -p && react-scripts start", - "start": "npx --yes create-react-play@latest -p && npm run lint && react-scripts start", - "build": "npx --yes create-react-play@latest -p && react-scripts build", + "start:nolint": "npx --yes create-react-play@latest -p && vite", + "start": "npx --yes create-react-play@latest -p && npm run lint && vite", + "build": "npx --yes create-react-play@latest -p && tsc && vite build", "snap": "react-snap", - "test": "react-scripts test", - "eject": "react-scripts eject", "cypress:open": "cypress open", "cypress:run": "cypress run", "lint": "eslint src/**/*.{js,jsx,ts,tsx}", From 78b089a75f4fb626c4fcd5977f0f18ad3ffaa74c Mon Sep 17 00:00:00 2001 From: Ammaar Aslam Date: Sat, 24 Jun 2023 18:33:11 +0530 Subject: [PATCH 06/15] renamed all .js files that includes jsx syntax to .jsx files --- index.html | 2 +- src/{App.js => App.jsx} | 0 src/common/badges-dashboard/{Badge.js => Badge.jsx} | 0 .../badges-dashboard/{BadgeCard.js => BadgeCard.jsx} | 0 .../{BadgeDetails.js => BadgeDetails.jsx} | 0 src/common/badges-dashboard/{Badges.js => Badges.jsx} | 0 .../{ClaimedBadges.js => ClaimedBadges.jsx} | 0 .../badges-dashboard/{OverView.js => OverView.jsx} | 0 src/common/badges-dashboard/{index.js => index.jsx} | 0 .../search/{search-context.js => search-context.jsx} | 0 src/{index.js => index.jsx} | 0 .../2048/Game2048Components/{Cell.js => Cell.jsx} | 0 .../2048/Game2048Components/{Game.js => Game.jsx} | 0 .../{GameHeader.js => GameHeader.jsx} | 0 .../{GameOverlay.js => GameOverlay.jsx} | 0 .../2048/Game2048Components/{Grid.js => Grid.jsx} | 0 .../2048/Game2048Components/{Modal.js => Modal.jsx} | 0 src/plays/2048/Game2048Components/{Row.js => Row.jsx} | 0 .../2048/Game2048Components/{Score.js => Score.jsx} | 0 .../{VideoMusic.js => VideoMusic.jsx} | 0 ...eTwentyFourtyEight.js => GameTwentyFourtyEight.jsx} | 0 .../{TwentyFourtyEight.js => TwentyFourtyEight.jsx} | 0 .../{BasicCalculator.js => BasicCalculator.jsx} | 0 .../{CalculatorBody.js => CalculatorBody.jsx} | 0 .../{DigitButton.js => DigitButton.jsx} | 0 .../{OperationButton.js => OperationButton.jsx} | 0 .../code-editor/{CodeEditor.js => CodeEditor.jsx} | 0 src/plays/codenchill/{Codenchill.js => Codenchill.jsx} | 0 src/plays/codenchill/{Main.js => Main.jsx} | 0 ...udioplayerContainer.js => AudioplayerContainer.jsx} | 0 .../AudioPlayerTracks/{TrackTile.js => TrackTile.jsx} | 0 .../{TrackControlSlice.js => TrackControlSlice.jsx} | 0 .../{TrackControls.js => TrackControls.jsx} | 0 .../features/Timer/{GuideModal.js => GuideModal.jsx} | 0 .../Timer/{TimerContainer.js => TimerContainer.jsx} | 0 .../{TimerControlSlice.js => TimerControlSlice.jsx} | 0 ...PalettesGenerator.js => ColorPalettesGenerator.jsx} | 0 .../components/{SingleColor.js => SingleColor.jsx} | 0 .../cricket-game/{CricketGame.js => CricketGame.jsx} | 10 +++++----- .../{CommentaryTimeline.js => CommentaryTimeline.jsx} | 0 .../components/{EndGameScreen.js => EndGameScreen.jsx} | 0 .../components/{InfoBox.js => InfoBox.jsx} | 0 .../cricket-game/components/{Modal.js => Modal.jsx} | 0 .../cricket-game/components/{Pitch.js => Pitch.jsx} | 0 .../cricket-game/components/{Score.js => Score.jsx} | 0 .../components/{ScorePanel.js => ScorePanel.jsx} | 6 +++--- .../cricket-game/components/{TopBar.js => TopBar.jsx} | 0 ...ustommemesgenerator.js => Custommemesgenerator.jsx} | 0 src/plays/dad-jokes/{DadJokes.js => DadJokes.jsx} | 0 src/plays/devblog/{App.js => App.jsx} | 0 src/plays/devblog/{Devblog.js => Devblog.jsx} | 0 src/plays/devblog/Pages/{Article.js => Article.jsx} | 0 src/plays/devblog/Pages/{Home.js => Home.jsx} | 0 src/plays/devblog/components/{Header.js => Header.jsx} | 0 .../devblog/components/{Loading.js => Loading.jsx} | 0 src/plays/devblog/components/{Post.js => Post.jsx} | 0 .../{DigitsDelight.js => DigitsDelight.jsx} | 0 .../components/{CategoryFact.js => CategoryFact.jsx} | 0 .../digital-delight/components/{Modal.js => Modal.jsx} | 0 .../components/{Random.js => Random.jsx} | 0 .../components/{TextFact.js => TextFact.jsx} | 0 .../digital-delight/components/{Title.js => Title.jsx} | 0 src/plays/emoji-game/{EmojiGame.js => EmojiGame.jsx} | 0 .../components/{Instruction.js => Instruction.jsx} | 0 .../emoji-game/components/{buttn.js => buttn.jsx} | 0 src/plays/emoji-game/components/{list.js => list.jsx} | 0 .../emoji-game/components/{welcome.js => welcome.jsx} | 0 src/plays/emojipedia/{Emojipedia.js => Emojipedia.jsx} | 0 .../components/{EmojiCard.js => EmojiCard.jsx} | 0 .../components/{SkeletonCard.js => SkeletonCard.jsx} | 0 ...{GithubProfileSearch.js => GithubProfileSearch.jsx} | 0 .../{GithubUserFinder.js => GithubUserFinder.jsx} | 0 .../{ImageCollector.js => ImageCollector.jsx} | 0 .../{ImageCompressor.js => ImageCompressor.jsx} | 0 ...UnsplashApi.js => ImageGalleryUsingUnsplashApi.jsx} | 0 src/plays/image-gallery/{Gallery.js => Gallery.jsx} | 0 .../{Imagegallery.js => Imagegallery.jsx} | 0 ...cept.js => InfiniteScrollWithDebouncingConcept.jsx} | 0 .../{InfiniteScroll.js => InfiniteScroll.jsx} | 0 .../{InfiniteScrolling.js => InfiniteScrolling.jsx} | 0 src/plays/infinite-scrolling/{Posts.js => Posts.jsx} | 0 .../{MarkdownEditor.js => MarkdownEditor.jsx} | 0 src/plays/memory-game/{modal.js => modal.jsx} | 0 .../motivate-me/{MotivateMe.js => MotivateMe.jsx} | 0 .../components/cards/{index.js => index.jsx} | 0 .../components/header/{index.js => index.jsx} | 0 .../components/search-bar/{index.js => index.jsx} | 0 .../motivate-me/container/{index.js => index.jsx} | 0 src/plays/navbar/{navListItems.js => navListItems.jsx} | 0 src/plays/notehack/{Notehack.js => Notehack.jsx} | 0 .../components/addNote/{AddNote.js => AddNote.jsx} | 0 .../components/header/{Header.js => Header.jsx} | 0 .../components/noteList/{NoteList.js => NoteList.jsx} | 0 .../singleNote/{SingleNote.js => SingleNote.jsx} | 0 .../{ObjectDetector.js => ObjectDetector.jsx} | 0 src/plays/pagination/{Pagination.js => Pagination.jsx} | 0 .../photoshopapp/{Photoshopapp.js => Photoshopapp.jsx} | 0 .../photoshopapp/{SidebarItem.js => SidebarItem.jsx} | 0 src/plays/photoshopapp/{Slider.js => Slider.jsx} | 0 src/plays/pixy/{Pixy.js => Pixy.jsx} | 0 .../{PlayDictionary.js => PlayDictionary.jsx} | 0 .../{QrCodeGenerator.js => QrCodeGenerator.jsx} | 0 .../{header.component.js => header.component.jsx} | 0 .../{menuItem.component.js => menuItem.component.jsx} | 0 ...{questions.component.js => questions.component.jsx} | 0 ...{moviePage.component.js => moviePage.component.jsx} | 0 .../{score.component.js => score.component.jsx} | 0 .../Components/{CardContainer.js => CardContainer.jsx} | 0 .../Components/{SideBarDesign.js => SideBarDesign.jsx} | 0 .../{SideBarOperation.js => SideBarOperation.jsx} | 0 ...teCardGenerator.js => RandomQuoteCardGenerator.jsx} | 0 .../{GradientComponent.js => GradientComponent.jsx} | 0 .../{ReactGradients.js => ReactGradients.jsx} | 0 .../roll-the-dice/{RollTheDice.js => RollTheDice.jsx} | 0 .../{SelfClickingButton.js => SelfClickingButton.jsx} | 0 .../{SimpleCalculator.js => SimpleCalculator.jsx} | 0 .../components/{Buttons.js => Buttons.jsx} | 0 .../components/{Calculator.js => Calculator.jsx} | 0 .../components/{Display.js => Display.jsx} | 0 .../{SimpleSeoComponent.js => SimpleSeoComponent.jsx} | 0 .../{SmartConverter.js => SmartConverter.jsx} | 0 .../components/{TextForm.js => TextForm.jsx} | 0 src/plays/smart-todo-list/{App.js => App.jsx} | 0 .../{SmartTodoList.js => SmartTodoList.jsx} | 0 .../context/{appContext.js => appContext.jsx} | 0 .../star-rating/{StarRating.js => StarRating.jsx} | 0 src/plays/sticky-notes/{App.js => App.jsx} | 0 .../sticky-notes/{StickyNotes.js => StickyNotes.jsx} | 0 .../sticky-notes/components/{Form.js => Form.jsx} | 0 .../sticky-notes/components/{Note.js => Note.jsx} | 0 .../tenzies-game/{TenziesGame.js => TenziesGame.jsx} | 0 .../{TextAnalyzer.js => TextAnalyzer.jsx} | 0 .../context/{textStates.js => textStates.jsx} | 0 .../{TravelAdvisor.js => TravelAdvisor.jsx} | 0 src/plays/tube2tunes/{Tube2tunes.js => Tube2tunes.jsx} | 0 .../tube2tunes/components/{Loader.js => Loader.jsx} | 0 .../{TypingSpeedTest.js => TypingSpeedTest.jsx} | 0 .../components/{ResultModal.js => ResultModal.jsx} | 0 .../components/{Stats.js => Stats.jsx} | 0 .../components/{Timer.js => Timer.jsx} | 0 .../components/{TypingTest.js => TypingTest.jsx} | 0 .../typing-speed-test/components/{Word.js => Word.jsx} | 0 src/plays/weather/{Weather.js => Weather.jsx} | 0 .../weather/components/{CityInput.js => CityInput.jsx} | 0 .../components/{ForecastData.js => ForecastData.jsx} | 0 .../components/{ForecastItem.js => ForecastItem.jsx} | 0 .../components/{WeatherDetail.js => WeatherDetail.jsx} | 0 .../components/{WeatherOutput.js => WeatherOutput.jsx} | 0 src/vite-env.d.ts | 1 + 149 files changed, 10 insertions(+), 9 deletions(-) rename src/{App.js => App.jsx} (100%) rename src/common/badges-dashboard/{Badge.js => Badge.jsx} (100%) rename src/common/badges-dashboard/{BadgeCard.js => BadgeCard.jsx} (100%) rename src/common/badges-dashboard/{BadgeDetails.js => BadgeDetails.jsx} (100%) rename src/common/badges-dashboard/{Badges.js => Badges.jsx} (100%) rename src/common/badges-dashboard/{ClaimedBadges.js => ClaimedBadges.jsx} (100%) rename src/common/badges-dashboard/{OverView.js => OverView.jsx} (100%) rename src/common/badges-dashboard/{index.js => index.jsx} (100%) rename src/common/search/{search-context.js => search-context.jsx} (100%) rename src/{index.js => index.jsx} (100%) rename src/plays/2048/Game2048Components/{Cell.js => Cell.jsx} (100%) rename src/plays/2048/Game2048Components/{Game.js => Game.jsx} (100%) rename src/plays/2048/Game2048Components/{GameHeader.js => GameHeader.jsx} (100%) rename src/plays/2048/Game2048Components/{GameOverlay.js => GameOverlay.jsx} (100%) rename src/plays/2048/Game2048Components/{Grid.js => Grid.jsx} (100%) rename src/plays/2048/Game2048Components/{Modal.js => Modal.jsx} (100%) rename src/plays/2048/Game2048Components/{Row.js => Row.jsx} (100%) rename src/plays/2048/Game2048Components/{Score.js => Score.jsx} (100%) rename src/plays/2048/Game2048Components/{VideoMusic.js => VideoMusic.jsx} (100%) rename src/plays/2048/{GameTwentyFourtyEight.js => GameTwentyFourtyEight.jsx} (100%) rename src/plays/2048/{TwentyFourtyEight.js => TwentyFourtyEight.jsx} (100%) rename src/plays/basic-calculator/{BasicCalculator.js => BasicCalculator.jsx} (100%) rename src/plays/basic-calculator/{CalculatorBody.js => CalculatorBody.jsx} (100%) rename src/plays/basic-calculator/{DigitButton.js => DigitButton.jsx} (100%) rename src/plays/basic-calculator/{OperationButton.js => OperationButton.jsx} (100%) rename src/plays/code-editor/{CodeEditor.js => CodeEditor.jsx} (100%) rename src/plays/codenchill/{Codenchill.js => Codenchill.jsx} (100%) rename src/plays/codenchill/{Main.js => Main.jsx} (100%) rename src/plays/codenchill/features/AudioPlayerTracks/{AudioplayerContainer.js => AudioplayerContainer.jsx} (100%) rename src/plays/codenchill/features/AudioPlayerTracks/{TrackTile.js => TrackTile.jsx} (100%) rename src/plays/codenchill/features/DisplayTrackControls/{TrackControlSlice.js => TrackControlSlice.jsx} (100%) rename src/plays/codenchill/features/DisplayTrackControls/{TrackControls.js => TrackControls.jsx} (100%) rename src/plays/codenchill/features/Timer/{GuideModal.js => GuideModal.jsx} (100%) rename src/plays/codenchill/features/Timer/{TimerContainer.js => TimerContainer.jsx} (100%) rename src/plays/codenchill/features/Timer/{TimerControlSlice.js => TimerControlSlice.jsx} (100%) rename src/plays/color-palettes-generator/{ColorPalettesGenerator.js => ColorPalettesGenerator.jsx} (100%) rename src/plays/color-palettes-generator/components/{SingleColor.js => SingleColor.jsx} (100%) rename src/plays/cricket-game/{CricketGame.js => CricketGame.jsx} (97%) rename src/plays/cricket-game/components/{CommentaryTimeline.js => CommentaryTimeline.jsx} (100%) rename src/plays/cricket-game/components/{EndGameScreen.js => EndGameScreen.jsx} (100%) rename src/plays/cricket-game/components/{InfoBox.js => InfoBox.jsx} (100%) rename src/plays/cricket-game/components/{Modal.js => Modal.jsx} (100%) rename src/plays/cricket-game/components/{Pitch.js => Pitch.jsx} (100%) rename src/plays/cricket-game/components/{Score.js => Score.jsx} (100%) rename src/plays/cricket-game/components/{ScorePanel.js => ScorePanel.jsx} (89%) rename src/plays/cricket-game/components/{TopBar.js => TopBar.jsx} (100%) rename src/plays/custommemesgenerator/{Custommemesgenerator.js => Custommemesgenerator.jsx} (100%) rename src/plays/dad-jokes/{DadJokes.js => DadJokes.jsx} (100%) rename src/plays/devblog/{App.js => App.jsx} (100%) rename src/plays/devblog/{Devblog.js => Devblog.jsx} (100%) rename src/plays/devblog/Pages/{Article.js => Article.jsx} (100%) rename src/plays/devblog/Pages/{Home.js => Home.jsx} (100%) rename src/plays/devblog/components/{Header.js => Header.jsx} (100%) rename src/plays/devblog/components/{Loading.js => Loading.jsx} (100%) rename src/plays/devblog/components/{Post.js => Post.jsx} (100%) rename src/plays/digital-delight/{DigitsDelight.js => DigitsDelight.jsx} (100%) rename src/plays/digital-delight/components/{CategoryFact.js => CategoryFact.jsx} (100%) rename src/plays/digital-delight/components/{Modal.js => Modal.jsx} (100%) rename src/plays/digital-delight/components/{Random.js => Random.jsx} (100%) rename src/plays/digital-delight/components/{TextFact.js => TextFact.jsx} (100%) rename src/plays/digital-delight/components/{Title.js => Title.jsx} (100%) rename src/plays/emoji-game/{EmojiGame.js => EmojiGame.jsx} (100%) rename src/plays/emoji-game/components/{Instruction.js => Instruction.jsx} (100%) rename src/plays/emoji-game/components/{buttn.js => buttn.jsx} (100%) rename src/plays/emoji-game/components/{list.js => list.jsx} (100%) rename src/plays/emoji-game/components/{welcome.js => welcome.jsx} (100%) rename src/plays/emojipedia/{Emojipedia.js => Emojipedia.jsx} (100%) rename src/plays/emojipedia/components/{EmojiCard.js => EmojiCard.jsx} (100%) rename src/plays/emojipedia/components/{SkeletonCard.js => SkeletonCard.jsx} (100%) rename src/plays/git-hub-profile-search/{GithubProfileSearch.js => GithubProfileSearch.jsx} (100%) rename src/plays/github-user-finder/{GithubUserFinder.js => GithubUserFinder.jsx} (100%) rename src/plays/image-collector/{ImageCollector.js => ImageCollector.jsx} (100%) rename src/plays/image-compressor/{ImageCompressor.js => ImageCompressor.jsx} (100%) rename src/plays/image-gallery-using-unsplash-api/{ImageGalleryUsingUnsplashApi.js => ImageGalleryUsingUnsplashApi.jsx} (100%) rename src/plays/image-gallery/{Gallery.js => Gallery.jsx} (100%) rename src/plays/image-gallery/{Imagegallery.js => Imagegallery.jsx} (100%) rename src/plays/infinite-scroll-with-debouncing-concept/{InfiniteScrollWithDebouncingConcept.js => InfiniteScrollWithDebouncingConcept.jsx} (100%) rename src/plays/infinite-scroll-with-debouncing-concept/components/{InfiniteScroll.js => InfiniteScroll.jsx} (100%) rename src/plays/infinite-scrolling/{InfiniteScrolling.js => InfiniteScrolling.jsx} (100%) rename src/plays/infinite-scrolling/{Posts.js => Posts.jsx} (100%) rename src/plays/markdown-editor/{MarkdownEditor.js => MarkdownEditor.jsx} (100%) rename src/plays/memory-game/{modal.js => modal.jsx} (100%) rename src/plays/motivate-me/{MotivateMe.js => MotivateMe.jsx} (100%) rename src/plays/motivate-me/components/cards/{index.js => index.jsx} (100%) rename src/plays/motivate-me/components/header/{index.js => index.jsx} (100%) rename src/plays/motivate-me/components/search-bar/{index.js => index.jsx} (100%) rename src/plays/motivate-me/container/{index.js => index.jsx} (100%) rename src/plays/navbar/{navListItems.js => navListItems.jsx} (100%) rename src/plays/notehack/{Notehack.js => Notehack.jsx} (100%) rename src/plays/notehack/components/addNote/{AddNote.js => AddNote.jsx} (100%) rename src/plays/notehack/components/header/{Header.js => Header.jsx} (100%) rename src/plays/notehack/components/noteList/{NoteList.js => NoteList.jsx} (100%) rename src/plays/notehack/components/singleNote/{SingleNote.js => SingleNote.jsx} (100%) rename src/plays/object-detector/{ObjectDetector.js => ObjectDetector.jsx} (100%) rename src/plays/pagination/{Pagination.js => Pagination.jsx} (100%) rename src/plays/photoshopapp/{Photoshopapp.js => Photoshopapp.jsx} (100%) rename src/plays/photoshopapp/{SidebarItem.js => SidebarItem.jsx} (100%) rename src/plays/photoshopapp/{Slider.js => Slider.jsx} (100%) rename src/plays/pixy/{Pixy.js => Pixy.jsx} (100%) rename src/plays/play-dictionary/{PlayDictionary.js => PlayDictionary.jsx} (100%) rename src/plays/qr-code-generator/{QrCodeGenerator.js => QrCodeGenerator.jsx} (100%) rename src/plays/quizeo/components/header/{header.component.js => header.component.jsx} (100%) rename src/plays/quizeo/components/menu-item/{menuItem.component.js => menuItem.component.jsx} (100%) rename src/plays/quizeo/components/questions/{questions.component.js => questions.component.jsx} (100%) rename src/plays/quizeo/pages/moviePage/{moviePage.component.js => moviePage.component.jsx} (100%) rename src/plays/quizeo/pages/score-page/{score.component.js => score.component.jsx} (100%) rename src/plays/random-quote-card-generator/Components/{CardContainer.js => CardContainer.jsx} (100%) rename src/plays/random-quote-card-generator/Components/{SideBarDesign.js => SideBarDesign.jsx} (100%) rename src/plays/random-quote-card-generator/Components/{SideBarOperation.js => SideBarOperation.jsx} (100%) rename src/plays/random-quote-card-generator/{RandomQuoteCardGenerator.js => RandomQuoteCardGenerator.jsx} (100%) rename src/plays/react-gradients/{GradientComponent.js => GradientComponent.jsx} (100%) rename src/plays/react-gradients/{ReactGradients.js => ReactGradients.jsx} (100%) rename src/plays/roll-the-dice/{RollTheDice.js => RollTheDice.jsx} (100%) rename src/plays/self-clicking-button/{SelfClickingButton.js => SelfClickingButton.jsx} (100%) rename src/plays/simple-calculator/{SimpleCalculator.js => SimpleCalculator.jsx} (100%) rename src/plays/simple-calculator/components/{Buttons.js => Buttons.jsx} (100%) rename src/plays/simple-calculator/components/{Calculator.js => Calculator.jsx} (100%) rename src/plays/simple-calculator/components/{Display.js => Display.jsx} (100%) rename src/plays/simple-seo-component/{SimpleSeoComponent.js => SimpleSeoComponent.jsx} (100%) rename src/plays/smart-converter/{SmartConverter.js => SmartConverter.jsx} (100%) rename src/plays/smart-converter/components/{TextForm.js => TextForm.jsx} (100%) rename src/plays/smart-todo-list/{App.js => App.jsx} (100%) rename src/plays/smart-todo-list/{SmartTodoList.js => SmartTodoList.jsx} (100%) rename src/plays/smart-todo-list/context/{appContext.js => appContext.jsx} (100%) rename src/plays/star-rating/{StarRating.js => StarRating.jsx} (100%) rename src/plays/sticky-notes/{App.js => App.jsx} (100%) rename src/plays/sticky-notes/{StickyNotes.js => StickyNotes.jsx} (100%) rename src/plays/sticky-notes/components/{Form.js => Form.jsx} (100%) rename src/plays/sticky-notes/components/{Note.js => Note.jsx} (100%) rename src/plays/tenzies-game/{TenziesGame.js => TenziesGame.jsx} (100%) rename src/plays/text-analyzer/{TextAnalyzer.js => TextAnalyzer.jsx} (100%) rename src/plays/text-analyzer/context/{textStates.js => textStates.jsx} (100%) rename src/plays/travel-advisor/{TravelAdvisor.js => TravelAdvisor.jsx} (100%) rename src/plays/tube2tunes/{Tube2tunes.js => Tube2tunes.jsx} (100%) rename src/plays/tube2tunes/components/{Loader.js => Loader.jsx} (100%) rename src/plays/typing-speed-test/{TypingSpeedTest.js => TypingSpeedTest.jsx} (100%) rename src/plays/typing-speed-test/components/{ResultModal.js => ResultModal.jsx} (100%) rename src/plays/typing-speed-test/components/{Stats.js => Stats.jsx} (100%) rename src/plays/typing-speed-test/components/{Timer.js => Timer.jsx} (100%) rename src/plays/typing-speed-test/components/{TypingTest.js => TypingTest.jsx} (100%) rename src/plays/typing-speed-test/components/{Word.js => Word.jsx} (100%) rename src/plays/weather/{Weather.js => Weather.jsx} (100%) rename src/plays/weather/components/{CityInput.js => CityInput.jsx} (100%) rename src/plays/weather/components/{ForecastData.js => ForecastData.jsx} (100%) rename src/plays/weather/components/{ForecastItem.js => ForecastItem.jsx} (100%) rename src/plays/weather/components/{WeatherDetail.js => WeatherDetail.jsx} (100%) rename src/plays/weather/components/{WeatherOutput.js => WeatherOutput.jsx} (100%) diff --git a/index.html b/index.html index b9a05516e1..cdd1d6641c 100644 --- a/index.html +++ b/index.html @@ -42,7 +42,7 @@
- + - \ No newline at end of file diff --git a/netlify.toml b/netlify.toml index b87b8d3dda..6ac5aa0246 100644 --- a/netlify.toml +++ b/netlify.toml @@ -1,4 +1,4 @@ [[redirects]] from = "/*" - to = "/index.html" + to = "/serverless.html" status = 200 diff --git a/serverless.html b/serverless.html new file mode 100644 index 0000000000..a07d488154 --- /dev/null +++ b/serverless.html @@ -0,0 +1,6 @@ + + From 9cfa6129ee015a77d35989082fce7c297d3ea44e Mon Sep 17 00:00:00 2001 From: Ammaar Aslam Date: Sun, 23 Jul 2023 12:45:41 +0530 Subject: [PATCH 15/15] fixed issues occured after main branch merge --- src/common/Testimonial/TestimonialModal.jsx | 2 +- src/common/activities/ActivityBanner.jsx | 4 ++-- src/common/activities/activitiesConfig.js | 13 +++++++++---- src/common/header/HeaderNav.jsx | 3 ++- src/common/techstack/TechStackInfo.js | 9 ++++++++- src/index.jsx | 1 - src/plays/codenchill/features/Timer/GuideModal.jsx | 2 +- src/plays/cricket-game/components/ScorePanel.jsx | 1 - .../Components/CardContainer.jsx | 1 - .../{PrioitySearch.js => PrioitySearch.jsx} | 0 .../{ReactTransitions.js => ReactTransitions.jsx} | 0 .../{TransitionSearch.js => TransitionSearch.jsx} | 0 12 files changed, 23 insertions(+), 13 deletions(-) rename src/plays/react-transitions/{PrioitySearch.js => PrioitySearch.jsx} (100%) rename src/plays/react-transitions/{ReactTransitions.js => ReactTransitions.jsx} (100%) rename src/plays/react-transitions/{TransitionSearch.js => TransitionSearch.jsx} (100%) diff --git a/src/common/Testimonial/TestimonialModal.jsx b/src/common/Testimonial/TestimonialModal.jsx index acabca5f91..f75c9100a6 100644 --- a/src/common/Testimonial/TestimonialModal.jsx +++ b/src/common/Testimonial/TestimonialModal.jsx @@ -4,7 +4,6 @@ import ModalClose from '@mui/joy/ModalClose'; import Typography from '@mui/joy/Typography'; import Sheet from '@mui/joy/Sheet'; import { useUserDisplayName, useUserId } from '@nhost/react'; -import { Box } from '@mui/material'; import Button from '@mui/joy/Button'; import InputLabel from '@mui/material/InputLabel'; import MenuItem from '@mui/material/MenuItem'; @@ -18,6 +17,7 @@ import { submit } from 'common/services/request'; import { toast, ToastContainer } from 'react-toastify'; import 'react-toastify/dist/ReactToastify.css'; import DOMPurify from 'dompurify'; +import Box from '@mui/material/Box'; export default function TestimonialModal({ isOpen, setIsOpen }) { const userDisplayName = useUserDisplayName(); diff --git a/src/common/activities/ActivityBanner.jsx b/src/common/activities/ActivityBanner.jsx index 1be36d3fed..7cdc3b818b 100644 --- a/src/common/activities/ActivityBanner.jsx +++ b/src/common/activities/ActivityBanner.jsx @@ -21,7 +21,7 @@ function ActivityBanner({ currentActivity }) { HRP Logo
@@ -58,7 +58,7 @@ function ActivityBanner({ currentActivity }) {
- +
); diff --git a/src/common/activities/activitiesConfig.js b/src/common/activities/activitiesConfig.js index 0bcb2b5431..7ff918fc6e 100644 --- a/src/common/activities/activitiesConfig.js +++ b/src/common/activities/activitiesConfig.js @@ -1,3 +1,8 @@ +import hackrplayLogo from './hackathon/Logo.svg'; +import hackrPlayHero from './hackathon/img-hero-coders.png'; +import twoPlaysAMonthLogo from './2playsamonth/BannerLogo.png'; +import twoPlaysAMonthHero from './2playsamonth/HeroCoders.png'; + export const activities = [ { id: 'hackrplay', @@ -5,8 +10,8 @@ export const activities = [ subtitle: 'Developers and Hacking are inseparable!', description: 'ReactPlay brings you the opportunity to take part in the Hackathon and learn from it. Showcase your mindblowing ideas, collaborate, and build projects - there are also chances to win exciting prizes.', - logo: './hackathon/Logo.svg', - heroImage: './hackathon/img-hero-coders.png' + logo: hackrplayLogo, + heroImage: hackrPlayHero }, { id: '2playsamonth', @@ -14,7 +19,7 @@ export const activities = [ subtitle: 'Learning is a journey than a destination.', description: 'ReactPlay brings you an opportunity to participate in the month-long drive to learn and contribute to Open Source. Join the #2PlaysAMonth and build two projects(plays) in the month of February. You will learn from expert code reviews while contributing to Open Source - you may also win some exciting prizes.', - logo: './2playsamonth/BannerLogo.png', - heroImage: './2playsamonth/HeroCoders.png' + logo: twoPlaysAMonthLogo, + heroImage: twoPlaysAMonthHero } ]; diff --git a/src/common/header/HeaderNav.jsx b/src/common/header/HeaderNav.jsx index fb6ee55ece..3682d682d7 100644 --- a/src/common/header/HeaderNav.jsx +++ b/src/common/header/HeaderNav.jsx @@ -7,9 +7,10 @@ import { IoAddSharp, IoShareSocial, IoHeartSharp } from 'react-icons/io5'; import { MdManageSearch, MdClose, MdEvent } from 'react-icons/md'; import SocialShare from 'common/components/SocialShare'; import { GoX } from 'react-icons/go'; -import { Modal, Box, Typography, Menu } from '@mui/material'; +import { Modal, Typography, Menu } from '@mui/material'; import { useSearchContext } from 'common/search/search-context'; import { CREATE_PLAY_DOC_LINK, UMAMI_EVENTS } from 'constants'; +import Box from '@mui/material/Box'; const HeaderNav = ({ showBrowse }) => { const { showShareModal, setShowShareModal } = useSearchContext(); diff --git a/src/common/techstack/TechStackInfo.js b/src/common/techstack/TechStackInfo.js index 03cbb7e841..cd2df80315 100644 --- a/src/common/techstack/TechStackInfo.js +++ b/src/common/techstack/TechStackInfo.js @@ -11,7 +11,8 @@ import { SiHasura, SiPostgresql, SiPython, - SiNodedotjs + SiNodedotjs, + SiVite } from 'react-icons/si'; import NHost from 'images/nhost.svg'; import Umami from 'images/umami.svg'; @@ -106,5 +107,11 @@ export const TechStackInfo = [ text: 'Umami', type: 'image', link: 'https://umami.is/' + }, + { + comp: SiVite, + text: 'Vite', + type: 'icon', + link: 'https://vitejs.dev/' } ]; diff --git a/src/index.jsx b/src/index.jsx index e6ca8e98d5..dbef4ca16a 100644 --- a/src/index.jsx +++ b/src/index.jsx @@ -12,7 +12,6 @@ import 'react-toastify/dist/ReactToastify.css'; /** removing console statement in react prod build */ /* eslint-disable no-console */ if (import.meta.env.NODE_ENV !== 'development') { - console.log = () => {}; console.debug = () => {}; console.info = () => {}; diff --git a/src/plays/codenchill/features/Timer/GuideModal.jsx b/src/plays/codenchill/features/Timer/GuideModal.jsx index 88166ce909..9f9e4fe4ec 100644 --- a/src/plays/codenchill/features/Timer/GuideModal.jsx +++ b/src/plays/codenchill/features/Timer/GuideModal.jsx @@ -1,10 +1,10 @@ import React, { useEffect, useState } from 'react'; import { BsInfoCircle } from 'react-icons/bs'; import { MdClose } from 'react-icons/md'; -import Box from '@mui/material/Box'; import Button from '@mui/material/Button'; import Typography from '@mui/material/Typography'; import Modal from '@mui/material/Modal'; +import Box from '@mui/material/Box'; const GuideModal = () => { const [openModal, setOpenModal] = useState(false); diff --git a/src/plays/cricket-game/components/ScorePanel.jsx b/src/plays/cricket-game/components/ScorePanel.jsx index b879aa9cb2..a290c41926 100644 --- a/src/plays/cricket-game/components/ScorePanel.jsx +++ b/src/plays/cricket-game/components/ScorePanel.jsx @@ -3,7 +3,6 @@ import Score from './Score.jsx'; import InfoBox from './InfoBox.jsx'; import CommentaryTimeline from './CommentaryTimeline.jsx'; - export default function ScorePanel(props) { const { userLevel, gameState, matchInProgress, commentary } = props; diff --git a/src/plays/random-quote-card-generator/Components/CardContainer.jsx b/src/plays/random-quote-card-generator/Components/CardContainer.jsx index 7ce914fc6e..96adf15f95 100644 --- a/src/plays/random-quote-card-generator/Components/CardContainer.jsx +++ b/src/plays/random-quote-card-generator/Components/CardContainer.jsx @@ -1,6 +1,5 @@ import React, { useEffect, useRef } from 'react'; import { FaQuoteLeft } from 'react-icons/fa'; -import data from '../data'; const CardContainer = ({ gradientColor, diff --git a/src/plays/react-transitions/PrioitySearch.js b/src/plays/react-transitions/PrioitySearch.jsx similarity index 100% rename from src/plays/react-transitions/PrioitySearch.js rename to src/plays/react-transitions/PrioitySearch.jsx diff --git a/src/plays/react-transitions/ReactTransitions.js b/src/plays/react-transitions/ReactTransitions.jsx similarity index 100% rename from src/plays/react-transitions/ReactTransitions.js rename to src/plays/react-transitions/ReactTransitions.jsx diff --git a/src/plays/react-transitions/TransitionSearch.js b/src/plays/react-transitions/TransitionSearch.jsx similarity index 100% rename from src/plays/react-transitions/TransitionSearch.js rename to src/plays/react-transitions/TransitionSearch.jsx