Skip to content

Cleaned Up #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
BSG-1 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Cleaned Up #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
64500c3
aligns picture divs to names, maps over both
BSG-1 Jan 29, 2019
48630bf
cleans up code, leaves styling functionality for later
BSG-1 Jan 29, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
120 changes: 120 additions & 0 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"private": true,
"dependencies": {
"react": "^16.7.0",
"react-bootstrap": "^0.32.4",
"react-dom": "^16.7.0",
"react-scripts": "2.1.3"
},
Expand Down
133 changes: 49 additions & 84 deletions src/components/AboutUs.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
import React, { Component } from "react";
import bg from "../images/bg.jpeg";
import sd from "../images/sd.jpeg";
import sg from "../images/sg.jpeg";
import gf from "../images/gf.jpeg";
import yp from "../images/yp.jpeg";
// import { Row, Col } from 'react-bootstrap';
// import bg from "../images/bg.jpeg";
// import sd from "../images/sd.jpeg";
// import sg from "../images/sg.jpeg";
// import gf from "../images/gf.jpeg";
// import yp from "../images/yp.jpeg";


const aboutUsStyles = {
Expand Down Expand Up @@ -46,7 +47,9 @@ const aboutUsStyles = {
padding: 5,
flexDirection: "column",
marginTop: 20,
width: "15%",
width: 200,
height: 200,
justifyContent: "center",
},
withOpacity: {
padding: 5,
Expand All @@ -58,22 +61,9 @@ const aboutUsStyles = {
}

class AboutUs extends Component {
// constructor(props) {
// super(props);
// this.state = {
// opacity: 1,
// padding: 5,
// flexDirection: "column",
// marginTop: 20,
// width: "15%",
// }
// this.mouseEnter = this.mouseEnter.bind(this);
// this.mouseLeave = this.mouseLeave.bind(this);
// this.handleClick = this.handleClick.bind(this);
// state = {
// hover: false
// }
state = {
hover: false
}

// mouseEnter() {
// console.log("mouse entered");
Expand All @@ -89,41 +79,48 @@ class AboutUs extends Component {
// this.setState({ opacity: 0.5 })
// }

componentDidMount() {
window.addEventListener("mouseover", this.handleMouseEnter);
}
// componentDidMount() {
// window.addEventListener("mouseover", this.handleMouseEnter);
// }

componentWillUnmount() {
window.removeEventListener("mouseout", this.handleMouseOut);
}
// componentWillUnmount() {
// window.removeEventListener("mouseout", this.handleMouseOut);
// }

handleMouseEnter = (event) => {
console.log(event);
// this.setState({
// hover: true,
// })
}
// handleMouseEnter = (event) => {
// console.log(event);
// // this.setState({
// // hover: true,
// // })
// }

handleMouseOut = () => {
console.log("leaving");
this.setState({
hover: false,
})
}
// handleMouseOut = () => {
// console.log("leaving");
// this.setState({
// hover: false,
// })
// }

render() {
// let pics = ["bg", "sg", "gf", "sd", "yp"];

// let imageArray = images.map(image => {
// return (
// < img
// key={image.id}
// style={this.state.hover === true ? aboutUsStyles.withOpacity : aboutUsStyles.facesIndividual}
// src={image.img}
// alt={image.id}
// />
// )
// });

let pics = ["bg", "sg", "gf", "sd", "yp"];
let bio = ["Bahadur Ghataorhe", "Sofiane Guerfus", "Gerardo Fernandez", "Sandon Du", "Yogi Patel"];
let contentArray = pics.map((picValue, index) => {
const fullName = bio[index];
return (
<div>
< img
key={picValue}
style={aboutUsStyles.facesIndividual}
src={require(`../images/${picValue}.jpeg`)}
alt={picValue}
/>
<div style={aboutUsStyles.facesDiv}>
{`${fullName}`}
</div>
</div>
)
});

return (
<section>
Expand All @@ -145,42 +142,10 @@ class AboutUs extends Component {
>
We're a group of Junior Engineers who went to a MERN Full Stack coding bootcamp together. While there, we worked on a multitude of class projects and assignments, ranging from simple To-Do lists to complex single-page applications in React. At SevaCode, you can rest assured that you won't be getting just one set of eyes on your project, there will be 5. Each of us has certification proving our skills as Full Stack Engineers, and we hope you'll choose us for your next project.
</p>

<div
style={aboutUsStyles.facesDiv}
mouseon={this.handleMouseEnter}
mouseoff={this.handleMouseOut}
>
<img
src={bg}
style={this.state.hover === true ? aboutUsStyles.withOpacity : aboutUsStyles.facesIndividual}
// mouseon={this.handleMouseEnter}
// mouseoff={this.handleMouseOut}
/>
<img
src={sd}
style={this.state.hover === true ? aboutUsStyles.withOpacity : aboutUsStyles.facesIndividual}
// mouseon={this.handleMouseEnter}
// mouseoff={this.handleMouseOut}
/>
<img
src={sg}
style={this.state.hover === true ? aboutUsStyles.withOpacity : aboutUsStyles.facesIndividual}
// mouseon={this.handleMouseEnter}
// mouseoff={this.handleMouseOut}
/>
<img
src={gf}
style={this.state.hover === true ? aboutUsStyles.withOpacity : aboutUsStyles.facesIndividual}
// mouseon={this.handleMouseEnter}
// mouseoff={this.handleMouseOut}
/>
<img
src={yp}
style={this.state.hover === true ? aboutUsStyles.withOpacity : aboutUsStyles.facesIndividual}
// mouseon={this.handleMouseEnter}
// mouseoff={this.handleMouseOut}
/>
{contentArray}
</div>

</div>
Expand Down