diff --git a/package-lock.json b/package-lock.json index c1732c7..ee4c046 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1359,6 +1359,35 @@ } } }, + "@fortawesome/fontawesome-common-types": { + "version": "6.1.1", + "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.1.1.tgz", + "integrity": "sha512-wVn5WJPirFTnzN6tR95abCx+ocH+3IFLXAgyavnf9hUmN0CfWoDjPT/BAWsUVwSlYYVBeCLJxaqi7ZGe4uSjBA==" + }, + "@fortawesome/fontawesome-svg-core": { + "version": "6.1.1", + "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-6.1.1.tgz", + "integrity": "sha512-NCg0w2YIp81f4V6cMGD9iomfsIj7GWrqmsa0ZsPh59G7PKiGN1KymZNxmF00ssuAlo/VZmpK6xazsGOwzKYUMg==", + "requires": { + "@fortawesome/fontawesome-common-types": "6.1.1" + } + }, + "@fortawesome/free-solid-svg-icons": { + "version": "6.1.1", + "resolved": "https://registry.npmjs.org/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-6.1.1.tgz", + "integrity": "sha512-0/5exxavOhI/D4Ovm2r3vxNojGZioPwmFrKg0ZUH69Q68uFhFPs6+dhAToh6VEQBntxPRYPuT5Cg1tpNa9JUPg==", + "requires": { + "@fortawesome/fontawesome-common-types": "6.1.1" + } + }, + "@fortawesome/react-fontawesome": { + "version": "0.1.18", + "resolved": "https://registry.npmjs.org/@fortawesome/react-fontawesome/-/react-fontawesome-0.1.18.tgz", + "integrity": "sha512-RwLIB4TZw0M9gvy5u+TusAA0afbwM4JQIimNH/j3ygd6aIvYPQLqXMhC9ErY26J23rDPyDZldIfPq/HpTTJ/tQ==", + "requires": { + "prop-types": "^15.8.1" + } + }, "@humanwhocodes/config-array": { "version": "0.9.5", "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.9.5.tgz", diff --git a/package.json b/package.json index 959e824..8296e33 100644 --- a/package.json +++ b/package.json @@ -3,6 +3,9 @@ "version": "0.1.0", "private": true, "dependencies": { + "@fortawesome/fontawesome-svg-core": "^6.1.1", + "@fortawesome/free-solid-svg-icons": "^6.1.1", + "@fortawesome/react-fontawesome": "^0.1.18", "@testing-library/jest-dom": "^5.16.2", "@testing-library/react": "^12.1.4", "@testing-library/user-event": "^13.5.0", diff --git a/src/App.js b/src/App.js index 448a7cf..98c0b44 100644 --- a/src/App.js +++ b/src/App.js @@ -13,10 +13,14 @@ import img_alaturca from './alaturca.jpg'; import Eingabefeld from "./Components/eingabefeld"; import "../node_modules/font-awesome/css/font-awesome.min.css"; import Liste from "./Components/liste"; +import MainPage from "./Components/mainpage"; +import HeaderBig from "./Components/header_big"; +import EndPage from "./Components/endpage"; function App() { return ( -
+
+
); } diff --git a/src/Components/card.jsx b/src/Components/card.jsx index 6f699dc..0711f52 100644 --- a/src/Components/card.jsx +++ b/src/Components/card.jsx @@ -1,13 +1,18 @@ import React from "react"; import bild from "../paparoy.jpg"; import ButtonPrimary from "./buttonPrimary"; +import Ueberschrift2 from "./ueberschrift2"; function Card(props) { return (
- Papa Roy +
+ Papa Roy +
-
{props.name || "Restaurant"}
+
+ +
diff --git a/src/Components/endpage.jsx b/src/Components/endpage.jsx new file mode 100644 index 0000000..aacd7c6 --- /dev/null +++ b/src/Components/endpage.jsx @@ -0,0 +1,12 @@ +import React from "react"; +import HeaderBig from "./header_big"; + +function EndPage() { + return ( +
+ +
+ ); +} + +export default EndPage; diff --git a/src/Components/header_big.jsx b/src/Components/header_big.jsx new file mode 100644 index 0000000..3e828ef --- /dev/null +++ b/src/Components/header_big.jsx @@ -0,0 +1,14 @@ +import React from "react"; +import p_logo_light from "../pizza_logo_light.png"; +import Ueberschrift1 from "./ueberschrift1"; + +function HeaderBig(props) { + return ( +
+ Logo + +
+ ); +} + +export default HeaderBig; diff --git a/src/Components/mainpage.jsx b/src/Components/mainpage.jsx new file mode 100644 index 0000000..c9f37c3 --- /dev/null +++ b/src/Components/mainpage.jsx @@ -0,0 +1,21 @@ +import React from "react"; +import Header1 from "../Components/header_1"; +import ButtonPrimary from "./buttonPrimary"; +import img_paparoy from "../paparoy.jpg"; +import img_alaturca from "../alaturca.jpg"; +import Card from "./card"; + +function MainPage() { + return ( +
+ +
+ + + +
+
+ ); +} + +export default MainPage; diff --git a/src/Components/ueberschrift1.jsx b/src/Components/ueberschrift1.jsx new file mode 100644 index 0000000..48eec30 --- /dev/null +++ b/src/Components/ueberschrift1.jsx @@ -0,0 +1,7 @@ +import React from "react"; + +function Ueberschrift1(props) { + return

{props.name || "Text"}

; +} + +export default Ueberschrift1; diff --git a/src/Components/ueberschrift2.jsx b/src/Components/ueberschrift2.jsx new file mode 100644 index 0000000..6b61684 --- /dev/null +++ b/src/Components/ueberschrift2.jsx @@ -0,0 +1,7 @@ +import React from "react"; + +function Ueberschrift2(props) { + return

{props.name || "Text"}

; +} + +export default Ueberschrift2;