Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

New changes #89

Closed
wants to merge 2 commits into from
Closed

New changes #89

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b0bb72f
made changes in achievement json (#83)
heyyakash Nov 29, 2023
e55d383
Some Changes (#88)
adityakhattri21 Nov 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
436 changes: 252 additions & 184 deletions src/acheive.json
View file
Open in desktop

Large diffs are not rendered by default.

5 changes: 0 additions & 5 deletions src/achievem.json
View file
Open in desktop

This file was deleted.

5 changes: 5 additions & 0 deletions src/assets/images/htb.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/images/logo.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/images/rec.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/assets/images/thm.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 8 additions & 4 deletions src/assets/scss/events/events.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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' ) {
Expand All @@ -20,6 +20,7 @@

.event-parent-container{
grid-template-columns: repeat(1,1fr);
place-items: center;
}
}

Expand Down Expand Up @@ -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;
}
}
Expand Down
6 changes: 3 additions & 3 deletions src/assets/scss/members/members.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -55,7 +55,7 @@
.members-img {
width: 100%;
height: 100%;

object-position: top;
margin-bottom: 12px;
object-fit: cover;
position: absolute;
Expand Down
15 changes: 9 additions & 6 deletions src/components/Achievements/Achievements.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
13 changes: 8 additions & 5 deletions src/components/Events/Events.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
10 changes: 5 additions & 5 deletions src/components/Members/Members.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
)
}

Expand All @@ -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>
</>
)
Expand Down
2 changes: 1 addition & 1 deletion src/components/layout/Header.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ const Header = ({
className='navlink'
onClick={closeMenu}
>
Members
Leads
</a>
</li>
<li>
Expand Down
5 changes: 0 additions & 5 deletions src/components/layout/partials/FooterNav.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,6 @@ const FooterNav = ({ className, ...props }) => {
return (
<nav {...props} className={classes}>
<ul className='list-reset'>
<li>
<a href='https://blog.pointblank.club/' target='_blank'>
Blog
</a>
</li>
<li>
<a href='https://forum.dsce.in/' target='_blank'>
Forum
Expand Down
Loading