resolved conflicts and some minor tweaks

Author: Abhishek-kumar09

src/components/SidePanel/Projects.js

@@ -15,7 +15,7 @@ const useStyles = makeStyles(theme => ({
   }
 }));
 
-function Projects({ projects, flat }) {
+function Projects({title, projects, flat }) {
   const classes = useStyles();
 
   return (
@@ -39,7 +39,7 @@ function Projects({ projects, flat }) {
               margin: '12px 0px 12px 8px'
             }}
           >
-            Learn To Make From this Course
+            {title}
           </Typography>
           {projects.map((project, index) => {
             return <Project project={project} />;

src/views/pages/Courses/Major.js

@@ -106,7 +106,7 @@ export default function Major({ course }) {
 
         <Hidden smDown>
           <Box display="flex" flexDirection="column" mb={3} ml={2}>
-            <Projects projects={course.projects} />
+            <Projects title="Learn To Make From This Course" projects={course.projects} />
           </Box>
         </Hidden>
       </Box>

src/views/pages/HomeView/Hero.js

@@ -11,41 +11,18 @@ function Hero({ className, ...rest }) {
   return (
     <div className={className} {...rest}>
       <HeroWithLogo
-<<<<<<< HEAD
-<<<<<<< HEAD
-        style={{ height: '420px' }}
-=======
         style={{height: "420px"}}
->>>>>>> fixed pixel perfect things
-=======
-        style={{ height: '420px' }}
->>>>>>> fixed netlify build with removing all unused variables
         title="Learn for Cause"
         title2="Code for Cause"
         imageUrl="/static/home/codeforcause.svg"
         firstComponent={
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> fixed netlify build with removing all unused variables
           <>
             <Typography variant="body1">
               An initiative to help the community by providing training,
               guidance and awareness about the possibilities in the software
               field to students & professionals.
             </Typography>
             <div style={{ height: '16px' }}></div>
-<<<<<<< HEAD
-=======
-          <><Typography variant="body1">
-            An initiative to help the community by providing training, guidance
-            and awareness about the possibilities in the software field to
-            students & professionals.
-          </Typography>
-            <div style={{height:"16px"}}></div>
->>>>>>> fixed pixel perfect things
-=======
->>>>>>> fixed netlify build with removing all unused variables
           </>
         }
         secondComponent={

src/views/pages/WorkshopView/WorkshopContent.js

@@ -17,72 +17,6 @@ const useStyles = makeStyles(theme => ({
     [theme.breakpoints.down('md')]: {
       padding: theme.spacing(10, 3, 10)
     }
-  },
-  cardGrid: {
-    paddingTop: theme.spacing(8),
-    paddingBottom: theme.spacing(8)
-  },
-  card: {
-    height: '100%',
-    display: 'flex',
-    flexDirection: 'column',
-    borderRadius: '10px',
-    margin: '12px'
-  },
-  cardMedia: {
-    width: '100%',
-    height: 'auto'
-    // paddingTop: "56.25%", // 16:9
-  },
-  cardContent: {},
-  chip: {
-    colorPrimary: '#B20000'
-  },
-  extraMargin: {
-    marginTop: '15px',
-    marginBottom: '0'
-  },
-  btn: {
-    textTransform: 'none'
-  },
-  paddingCls: {
-    paddingLeft: '10px',
-    paddingRight: '10px'
-  },
-  paddingClsxs: {
-    padding: 0
-  },
-  iconSize: {
-    fontSize: '32px'
-  },
-  text: {
-    color: '#FFFFFF'
-  },
-  avatarLarge: {
-    width: theme.spacing(16),
-    height: theme.spacing(16),
-    margin: theme.spacing(4, 0, 2)
-  },
-
-  avatarGrid: {
-    display: 'flex',
-    flexDirection: 'column',
-    alignItems: 'center',
-    justifyContent: 'center',
-    padding: '5px'
-  },
-
-  slide: {
-    perspective: 0, // create perspective
-    overflow: 'hidden',
-    // relative is a must if you want to create overlapping layers in children
-    position: 'relative'
-  },
-  background: {
-    width: '100%',
-    height: 'auto',
-    backgroundPosition: 'bottom center',
-    backgroundSize: 'cover'
   }
 }));
 
@@ -108,7 +42,7 @@ export default function WorkshopContent({ details }) {
 
         <Hidden smDown>
           <Box display="flex" flexDirection="column" mb={3} ml={2}>
-            <Projects projects={details.projects} />
+            <Projects title="Our Previous Workshops" projects={details.projects} />
           </Box>
         </Hidden>
       </Box>