Skip to content

GitLab

Commit 7be78927 authored by Dhiraj Shrivastava's avatar Dhiraj Shrivastava
Browse files

Update with cosomatic changes

parent ab8c0345
Hide whitespace changes
Inline Side-by-side
src/app/_services/authentication.service.ts
View file @ 7be78927
......@@ -85,7 +85,7 @@ export class AuthenticationService {
localStorage.removeItem('date');
localStorage.removeItem('flightNumber');
// localStorage.removeItem('CurrentFqtv');
localStorage.removeItem("UserDat");
localStorage.removeItem("UserData");
this.currentUserSubject.next(null);
}
}
\ No newline at end of file
src/app/admin/admin.component.html
View file @ 7be78927
<div class="row" style="margin-top: 5%;">
<div class="col-lg-3"></div>
<div class="col-lg-6">
<div class="col-lg-2"></div>
<div class="col-lg-8">
<div class="card-deck">
<div class="card text-center">
<div class="card-block">
<h4 class="card-title">Search Flight</h4>
<div class="with-icon">
<mat-icon>airplanemode_active</mat-icon><span class="card-heading">Search Flight</span>
</div>
<form [formGroup]="flight_search" (ngSubmit)="onSubmit()" style="margin: 20px;">
<div class="form-group">
<select class="custom-select" (change)="changeFlight($event)" formControlName="flight_number">
......@@ -38,20 +40,51 @@
src="data:image/gif;base64,R0lGODlhEAAQAPIAAP///wAAAMLCwkJCQgAAAGJiYoKCgpKSkiH/C05FVFNDQVBFMi4wAwEAAAAh/hpDcmVhdGVkIHdpdGggYWpheGxvYWQuaW5mbwAh+QQJCgAAACwAAAAAEAAQAAADMwi63P4wyklrE2MIOggZnAdOmGYJRbExwroUmcG2LmDEwnHQLVsYOd2mBzkYDAdKa+dIAAAh+QQJCgAAACwAAAAAEAAQAAADNAi63P5OjCEgG4QMu7DmikRxQlFUYDEZIGBMRVsaqHwctXXf7WEYB4Ag1xjihkMZsiUkKhIAIfkECQoAAAAsAAAAABAAEAAAAzYIujIjK8pByJDMlFYvBoVjHA70GU7xSUJhmKtwHPAKzLO9HMaoKwJZ7Rf8AYPDDzKpZBqfvwQAIfkECQoAAAAsAAAAABAAEAAAAzMIumIlK8oyhpHsnFZfhYumCYUhDAQxRIdhHBGqRoKw0R8DYlJd8z0fMDgsGo/IpHI5TAAAIfkECQoAAAAsAAAAABAAEAAAAzIIunInK0rnZBTwGPNMgQwmdsNgXGJUlIWEuR5oWUIpz8pAEAMe6TwfwyYsGo/IpFKSAAAh+QQJCgAAACwAAAAAEAAQAAADMwi6IMKQORfjdOe82p4wGccc4CEuQradylesojEMBgsUc2G7sDX3lQGBMLAJibufbSlKAAAh+QQJCgAAACwAAAAAEAAQAAADMgi63P7wCRHZnFVdmgHu2nFwlWCI3WGc3TSWhUFGxTAUkGCbtgENBMJAEJsxgMLWzpEAACH5BAkKAAAALAAAAAAQABAAAAMyCLrc/jDKSatlQtScKdceCAjDII7HcQ4EMTCpyrCuUBjCYRgHVtqlAiB1YhiCnlsRkAAAOwAAAAAAAAAAAA==" />
</div>
</form>
<div class="row justify-content-md-center " style="margin-top: 20px;margin-bottom: 10px;" *ngIf="submitted">
<div class="col-12 col-md-12 col-lg-12 col-xl-12">
<h4 class="card-title-search"> Search Result </h4>
</div>
<div class="col-2"></div>
<div class="col-sm-10">
<p style="margin-top: 2%;" *ngIf="no_data">No Bookings found!</p>
<p style="margin-top: 2%;color: green;" *ngIf="isFlightCancel">Flight Cancelled Successfully!</p>
<table class="table table-responsive" *ngIf="!no_data && !isFlightCancel"
style="overflow-y:scroll;max-height: 318px;">
<tr>
<th>Flight #</th>
<th>Date</th>
<th>PNR #</th>
<th>Name</th>
<th>Phone</th>
</tr>
<tbody *ngFor="let listshow of show.body.Pax_Details">
<tr *ngIf="listshow.Record_Locator">
<td style="color: #3f51b5 !important;font-size: 12px !important;">{{show.body.Fltdetails}}</td>
<td style="color: #3f51b5 !important;font-size: 12px !important;">{{show.body.Date}}</td>
<td style="color: #3f51b5 !important;font-size: 12px !important;">{{listshow.Record_Locator}}</td>
<td style="color: #3f51b5 !important;font-size: 12px !important;">{{listshow.Name}}</td>
<td style="color: #3f51b5 !important;font-size: 12px !important;">{{listshow.Phone}}</td>
</tr>
</tbody>
<button class="btn btn-cancel" style="margin-top: 20px;margin-left: 25%;"
(click)="cancel_flight()">Cancel
Flight</button>
</table>
</div>
</div>
</div>
</div>
</div>
</div>
<div class="col-lg-3"></div>
<div class="col-lg-2"></div>
</div>
<div class="row justify-content-md-center" style="margin-top: 20px;" *ngIf="showSearchresult">
<!-- <div class="col-md-4 col-lg-4 col-xl-4"></div> -->
<!-- <div class="row justify-content-md-center" style="margin-top: 20px;" *ngIf="showSearchresult">
<div class="col-12 col-sm-12 col-md-7 col-lg-6 col-xl-5">
<div class="card-deck">
<div class="card text-center">
<div class="card-block">
<div class="with-icon">
<mat-icon>airplanemode_active</mat-icon><span class="card-heading">Search Result</span>
<span class="card-heading">Search Result</span>
</div>
<p style="margin-top: 2%;" *ngIf="no_data">No Bookings found!</p>
......@@ -59,9 +92,9 @@
<table class="table table-striped table-responsive" *ngIf="!no_data && !isFlightCancel"
style="overflow-y:scroll;max-height: 318px;">
<tr>
<th>Flight Details</th>
<th>Flight #</th>
<th>Date</th>
<th>Record Locator</th>
<th>PNR #</th>
<th>Name</th>
<th>Phone</th>
</tr>
......@@ -82,4 +115,4 @@
</div>
</div>
</div>
</div>
\ No newline at end of file
</div> -->
\ No newline at end of file
src/app/app.component.html
View file @ 7be78927
......@@ -4,8 +4,8 @@
style=""
*ngIf="currentUser || returnUrl">
<a class="navbar-brand" href="#"><img src="../assets/images/bestAirline.jpg" alt="logo" width="140px"></a>
<button class="navbar-toggler bg-light" type="button" data-toggle="collapse" data-target="#navbarNav">
<span class="navbar-toggler-icon bg-light"></span>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNav">
<span class="navbar-toggler-icon"></span>
</button>
<div class="collapse navbar-collapse" id="navbarNav">
<ul class="navbar-nav mr-auto">
......@@ -22,8 +22,9 @@
</li>
</ul>
<ul class="navbar-nav">
<li class="nav-item">
<a class="nav-link" (click)="logout()">Logout</a>
<li class="nav-item" >
<a class="nav-link" (click)="logout()" style=" display: flex;
align-items: center;"><mat-icon>logout</mat-icon>Logout</a>
</li>
</ul>
</div>
......@@ -32,8 +33,8 @@
<ng-container *ngIf="currentUser && currentUser.Fqtv !== 'admin'">
<nav class="navbar navbar-expand-md navbar-light bg-dark sticky-top custom-nav" style="" >
<a class="navbar-brand" href="#"><img src="../assets/images/bestAirline.jpg" alt="logo" width="150px"></a>
<button class="navbar-toggler bg-light" type="button" data-toggle="collapse" data-target="#navbarNav">
<span class="navbar-toggler-icon bg-light"></span>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNav">
<span class="navbar-toggler-icon"></span>
</button>
<div class="collapse navbar-collapse" id="navbarNav">
<ul class="navbar-nav mr-auto">
......
src/app/home/home.component.html
View file @ 7be78927
......@@ -8,7 +8,7 @@
<mat-icon>account_box</mat-icon><span class="card-heading">Your Profile</span>
</div>
<!-- <h4 class="card-title"> Your Profile</h4> -->
<table class="table table-striped">
<table class="table table-striped passenger-info">
<tbody>
<tr>
<td><strong>FQTV</strong></td>
......@@ -42,7 +42,7 @@
</table>
</div>
</div>
<div class="card text-center">
<div class="card text-center" style="max-width: 500px;">
<div class="card-block">
<div class="with-icon">
<mat-icon>assignment</mat-icon><span class="card-heading">Your Bookings</span>
......@@ -50,15 +50,15 @@
<!-- <h4 class="card-title"> Your Bookings </h4> -->
<p style="margin-top: 2%;" *ngIf="this.newUserData.Pnr_Details[0].Record_Locator === ''">No Bookings found!</p>
<table class="table table-striped table-responsive" *ngIf="this.newUserData.Pnr_Details[0].Record_Locator !== ''"
<table class="table table-striped table-responsive passenger-bookings" *ngIf="this.newUserData.Pnr_Details[0].Record_Locator !== ''"
style="overflow-y:scroll;max-height: 318px;">
<tr>
<th>Sr. No.</th>
<th>Record Locator</th>
<th>Flight number</th>
<th>Flight Date</th>
<th>Flight Brd</th>
<th>Flight Off</th>
<th>PNR #</th>
<th>Flight #</th>
<th>Journey Date</th>
<th>From</th>
<th>To</th>
</tr>
<tbody *ngFor="let item of this.newUserData.Pnr_Details; let i = index " >
<tr *ngIf="item.Record_Locator !== ''" >
......
src/app/login/login.component.html
View file @ 7be78927
......@@ -40,10 +40,11 @@
<div class="col-sm-7 col-lg-6" >
<div class="row">
<div class="col-lg-2"></div>
<div class="col-lg-10" style="margin-top: 25%;">
<h3 class="tag-line">BEST AIRLINES</h3>
<h5 class="sub-tag-line" >Get the best, most economical and updated afresh listings here !</h5>
<hr>
<div class="col-lg-10" style="margin-top: 20%;">
<!-- <h3 class="tag-line">BEST AIRLINES</h3> -->
<img src="../assets/images/bestAirlineLanding.jpg" alt="logo" width="490px" height="114px">
<!-- <h5 class="sub-tag-line" >Get the best, most economical and updated afresh listings here !</h5>
<hr> -->
<!-- <img src="/assets/images/ibm_logo1.jpg" style="align-items: center;" height="100px" width="140px"> -->
</div>
</div>
......
src/app/login/login.component.ts
View file @ 7be78927
......@@ -57,6 +57,7 @@ export class LoginComponent implements OnInit {
// stop here if form is invalid
if (this.loginForm.invalid) {
this.loading = false;
return;
}
this.loading = true;
......@@ -78,7 +79,7 @@ export class LoginComponent implements OnInit {
}
},
error => {
this.alertService.error(error);
this.alertService.error('Error while login, please contact system administrator.', true);
this.loading = false;
this.router.navigate(['/login']);
});
......
src/app/new-booking/new-booking.component.html
View file @ 7be78927
......@@ -34,6 +34,15 @@
</div>
</div>
</div>
<div class="col-sm-12">
<div class="form-group">
<input type="date" formControlName="date" placeholder="Date" class="form-control"
[ngClass]="{ 'is-invalid': submitted && f.date.errors }" />
<div *ngIf="submitted && f.date.errors" class="invalid-feedback">
<div *ngIf="f.date.errors.required" style="text-align:left">Date is required</div>
</div>
</div>
</div>
<div class="col-md-12 col-lg-12 col-xl-12">
<div class="form-group">
<button class="btn btn-login1" (click)=onSearchFlightClick()>Search Flights</button>
......@@ -44,15 +53,7 @@
</div>
<!-- *ngIf="availableFlights" -->
<div class="row" *ngIf="availableFlights">
<div class="col-sm-12">
<div class="form-group">
<input type="date" formControlName="date" placeholder="Date" class="form-control"
[ngClass]="{ 'is-invalid': submitted && f.date.errors }" />
<div *ngIf="submitted && f.date.errors" class="invalid-feedback">
<div *ngIf="f.date.errors.required" style="text-align:left">Date is required</div>
</div>
</div>
</div>
<!-- Booking Date removed from here -->
<div class="col-sm-12">
<div class="row justify-content-md-center">
<div class="col-sm-12 col-md-12"
......
src/app/notified-passengers/notified-passengers.component.html
View file @ 7be78927
......@@ -43,7 +43,7 @@
<table class="table table-responsive" style="max-height: 318px;"
*ngIf="this.show.body[0] !== undefined">
<tr>
<th>PNR Loc</th>
<th>PNR #</th>
<th>Passenger Name</th>
<th>Email-ID</th>
<th>Phone Number</th>
......
src/app/notified-passengers/notified-passengers.component.ts
View file @ 7be78927
......@@ -11,7 +11,7 @@ import { HttpResponse } from '@angular/common/http';
})
export class NotifiedPassengersComponent implements OnInit {
flight_status_search: FormGroup;
flight_Numbers: any = ['AC1602','BT1000', 'BT1001', 'BT1002', 'BT1003','BT1004','BT1005'];
flight_Numbers: any = ['BT1000', 'BT1001', 'BT1002', 'BT1003','BT1004','BT1005'];
loading = false;
submitted = false;
showRecord = false;
......
src/index.html
View file @ 7be78927
......@@ -6,7 +6,7 @@
<base href="/">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="icon" type="image/x-icon" href="favicon.ico">
<link rel="icon" type="image/x-icon" href="./assets/images/favicon.png">
<link href="//cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.1.3/css/bootstrap.min.css" rel="stylesheet" />
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.5.0/css/bootstrap.min.css">
<!-- <link rel="stylesheet" href="HVO_Wiki.css"> -->
......
src/styles.scss
View file @ 7be78927
......@@ -256,14 +256,13 @@ navbar-light .navbar-toggler {
color:#0ac0ee !important;
}
// .ng-invalid{
// border-color: #dc3545;
// padding-right: calc(1.5em + .75rem);
// // background-image: url(data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='12' height='12' fill='none' stroke='%23dc3545' viewBox='0 0 12 12'%3e%3ccircle cx='6' cy='6' r='4.5'/%3e%3cpath stroke-linejoin='round' d='M5.8 3.6h.4L6 6.5z'/%3e%3ccircle cx='6' cy='8.2' r='.6' fill='%23dc3545' stroke='none'/%3e%3c/svg%3e);
// background-repeat: no-repeat;
// background-position: right calc(.375em + .1875rem) center;
// background-size: calc(.75em + .375rem) calc(.75em + .375rem);
// }
.passenger-info tbody tr:nth-of-type(odd){
background-color: #fafcff !important;
}
.passenger-bookings tbody tr:nth-of-type(odd){
background-color: #fafcff !important;
}
.custom-control {
position: relative !important;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment