Skip to content

Commit

Permalink
Merge pull request #56 from developer-student-clubs/develop
Browse files Browse the repository at this point in the history
Fixed content formatting on Event Page
  • Loading branch information
rishav-singh-0 authored Mar 16, 2021
2 parents 97b818e + 7a4ea1b commit cf8ecc1
Show file tree
Hide file tree
Showing 2 changed files with 86 additions and 57 deletions.
63 changes: 42 additions & 21 deletions src/Components/EventCard.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import React from "react";
import { makeStyles, ThemeProvider } from "@material-ui/core/styles";
import Card from "@material-ui/core/Card";
import CardContent from "@material-ui/core/CardContent";
import Button from '@material-ui/core/Button';
import Button from "@material-ui/core/Button";
import CardMedia from "@material-ui/core/CardMedia";
import Typography from "@material-ui/core/Typography";
import { createMuiTheme } from "@material-ui/core/styles";
Expand Down Expand Up @@ -71,34 +71,55 @@ function ImgMediaCard(props) {
<ThemeProvider theme={fonttheme}>
<Typography variant="body2" component="p">
{props.member.content} <br /> <br />
{!props.member.current ? (
<div>
{props.member.conduct} <br />
{!props.member.jury ? null : (
<div>{props.member.jury}</div>
)}{" "}
<br />
{props.member.platform}
</div>
) : null}
{props.member.current ? (
<div>
{props.member.add0} <br />
{props.member.add1} <br />
{props.member.add2} <br /> <br />
{props.member.add3} <br /> <br />
{props.member.date1} <br />
{props.member.date2} <br /> <br />
</div>
) : null}
</Typography>
{props.member.current ? (
<div>
<Button
variant="contained"
color="primary"
href="https://forms.gle/EbuqBZfUHS7WYN7r6"
>
Register
</Button>
<Button
variant="contained"
color="secondary"
href="https://youtu.be/j-irhD-VMIc"
>
Video
</Button>
</div>
) : null}

<Typography variant="body2" component="p">
{props.member.add1} <br />
{props.member.add2}
</Typography>

<Typography variant="body2" component="p">
{props.member.conduct} <br /> <br />
{props.member.date1}<br/>
{props.member.date1}
</Typography>

<Typography variant="body2" component="p">
{props.member.platform} <br />
</Typography>
{props.member.current? <Button variant="contained" color="primary" href="https://forms.gle/EbuqBZfUHS7WYN7r6">
Regiseter
</Button>:null}

<Typography variant="body2" component="p"></Typography>
</ThemeProvider>
</CardContent>
</div>
<CardMedia
component="img"
image={props.member.image}
image={props.member.image}
alt="project image"
style = {{width : 350}}
style={{ width: 350 }}
title="project image"
/>
</Card>
Expand Down
80 changes: 44 additions & 36 deletions src/Content/EventContent.js
Original file line number Diff line number Diff line change
@@ -1,40 +1,48 @@
export const event = [
{
Category: "Current Events",
Events: [
{
title: "Basic Electronics Battle (2X March 2021)",
image: process.env.PUBLIC_URL + "/Assets/Event/current/3.jpg",
content: "Too bored of sessionals and submissions!! Don’t worry Abhiyanta Community has come up with an awesome electronics based event “Basic Electronic Battle”, an open book competition. Yes you heard it right, open book competition. A competition in which you can test your electronic skills and showcase your talent.This event consist of two exciting rounds, ",
add1:"Round A : Electronics questions which requires Basic Practical Knowledge ",
add2: "Round B : Debate round between shortlisted teams You have to take part in a team consisting of two members from DDU. Don’t miss this thriller opportunity, as only the first 50 teams will be taken into consideration.",
date1:"Date of event: 21 March 2021 (24 Hours)",
date2:" Last date of registration: 19 March 2021",
current:true
},

]
} ,
{
{
Category: "Current Events",
Events: [
{
title: "Basic Electronics Battle (21 March 2021)",
image: process.env.PUBLIC_URL + "/Assets/Event/current/3.jpg",

Category: "Past Events",
Events: [
{
title: "e-Yantra awareness program (14 August 2020)",
image: process.env.PUBLIC_URL + "/Assets/Event/past/1.jpg",
content: " Online webinar to spread awareness regarding various competitions conducted by e-yantra. E-yantra conducts many exciting competitions and hackathons such as eYRC and eYIC. The speakers are 2nd place holder of the eYRC robotics competition in the theme of Biped Patrol.",
conduct:"Conducted by - Prit Varmora, Ritvik Tiwari ",
platform:"Platform: Google Meet"
},

{
title: "Convince Investors’ (06 December 2020)",
image: process.env.PUBLIC_URL + "/Assets/Event/past/2.jpg",
content: "Online competition where teams present their project to potential investors. Teams which were working since past 2 months on industry-level projects get a chance to market their project in front of experienced jury members from the industry.",
conduct: "Conducted by - Prit Varmora, Minu Chaudhary, Ritvik Tiwari, Soham Jury Members - Raj Shingala (Cadence Design System Pratik Gupta (Cadence Design Systems)",
platform:"Platform: Google Meet"
},
]
},
content:
"Too bored of sessionals and submissions! Don’t worry Abhiyanta Community has come up with an awesome electronics based open book challenge. Yes you heard it right, open book challenge. A competition in which you can test your electronic skills and showcase your talent.",
add0: "This event consist of two exciting rounds,",
add1:
"Round I: Answer basic electronics questions in most creative way",
add2: "Round II: Debate round between top performing teams of round I",
add3:
"You have to take part in a team consisting of two members. Don’t miss this thriller opportunity, as only the first 100 teams will be taken into consideration.",
date1: "Date of event: 21 March 2021 (24 Hours)",
date2: "Last date of registration: 19 March 2021 ",
current: true,
},
],
},
{
Category: "Past Events",
Events: [
{
title: "e-Yantra awareness program (14 August 2020)",
image: process.env.PUBLIC_URL + "/Assets/Event/past/1.jpg",
content:
"Online webinar to spread awareness regarding various competitions conducted by e-yantra. E-yantra conducts many exciting competitions and hackathons such as eYRC and eYIC. The speakers are 2nd place holder of the eYRC robotics competition in the theme of Biped Patrol.",
conduct: "Conducted by - Prit Varmora, Ritvik Tiwari ",
platform: "Platform: Google Meet",
},

{
title: "Convince Investors’ (06 December 2020)",
image: process.env.PUBLIC_URL + "/Assets/Event/past/2.jpg",
content:
"Online competition where teams present their project to potential investors. Teams which were working since past 2 months on industry-level projects get a chance to market their project in front of experienced jury members from the industry.",
conduct:
"Conducted by - Prit Varmora, Minu Chaudhary, Ritvik Tiwari, Soham Vekariya.",
jury:
"Jury Members - Raj Shingala (Cadence Design System Pratik Gupta (Cadence Design Systems)",
platform: "Platform: Google Meet",
},
],
},
];

0 comments on commit cf8ecc1

Please sign in to comment.