Skip to content
This repository has been archived by the owner on Mar 7, 2024. It is now read-only.

Commit

Permalink
Implement new Workshop Design: final
Browse files Browse the repository at this point in the history
  • Loading branch information
Abhishek-kumar09 committed Oct 8, 2020
1 parent 2360560 commit 151b31e
Show file tree
Hide file tree
Showing 12 changed files with 272 additions and 213 deletions.
Binary file added public/static/images/backs/course.png
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 public/static/images/backs/ws.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions src/Routes.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import ProfileView from 'src/views/pages/ProfileView';
import ApplicationsView from 'src/views/pages/ApplicationsView';
import Error404View from 'src/views/pages/Error404View';
import StudentDashboardView from 'src/views/pages/StudentDashboardView';
import WorkshopView from 'src/views/pages/WorkshopView';
import CoursePage from 'src/views/pages/Courses/CoursePage';
import TermsView from './views/pages/documents/termsView';
import DocsLayout from './layouts/DocsLayout';
Expand Down
12 changes: 9 additions & 3 deletions src/components/Hero/HeroWithOneButton.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ const useStyles = makeStyles(theme => ({
root: {
minHeight: '350px',
color: '#FFF',
padding: '100px 70px',
padding: '127px 70px',
[theme.breakpoints.down('md')]: {
paddingLeft: 15,
paddingRight: 15
Expand Down Expand Up @@ -39,6 +39,7 @@ const useStyles = makeStyles(theme => ({
function Hero({
title,
subtitle,
subtitleDesign,
className, // className
backgroundImage = null, // Link to the background image if any
component = null, // The Button or any component provided
Expand All @@ -60,9 +61,13 @@ function Hero({
>
<Container maxWidth="lg">
<div className={classes.main}>
<Typography variant="h1">{title}</Typography>
<Typography align='center' variant="h2">{title}</Typography>
<Box mt={2}>
<Typography variant="body1" align="center">
<Typography
className={subtitleDesign}
variant="body1"
align="center"
>
{subtitle}
</Typography>
</Box>
Expand Down Expand Up @@ -92,6 +97,7 @@ function Hero({
Hero.propTypes = {
title: PropTypes.string,
subtitle: PropTypes.string,
subtitleDesign: PropTypes.string,
className: PropTypes.string,
backgroundImage: PropTypes.string,
component: PropTypes.oneOfType([PropTypes.string, PropTypes.func])
Expand Down
48 changes: 0 additions & 48 deletions src/data/workshopData/workshopDetail.js

This file was deleted.

4 changes: 3 additions & 1 deletion src/views/pages/CLView/CTA.js
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,7 @@ function CTA({ className, ...rest }) {
target="_blank"
size="large"
variant="outlined"
focusRipple={false}
>
Submit Request
</Button>
Expand Down Expand Up @@ -203,10 +204,11 @@ function CTA({ className, ...rest }) {
<Button
className={classes.Button + ' ' + classes.secondaryBtn}
component="a"
href="https://codecau.se/ws"
href="/workshops"
target="_blank"
size="large"
variant="outlined"
focusRipple={false}
>
Submit Request
</Button>
Expand Down
127 changes: 127 additions & 0 deletions src/views/pages/WorkshopView/AboutWorkshops.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,127 @@
import { Divider, Grid, makeStyles, Typography } from '@material-ui/core';
import React from 'react';

const useStyles = makeStyles(theme => ({
root: {
width: '80%',
margin: 'auto',
[theme.breakpoints.down('sm')]: {
width: '90%'
}
},
mainHeading: {
padding: '150px 0px 80px'
},
desc: {
fontStyle: 'italic',
fontWeight: 500,
paddingBottom: '20px'
},
stats: {},
divider: {
backgroundColor: '#D4D4D4',
padding: '0px 1px',
height: 'auto',
width: 'auto',
border: '0.5px #525252'
},
aboutText: {
color: '#747474',
paddingBottom: '10px'
},
extraPadding: {
padding: '0px 0px 20px',
[theme.breakpoints.down('sm')]: {
margin: 'auto',
padding: '40px 0px'
}
}
}));

export default function AboutWorkshops() {
const classes = useStyles();

return (
<div className={classes.root}>
<Typography className={classes.mainHeading} variant="h2" align="center">
About Wokshops
</Typography>
<Grid container xs={12} justify="space-between">
<Grid className={classes.stats} container item md={3}>
<Grid item xs={4}>
<Typography variant="h4">120+</Typography>
</Grid>
<Grid item xs={6}>
<Typography className={classes.desc}>Workshops</Typography>
</Grid>
<Grid item xs={4}>
<Typography variant="h4">30+</Typography>
</Grid>
<Grid item xs={6}>
<Typography className={classes.desc}>Topics</Typography>
</Grid>
<Grid item xs={4}>
<Typography variant="h4">25+</Typography>
</Grid>
<Grid item xs={6}>
<Typography className={classes.desc}>Speakers</Typography>
</Grid>
<Grid item xs={4}>
<Typography variant="h4">15000+</Typography>
</Grid>
<Grid item xs={6}>
<Typography className={classes.desc}>participants</Typography>
</Grid>
</Grid>
<Divider
className={classes.divider}
variant="fullWidth"
orientation="vertical"
/>
<Grid container item md={7}>
<Typography
align="center"
className={classes.extraPadding}
variant="h4"
>
Workshops are About...
</Typography>
<ABoutText
left="How To Learn Technology?"
right="How To Learn Technology?"
/>
<ABoutText left="Machine Learning" right="Machine Learning" />
<ABoutText
left="Data Structures And Algorithms"
right="Data Structures And Algorithms"
/>
<ABoutText left="Javascript" right="Javascript" />
<ABoutText left="Game Development" right="Game Development" />
<ABoutText left="Real Life Strategies" right="Real Life Strategies" />
<ABoutText left="Real Life Strategies" right="Real Life Strategies" />
</Grid>
</Grid>

<Divider
className={classes.divider}
variant="fullWidth"
style={{ margin: '80px 0px', padding: '0.5px' }}
/>
</div>
);
}

function ABoutText({ left, right }) {
const classes = useStyles();

return (
<Grid container item justify="space-evenly">
<Grid className={classes.aboutText} sm={6} xs={12}>
<Typography variant="body2">{left}</Typography>
</Grid>
<Grid className={classes.aboutText} sm={6} xs={12}>
<Typography variant="body2">{right}</Typography>
</Grid>
</Grid>
);
}
Loading

0 comments on commit 151b31e

Please sign in to comment.