diff --git a/src/App.js b/src/App.js index a438a9c..44daaef 100644 --- a/src/App.js +++ b/src/App.js @@ -1,7 +1,6 @@ import logo from "./logo.svg"; import ButtonPrimary from "./Components/buttonPrimary"; import ButtonSecondary from "./Components/buttonSecondary"; -import "./App.css"; import p_logo_dark from "./pizza_logo_dark.png"; import p_logo_light from "./pizza_logo_light.png"; import Header1 from "./Components/header_1"; @@ -14,11 +13,14 @@ import "../node_modules/font-awesome/css/font-awesome.min.css"; import Liste from "./Components/liste"; import Anmeldepage from "./Pages/anmeldepage"; import Registrierung from "./Pages/registrierung"; +import Warenkorb from "./Pages/warenkorb"; +import Listenansicht from "./Pages/listenansicht"; +import "./App.css"; function App() { return (
- +
); } diff --git a/src/Components/liste.jsx b/src/Components/liste.jsx index 8e1fd9f..d2e3be3 100644 --- a/src/Components/liste.jsx +++ b/src/Components/liste.jsx @@ -4,18 +4,19 @@ import ButtonRound from "./buttonRound"; function Liste(props) { var gericht = props.gericht; var price = props.price; + let icon_button = props.icon_button; return (
-
{gericht}
+
{gericht}
{price}
- +
); diff --git a/src/Pages/listenansicht.jsx b/src/Pages/listenansicht.jsx index 3e26ca3..b0e0ce3 100644 --- a/src/Pages/listenansicht.jsx +++ b/src/Pages/listenansicht.jsx @@ -12,7 +12,7 @@ function Listenansicht(props) { //Daten von Backend erforderlich + Bild vom jeweiligen Restaurant erforderlich for (let index = 0; index < number; index++) { - listen.push(); + listen.push(); if (color_liste == true) { color_liste = false; } else { @@ -22,11 +22,12 @@ function Listenansicht(props) { return (
- - Papa Roy +
+ Papa Roy +
{listen} -
- +
+
); diff --git a/src/Pages/warenkorb.jsx b/src/Pages/warenkorb.jsx new file mode 100644 index 0000000..11ccc3f --- /dev/null +++ b/src/Pages/warenkorb.jsx @@ -0,0 +1,64 @@ +import React, { useState } from "react"; +import Header1 from "../Components/header_1"; +import warenkorb_image from "../warenkorb_icon.png"; +import restaurant_image from "../restaurant_icon.png"; +import kassa_image from "../kassa_icon.png"; +import Liste from "../Components/liste"; +import ButtonSecondary from "../Components/buttonSecondary"; + +function Warenkorb(props) { + //Übergabe vom Namen des Restaurants (merken von Cards?!) + + //Speicherung der gewählten Gerichte von der Listenansicht (muss an diese Page übergeben werden) + //Code mit Demoliste + + //Summe der Preise muss noch gebildet werden mit umwandlung in fließkomma wert + + var color_liste = true; + var number = 3; + let listen = []; + + for (let index = 0; index < number; index++) { + listen.push(); + if (color_liste == true) { + color_liste = false; + } else { + color_liste = true; + } + } + return ( +
+ +

+
+ Warenkorbicon + +
+

+
+ Restauranticon + +
+ +

+

+ {listen} +

+

+
+ Kassa + +
+

+

+
+ + +
+
+ ); +} + +export default Warenkorb; diff --git a/src/kassa_icon.png b/src/kassa_icon.png new file mode 100644 index 0000000..8899784 Binary files /dev/null and b/src/kassa_icon.png differ diff --git a/src/paparoy_liste.png b/src/paparoy_liste.png index aabcacf..cd00cbe 100644 Binary files a/src/paparoy_liste.png and b/src/paparoy_liste.png differ diff --git a/src/restaurant_icon.png b/src/restaurant_icon.png new file mode 100644 index 0000000..fd094ac Binary files /dev/null and b/src/restaurant_icon.png differ diff --git a/src/warenkorb_icon.png b/src/warenkorb_icon.png new file mode 100644 index 0000000..754db69 Binary files /dev/null and b/src/warenkorb_icon.png differ