some editing

pbdsce · Nov 22, 2023 · f234b35 · f234b35
1 parent 0b23e0b
commit f234b35
Show file tree

Hide file tree

Showing 7 changed files with 58 additions and 19 deletions.
diff --git a/src/App.js b/src/App.js
@@ -4,6 +4,7 @@ import AppRoute from './utils/AppRoute';
 import ScrollReveal from './utils/ScrollReveal';
 import ReactGA from 'react-ga';
 
+
 // Layouts
 import LayoutDefault from './layouts/LayoutDefault';
 import LayoutCoc from './layouts/LayoutCoc';
@@ -13,6 +14,7 @@ import Home from './views/Home';
 import Coc from './views/Coc';
 import Events from './components/Events/Events';
 import Members from "./components/Members/Members";
+import Achievements from './components/Achievements/Achievements'
 
 // Initialize Google Analytics
 ReactGA.initialize(process.env.REACT_APP_GA_CODE);
@@ -43,6 +45,7 @@ const App = () => {
           <AppRoute exact path="/" component={Home} layout={LayoutDefault} />
           <AppRoute exact path="/CodeofConduct" component={Coc} layout={LayoutCoc} />
           <AppRoute exact path="/events" component={Events} layout={LayoutDefault} />
+          <AppRoute exact path="/achievements" component={Achievements} layout={LayoutDefault} />
           <AppRoute exact path="/members" component={Members} layout={LayoutDefault}/>
 
         </Switch>

diff --git a/src/achievem.json b/src/achievem.json
@@ -0,0 +1,5 @@
+[{
+    "event_name": "John Doe",
+    "event_description": "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore e",
+    "event_poster":"https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcQlwj2YK4IT8kJKQS7a57mwtW1tDedIj4lobQ&usqp=CAU"
+}]
diff --git a/src/assets/scss/events/events.scss b/src/assets/scss/events/events.scss
@@ -45,7 +45,7 @@
     }
 
     .event-content-container{
-        padding-left:20px;
+        padding: 0 20px;
         display: flex;
         flex-direction: column;
         gap:1rem;

diff --git a/src/components/Achievements/Achievements.js b/src/components/Achievements/Achievements.js
@@ -0,0 +1,40 @@
+import React from 'react'
+import Hero2 from '../sections/Hero2';
+import CodeofConduct from '../sections/CodeofConduct';
+import SectionHeader from '../sections/partials/SectionHeader';
+import classNames from 'classnames';
+import data from '../../achievem.json'
+
+const Events = () => {
+
+    const sectionHeader = {
+        title: 'Achievements',
+    };
+
+    return (
+        <>
+            <Hero2 className="illustration-section-01" />
+
+            <div className="container">
+                <SectionHeader style={{ marginTop: "-30px" }} data={sectionHeader} className="center-content" />
+                <div className='event-parent-container'>
+                    {data.map((x, i) => {
+                        return (
+                            <div 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.event_description} </b></p>
+                                </div>
+                            </div>
+                        )
+                    })}
+                </div>
+            </div>
+        </>
+    )
+}
+
+export default Events
diff --git a/src/components/Members/Members.js b/src/components/Members/Members.js
@@ -30,13 +30,13 @@ const Members = () => {
 
             <div className="container">
                 <SectionHeader style={{ marginTop: "-30px" }} data={sectionHeader} className="center-content" />
-                <h3 style = {{marginLeft:"10px"}}>Leads</h3>
+                <h3 style = {{textAlign:"center"}}>Leads</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 = {{marginLeft:"10px"}}>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} />

diff --git a/src/components/layout/Header.js b/src/components/layout/Header.js
@@ -143,24 +143,15 @@ const Header = ({
                       </li>
                       <li>
                         <a
-                          href={'https://blog.pointblank.club/'}
+                          href={'/achievements'}
 
                           className='navlink'
                           onClick={closeMenu}
                         >
-                          Blog
-                        </a>
-                      </li>
-                      <li>
-                        <a
-                          href={'https://forum.dsce.in/'}
-
-                          className='navlink'
-                          onClick={closeMenu}
-                        >
-                          Forum
+                          Achievements
                         </a>
                       </li>
+
                       <li>
                         <a
                           href={'https://forms.gle/yCwMHcn2iatnk9mW6'}

diff --git a/src/events.json b/src/events.json
@@ -7,7 +7,7 @@
         "event_date":"12/12/2023",
         "event_start_time":"18:00",
         "event_end_time":"19:00",
-        "event_poster":"https://img.freepik.com/free-photo/beautiful-scenery-summit-mount-everest-covered-with-snow-white-clouds_181624-21317.jpg?w=1380&t=st=1692111092~exp=1692111692~hmac=c2312c189502d05ff83a1d06806c73f56bde480c24e5437614441f14068d43a9"
+        "event_poster":"https://www.oyorooms.com/blog/wp-content/uploads/2018/02/event.jpg"
     },
     {
         "event_name": "This is a new Event",
@@ -17,7 +17,7 @@
         "event_date":"12/12/2023",
         "event_start_time":"18:00",
         "event_end_time":"19:00",
-        "event_poster":"https://img.freepik.com/free-photo/beautiful-scenery-summit-mount-everest-covered-with-snow-white-clouds_181624-21317.jpg?w=1380&t=st=1692111092~exp=1692111692~hmac=c2312c189502d05ff83a1d06806c73f56bde480c24e5437614441f14068d43a9"
+        "event_poster":"https://www.oyorooms.com/blog/wp-content/uploads/2018/02/event.jpg"
     },
     {
         "event_name": "This is a new Event",
@@ -27,7 +27,7 @@
         "event_date":"12/12/2023",
         "event_start_time":"18:00",
         "event_end_time":"19:00",
-        "event_poster":"https://img.freepik.com/free-photo/beautiful-scenery-summit-mount-everest-covered-with-snow-white-clouds_181624-21317.jpg?w=1380&t=st=1692111092~exp=1692111692~hmac=c2312c189502d05ff83a1d06806c73f56bde480c24e5437614441f14068d43a9"
+        "event_poster":"https://www.oyorooms.com/blog/wp-content/uploads/2018/02/event.jpg"
     },
     {
         "event_name": "This is a new Event",
@@ -37,7 +37,7 @@
         "event_date":"12/12/2023",
         "event_start_time":"18:00",
         "event_end_time":"19:00",
-        "event_poster":"https://img.freepik.com/free-photo/beautiful-scenery-summit-mount-everest-covered-with-snow-white-clouds_181624-21317.jpg?w=1380&t=st=1692111092~exp=1692111692~hmac=c2312c189502d05ff83a1d06806c73f56bde480c24e5437614441f14068d43a9"
+        "event_poster":"https://www.oyorooms.com/blog/wp-content/uploads/2018/02/event.jpg"
     }
 
 ]