Skip to content

Commit 5b4ac63

Browse files
rishichawlarishichawla
authored
Merge pull request #19 from Ayushi0508/test
some bugs fixed
2 parents 8427a18 + df21060 commit 5b4ac63

27 files changed

Lines changed: 829 additions & 677 deletions

‎src/App.css‎

Lines changed: 16 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,24 @@
1-
.header-color{
2-
background: rgb(177, 11, 11);
3-
background-image: url("https://lesilets.com/wp-content/uploads/2018/04/1096907-cool-dark-background-2560x1600-for-tablet-1024x640.jpg");
4-
position: fixed;
1+
.header-color {
2+
background: rgb(177, 11, 11);
3+
background-image: url("https://lesilets.com/wp-content/uploads/2018/04/1096907-cool-dark-background-2560x1600-for-tablet-1024x640.jpg");
4+
position: fixed;
55
}
6-
.draw
7-
{
8-
position: fixed;
6+
.draw {
7+
position: fixed;
98
}
109
.contact-list i {
11-
font-size: 66px;
12-
padding-right: 5rem;
10+
font-size: 66px;
11+
padding-right: 5rem;
1312
}
1413

15-
16-
17-
body {
18-
-webkit-overflow-scrolling: touch;
14+
::-webkit-scrollbar {
15+
width: 0px;
16+
overflow: hidden;
17+
background: transparent;
1918
}
20-
21-
.margin{
22-
padding-top: 2% ;
19+
.margin {
20+
padding-top: 2%;
2321
}
24-
.demo-big-content
25-
{
26-
/* position: relative; */
22+
body {
23+
background-color: #a4b0bd;
2724
}
28-
29-
30-
31-
32-

‎src/App.js‎

Lines changed: 51 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -1,59 +1,58 @@
1-
import React, {Component} from "react";
1+
import React, { Component } from "react";
22
import "./App.css";
3-
import {Layout, Header, Navigation, Drawer, Content} from "react-mdl";
3+
import { Layout, Header, Navigation, Drawer, Content } from "react-mdl";
44
import Routes from "./routes";
5-
import Footer from './components/footer'
6-
import {Link} from "react-router-dom";
7-
import HomePage from "./components/homepage";
8-
import ParticleLogo from "./components/logo";
5+
import Footer from "./components/footer";
6+
import { Link } from "react-router-dom";
97

108
class App extends Component {
11-
render() {
12-
return (
13-
<div className="demo-big-content">
14-
<Layout fixedHeader >
15-
<Header transparent
16-
className="header-color"
17-
title={
18-
<Link style={{textDecoration: "none", color: "white"}} to="/">
19-
Codefoster
20-
</Link>
21-
}
22-
scroll
23-
>
24-
<Navigation >
25-
<Link to="/">Home</Link>
26-
<Link to="/events">Events</Link>
27-
<Link to="/blogs">Blogs</Link>
28-
<Link to="/team">Our Team</Link>
29-
</Navigation>
30-
</Header>
31-
<Drawer className="draw"
32-
title={
33-
<Link style={{textDecoration: "none", color: "black"}} to="/">
34-
Codefoster
35-
</Link>
36-
}
37-
>
38-
<Navigation >
39-
<Link to="/">Home</Link>
40-
<Link to="/events">Events</Link>
41-
<Link to="/blogs">Blogs</Link>
42-
<Link to="/team">Our Team</Link>
43-
</Navigation>
44-
</Drawer>
45-
<div className="margin">
46-
</div>
47-
<Content >
48-
<div className="page-content"/>
49-
<ParticleLogo/>
50-
<Routes/>
51-
</Content>
52-
<Footer />
53-
</Layout>
54-
</div>
55-
);
56-
}
9+
render() {
10+
return (
11+
<div className="demo-big-content">
12+
<Layout fixedHeader>
13+
<Header
14+
transparent
15+
className="header-color"
16+
title={
17+
<Link style={{ textDecoration: "none", color: "white" }} to="/">
18+
Codefoster
19+
</Link>
20+
}
21+
scroll
22+
>
23+
<Navigation>
24+
<Link to="/">Home</Link>
25+
<Link to="/events">Events</Link>
26+
<Link to="/blogs">Blogs</Link>
27+
<Link to="/team">Our Team</Link>
28+
</Navigation>
29+
</Header>
30+
<Drawer
31+
className="draw"
32+
title={
33+
<Link style={{ textDecoration: "none", color: "black" }} to="/">
34+
Codefoster
35+
</Link>
36+
}
37+
>
38+
<Navigation>
39+
<Link to="/">Home</Link>
40+
<Link to="/events">Events</Link>
41+
<Link to="/blogs">Blogs</Link>
42+
<Link to="/team">Our Team</Link>
43+
</Navigation>
44+
</Drawer>
45+
<div className="margin"></div>
46+
<Content>
47+
<div className="page-content" />
48+
{/* <ParticleLogo/> */}
49+
<Routes />
50+
</Content>
51+
<Footer />
52+
</Layout>
53+
</div>
54+
);
55+
}
5756
}
5857

5958
export default App;

‎src/components/blogs.js‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import {
1212
CardMenu,
1313
IconButton
1414
} from "react-mdl";
15-
import './static/blogs.css';
15+
import "./static/blogs.css";
1616

1717
class Blogs extends Component {
1818
constructor(props) {
@@ -125,7 +125,6 @@ class Blogs extends Component {
125125
<div className="content">{this.toggleCategories()}</div>
126126
</Cell>
127127
</Grid>
128-
129128
</div>
130129
);
131130
}

‎src/components/card.js‎

Lines changed: 48 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,55 @@
1-
import React, {Component} from "react";
2-
import {Grid, Cell} from "react-mdl";
3-
import './static/card.css'
1+
import React, { Component } from "react";
2+
import { Grid, Cell } from "react-mdl";
3+
import "./static/card.css";
44

55
class member extends Component {
6-
constructor(props) {
7-
super(props);
8-
}
9-
render(){
6+
constructor(props) {
7+
super(props);
8+
}
9+
render() {
1010
return (
11-
12-
<div className="contact-grid">
13-
14-
<h2>{this.props.member.name}</h2>
15-
<img className="logo1"
16-
src="https://cdn2.iconfinder.com/data/icons/avatar-2/512/Fred_man-512.png"
17-
alt="avatar"
18-
/>
19-
<p className="para" > {this.props.member.description} </p>
20-
<div>
21-
<a href={this.props.member.links.linkedIn} class="generic-anchor" target="_blank"
22-
title="linkedin" itemProp="significantLink">
23-
<i class="fa fa-linkedin"/>
24-
</a>
25-
&nbsp;
26-
<a href={this.props.member.links.github} class="generic-anchor" target="_blank" title="Github"
27-
itemProp="significantLink">
28-
<i class="fa fa-github"/>
29-
</a>
30-
&nbsp;
31-
<a href={this.props.member.links.portfolio} class="generic-anchor" target="_blank"
32-
title="Portfolio" itemProp="significantLink">
33-
<i class="fa fa-dribbble"/>
34-
</a>
35-
36-
</div>
37-
</div>
38-
11+
<div className="contact-grid">
12+
<h2>{this.props.member.name}</h2>
13+
<img
14+
className="circular--square"
15+
src="https://cdn2.iconfinder.com/data/icons/avatar-2/512/Fred_man-512.png"
16+
alt="avatar"
17+
/>
18+
<p className="para"> {this.props.member.description} </p>
19+
<div>
20+
<a
21+
href={this.props.member.links.linkedIn}
22+
class="generic-anchor"
23+
target="_blank"
24+
title="linkedin"
25+
itemProp="significantLink"
26+
>
27+
<i class="fa fa-linkedin" />
28+
</a>
29+
&nbsp;
30+
<a
31+
href={this.props.member.links.github}
32+
class="generic-anchor"
33+
target="_blank"
34+
title="Github"
35+
itemProp="significantLink"
36+
>
37+
<i class="fa fa-github" />
38+
</a>
39+
&nbsp;
40+
<a
41+
href={this.props.member.links.portfolio}
42+
class="generic-anchor"
43+
target="_blank"
44+
title="Portfolio"
45+
itemProp="significantLink"
46+
>
47+
<i class="fa fa-dribbble" />
48+
</a>
49+
</div>
50+
</div>
3951
);
40-
}
52+
}
4153
}
4254

43-
4455
export default member;

‎src/components/event_data.js‎

Lines changed: 113 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,113 @@
1+
const event = [
2+
{
3+
name: "CodeCasino",
4+
subtitle: "Two stage Competition",
5+
description:
6+
"Total 108 team registred we were having participants from SGSITS, IET-DAVV and other Technical Colleges",
7+
dates: " Febuary 17, 2016"
8+
},
9+
{
10+
name: "Memorandum of Understanding",
11+
subtitle: "with TechKriti'17, IIT Kanpur",
12+
description: "why is not kazi",
13+
dates: " tm sddfsajskfjskf djfksdjfk"
14+
},
15+
16+
{
17+
name: "CodeMania",
18+
subtitle: "Introduce the students to the world of competitive coding",
19+
description: "Hosted on HackerRank",
20+
dates: "August 14, 2018"
21+
},
22+
23+
{
24+
name: "Workshop on Microsoft Bot Framework",
25+
subtitle: "lead by Yashraj Nayak, Community Manager MSTC",
26+
description:
27+
"With a crowd of 143 participants, learnt Microsoft Bot Frameworks and deployed them on cloud",
28+
dates: "September 3, 2018"
29+
},
30+
31+
{
32+
name: "Open workshop on Web Technologies (HTML5, CSS3, JS)",
33+
subtitle: "86 participants",
34+
description:
35+
"Enthusiasm for learning and building the project hands-on was simply enthralling",
36+
dates: "March 9, 2018"
37+
},
38+
39+
{
40+
name: "Monthly Meetups", // chai per charcha(maybe)
41+
subtitle: "Discussion on trending technology",
42+
description:
43+
"Members of club work together to exlore new areas of tech and build projects",
44+
dates: "11:00AM - 01:00PM, Saturdays"
45+
},
46+
{
47+
name: "CodeBlitz",
48+
subtitle: "Friday Challenge",
49+
description:
50+
"Supported by CoderDojo | No entry Fees | Competitive coding based",
51+
dates: "January - April, 2018"
52+
},
53+
{
54+
name: "Raspberry Jam Indore",
55+
subtitle: "",
56+
description: "",
57+
dates: "03-04 March, 2018"
58+
},
59+
{
60+
name: "IInd year Orientation/Recruitment",
61+
subtitle: "",
62+
description: "why is not kazi",
63+
dates: "July, 2019"
64+
},
65+
{
66+
name: "Ist year Orientation",
67+
subtitle: "",
68+
description: "why is not kazi",
69+
dates: "September, 2019"
70+
},
71+
{
72+
name: "Memorandum of Understanding",
73+
subtitle: "With Play 360 TGL",
74+
description: "why is not kazi",
75+
dates: "Feb, 2018"
76+
},
77+
{
78+
name: "FlickShot v2",
79+
subtitle: "Conducted under Aayaam'18",
80+
description: "With a cash reward of ₹ 5000/-",
81+
dates: "Feb, 2018"
82+
},
83+
84+
{
85+
name: "Maxpayin",
86+
subtitle: "Conducted under Aayaam'18",
87+
description: "With a cash reward of ₹ 5000/-",
88+
dates: "Feb, 2018"
89+
},
90+
{
91+
name: "CodeBlitz 2.0",
92+
subtitle: "Friday Challenge",
93+
description:
94+
"Supported by CoderDojo | No entry Fees | Competitive coding based",
95+
dates: "January - April, 2018"
96+
},
97+
{
98+
name: "CodeBlitz3",
99+
subtitle: "Friday Challenge",
100+
description:
101+
"Supported by CoderDojo | No entry Fees | Competitive coding based",
102+
dates: "January - April, 2018"
103+
},
104+
{
105+
name: "CodeBlitz4",
106+
subtitle: "Friday Challenge",
107+
description:
108+
"Supported by CoderDojo | No entry Fees | Competitive coding based",
109+
dates: "January - April, 2018"
110+
}
111+
];
112+
113+
export { event };

0 commit comments

Comments
 (0)