Skip to content

Commit

Permalink
Fixed Conflicts in app.js
Browse files Browse the repository at this point in the history
  • Loading branch information
Kritika-Singhal committed Jul 26, 2020
2 parents 9f2785d + b890856 commit 4c2e570
Show file tree
Hide file tree
Showing 13 changed files with 517 additions and 13,968 deletions.
13,749 changes: 0 additions & 13,749 deletions client/package-lock.json

This file was deleted.

10 changes: 6 additions & 4 deletions client/src/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import DashboardContainer from './Components/Dashboard/DashboardContainer';
import DetailContainer from './Components/Organization/OrganizationDetail/DetailContainer';
import SignIn from './Components/Authentication/Signin'
import SignUp from './Components/Authentication/Signup'

import ProjectDetails from './Components/Organization/OrganizationDetail/ProjectDetails/ProjectDetailsContainer'

class App extends Component {
render() {
Expand All @@ -17,9 +17,11 @@ class App extends Component {
<Switch>
<Route exact path='/Dashboard' component={DashboardContainer} />
<Route exact path='/organization' component={OrganizationContainer} />
<Route exact path='/OrganizationDetail' component = {DetailContainer} />
<Route exact path='/signin' component={SignIn} />
<Route exact path='/signup' component={SignUp} />
<Route path='/OrganizationDetail' component = {DetailContainer} />
{/* <Route exact path='/'component={Navbar} /> */}
<Route path='/signin' component={SignIn} />
<Route path='/signup' component={SignUp} />
<Route path='/ProjectDetails' component ={ProjectDetails}/>

</Switch>
</div>
Expand Down
13 changes: 5 additions & 8 deletions client/src/Components/Layout/Header.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,20 @@ import Card from "@material-ui/core/Card";
import CardContent from "@material-ui/core/CardContent";
import Typography from "@material-ui/core/Typography";


const useStyles = makeStyles({
root: {
minWidth: 275,
height: 150
height: 150,
},
title: {
fontSize: 40,
marginLeft: 60,
marginTop: 30
marginTop: 30,
},
pos: {
marginBottom: 12,
marginLeft: 60
}
marginLeft: 60,
},
});

export default function OutlinedCard(props) {
Expand All @@ -31,9 +30,7 @@ export default function OutlinedCard(props) {
<Typography className={classes.title} component="h2">
{props.name}
</Typography>
<Typography className={classes.pos}>
{props.desc}
</Typography>
<Typography className={classes.pos}>{props.desc}</Typography>
</CardContent>
</Card>
</div>
Expand Down
135 changes: 74 additions & 61 deletions client/src/Components/Organization/OrganizationDetail/ProjectCard.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,107 +7,120 @@ import CardContent from "@material-ui/core/CardContent";
import { CardMedia } from "@material-ui/core";
import Button from "@material-ui/core/Button";
import Typography from "@material-ui/core/Typography";
import {cardData} from "../../../Data/Proj.json";
import { cardData } from "../../../Data/Proj.json";
import { useHistory } from "react-router-dom";

const useStyles = makeStyles(theme => ({

const useStyles = makeStyles((theme) => ({
root: {
backgroundColor: "#FFFFFF",
maxWidth: 700,
marginTop: 20,
marginBottom: 20,
marginLeft: 150,
height: 150,
display: "block"
display: "block",
},
details: {
display: "flex",
flexDirection: "row"
flexDirection: "row",
},
im: {
marginLeft: 45,
marginTop: 15,
height: 100,
width: 100
width: 100,
},
content: {
marginTop: 0,
marginLeft: 20
marginLeft: 20,
},

pos1: {
marginTop: 0,
maxWidth: 450
maxWidth: 450,
},
pos2: {
marginTop: 5,
height: 10
height: 10,
},
btn: {
marginLeft: 570
marginLeft: 570,
},
cap: {
marginTop: 0,
marginLeft: 30,
borderRadius: "30px",
height: 23,
textTransform: "none"
}
textTransform: "none",
},
}));

export default function ImgMediaCard() {
export default function ProjectCard() {
const classes = useStyles();
const history = useHistory();

function handleChange(){
history.push('./ProjectDetails');
}


return (
<React.Fragment>
{cardData.map((data) => (
<Card className={classes.root}>
<CardActionArea>
<div className={classes.details}>
<CardMedia
className={classes.im}
component="img"
alt="org-logo"
height="140"
src={data.image}
title="Organisation card"
/>
<CardContent className={classes.content}>
<Typography
variant="h5"
component="h2"
align="left"
className={classes.pos1}
>
{data.title}
{cardData.map((data) => (
<Card className={classes.root}>
<CardActionArea>
<div className={classes.details}>
<CardMedia
className={classes.im}
component="img"
alt="org-logo"
height="140"
src={data.image}
title="Organisation card"
/>
<CardContent className={classes.content}>
<Typography
variant="h5"
component="h2"
align="left"
className={classes.pos1}
>
{data.title}

{data.features.map((f) => (
<Button
variant="contained"
color="primary"
size="small"
className={classes.cap}
>
{f.name}
</Button>
))}
</Typography>

{data.features.map((f) => (
<Button variant="contained" color="primary" size="small" className={classes.cap}>
{f.name}
<Typography
variant="body2"
color="textSecondary"
component="p"
align="left"
className={classes.pos2}
>
{data.desc}
</Typography>
</CardContent>
</div>
</CardActionArea>
<div>
<CardActions>
<Button size="small" color="primary" className={classes.btn} onClick={handleChange}>
View more
</Button>
))}
</Typography>

<Typography
variant="body2"
color="textSecondary"
component="p"
align="left"
className={classes.pos2}
>
{data.desc}
</Typography>
</CardContent>
</div>
</CardActionArea>
<div>
<CardActions>
<Button size="small" color="primary" className={classes.btn}>
View more
</Button>
</CardActions>
</div>
</Card>
))}
</React.Fragment>
</CardActions>
</div>
</Card>
))}
</React.Fragment>
);
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
import React from "react";
import CardContent from "@material-ui/core/CardContent";
import Typography from "@material-ui/core/Typography";
import Box from "@material-ui/core/Box";
import { Link } from "@material-ui/core";
import Button from "@material-ui/core/Button";
import useStyles from "./ProjectHeaderStyling";

const LeftPane = () => {
const classes = useStyles();
return (
<div>
<CardContent className={classes.LeftCardContent}>
<Typography className={classes.projectname}>Donut</Typography>
</CardContent>
<CardContent className={classes.LeftCardContent}>
<Typography className={classes.orgname}>
<Box fontWeight="fontWeightBold" m={1}>
Codeuino
</Box>
</Typography>
</CardContent>
<CardContent className={classes.LeftCardContent}>
<Typography className={classes.orglink}>
<Link href="#">www.codeuino.org/donut</Link>
</Typography>
</CardContent>
<CardContent className={classes.LeftCardContent}>
<Typography className={classes.tt}>
<Typography variant="h5" align="left" className={classes.tt}>
Topics:
<Button
variant="contained"
color="primary"
size="small"
className={classes.cap}
>
UI/UX
</Button>
<Button
variant="contained"
color="primary"
size="small"
className={classes.cap}
>
Graphic Design
</Button>
<Button
variant="contained"
color="primary"
size="small"
className={classes.cap}
>
Web Design
</Button>
</Typography>
</Typography>
<Typography className={classes.tt}>
<Typography variant="h5" align="left" className={classes.tt}>
Technology required:
<Button
variant="contained"
color="primary"
size="small"
className={classes.cap}
>
Adobe Illustrator
</Button>
<Button
variant="contained"
color="primary"
size="small"
className={classes.cap}
>
Figma
</Button>
</Typography>
</Typography>
</CardContent>
</div>
);
};

export default LeftPane;
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
import { makeStyles } from "@material-ui/core/styles";

const useStyles = makeStyles({
root: {
marginTop: 50,
marginLeft: 50,
marginRight: 50,
},
pos1: {
marginTop: 140,
},
buttonspacing: {
marginLeft: 195,
},
head: {
fontSize: 18,
marginTop: 40,
},
text: {
marginLeft: 10,
fontSize: 17,
},
listSection: {
backgroundColor: "inherit",
},
ul: {
backgroundColor: "inherit",
padding: 0,
},
tasks: {
marginLeft: -10,
},
github: {
fontSize: 15,
},
});

export default useStyles;
Loading

0 comments on commit 4c2e570

Please sign in to comment.