From 469f36f528b95df5793c76b855dedc96181fd11a Mon Sep 17 00:00:00 2001 From: Rorschach-ar Date: Tue, 17 Jan 2023 09:23:16 +0530 Subject: [PATCH 1/5] ui change --- .../booksdisplay/booksdisplay.component.html | 110 +++++++++--------- 1 file changed, 52 insertions(+), 58 deletions(-) diff --git a/FrontEnd/Library/src/app/booksdisplay/booksdisplay.component.html b/FrontEnd/Library/src/app/booksdisplay/booksdisplay.component.html index f405e060..b9fe1983 100644 --- a/FrontEnd/Library/src/app/booksdisplay/booksdisplay.component.html +++ b/FrontEnd/Library/src/app/booksdisplay/booksdisplay.component.html @@ -1,65 +1,59 @@ - -
-
-
-
-

-

Books Details

+
+ +
+
+

+

Books Details

- - - - - - - - - - - - - - - - - - - - - - - - - - - -
Book NameCategory-NamePublicationAutherBook CopiesBook CoverAction
{{books.booksName}}{{books.category.categoryName}}{{books.publication}}{{books.auther}}{{books.booksCopies}} - - - -
-
- - -
-
-
-
\ No newline at end of file + "> + + {{books.booksName}} + {{books.category.categoryName}} + {{books.publication}} + {{books.auther}} + {{books.booksCopies}} + + + + + + + + +
+ + +
+ + \ No newline at end of file From 74cb732191d79bd64afb5afb80963e4a86ca14d5 Mon Sep 17 00:00:00 2001 From: Rorschach-ar Date: Tue, 17 Jan 2023 09:58:35 +0530 Subject: [PATCH 2/5] ui --- FrontEnd/Library/src/app/borrow/borrow.component.html | 5 +---- .../src/app/borrowhistory/borrowhistory.component.html | 2 +- FrontEnd/Library/src/app/navbar2/navbar2.component.html | 4 ++-- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/FrontEnd/Library/src/app/borrow/borrow.component.html b/FrontEnd/Library/src/app/borrow/borrow.component.html index 0241aacc..d53cb9f9 100644 --- a/FrontEnd/Library/src/app/borrow/borrow.component.html +++ b/FrontEnd/Library/src/app/borrow/borrow.component.html @@ -77,10 +77,7 @@

Borrow Details

