Skip to content

BCN-Web-PT Olga Zinoveva #22

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
OlgaZS wants to merge 2 commits into
base: master
Choose a base branch
from
Open

BCN-Web-PT Olga Zinoveva #22

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
1fcb465
done idCard and greetings
OlgaZS Oct 5, 2019
e899fc9
done with out css
OlgaZS Oct 5, 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
74 changes: 70 additions & 4 deletions src/App.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,80 @@
import React, { Component } from 'react';
import React, { Component } from "react";
import IdCard from "./components/idCard";
import Greetings from "./components/Greetings";
import Random from "./components/Random";
import BoxColor from "./components/BoxColor";
import CreditCard from "./components/CreditCard";
import "./components/css/app.css";

class App extends Component {
render() {
return (
<div className="App">
<h1>IdCard</h1>
{/* TODO: Use the IdCard component */}
<div>
<h1>IdCard</h1>
<IdCard
lastName="Doe"
firstName="John"
gender="male"
height={178}
birth={new Date("1992-07-14")}
picture="https://randomuser.me/api/portraits/men/44.jpg"
/>

<IdCard
lastName="Delores "
firstName="Obrien"
gender="female"
height={172}
birth={new Date("1988-05-11")}
picture="https://randomuser.me/api/portraits/women/44.jpg"
/>
</div>

<h1>Greetings</h1>
{/* TODO: Use the Greetings component */}
<Greetings lang="es">Ludwig</Greetings>
<Greetings lang="fr">François</Greetings>

<h2>Random</h2>
<Random min={1} max={6} />
<Random min={1} max={100} />
<h2>BoxColor</h2>
<BoxColor r={255} g={0} b={0} />
<BoxColor r={128} g={255} b={0} />

<h2>CreditCard</h2>
<div className="creditCard">
<CreditCard
type="Visa"
number="0123456789018845"
expirationMonth={3}
expirationYear={2021}
bank="BNP"
owner="Maxence Bouret"
bgColor="#11aa99"
color="white"
/>
<CreditCard
type="Master Card"
number="0123456789010995"
expirationMonth={3}
expirationYear={2021}
bank="N26"
owner="Maxence Bouret"
bgColor="#eeeeee"
color="#222222"
/>
<CreditCard
type="Visa"
number="0123456789016984"
expirationMonth={12}
expirationYear={2019}
bank="Name of the Bank"
owner="Firstname Lastname"
bgColor="#ddbb55"
color="white"
/>
</div>
</div>
);
}
Expand Down
18 changes: 18 additions & 0 deletions src/components/BoxColor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
import React, { Component } from "react";

class BoxColor extends Component {
render() {
const divStyle = {
background: `rgb(${this.props.r},${this.props.g},${this.props.b})`,
width: `300px`,
height: `50px`
};
return (
<div style={divStyle}>
rgb({this.props.r},{this.props.g},{this.props.b})
</div>
);
}
}

export default BoxColor;
30 changes: 30 additions & 0 deletions src/components/CreditCard.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
import React, { Component } from "react";

class CreditCard extends Component {
render() {
const divStyle = {
background: this.props.bgColor,
color: this.props.color,
width: `300px`,
height: `170px`
};
const hideNumber = number => {
return "**** **** **** " + number.slice(-4);
};

return (
<div style={divStyle}>
<p>{this.props.type}</p>
<p>{hideNumber(this.props.number)}</p>
<p>
Expires {this.props.expirationMonth}
<span>/{this.props.expirationYear}</span>
<span> {this.props.bank}</span>
</p>
<p>{this.props.owner}</p>
</div>
);
}
}

export default CreditCard;
23 changes: 23 additions & 0 deletions src/components/Greetings.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
import React, { Component } from "react";

class Greetings extends Component {
render() {
return (
<div>
{this.props.lang === "en" ? (
<span>Hello {this.props.children}</span>
) : null}
{this.props.lang === "es" ? (
<span>Hola {this.props.children}</span>
) : null}
{this.props.lang === "de" ? (
<span>Hallo {this.props.children}</span>
) : null}
{this.props.lang === "fr" ? (
<span>Bonjour {this.props.children}</span>
) : null}
</div>
);
}
}
export default Greetings;
16 changes: 16 additions & 0 deletions src/components/Random.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
import React, { Component } from "react";

class Random extends Component {
render() {
return (
<div>
Random value beetween {this.props.min} and {this.props.max} =>{" "}
{Math.floor(Math.random() * (this.props.max - this.props.min + 1)) +
this.props.min}
;
</div>
);
}
}

export default Random;
4 changes: 4 additions & 0 deletions src/components/css/app.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
.creditCard {
display: flex;
justify-content: space-around;
}
10 changes: 10 additions & 0 deletions src/components/css/idCard.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
.card {
display: flex;
flex-direction: row;
border: solid 1px rgb(0, 0, 0);
}

.cardText {
display: block;
flex-direction: column;
}
36 changes: 36 additions & 0 deletions src/components/idCard.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
import React, { Component } from "react";
import "./css/idCard.css";

class IdCard extends Component {
render() {
return (
<div className="card">
<img src={this.props.picture} alt="cardImage" />
<div className="cardText">
<p>{this.props.lastName}</p>
<p>{this.props.firstName}</p>
<p>{this.props.gender}</p>
<p>{this.props.height}</p>
<p>{this.props.birth.toISOString()}</p>
</div>
</div>
);
}
}
export default IdCard;

// const IdCard = props => {
// console.log(props);
// return (
// <div className="card">
// <img src={props.picture} alt="cardImage" />
// <div className="">
// <p>{props.lastName}</p>
// <p>{props.firstName}</p>
// <p>{props.gender}</p>
// <p>{props.height}</p>
// <p>{props.birth}</p>
// </div>
// </div>
// );
// };