Merge pull request #73 from heyyakash/new

corrected json
pbdsce · Nov 29, 2023 · 508b2be · 508b2be
2 parents 315b685 + 52aaba4
commit 508b2be
Show file tree

Hide file tree

Showing 12 changed files with 310 additions and 259 deletions.
diff --git a/src/acheive.json b/src/acheive.json
diff --git a/src/achievem.json b/src/achievem.json
diff --git a/src/assets/images/rec.png b/src/assets/images/rec.png
diff --git a/src/assets/scss/events/events.scss b/src/assets/scss/events/events.scss
@@ -6,7 +6,7 @@
     width: 100%;
     gap: 1.4rem; /* Adjust the gap as needed */
     justify-content: center;
-    place-items: center;
+    place-items: start;
 }
 
 @include media( '<=large' ) {
@@ -20,6 +20,7 @@
 
     .event-parent-container{
         grid-template-columns: repeat(1,1fr);
+        place-items: center;
     }
 }
 
@@ -48,17 +49,20 @@
         padding: 0 20px;
         display: flex;
         flex-direction: column;
-        gap:1rem;
+        margin: 1rem 0;
+        // gap:1rem;
 
         // line-height:0px; 
         h3{
             font-size:1.2789rem;
             font-weight: 700;
-            line-height: 0px;
+            margin:0;
+            // line-height: 0px;
         }
         p{
-            margin-top:-10px;
+            // margin-top:-10px;
             font-size: .8rem;
+            margin:0;
             // line-height: 0px;
         }
     }

