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.

Sign up for GitHub

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

946605: Need to implement UI team suggested changes in hotel booking #19

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

946605: Need to implement UI team suggested changes in hotel booking #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
56 changes: 53 additions & 3 deletions Hotel-booking-App/src/components/HotelBook/HotelBook.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@
}

.e-side-bar-treeview-separator {
padding: 10px 3px;
padding: 10px;
}

.e-line-separator,
Expand Down Expand Up @@ -383,7 +383,7 @@
}

.e-book-details-button {
padding-right: 65px;
padding-right: 95px;
}

.e-padding-right {
Expand Down Expand Up @@ -529,7 +529,13 @@

#hotelamenities,
#roomamenities {
border: 0px;
border-color: #a5b4fc;
}

.e-treeview .e-level-1.e-list-item>.e-fullrow,
.e-treeview .e-level-1.e-list-item.e-active.e-hover>.e-fullrow,
.e-treeview .e-level-1.e-list-item.e-active.e-node-focus>.e-fullrow {
background-color: #eef2ff;
}

.e-dialog.e-dialog-print-info .e-dlg-header {
Expand Down Expand Up @@ -573,6 +579,50 @@
width: 96%;
}

.vertical-divider {
width: 1px;
background-color: #a5b4fc;
flex-shrink: 0;
margin: 0px 15px;
}

.e-info-flex-direction-column {
flex-direction: column;
}

.e-info-flex-40-width {
width: 40%
}

.e-info-flex-50-width {
width: 50%
}

.e-info-flex-60-width {
width: 60%
}

.e-info-flex-40-height {
height: 40%
}

.e-info-flex-50-height {
height: 50%
}

.e-info-flex-60-height {
height: 60%
}

#form1 {
padding: 0px 30px;
}

.e-padding-side {
padding-left: 20px;
padding-right: 20px;
}

