Skip to content
This repository has been archived by the owner on Feb 9, 2024. It is now read-only.

London 9 - Vitalina Kuzmenko - cyf-hotel-react #540

Open
wants to merge 59 commits into
base: master
Choose a base branch
from
Open

London 9 - Vitalina Kuzmenko - cyf-hotel-react #540

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
59 commits
Select commit Hold shift + click to select a range
e966460
Adding logo and extracting searchButton
VitalinaKuzmenko Feb 24, 2023
2982a72
TouristsInfoCards componend added
VitalinaKuzmenko Feb 24, 2023
3f942e9
Footer component added
VitalinaKuzmenko Feb 24, 2023
b35b5b4
SearcgResults component created with fake data
VitalinaKuzmenko Feb 24, 2023
2a9776b
just small last update
VitalinaKuzmenko Feb 25, 2023
667fb27
Created cities.json, fixed TouristInfoCards, added keys inside Search…
VitalinaKuzmenko Feb 25, 2023
0ff6fe5
Changed key inside TouristInfoCards.js
VitalinaKuzmenko Feb 25, 2023
c7a07de
Added number of night to the table
VitalinaKuzmenko Feb 26, 2023
41c2b68
Adding restaurantButton and increasing odren number
VitalinaKuzmenko Feb 26, 2023
32553f1
Adding 2 more orders to page
VitalinaKuzmenko Feb 26, 2023
9894190
Creating BookingsRow and highlightning of rows
VitalinaKuzmenko Feb 26, 2023
c7c64d7
Fetching data about guests from AP
VitalinaKuzmenko Feb 27, 2023
bd9bdfa
Adding onChange handleSubmit inside search.js
VitalinaKuzmenko Feb 27, 2023
6f6253b
Implementing the search functionality in booking.js
VitalinaKuzmenko Feb 27, 2023
fdac8c7
Displaying customer profile inside SearchResults.js - only id
VitalinaKuzmenko Feb 27, 2023
8071614
Displaying Customer Profile - fetching data
VitalinaKuzmenko Feb 27, 2023
55e52e8
Showing a loading message in booking.js
VitalinaKuzmenko Feb 27, 2023
94153da
Displaying error message
VitalinaKuzmenko Feb 27, 2023
e93ffd9
Create a new booking form inside NewBookingForm component
VitalinaKuzmenko Feb 27, 2023
4623b34
Not finished sorting tables
VitalinaKuzmenko Feb 27, 2023
c9c2ef0
refactoring handleTableRowClick inside BookingsRow, addding looping i…
VitalinaKuzmenko Mar 4, 2023
ff7f13b
Sorting columns in array without number of nights column
VitalinaKuzmenko Mar 5, 2023
16b991f
Changing SearchResults component, adding possibility to sort number o…
VitalinaKuzmenko Mar 5, 2023
7486e0d
Adding possibility to change sorted order for each column seperately
VitalinaKuzmenko Mar 5, 2023
b8c2b49
Fixing the bug with sortStates inside sortBy function
VitalinaKuzmenko Mar 5, 2023
3b6f5aa
Adding small fix into searchResult componnent
VitalinaKuzmenko Mar 5, 2023
5cb8195
Fixed some errors inside validation of new booking form
VitalinaKuzmenko Mar 5, 2023
6d84c18
Adding react-datepicker pack and adding two dated input imported from…
VitalinaKuzmenko Mar 5, 2023
d507978
Adding function addTenDaysToDate
VitalinaKuzmenko Mar 5, 2023
11c0f7f
Some updates in search
VitalinaKuzmenko Mar 5, 2023
82ae0ee
Adding full list function and deleting update of info onchange inside…
VitalinaKuzmenko Mar 5, 2023
abc9da9
Sending litle changes: from let to const
VitalinaKuzmenko Mar 6, 2023
9134110
Changing page structure/order, hiding show profile button for new boo…
VitalinaKuzmenko Mar 6, 2023
b94706f
Adding navbar, adding media-images, adding main-back
VitalinaKuzmenko Mar 6, 2023
50c04af
Finished stylining header
VitalinaKuzmenko Mar 6, 2023
bac00d8
Changing newBookingForm into bootstrap form
VitalinaKuzmenko Mar 6, 2023
1337561
Adding styling for main section
VitalinaKuzmenko Mar 6, 2023
c68a883
Adding html and styling HotelImages component
VitalinaKuzmenko Mar 6, 2023
c295161
Created Attractions component, styled attractions component
VitalinaKuzmenko Mar 6, 2023
467f3ff
Changed Attractions style and started working on restaurant style
VitalinaKuzmenko Mar 6, 2023
9d25334
Adding Sent order button inside Restaurant.
VitalinaKuzmenko Mar 6, 2023
82d3fad
Restaurant component finished styling
VitalinaKuzmenko Mar 7, 2023
aa61fe9
Fixing responsive design for restaurnat and attractions
VitalinaKuzmenko Mar 7, 2023
aa43c8b
Search component of guest list is styled
VitalinaKuzmenko Mar 7, 2023
823ab65
Finished styling table in Booking.css
VitalinaKuzmenko Mar 7, 2023
4f6d2f7
Finished styling customer profile inside Bookings.css
VitalinaKuzmenko Mar 7, 2023
526f186
Adding styling for footer inside App.css
VitalinaKuzmenko Mar 7, 2023
aa96a2a
Fixed email patterm in NewBookingFOrm
VitalinaKuzmenko Mar 7, 2023
25ba080
Adding links to navbar
VitalinaKuzmenko Mar 7, 2023
c3e79fe
Adding react-scroll, adding scrolling navbar
VitalinaKuzmenko Mar 7, 2023
b2691b4
Adding react-scroll to check all guests button
VitalinaKuzmenko Mar 7, 2023
bdb2e0a
Adding arrow - to go up page
VitalinaKuzmenko Mar 8, 2023
bbc691c
Update Heading.js
VitalinaKuzmenko Mar 8, 2023
52e0928
Changed title length inside NewBookingForm component
VitalinaKuzmenko Mar 8, 2023
7ad477a
Adding submit message to NewBookingForm component
VitalinaKuzmenko Mar 8, 2023
b96ceaa
Adding some comments to components
VitalinaKuzmenko Mar 8, 2023
b443ff8
Changing link to API
VitalinaKuzmenko Mar 27, 2023
b586add
Chaning size of h1 inside restaurant
VitalinaKuzmenko Mar 27, 2023
0e675ab
Adding media queries to h1 in restaurant
VitalinaKuzmenko Mar 27, 2023
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
141 changes: 132 additions & 9 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 6 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,13 @@
"version": "0.1.0",
"private": true,
"dependencies": {
"eslint": "^8.35.0",
"moment": "^2.29.4",
"react": "^18.2.0",
"react-datepicker": "^4.10.0",
"react-dom": "^18.2.0",
"react-scripts": "^5.0.1"
"react-scripts": "^5.0.1",
"react-scroll": "^1.8.9"
},
"scripts": {
"start": "react-scripts start",
Expand All @@ -14,6 +18,7 @@
"eject": "react-scripts eject"
},
"devDependencies": {
"eslint-plugin-react-hooks": "^4.6.0",
"husky": "^8.0.3",
"prettier": "^2.8.4",
"pretty-quick": "^3.1.3"
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we we have our dependencies int he correct sections? 😃

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't know. I was installing dependencies using npm install. And it was installed automatically. Is something wrong with it?

Copy link

@sampennington sampennington Mar 6, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So there is just one issue, eslint should be included in the dev dependencies section.

There are two types of dependencies:

  • "dependencies": Packages required by your application in production. (production is just the live website you deploy)
  • "devDependencies": Packages that are only needed for local development and testing.

Eslint falls into the second one

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can read more about this here: https://docs.npmjs.com/specifying-dependencies-and-devdependencies-in-a-package-json-file

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

But I have it inside devDependencies, no?
"devDependencies": {
"eslint-plugin-react-hooks": "^4.6.0",

Maybe I will ask you personally about it :) Thank you!

Expand Down
80 changes: 38 additions & 42 deletions public/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,17 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8" />
<meta
name="viewport"
content="width=device-width, initial-scale=1, shrink-to-fit=no"
/>
<meta name="theme-color" content="#000000" />
<!--

<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
<meta name="theme-color" content="#000000" />
<!--
manifest.json provides metadata used when your web app is added to the
homescreen on Android. See https://developers.google.com/web/fundamentals/engage-and-retain/web-app-manifest/
-->
<link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
<link rel="shortcut icon" href="%PUBLIC_URL%/favicon.ico" />
<!--
<link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
<link rel="shortcut icon" href="%PUBLIC_URL%/favicon.ico" />
<!--
Notice the use of %PUBLIC_URL% in the tags above.
It will be replaced with the URL of the `public` folder during the build.
Only files inside the `public` folder can be referenced from the HTML.
Expand All @@ -22,36 +20,33 @@
work correctly both with client-side routing and a non-root public URL.
Learn how to configure a non-root public URL by running `npm run build`.
-->
<link
rel="stylesheet"
href="https://stackpath.bootstrapcdn.com/bootstrap/4.2.1/css/bootstrap.min.css"
integrity="sha384-GJzZqFGwb1QTTN6wy59ffF1BuGJpLSa9DkKMp0DgiMDm4iYMj70gZWKYbI706tWS"
crossorigin="anonymous"
/>
<title>React App</title>
</head>
<body>
<noscript>
You need to enable JavaScript to run this app.
</noscript>
<script
src="https://code.jquery.com/jquery-3.2.1.min.js"
integrity="sha256-hwg4gsxgFZhOsEEamdOYGBf13FyQuiTwlAQgxVSNgt4="
crossorigin="anonymous"
></script>
<script
src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.11.0/umd/popper.min.js"
integrity="sha384-b/U6ypiBEHpOf/4+1nzFpr53nxSS+GLCkfwBdFNTxtclqqenISfwAzpKaMNFNmj4"
crossorigin="anonymous"
></script>
<script
src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-beta/js/bootstrap.min.js"
integrity="sha384-h0AbiXch4ZDo7tp9hKZ4TsHbi047NrKGLO3SEJAg45jXxnGIfYzk4Si90RDIqNm1"
crossorigin="anonymous"
></script>
<div id="root"></div>

<!--
<!-- google fonts -->
<link rel="preconnect" href="https://fonts.googleapis.com">
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
<link href="https://fonts.googleapis.com/css2?family=Caveat:wght@400;500;600;700&family=Righteous&display=swap"
rel="stylesheet">

<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.2.1/css/bootstrap.min.css"
integrity="sha384-GJzZqFGwb1QTTN6wy59ffF1BuGJpLSa9DkKMp0DgiMDm4iYMj70gZWKYbI706tWS" crossorigin="anonymous" />
<title>React App</title>
</head>

<body>
<noscript>
You need to enable JavaScript to run this app.
</noscript>
<script src="https://code.jquery.com/jquery-3.2.1.min.js"
integrity="sha256-hwg4gsxgFZhOsEEamdOYGBf13FyQuiTwlAQgxVSNgt4=" crossorigin="anonymous"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.11.0/umd/popper.min.js"
integrity="sha384-b/U6ypiBEHpOf/4+1nzFpr53nxSS+GLCkfwBdFNTxtclqqenISfwAzpKaMNFNmj4"
crossorigin="anonymous"></script>
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-beta/js/bootstrap.min.js"
integrity="sha384-h0AbiXch4ZDo7tp9hKZ4TsHbi047NrKGLO3SEJAg45jXxnGIfYzk4Si90RDIqNm1"
crossorigin="anonymous"></script>
<div id="root"></div>

<!--
This HTML file is a template.
If you open it directly in the browser, you will see an empty page.

Expand All @@ -61,5 +56,6 @@
To begin the development, run `npm start` or `yarn start`.
To create a production bundle, use `npm run build` or `yarn build`.
-->
</body>
</html>
</body>

</html>
Loading