diff --git a/src/assets/scss/members/members.scss b/src/assets/scss/members/members.scss
@@ -36,14 +36,14 @@
 .members-container {
     // padding: 0 1.5rem;
     align-items: center;
-    background-color: rgba(255, 255, 255, 0.079);
+    background-color: rgba(252, 216, 216, 0.079);
     border-radius: 7px;
     // min-height: 350px;
     width: 330px;
     display: flex;
     align-items: flex-end;
     justify-content: center;
-    height: 330px;
+    height: 350px;
     overflow: hidden;
     // margin-bottom: 5%;
     position: relative;
@@ -55,7 +55,7 @@
     .members-img {
         width: 100%;
         height: 100%;
-
+        object-position: top;
         margin-bottom: 12px;
         object-fit: cover;
         position: absolute;

diff --git a/src/components/Achievements/Achievements.js b/src/components/Achievements/Achievements.js
@@ -17,18 +17,21 @@ const Events = () => {
 
             <div className="container">
                 <SectionHeader style={{ marginTop: "-30px" }} data={sectionHeader} className="center-content" />
-                <div className='event-parent-container'>
+                <div className='event-parent-container' style = {{alignItems:"stretch"}}>
                     {data.map((x, i) => {
                         return (
-                            <a href = {x["Portfolio/Github"]} className="event-container" key={i}>
+                            <div className="event-container" key={i}>
                                 <div className='event-poster-container'>
-                                    <img src={"https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcQlwj2YK4IT8kJKQS7a57mwtW1tDedIj4lobQ&usqp=CAU"} alt="logo" className='event-poster' />
+                                    <img src={x["imageLink"]} alt="logo" className='event-poster' />
                                 </div>
                                 <div className='event-content-container'>
-                                    <h3>{x["Name"]}</h3>
-                                    <p><b>{x["achievements"]} </b></p>
+                                    <h3 style={{textAlign:"center",fontSize:"1rem"}}>{x["Name"]}</h3>
+                                    <ul>
+                                        {x["achievements"].map((x,i)=><li key = {x+i.toString()}>{x}</li>)}
+                                        {/* <li></li> */}
+                                    </ul>
                                 </div>
-                            </a>
+                            </div>
                         )
                     })}
                 </div>

diff --git a/src/components/Events/Events.js b/src/components/Events/Events.js
@@ -17,20 +17,23 @@ const Events = () => {
 
             <div className="container">
                 <SectionHeader style={{ marginTop: "-30px" }} data={sectionHeader} className="center-content" />
+                {data.length===0?(<p style = {{textAlign:"center",width:"100%"}}>No New Events</p>):""}
                 <div className='event-parent-container'>
+
                     {data.map((x, i) => {
                         return (
-                            <div className="event-container" key={i}>
+                            <a target = "_blank" href = {x.event_link} className="event-container" key={i}>
                                 <div className='event-poster-container'>
                                     <img src={x.event_poster} alt="logo" className='event-poster' />
                                 </div>
                                 <div className='event-content-container'>
                                     <h3>{x.event_name}</h3>
-                                    <p><b>{x.speaker_name} </b>, {x.speaker_designation}
-                                    <br />
-                                    {x.event_date}, {x.event_start_time} - {x.event_start_time}</p>
+                                    <p><b>{x.speaker_name} </b> {x.speaker_designation}</p>
+                                    <p style={{fontWeight:"500",marginTop:"4px"}}>{x.event_description}</p>
+                                    <p>{x.event_date} {x.event_start_time.length !==0 ? (<>, {x.event_start_time} - {x.event_start_time}</>):""}</p>
+
                                 </div>
-                            </div>
+                            </a>
                         )
                     })}
                 </div>

diff --git a/src/components/Members/Members.js b/src/components/Members/Members.js
@@ -7,14 +7,14 @@ import { Link } from "react-router-dom"
 
 export const Card = ({img, name, role}) => {
     return (
-        <Link to="https://pointblank.vercel.app/kitarp29" className="members-container">
+        <div className="members-container">
             <img src={img} alt="logo" className='members-img' />
             <div className='members-img-overlay'></div>
             <div className='members-info-container'>
                 <h2>{name}</h2>
                 <h3>{role}</h3>
             </div>
-        </Link>
+        </div>
     )
 }
 
@@ -30,18 +30,18 @@ const Members = () => {
 
             <div className="container">
                 <SectionHeader style={{ marginTop: "-30px" }} data={sectionHeader} className="center-content" />
-                <h3 style = {{textAlign:"center"}}>Leads</h3>
+                {/* <h3 style = {{textAlign:"center"}}></h3> */}
                 <div className='members-parent-container'>
                     {data.filter((x)=>x.role==="Lead").map((item, key) => (
                         <Card img={item.img} key={key} name={item.name} role={item.role} />
                     ))}
                 </div>
-                <h3 style = {{textAlign:"center"}}>Members</h3>
+                {/* <h3 style = {{textAlign:"center"}}>Members</h3>
                 <div className='members-parent-container'>
                     {data.filter((x)=>x.role==="Member").map((item, key) => (
                         <Card img={item.img} key={key} name={item.name} role={item.role} />
                     ))}
-                </div>
+                </div> */}
             </div>
         </>
     )

diff --git a/src/components/layout/Header.js b/src/components/layout/Header.js
@@ -144,7 +144,7 @@ const Header = ({
                           className='navlink'
                           onClick={closeMenu}
                         >
-                          Members
+                          Leads
                         </a>
                       </li>
                       <li>

diff --git a/src/components/sections/Hero.js b/src/components/sections/Hero.js
@@ -11,6 +11,8 @@ import ca_1 from '../../assets/images/new1.jpeg'
 import ca_2 from './../../assets/images/pb_1.png'
 import ca_3 from './../../assets/images/pb_2.png'
 import ca_4 from './../../assets/images/new2.jpeg'
+import rec from "../../assets/images/rec.png"
+import { useHistory } from 'react-router-dom/cjs/react-router-dom'
 
 const propTypes = {
     ...SectionProps.types,
@@ -50,13 +52,18 @@ const Hero = ({
         invertColor && 'invert-color',
         className
     )
-
+    useHistory()
     const innerClasses = classNames(
         'hero-inner section-inner',
         topDivider && 'has-top-divider',
         bottomDivider && 'has-bottom-divider'
     )
 
+
+    const route = () => {
+        window.location.href = "/form"
+    }
+
     return (
         <section {...props} className={outerClasses}>
             <div className='container'>
@@ -87,7 +94,7 @@ const Hero = ({
                         data-reveal-delay='500'
                     >
                         <AwesomeSlider>
-
+                            <div style = {{cursor:"pointer"}} onClick={()=>{route()}} data-src={rec} />
                             <div data-src={ca_2} />
                             <div data-src={ca_3} />
                             <div data-src={ca_1} />

diff --git a/src/core.json b/src/core.json
@@ -44,14 +44,15 @@
     "name" : "Debayan Ghosh Dastider",
     "role" : "Lead"
   },
+  { 
+    "img" : "https://media.licdn.com/dms/image/D5603AQHKig9YtCb4Dg/profile-displayphoto-shrink_400_400/0/1696183693747?e=1706745600&v=beta&t=_fwVuvzW8mHh7RhqOJSEqf0esRjcdHe4l3La65757NY",
+    "name" : " Animesh Kumar Jha",
+    "role" : "Social Media"
+  },
   {
     "img" : "https://avatars.githubusercontent.com/u/83706503?s=400&u=2d00114433bc28b8e28252e41bbc919229b9a7f4&v=4",
     "name" : "Rithik Raj Pandey",
     "role" : "Lead"
-  },
-  {
-    "img" : "https://media.licdn.com/dms/image/D5603AQGqUJtDkkC0cw/profile-displayphoto-shrink_400_400/0/1696353001024?e=1704326400&v=beta&t=rA6E3C5K-544uYtvKWexl6zjUrR0IIoO3AZ8qrrWRZ8",
-    "name" : "Akash Singh",
-    "role" : "Member"
   }
+
 ]
diff --git a/src/events.json b/src/events.json
@@ -1,43 +1,13 @@
 [
     {
-        "event_name": "This is a new Event",
-        "event_description": "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.",
-        "speaker_name":"John Doe",
-        "speaker_designation":"App Developer at Google", 
-        "event_date":"12/12/2023",
-        "event_start_time":"18:00",
-        "event_end_time":"19:00",
-        "event_poster":"https://www.oyorooms.com/blog/wp-content/uploads/2018/02/event.jpg"
-    },
-    {
-        "event_name": "This is a new Event",
-        "event_description": "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.",
-        "speaker_name":"John Doe",
-        "speaker_designation":"App Developer at Google", 
-        "event_date":"12/12/2023",
-        "event_start_time":"18:00",
-        "event_end_time":"19:00",
-        "event_poster":"https://www.oyorooms.com/blog/wp-content/uploads/2018/02/event.jpg"
-    },
-    {
-        "event_name": "This is a new Event",
-        "event_description": "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.",
-        "speaker_name":"John Doe",
-        "speaker_designation":"App Developer at Google", 
-        "event_date":"12/12/2023",
-        "event_start_time":"18:00",
-        "event_end_time":"19:00",
-        "event_poster":"https://www.oyorooms.com/blog/wp-content/uploads/2018/02/event.jpg"
-    },
-    {
-        "event_name": "This is a new Event",
-        "event_description": "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.",
-        "speaker_name":"John Doe",
-        "speaker_designation":"App Developer at Google", 
-        "event_date":"12/12/2023",
-        "event_start_time":"18:00",
-        "event_end_time":"19:00",
-        "event_poster":"https://www.oyorooms.com/blog/wp-content/uploads/2018/02/event.jpg"
+        "event_name": "PointBlank Recruitment 2023-24",
+        "event_description": "Unleash Possibilities : Point Blank is Recruiting !!!",
+        "speaker_name":"",
+        "speaker_designation":"", 
+        "event_date":"08/12/2023",
+        "event_start_time":"",
+        "event_end_time":"",
+        "event_poster":"https://ik.imagekit.io/qx5kklh3ls/rec.png?updatedAt=1701247115375",
+        "event_link":"/form"
     }
-
 ]
-Original file line number
+Diff line change
@@ Expand Up / @@ -144,7 +144,7 @@ const Header = ({ @@
                               className='navlink'
                               onClick={closeMenu}
                             >
-                              Members
+                              Leads
                             </a>
                           </li>
                           <li>
@@ Expand Down @@