Skip to content

Arun #42

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

Merged
Rorschach-ar merged 5 commits into from
Jan 30, 2023
Merged

Arun #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9f7fc4f
baseurl
Rorschach-ar Jan 30, 2023
90b05ed
addbook
Rorschach-ar Jan 30, 2023
365311d
Accept request
Rorschach-ar Jan 30, 2023
88339de
user reg
Rorschach-ar Jan 30, 2023
19ef90c
Merge pull request #41 from negilbabu/Development
Rorschach-ar Jan 30, 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
21 changes: 11 additions & 10 deletions FrontEnd/Library/src/app/acceptrequest/acceptrequest.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
<app-sidenav></app-sidenav>


<div class="text-center">
<form [formGroup]="ObjSampleForm" ><br>


<form [formGroup]="ObjSampleForm" (ngSubmit)="onSubmit()"><br>
<label><h2>AcceptRequest </h2></label>
<table align="center">
<br>
<div>Return Date&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<input style="width: 180px; margin:0 auto;" type="date" class="text-danger1" placeholder="returnDate" formControlName="returnDate" name="returnDate" min="{{date | date :'yyyy-MM-dd' }}" (input)="datas()" required></div>

<table align="center">
<tr> <td>
Return Date </td><td><input type="date" class="text-danger1" placeholder="returnDate" formControlName="returnDate" name="returnDate" min="{{date | date :'yyyy-MM-dd' }}" (input)="datas()" required>
<span class="text-danger" class="text-danger" *ngIf="ObjSampleForm.controls['returnDate'].touched && ObjSampleForm.hasError('required','returnDate')"><small>Return Date is required</small>
</span></td></tr>

Expand All @@ -15,11 +17,10 @@
</span><br></td></tr>



<input class="btn" style="width: 180px;" type="submit" name="onSubmit" value="Submit" [disabled]="!ObjSampleForm.valid"><br><br><br>

</table>

<tr><td></td>
<td>
<button mat-raised-button (click)="submit()" [disabled]="!ObjSampleForm.valid" color="primary" style="position: relative;" class="mycls" >Submit</button>
</td></tr></table>

</form>

Expand Down
35 changes: 0 additions & 35 deletions FrontEnd/Library/src/app/addbooks/addbooks.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,41 +1,6 @@
<app-sidenav></app-sidenav>


@media only screen and (max-width: 620px) {
/* For mobile phones: */
.right {
width: 87%;

}
/* .form-control{
top:15%;
}
*/
.csvv{
position: relative;
left: 8%;
top:65px;
}

.centered{
top: 18%;
left:45%;
}
.mat-dialog-container{
margin-left: 20%;
}

.form-control{
width: 30vh;
}



}
</style>
</head>
<br><br><br><br><br>

<div class="split right">
<div class="col-md-6" style="width:100% ;" >

Expand Down
6 changes: 4 additions & 2 deletions FrontEnd/Library/src/app/borrow.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,9 @@ export class BorrowService {
return _window();
}

apiurl='http://localhost:8080';
// apiurl='http://localhost:8080';

baseUrl=environment.apiUrl;
accesstocken:any
constructor(private http:HttpClient,private router:Router) { }

