Skip to content
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.

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

Kcal/repas #97

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
13,727 changes: 8,562 additions & 5,165 deletions package-lock.json

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,14 @@
"encoding": "^0.1.13",
"faunadb": "^3.0.1",
"history": "^4.10.1",
"immer": "^9.0.6",
"netlify-lambda": "^2.0.1",
"react": "^16.12.0",
"react-dom": "^16.12.0",
"react-redux": "^7.2.0",
"react-router": "^5.1.2",
"react-router-dom": "^5.1.2",
"react-scripts": "3.4.1",
"react-scripts": "^4.0.3",
"redux": "^4.0.5",
"redux-saga": "^1.1.3",
"typescript": "~3.7.2"
Expand Down
Binary file added src/assets/images/food/OIP.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions src/data/food.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import Maki from "../assets/images/food/Maki.svg";
import Sushi from "../assets/images/food/Sushi.svg";
import California from "../assets/images/food/California.svg";
import BeefCheese from "../assets/images/food/Brochette boeuf fro.svg";
import Friture from "../assets/images/food/OIP.jpg";

export interface FoodItem {
name: string;
Expand Down Expand Up @@ -42,5 +43,10 @@ export const FOOD_ITEMS: Array<FoodItem> = [
name: "Viande",
kcal: 130,
imageUrl: Meat
},
{
name: "Friture",
kcal: 150,
imageUrl: Friture
}
];
2 changes: 1 addition & 1 deletion src/pages/Calculator/Calculator.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ export const CalculatorPage: React.FC<Props> = (props: Props) => {
</div>
<div className={classes.buttonContainer}>
<Button variant="contained" onClick={sendData(result)}>
{result} Kcal
{result} Kcal/REpas
</Button>
</div>
</div>
Expand Down
3 changes: 2 additions & 1 deletion tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@
"resolveJsonModule": true,
"isolatedModules": true,
"noEmit": true,
"jsx": "react"
"jsx": "react",
"noFallthroughCasesInSwitch": true
},
"include": [
"src"
Expand Down
7,335 changes: 4,315 additions & 3,020 deletions yarn.lock

Large diffs are not rendered by default.