- +
START DATE   
-
+
LIBRARY
@@ -16,7 +16,7 @@
- + From 47fe79224e7dce3bb3691d89f592fd4ee1ffa7f7 Mon Sep 17 00:00:00 2001 From: Rorschach-ar Date: Wed, 18 Jan 2023 16:41:49 +0530 Subject: [PATCH 3/5] ui changes --- .../service/impl/BorrowServiceImpl.java | 2 +- .../Library/src/app/app-routing.module.ts | 4 ++- FrontEnd/Library/src/app/app.module.ts | 2 ++ .../src/app/homepage/homepage.component.css | 19 +++++++++++++++ .../src/app/homepage/homepage.component.html | 9 +++++++ .../app/homepage/homepage.component.spec.ts | 23 ++++++++++++++++++ .../src/app/homepage/homepage.component.ts | 15 ++++++++++++ .../Library/src/app/login/login.component.ts | 5 +--- .../src/app/sidenav2/sidenav2.component.html | 2 +- .../assets/wp6974333-bookstore-wallpapers.jpg | Bin 0 -> 167614 bytes 10 files changed, 74 insertions(+), 7 deletions(-) create mode 100644 FrontEnd/Library/src/app/homepage/homepage.component.css create mode 100644 FrontEnd/Library/src/app/homepage/homepage.component.html create mode 100644 FrontEnd/Library/src/app/homepage/homepage.component.spec.ts create mode 100644 FrontEnd/Library/src/app/homepage/homepage.component.ts create mode 100644 FrontEnd/Library/src/assets/wp6974333-bookstore-wallpapers.jpg diff --git a/BackEnd/Library/src/main/java/com/innovature/Library/service/impl/BorrowServiceImpl.java b/BackEnd/Library/src/main/java/com/innovature/Library/service/impl/BorrowServiceImpl.java index bd3ca36e..981adbde 100644 --- a/BackEnd/Library/src/main/java/com/innovature/Library/service/impl/BorrowServiceImpl.java +++ b/BackEnd/Library/src/main/java/com/innovature/Library/service/impl/BorrowServiceImpl.java @@ -332,7 +332,7 @@ public List getBorrowHistory(Integer pageNo, Integer pageSize, String so @Override @Transactional // @Scheduled(cron="* */1 * * * * ") - @Scheduled(cron = "0 0 12 * * ?") + @Scheduled(cron = "0 0 12 * * ?") public void sendMails() { System.out.println("Email sent successfully"); diff --git a/FrontEnd/Library/src/app/app-routing.module.ts b/FrontEnd/Library/src/app/app-routing.module.ts index eb61dfab..fa627e4d 100644 --- a/FrontEnd/Library/src/app/app-routing.module.ts +++ b/FrontEnd/Library/src/app/app-routing.module.ts @@ -31,6 +31,7 @@ import { ForgotpasswordComponent } from './forgotpassword/forgotpassword.compone import { Sidenav2Component } from './sidenav2/sidenav2.component'; import { Navbar2Component } from './navbar2/navbar2.component'; import { AdminNavbarComponent } from './admin-navbar/admin-navbar.component'; +import { HomepageComponent } from './homepage/homepage.component'; const routes: Routes = [ {path: '',redirectTo:'login',pathMatch:'full'}, @@ -63,7 +64,8 @@ const routes: Routes = [ {path:'sidenav2',component:Sidenav2Component,canActivate: [HomeguardGuard]}, {path:'navbar2',component:Navbar2Component,canActivate: [HomeguardGuard]}, {path:'sidenav2',component:Sidenav2Component,canActivate: [HomeguardGuard]}, - {path:'admin-navbar',component:AdminNavbarComponent,canActivate: [HomeguardGuard]} + {path:'admin-navbar',component:AdminNavbarComponent,canActivate: [HomeguardGuard]}, + {path:'homepage',component:HomepageComponent,canActivate:[HomeguardGuard]} ]; @NgModule({ diff --git a/FrontEnd/Library/src/app/app.module.ts b/FrontEnd/Library/src/app/app.module.ts index 30604399..965e8468 100644 --- a/FrontEnd/Library/src/app/app.module.ts +++ b/FrontEnd/Library/src/app/app.module.ts @@ -57,6 +57,7 @@ import {Chart} from 'chart.js'; import { Sidenav2Component } from './sidenav2/sidenav2.component'; import { Navbar2Component } from './navbar2/navbar2.component'; import { AdminNavbarComponent } from './admin-navbar/admin-navbar.component'; +import { HomepageComponent } from './homepage/homepage.component'; // import {MatIconModule} from '@angular/material/icon'; // import { MatToolbarModule } from '@angular/material'; @@ -97,6 +98,7 @@ import { AdminNavbarComponent } from './admin-navbar/admin-navbar.component'; Sidenav2Component, Navbar2Component, AdminNavbarComponent, + HomepageComponent, // Chart // ModalComponent diff --git a/FrontEnd/Library/src/app/homepage/homepage.component.css b/FrontEnd/Library/src/app/homepage/homepage.component.css new file mode 100644 index 00000000..0aa062c7 --- /dev/null +++ b/FrontEnd/Library/src/app/homepage/homepage.component.css @@ -0,0 +1,19 @@ +.home img +{ + width: 100%; + height: 574px; + object-position: center; + +} +.homecontent +{ +position: absolute; +top:50%; +left: 70%; +transform: translate(-50%,-50%); +} +.homecontent h1 +{ +color: rgb(243, 246, 248); +font-size: 30px; +} \ No newline at end of file diff --git a/FrontEnd/Library/src/app/homepage/homepage.component.html b/FrontEnd/Library/src/app/homepage/homepage.component.html new file mode 100644 index 00000000..908a0b89 --- /dev/null +++ b/FrontEnd/Library/src/app/homepage/homepage.component.html @@ -0,0 +1,9 @@ + +
+ +
+

start reading for bright future

+ Explore books   + Book now +
+
\ No newline at end of file diff --git a/FrontEnd/Library/src/app/homepage/homepage.component.spec.ts b/FrontEnd/Library/src/app/homepage/homepage.component.spec.ts new file mode 100644 index 00000000..5484c7ef --- /dev/null +++ b/FrontEnd/Library/src/app/homepage/homepage.component.spec.ts @@ -0,0 +1,23 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { HomepageComponent } from './homepage.component'; + +describe('HomepageComponent', () => { + let component: HomepageComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [ HomepageComponent ] + }) + .compileComponents(); + + fixture = TestBed.createComponent(HomepageComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/FrontEnd/Library/src/app/homepage/homepage.component.ts b/FrontEnd/Library/src/app/homepage/homepage.component.ts new file mode 100644 index 00000000..601492b1 --- /dev/null +++ b/FrontEnd/Library/src/app/homepage/homepage.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-homepage', + templateUrl: './homepage.component.html', + styleUrls: ['./homepage.component.css'] +}) +export class HomepageComponent implements OnInit { + + constructor() { } + + ngOnInit(): void { + } + +} diff --git a/FrontEnd/Library/src/app/login/login.component.ts b/FrontEnd/Library/src/app/login/login.component.ts index 9d70f439..4d712659 100644 --- a/FrontEnd/Library/src/app/login/login.component.ts +++ b/FrontEnd/Library/src/app/login/login.component.ts @@ -18,9 +18,6 @@ export class LoginComponent implements OnInit { constructor(private router:Router, private service:UserserviceService,private toast : NgToastService ) { } - - - loginForm:FormGroup=new FormGroup( { email:new FormControl('',[Validators.required]), @@ -44,7 +41,7 @@ export class LoginComponent implements OnInit { if(result.role==2){ localStorage.setItem('token',this.responsedata.accessToken.value) this.toast.info({detail:'Hello User ',summary:'LogIn Successfull',duration:5000}); - this.router.navigate(['/sidenav2']) + this.router.navigate(['/homepage']) } diff --git a/FrontEnd/Library/src/app/sidenav2/sidenav2.component.html b/FrontEnd/Library/src/app/sidenav2/sidenav2.component.html index f776a271..c0615408 100644 --- a/FrontEnd/Library/src/app/sidenav2/sidenav2.component.html +++ b/FrontEnd/Library/src/app/sidenav2/sidenav2.component.html @@ -6,7 +6,7 @@