From 2622951e90ed86e03cdd8fbd98c58b2a5ac2015b Mon Sep 17 00:00:00 2001 From: BEKIRKSU Date: Wed, 14 Jun 2023 09:20:04 -0700 Subject: [PATCH 01/27] Header --- src/Header.jsx | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 src/Header.jsx diff --git a/src/Header.jsx b/src/Header.jsx new file mode 100644 index 000000000..81c3c4475 --- /dev/null +++ b/src/Header.jsx @@ -0,0 +1,14 @@ +import React from "react"; + +const Header = () => { + return ( +
+
+

Search Bookings

+
+
+ + ); + }; + +export default Header; \ No newline at end of file From fa6f1f42dc547fd23b9a5ce6428db1cc20ed9321 Mon Sep 17 00:00:00 2001 From: BEKIRKSU Date: Wed, 14 Jun 2023 09:20:19 -0700 Subject: [PATCH 02/27] Header added as component --- src/Search.js | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/src/Search.js b/src/Search.js index 7bd5871c0..59e903445 100644 --- a/src/Search.js +++ b/src/Search.js @@ -1,24 +1,14 @@ import React from "react"; +import SearchButton from "./SearchButton"; const Search = () => { return ( -
-
-

Search Bookings

-
+ < Header/>
-
- - -
+ < SearchButton/>
From 134b6ebde7639cd31c651402756894b0abc980a7 Mon Sep 17 00:00:00 2001 From: BEKIRKSU Date: Wed, 14 Jun 2023 09:20:32 -0700 Subject: [PATCH 03/27] SearchButton made into a component --- src/SearchButton.jsx | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 src/SearchButton.jsx diff --git a/src/SearchButton.jsx b/src/SearchButton.jsx new file mode 100644 index 000000000..07efd0290 --- /dev/null +++ b/src/SearchButton.jsx @@ -0,0 +1,16 @@ +import React from "react"; + +const SearchButton = () => { + return (
+ + +
+ ); +} + +export default SearchButton; \ No newline at end of file From a8b324b5c549775ec81dbfa4311086bf7304c884 Mon Sep 17 00:00:00 2001 From: BEKIRKSU Date: Wed, 14 Jun 2023 09:22:07 -0700 Subject: [PATCH 04/27] Header imported --- src/Search.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Search.js b/src/Search.js index 59e903445..c2ad58388 100644 --- a/src/Search.js +++ b/src/Search.js @@ -1,16 +1,16 @@ import React from "react"; import SearchButton from "./SearchButton"; +import Header from "./Header"; const Search = () => { return ( - < Header/> +
- < SearchButton/> + -
); From f27b2bb43aaaa843a345d0fee895ce074be3310f Mon Sep 17 00:00:00 2001 From: BEKIRKSU Date: Wed, 14 Jun 2023 09:23:26 -0700 Subject: [PATCH 05/27] Div added --- src/Search.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/Search.js b/src/Search.js index c2ad58388..e2db543ca 100644 --- a/src/Search.js +++ b/src/Search.js @@ -4,15 +4,17 @@ import Header from "./Header"; const Search = () => { return ( -
+
+ < Header/>
- + < SearchButton/>
+
); }; From a8a8b30b48209c2788aa4aa6e04381d36342be59 Mon Sep 17 00:00:00 2001 From: BEKIRKSU Date: Wed, 14 Jun 2023 09:29:33 -0700 Subject: [PATCH 06/27] Image of Rome added --- src/Header.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Header.jsx b/src/Header.jsx index 81c3c4475..85ec23ffd 100644 --- a/src/Header.jsx +++ b/src/Header.jsx @@ -5,9 +5,9 @@ const Header = () => {

Search Bookings

+ image of Rome
- ); }; From bdd2ac88e04b8bc73c429780adb33c2f3014ba69 Mon Sep 17 00:00:00 2001 From: BEKIRKSU Date: Wed, 14 Jun 2023 09:29:56 -0700 Subject: [PATCH 07/27] Image of Rome CSS --- src/index.css | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/index.css b/src/index.css index 4607bb217..16f8cdde9 100644 --- a/src/index.css +++ b/src/index.css @@ -24,3 +24,8 @@ body { .search-row input { margin-right: 10px; } + +.imageOfRome { + width: 400px; + height: auto; +} \ No newline at end of file From af6678f9a398a52fc2bd8ac302b27fa1cee4ffa8 Mon Sep 17 00:00:00 2001 From: BEKIRKSU Date: Wed, 14 Jun 2023 09:43:52 -0700 Subject: [PATCH 08/27] --- --- src/App.js | 3 ++- src/Footer.jsx | 15 +++++++++++++++ src/TouristInfoCards.jsx | 37 +++++++++++++++++++++++++++++++++++++ 3 files changed, 54 insertions(+), 1 deletion(-) create mode 100644 src/Footer.jsx create mode 100644 src/TouristInfoCards.jsx diff --git a/src/App.js b/src/App.js index 953c98560..96f2cf231 100644 --- a/src/App.js +++ b/src/App.js @@ -1,5 +1,5 @@ import React from "react"; - +import TouristInfoCards from "./TouristInfoCards"; import Bookings from "./Bookings"; import "./App.css"; @@ -7,6 +7,7 @@ const App = () => { return (
CYF Hotel
+
); diff --git a/src/Footer.jsx b/src/Footer.jsx new file mode 100644 index 000000000..5b44b4bff --- /dev/null +++ b/src/Footer.jsx @@ -0,0 +1,15 @@ +import React from "react"; + +const Footer = ({ address }) => { + return ( +
+
    + {address.map((item, index) => ( +
  • {item}
    • + ))} +
+
+ ); +}; + +export default Footer; \ No newline at end of file diff --git a/src/TouristInfoCards.jsx b/src/TouristInfoCards.jsx new file mode 100644 index 000000000..bf6358fe3 --- /dev/null +++ b/src/TouristInfoCards.jsx @@ -0,0 +1,37 @@ +import React from "react"; + +const TouristInfoCards = () => { + return ( +
+
+ Glasgow +
+ Go somewhere +

Glasgow

+

Experience the vibrant cultural scene and architectural beauty of Glasgow.

+ Visit Glasgow +
+
+
+ Manchester +
+ Go somewhere +

Manchester

+

Discover the rich history, music, and sports culture of Manchester.

+ Visit Manchester +
+
+
+ London +
+ Go somewhere +

London

+

Explore the iconic landmarks, world-class museums, and diverse attractions of London.

+ Visit London +
+
+
+ ); +}; + +export default TouristInfoCards; \ No newline at end of file From bb03e7b8d7e93097784b61f52e56d57d4f205a56 Mon Sep 17 00:00:00 2001 From: BEKIRKSU Date: Wed, 14 Jun 2023 10:16:53 -0700 Subject: [PATCH 09/27] App --- src/App.js | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/App.js b/src/App.js index 96f2cf231..a049cad7f 100644 --- a/src/App.js +++ b/src/App.js @@ -1,14 +1,22 @@ import React from "react"; import TouristInfoCards from "./TouristInfoCards"; import Bookings from "./Bookings"; +import Footer from "./Footer"; import "./App.css"; const App = () => { + const address = [ + "123 Fake Street, London, E1 4UD", + "hello@fakehotel.com", + "0123 456789", + ]; + return (
CYF Hotel
+
); }; From 57f928774525366a1538065192deb822fec100e3 Mon Sep 17 00:00:00 2001 From: BEKIRKSU Date: Thu, 15 Jun 2023 09:08:03 -0700 Subject: [PATCH 10/27] BookingTable made --- src/BookingTable.jsx | 60 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100644 src/BookingTable.jsx diff --git a/src/BookingTable.jsx b/src/BookingTable.jsx new file mode 100644 index 000000000..b1df95fb5 --- /dev/null +++ b/src/BookingTable.jsx @@ -0,0 +1,60 @@ +import React from 'react'; + +const BookingTable = () => { + const bookings = [ + { + id: 1, + title: 'Mr', + firstName: 'John', + surname: 'Doe', + email: 'john@example.com', + roomId: 101, + checkInDate: '2023-06-16', + checkOutDate: '2023-06-20', + }, + { + id: 2, + title: 'Mrs', + firstName: 'Jane', + surname: 'Smith', + email: 'jane@example.com', + roomId: 202, + checkInDate: '2023-06-18', + checkOutDate: '2023-06-23', + }, + // Add more bookings here... + ]; + + return ( + + + + + + + + + + + + + + + {bookings.map((booking) => ( + + + + + + + + + + + ))} + +
IDTitleFirst NameSurnameEmailRoom IDCheck In DateCheck Out Date
{booking.id}{booking.title}{booking.firstName}{booking.surname}{booking.email}{booking.roomId}{booking.checkInDate}{booking.checkOutDate}
+ ); +}; + +export default BookingTable; \ No newline at end of file From e7dacf4c51584c5fa6d36c38cbf4fda7de810170 Mon Sep 17 00:00:00 2001 From: BEKIRKSU Date: Thu, 15 Jun 2023 09:08:28 -0700 Subject: [PATCH 11/27] Bookings component made --- src/Bookings.jsx | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 src/Bookings.jsx diff --git a/src/Bookings.jsx b/src/Bookings.jsx new file mode 100644 index 000000000..a0c468a24 --- /dev/null +++ b/src/Bookings.jsx @@ -0,0 +1,13 @@ +import React from 'react'; +import BookingTable from './BookingTable'; + +const Bookings = () => { + return ( +
+

Hotel Bookings

+ +
+ ); +}; + +export default Bookings; \ No newline at end of file From 086f032882d78524a05ff1db9dc34ebd9a134e46 Mon Sep 17 00:00:00 2001 From: BEKIRKSU Date: Thu, 15 Jun 2023 09:17:11 -0700 Subject: [PATCH 12/27] App --- src/App.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/App.js b/src/App.js index a049cad7f..87f145b6c 100644 --- a/src/App.js +++ b/src/App.js @@ -1,6 +1,7 @@ import React from "react"; import TouristInfoCards from "./TouristInfoCards"; import Bookings from "./Bookings"; +import Bookings2 from "./Bookings2"; import Footer from "./Footer"; import "./App.css"; @@ -16,6 +17,10 @@ const App = () => {
CYF Hotel
+
+

Hotel Management System

+ +