Expand Down Expand Up @@ -83,7 +85,7 @@ handleError(err: HttpErrorResponse): any {
//user
LoadByIssueDateUser(date1:any,date2:any){

return this.http.get(this.apiurl + "/borrow/user/loadByIssueDateUser/"+date1+"/"+date2);
return this.http.get(this.baseUrl + "/borrow/user/loadByIssueDateUser/"+date1+"/"+date2);
}


Expand Down
164 changes: 66 additions & 98 deletions FrontEnd/Library/src/app/user-reg/user-reg.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,108 +1,76 @@

<ul class="nav-mobile">
<li class="cls">
<label style="position: relative;text-align: center; left: 8%;">LIBRARY</label>
<button type="button" style="position: relative;float: right;" class="button" (click)="Login()">LOGIN</button>

<div class="right">

</div>

<ul class="nav-mobile" >
<li class="cls">
<label style="position: relative;text-align: center; left: 8%;">LIBRARY</label>
<button type="button" style="position: relative;float: right;" class="button" (click)="Login()">Back to LOGIN</button>

<div class="right">


</div>
</li>
</ul>

</ul>


<router-outlet></router-outlet>


<div class="text-center">
<form [formGroup]="ObjSampleForm" (ngSubmit)="onSubmit()">

<div style="width: 180px; margin:0 auto;" class="example-container"><br>
<div style="width: 50px; margin:0 auto;"> <label>
<h2>SignUp</h2>
</label></div>
<br>

<div>
<input type="text" class="text-danger1" placeholder="First Name" formControlName="firstName"
name="firstName" maxlength="30" pattern='[a-zA-z]+' required>
<span class="text-danger"
*ngIf="ObjSampleForm.controls['firstName'].touched && ObjSampleForm.hasError('required','firstName')"><small>Firstname
is required</small> </span>
<span class="text-danger"
*ngIf="ObjSampleForm.controls['firstName'].touched && ObjSampleForm.hasError('pattern','firstName')"><small>Firstname
Should be Characters </small></span>
<span class="text-danger"
*ngIf="ObjSampleForm.controls['firstName'].touched && ObjSampleForm.hasError('maxlength(30)','firstName')"><small>Firstname
must be less than 30</small></span>
</div> <br>

<div>
<input type="text" class="text-danger1" placeholder="Last Name" formControlName="lastName"
name="lastName" maxlength="100" required>
<span class="text-danger"
*ngIf="ObjSampleForm.controls['lastName'].touched && ObjSampleForm.hasError('required','lastName')"><small>Lastname
is required</small> </span>
<div class="text-center">
<form [formGroup]="ObjSampleForm" >

<div style="width: 180px; margin:0 auto;" class="example-container" ><br>
<div style="width: 50px; margin:0 auto;"> <label ><h2>SignUp</h2></label></div>
<br>

<div>
<input type="text" class="text-danger1" placeholder="First Name" formControlName="firstName" name="firstName" maxlength="30" pattern='[a-zA-z]+' required>
<span class="text-danger" *ngIf="ObjSampleForm.controls['firstName'].touched && ObjSampleForm.hasError('required','firstName')"><small>Firstname is required</small> </span>
<span class="text-danger" *ngIf="ObjSampleForm.controls['firstName'].touched && ObjSampleForm.hasError('pattern','firstName')"><small>Firstname Should be Characters </small></span>
<span class="text-danger" *ngIf="ObjSampleForm.controls['firstName'].touched && ObjSampleForm.hasError('maxlength(30)','firstName')"><small>Firstname must be less than 30</small></span>
</div> <br>

<div>
<input type="text" class="text-danger1" placeholder="Last Name" formControlName="lastName" name="lastName" maxlength="100" required>
<span class="text-danger" *ngIf="ObjSampleForm.controls['lastName'].touched && ObjSampleForm.hasError('required','lastName')"><small>Lastname is required</small> </span>
</div> <br>

<div>
<input type="date" class="text-danger1" placeholder="DOB" formControlName="dob" name="dob" max="{{date | date :'yyyy-MM-dd' }}" required>
<span class="text-danger" *ngIf="ObjSampleForm.controls['dob'].touched && ObjSampleForm.hasError('required','dob')"><small>Date-of-birth is required</small> </span>

</div> <br>
<div>
<input type="text" class="text-danger1" placeholder="Address" formControlName="address" name="address" maxlength="100" required>
<span class="text-danger" *ngIf="ObjSampleForm.controls['address'].touched && ObjSampleForm.hasError('required','address')"><small>Address is required</small></span>
</div> <br>
<div>
<input type="text" class="text-danger1" placeholder="phone" formControlName="phone" name="phone" maxlength="10" required>
<span class="text-danger" *ngIf="ObjSampleForm.controls['phone'].touched && ObjSampleForm.hasError('required','phone')"><small>Phone n.o is required</small> </span>
</div> <br>

<div>
<input type="date" class="text-danger1" placeholder="DOB" formControlName="dob" name="dob"
max="{{date | date :'yyyy-MM-dd' }}" required>
<span class="text-danger"
*ngIf="ObjSampleForm.controls['dob'].touched && ObjSampleForm.hasError('required','dob')"><small>Date-of-birth
is required</small> </span>
</div> <br>
<div>
<input type="text" class="text-danger1" placeholder="Address" formControlName="address" name="address"
maxlength="100" required>
<span class="text-danger"
*ngIf="ObjSampleForm.controls['address'].touched && ObjSampleForm.hasError('required','address')"><small>Address
is required</small></span>
</div> <br>
<div>
<input type="text" class="text-danger1" placeholder="phone" formControlName="phone" name="phone"
maxlength="10" required>
<span class="text-danger"
*ngIf="ObjSampleForm.controls['phone'].touched && ObjSampleForm.hasError('required','phone')"><small>Phone
n.o is required</small> </span>
</div> <br>
<!-- <div>
<input type="number" class="text-danger1" placeholder="role" formControlName="role" name="role" maxlength="20" required>
</div> <br><br> -->
<div>
<input type="password" class="text-danger1" placeholder="password" formControlName="password"
name="password" pattern='(?=.*\d)(?=.*[a-z])(?=.*[#$@!%&*?])(?=.*[A-Z]).{8,}' minlength="8"
required>
<span class="text-danger"
*ngIf="ObjSampleForm.controls['password'].touched && ObjSampleForm.hasError('required','password')"><small>pswd
is required<br>use (uppercase,lowercase & numbers)<br>minimum 8 character</small>
</span>
<br><br>

<input type="password" class="text-danger1" placeholder="password" formControlName="password" name="password" pattern='(?=.*\d)(?=.*[a-z])(?=.*[#$@!%&*?])(?=.*[A-Z]).{8,}' minlength="8" required>
<span class="text-danger" *ngIf="ObjSampleForm.controls['password'].touched && ObjSampleForm.hasError('required','password')"><small>pswd is required</small></span>
<span class="text-danger" *ngIf=" ObjSampleForm.hasError('pattern','password')"><small>use alphanumeric & special characters &nbsp;</small></span>
<span class="text-danger" *ngIf="ObjSampleForm.controls['password'].touched && ObjSampleForm.hasError('minlength','password')"><small>minimum 8 character</small></span>
<br><br>
</div>
<div>
<input type="email" class="text-danger1" placeholder="email" formControlName="email" name="email"
maxlength="100" required>

<span class="text-danger"
*ngIf="ObjSampleForm.controls['email'].touched && ObjSampleForm.hasError('required','email')"><small>Email
is required</small>
</span>

</div> <br><br>


<button mat-raised-button color="warn" (click)="clear()">Clear</button>
&nbsp; &nbsp;
<button mat-raised-button (click)="onSubmit()" color="primary"
[disabled]="ObjSampleForm.invalid">Submit</button>


</div>

</form>

</div>

<input type="email" class="text-danger1" placeholder="email" formControlName="email" name="email" maxlength="100" required>

<span class="text-danger" *ngIf="ObjSampleForm.controls['email'].touched && ObjSampleForm.hasError('required','email')"><small>Email is required</small>
</span>

</div> <br><br>


<button mat-raised-button color="warn" class="b1" type="reset">Clear</button>
&nbsp; &nbsp;
<button mat-raised-button (click)="onSubmit()" color="primary" >Submit</button>

</div>

</form>

</div>