Merge branch 'main' into playState

src/meta/play-meta.js

@@ -10,6 +10,8 @@ import {
   RandomMemeGenerator,
   ReactTodoApp,
   //import play here
+States,
+//import play here
 } from "plays";
 
 export const plays = [
@@ -80,10 +82,11 @@ export const plays = [
     github: 'murtuzaalisurti',
     featured: true
   }, {
-    id: 'pl-states',
-    name: 'States',
+    id: 'pl-states', 
+    name: 'States', 
     description: 'States in Functional Components',
-    component: () => { return <States /> },
+    component: () => {return <States />},
+
     path: '/plays/states',
     level: 'Beginner',
     tags: 'Hooks,State,JSX',
@@ -125,6 +128,7 @@ export const plays = [
     github: 'nirban256',
     cover: 'https://res.cloudinary.com/atapas/image/upload/v1650866465/demos/cover_y20bzk.png',
     blog: '',
+    blog: 'https://abhishek-90.github.io/My-Portfolio/',
     video: ''
   }, //replace new play item here
 ];

src/plays/states/States.jsx

@@ -3,16 +3,9 @@ import { getPlayById } from "meta/play-meta-util";
 import PlayHeader from "common/playlists/PlayHeader";
 import "./states.css";
 
-<<<<<<< HEAD
 function States() {
   const location = useLocation();
   const { id } = location.state;
-=======
-function States(props) {
-  // Do not remove the below lines.
-  // The following code is to fetch the current play from the URL
-  const { id } = props;
->>>>>>> ccd1aa9a02cba5ebc27b7a546f658ec45b3f1f04
   const play = getPlayById(id);
 
   // Your Code Start below.
@@ -40,6 +33,21 @@ function States(props) {
   const handleDurationChange = (e) => {
     setDuration(e.target.value);
   };
+=======
+
+import { useLocation } from 'react-router-dom';
+import { getPlayById } from 'meta/play-meta-util';
+
+import PlayHeader from 'common/playlists/PlayHeader';
+
+function States() {
+  // Do not remove the below lines. 
+  // The following code is to fetch the current play from the URL
+  const location = useLocation();
+  const { id } = location.state;
+  const play = getPlayById(id);
+
+  // Your Code Start below.
 
   return (
     <>