Skip to content

Commit 5ca350c

Browse files
Jai-Solania-29Jai-Solania-29
authored
Merge pull request #7 from Jai-Solania-29/jaideep
Events Page Added
2 parents 0e010f5 + 2e39d73 commit 5ca350c

14 files changed

+161
-7
lines changed

Diff for: ‎src/App.js

+2
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,14 @@ import Header from "./components/Header";
55
import Initiative from "./components/Initiative";
66
import Footer from "./components/Footer";
77
import Contact from "./components/Contact";
8+
import Event from './components/Events';
89

910
const App = () => {
1011
return (
1112
<div>
1213
<Header />
1314
<Initiative />
15+
<Event />
1416
<Community />
1517
<Collaboration />
1618
<Contact />

Diff for: ‎src/Images/D2D img 1.png

98.4 KB
Loading

Diff for: ‎src/Images/D2D img 2.png

82.7 KB
Loading

Diff for: ‎src/Images/D2D img 3.png

92.3 KB
Loading

Diff for: ‎src/Images/Events_bottom.png

1.31 KB
Loading

Diff for: ‎src/Images/Events_left.png

9.48 KB
Loading

Diff for: ‎src/Images/Frame 1.png

112 KB
Loading

Diff for: ‎src/Images/calendar.png

466 Bytes
Loading

Diff for: ‎src/Images/clock.png

769 Bytes
Loading

Diff for: ‎src/components/Collaboration.js

-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import "../styles/collaboration.css";
88
function Collaboration() {
99
return(
1010
<div className="collab">
11-
<div className="content">
1211
<h1 className="c-head">Our <span className="sub">Collaborations</span></h1>
1312
<div className="partner">
1413
<img className="side" src={side} alt="side" />
@@ -17,7 +16,6 @@ function Collaboration() {
1716
<img className="partner-img" src={partner} alt="partner" />
1817
<img className="side-R" src={sideR} alt="sideR" />
1918
</div>
20-
</div>
2119
</div>
2220
)
2321
}

Diff for: ‎src/components/Community.js

+3-2
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,10 @@ import "../styles/community.css";
55
function Community() {
66
return(
77
<div className="community">
8-
<div className="content1">
8+
<div className="heading">
99
<h1 className="comm-head">Join our <span className="sub-head">Community</span> to </h1>
1010
<h1 className="comm-head-sub">connect with great minds</h1>
11+
</div>
1112
<div className="category">
1213

1314
<div className="hackathon">
@@ -40,7 +41,7 @@ function Community() {
4041
</div>
4142
</div>
4243
</div>
43-
</div>
44+
4445
</div>
4546
)
4647
}

Diff for: ‎src/components/Events.js

+63
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
import React from "react";
2+
import "../styles/events.css";
3+
import eventL from "../Images/Events_left.png";
4+
import event1 from "../Images/D2D img 1.png";
5+
import event2 from "../Images/D2D img 2.png";
6+
import event3 from "../Images/D2D img 3.png";
7+
import calendar from "../Images/calendar.png";
8+
import clock from "../Images/clock.png";
9+
10+
11+
12+
function Event() {
13+
return(
14+
<div className="event">
15+
<div className="e-head">
16+
<h1 className="event-head">Our Upcoming <span className="event-sub">Events</span></h1>
17+
</div>
18+
<div className="list">
19+
<div className="pic">
20+
<img className="event-left" src={eventL} alt="event-left" />
21+
</div>
22+
23+
<div className="event1">
24+
<img className="event-1" src={event1} alt="event1" />
25+
<div className="e-content">
26+
<h4 className="e1-head">D2D Meetup Delhi</h4>
27+
<p className="date1">Sunday Oct 22, 2022</p>
28+
<p className="time1">15:00 - 17:00</p>
29+
</div>
30+
<div className="btn">
31+
<button className="register1">Register Now</button>
32+
</div>
33+
</div>
34+
35+
<div className="event2">
36+
<img className="event-1" src={event2} alt="event1" />
37+
<div className="e-content">
38+
<h4 className="e1-head">D2D Meetup Goa</h4>
39+
<p className="date1">Wednesday Oct 26, 2022</p>
40+
<p className="time1">15:00 - 17:00</p>
41+
</div>
42+
<div className="btn">
43+
<button className="register1">Register Now</button>
44+
</div>
45+
</div>
46+
47+
<div className="event3">
48+
<img className="event-1" src={event3} alt="event1" />
49+
<div className="e-content">
50+
<h4 className="e1-head">D2D Meetup CU</h4>
51+
<p className="date1">Saturday Nov 1, 2022</p>
52+
<p className="time1">15:00 - 17:00</p>
53+
</div>
54+
<div className="btn">
55+
<button className="register1">Register Now</button>
56+
</div>
57+
</div>
58+
</div>
59+
</div>
60+
)
61+
}
62+
63+
export default Event;

Diff for: ‎src/styles/community.css

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
1-
2-
.content1{
1+
.community{
32
font-family: 'Roboto', sans-serif;
43
font-style: normal;
54
font-weight: 700;
65
font-size: 1.5rem;
7-
text-align: center;
86
color: #000000;
97
}
8+
.heading{
9+
text-align: center;
10+
}
1011
.sub-head{
1112
color: #001AFF;
1213
}

Diff for: ‎src/styles/events.css

+89
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,89 @@
1+
.event{
2+
font-family: 'Roboto', sans-serif;
3+
font-style: normal;
4+
font-weight: 700;
5+
font-size: 1.5rem;
6+
color: #000000;
7+
margin-bottom: 8%;
8+
}
9+
.e-head{
10+
text-align: center;
11+
}
12+
.event-sub{
13+
color: #1400FF;
14+
}
15+
16+
.list{
17+
display: flex;
18+
margin-top: 3%;
19+
}
20+
.event-left{
21+
margin-top: -117%;
22+
height: 186%;
23+
}
24+
25+
.event1{
26+
text-align: center;
27+
background-color: #E9F4FF;
28+
height: fit-content;
29+
border-radius: 4%;
30+
margin-left: 6%;
31+
width: 21%;
32+
height: 390px;
33+
}
34+
.event2{
35+
text-align: center;
36+
background-color: #E9F4FF;
37+
height: fit-content;
38+
border-radius: 4%;
39+
margin-left: 4%;
40+
width: 21%;
41+
height: 390px;
42+
}
43+
.event3{
44+
text-align: center;
45+
background-color: #E9F4FF;
46+
height: fit-content;
47+
border-radius: 4%;
48+
margin-left: 4%;
49+
width: 21%;
50+
height: 390px;
51+
}
52+
53+
.event-1{
54+
width: fit-content;
55+
height: fit-content;
56+
padding-left: 4%;
57+
padding-right: 4%;
58+
padding-top: 4%;
59+
}
60+
61+
.e-content{
62+
font-size: 1.7rem;
63+
text-align: left;
64+
margin-left: 12%;
65+
margin-top: -5%;
66+
}
67+
.e1-head{
68+
color: #FF0000;
69+
}
70+
71+
.date1{
72+
font-size: 17px;
73+
margin-top: -6%;
74+
}
75+
.time1{
76+
font-size: 17px;
77+
}
78+
.btn{
79+
text-align: center;
80+
}
81+
.register1{
82+
background-color: #FF0000;
83+
color: white;
84+
border: none;
85+
border-radius: 21px;
86+
width: 52%;
87+
height: 38px;
88+
margin-top: 3%;
89+
}

0 commit comments

Comments
 (0)