@import '../../../node_modules/@syncfusion/ej2-base/styles/tailwind3.css';
@import '../../../node_modules/@syncfusion/ej2-buttons/styles/tailwind3.css';
@import '../../../node_modules/@syncfusion/ej2-calendars/styles/tailwind3.css';
Expand Down
59 changes: 26 additions & 33 deletions Hotel-booking-App/src/components/HotelBook/HotelBook.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -364,18 +364,34 @@ function HotelBook() {
<img src={src} alt={props.RoomImgID} className='e-img' />
</div>
<div className='e-info-container'>
<div className='e-row-template-separator'>
<div className='e-flex-layout'>
<div className='e-info-flex-width-applier'>
<div className='e-flex-layout'>
<div className='e-info-flex-60-width e-flex-layout e-info-flex-direction-column'>
<div className='e-row-template-separator e-info-flex-60-height'>
<div>
<span className='e-semi-bold-header-text'>{props.HotelName}</span>
</div>
<div className='normal-text-color e-flex-layout e-margin-top-10'>
<span className='e-map-text-styler e-semi-title-header-text' onClick={showMap}><img src="./images/map.png" className="e-map-img" alt="Map" title='Show on map' /></span>
<span className='e-address-text-styler e-map-text-spacer'>{props.Address}</span>
</div>
<div className='normal-text-color e-margin-top-10'>
{props.Description}
</div>
</div>
<div className='e-row-template-separator e-info-flex-40-height'>
<span className='e-semi-title-header-text'>Amenities:</span>
<ChipListComponent cssClass='e-outline'>
<ChipsDirective>
{hotelFacilityList.map((item, index) => (
<ChipDirective key={index} text={item} cssClass="e-info" enabled={false}></ChipDirective>
))}
</ChipsDirective>
</ChipListComponent>
</div>
<div className='e-info-flex-width-applier'>
</div>
<div className='vertical-divider'></div>
<div className='e-info-flex-40-width e-flex-layout e-info-flex-direction-column'>
<div className='e-row-template-separator e-info-flex-50-height'>
<div>
<span className='e-semi-title-header-text'>Rating:</span>
</div>
Expand All @@ -387,37 +403,14 @@ function HotelBook() {
({props.ReviewCount} reviews)
</div>
</div>

</div>
</div>
</div>
<div className='e-row-template-separator'>
<div className='e-flex-layout'>
<div className='e-info-flex-width-applier normal-text-color'>
{props.Description}
</div>
<div className='e-info-flex-width-applier'>
<div className='e-row-template-separator e-info-flex-50-height'>
<div>
<span className='e-semi-title-header-text'>Room Name:</span> <span className='e-semi-bold-title-header-text'>{props.RoomName}</span><span className='normal-text-color'> ({props.Capacity} person)</span>
</div>
<div className='e-semi-title-header-text normal-hint-text-color'>(Extra bed capacity: {props.ExtraBed} and per bed cost: ${props.ExtraBedCost})</div>
</div>

</div>
</div>
<div className='e-row-template-separator'>
<div className='e-flex-layout'>
<div className='e-info-flex-width-applier'>
<span className='e-semi-title-header-text'>Amenities:</span>
<ChipListComponent cssClass='e-outline'>
<ChipsDirective>
{hotelFacilityList.map((item, index) => (
<ChipDirective key={index} text={item} cssClass="e-info" enabled={false}></ChipDirective>
))}
</ChipsDirective>
</ChipListComponent>
</div>
<div className='e-info-flex-width-applier'>
<div className='e-row-template-separator e-info-flex-50-height'>
<span className='e-semi-title-header-text'>Room Amenities:</span>
<ChipListComponent cssClass='e-outline'>
<ChipsDirective>
Expand All @@ -432,7 +425,7 @@ function HotelBook() {
</div>
</div>
<div className='e-data-line-separator'></div>
<div className='e-book-layout'>
<div className='e-book-layout e-padding-side'>
<div className='e-extralist-price-info-container'>
<div className='e-extralist-container'>
<ChipListComponent cssClass='e-outline'>
Expand All @@ -456,7 +449,7 @@ function HotelBook() {
</div>
</div>
<div className='e-book-spacer'></div>
<div className='e-book-button e-padding-right'>
<div className='e-book-button'>
<ButtonComponent cssClass='e-primary e-outline' onClick={goToRoomBookingPage} disabled={!isRoomAvailable}>{!isRoomAvailable ? "Room's not available" : "Book Room"}</ButtonComponent>
</div>
</div>
Expand Down Expand Up @@ -896,7 +889,7 @@ function HotelBook() {
<div className='e-details-info-container'>
<div className='e-booking-details-container'>
<div className='e-header-text e-light-blue-border-bottom'>Booking Details</div>
<form id="form1" method="post">
<form id="form1" method="post" className='e-margin-top-10'>
<div className='e-booking-details-separator'>
<div className='e-semi-header-text'>Personal information</div>
<div className='e-flex-layout e-booking-details-separator'>
Expand Down Expand Up @@ -988,7 +981,7 @@ function HotelBook() {
</div>
<div className='e-hotel-details-container'>
<div className='e-header-text e-light-blue-border-bottom'>Information</div>
<div className='e-hotel-details-side-bar-separator'><span className='e-semi-title-header-text'>Hotel Name: </span><span className='e-semi-bold-header-text'>{selectedRoom.HotelName}</span></div>
<div className='e-hotel-details-side-bar-separator e-margin-top-10'><span className='e-semi-title-header-text'>Hotel Name: </span><span className='e-semi-bold-header-text'>{selectedRoom.HotelName}</span></div>
<div className='e-info-flex-items-center-applier e-hotel-details-side-bar-separator'><span className='e-semi-title-header-text'>Rating: </span><RatingComponent value={selectedRoom.Rating} readOnly={true} cssClass='e-custom-rating-color'></RatingComponent></div>
<div className='e-hotel-details-side-bar-separator'><span className='e-semi-title-header-text'>Room Name: </span><span className='e-semi-bold-title-header-text'>{selectedRoom.RoomName}</span></div>
<div className='e-hotel-details-side-bar-separator'><span className='e-semi-title-header-text'>Capacity: </span><span className='normal-text-color'>{selectedRoom.Capacity} person</span></div>
Expand Down