From 18aa688d34f0d0b2e05614ef22dc4c6842f7c4e4 Mon Sep 17 00:00:00 2001 From: bruno-roberto Date: Sun, 9 Oct 2022 21:47:38 -0300 Subject: [PATCH] =?UTF-8?q?Forget-Password=20casca=20User=20de=20n=C3=A3o?= =?UTF-8?q?=20admin=20Altera=C3=A7=C3=B5es=20em=20componentes?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/src/app/about/about.component.ts | 8 +- frontend/main/src/app/app-routing.module.ts | 36 +-- frontend/main/src/app/app.module.ts | 4 - .../src/app/balance/balance.component.css | 0 .../src/app/balance/balance.component.html | 1 - .../src/app/balance/balance.component.spec.ts | 23 -- .../main/src/app/balance/balance.component.ts | 15 - .../src/app/carriers/carriers.component.ts | 8 +- frontend/main/src/app/cost/cost.component.css | 0 .../main/src/app/cost/cost.component.html | 1 - .../main/src/app/cost/cost.component.spec.ts | 23 -- frontend/main/src/app/cost/cost.component.ts | 15 - .../forget-password.component.css | 290 ++++++++++++++++++ .../forget-password.component.html | 41 ++- .../forget-password.component.ts | 26 +- .../main/src/app/ship-qt/ship-qt.component.ts | 7 +- .../user-client/user-client.component.html | 184 ++++++++++- .../app/user-client/user-client.component.ts | 132 +++++++- .../main/src/app/users/users.component.ts | 8 +- .../main/src/app/visits/visits.component.ts | 8 +- 20 files changed, 718 insertions(+), 112 deletions(-) delete mode 100644 frontend/main/src/app/balance/balance.component.css delete mode 100644 frontend/main/src/app/balance/balance.component.html delete mode 100644 frontend/main/src/app/balance/balance.component.spec.ts delete mode 100644 frontend/main/src/app/balance/balance.component.ts delete mode 100644 frontend/main/src/app/cost/cost.component.css delete mode 100644 frontend/main/src/app/cost/cost.component.html delete mode 100644 frontend/main/src/app/cost/cost.component.spec.ts delete mode 100644 frontend/main/src/app/cost/cost.component.ts diff --git a/frontend/main/src/app/about/about.component.ts b/frontend/main/src/app/about/about.component.ts index 636ebec..c40f34b 100644 --- a/frontend/main/src/app/about/about.component.ts +++ b/frontend/main/src/app/about/about.component.ts @@ -1,6 +1,7 @@ import { HttpClient } from '@angular/common/http'; import { Component, OnInit } from '@angular/core'; import { Router } from '@angular/router'; +import { catchError } from 'rxjs'; import { AboutService } from '../about.service'; @Component({ @@ -53,7 +54,12 @@ export class AboutComponent implements OnInit { this.abouts = new Array() -this.aboutService.listAbout().pipe().subscribe((response: any) => { +this.aboutService.listAbout().pipe( + catchError((error)=>{ + return error + }) + +).subscribe((response: any) => { console.log(response); var count = Object.keys(response).length diff --git a/frontend/main/src/app/app-routing.module.ts b/frontend/main/src/app/app-routing.module.ts index 32954c6..31a041b 100644 --- a/frontend/main/src/app/app-routing.module.ts +++ b/frontend/main/src/app/app-routing.module.ts @@ -1,9 +1,7 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; import { AboutComponent } from './about/about.component'; -import { BalanceComponent } from './balance/balance.component'; import { CarriersComponent } from './carriers/carriers.component'; -import { CostComponent } from './cost/cost.component'; import { EditComponent } from './edit/edit.component'; import { FinanceComponent } from './finance/finance.component'; import { ForgetPasswordComponent } from './forget-password/forget-password.component'; @@ -21,24 +19,22 @@ import { UsersComponent } from './users/users.component'; import { VisitsComponent } from './visits/visits.component'; const routes: Routes = [ - { path: 'home', component:HomeComponent, canActivate:[LoginserviceService]}, - { path: 'dashboard', component:InsightComponent, canActivate:[LoginserviceService]}, - { path: '', component:LoginComponent}, - { path: 'users', component:UsersComponent, canActivate:[LoginserviceService]}, - { path: 'carriers', component:CarriersComponent, canActivate:[LoginserviceService]}, - { path: 'pack-register', component:PackregComponent, canActivate:[LoginserviceService]}, - { path: 'pack-track', component:PacktrackComponent, canActivate:[LoginserviceService]}, - { path: 'finance', component:FinanceComponent, canActivate:[LoginserviceService]}, - { path: 'receipt', component:ReceiptComponent, canActivate:[LoginserviceService]}, - { path: 'cost', component:CostComponent, canActivate:[LoginserviceService]}, - { path: 'balance', component:BalanceComponent, canActivate:[LoginserviceService]}, - { path: 'ship-quote', component:ShipQtComponent, canActivate:[LoginserviceService]}, - { path: 'recent-quote', component:RctQtComponent, canActivate:[LoginserviceService]}, - { path: 'edit', component:EditComponent, canActivate:[LoginserviceService]}, - { path: 'about', component:AboutComponent, canActivate:[LoginserviceService]}, - { path: 'forgetPassword', component:ForgetPasswordComponent}, - { path: "user-client", component:UserClientComponent, canActivate:[LoginserviceService]}, - { path: "visits", component:VisitsComponent, canActivate:[LoginserviceService]} + { path: 'home', component: HomeComponent, canActivate: [LoginserviceService] }, + { path: 'dashboard', component: InsightComponent, canActivate: [LoginserviceService] }, + { path: '', component: LoginComponent }, + { path: 'users', component: UsersComponent, canActivate: [LoginserviceService] }, + { path: 'carriers', component: CarriersComponent, canActivate: [LoginserviceService] }, + { path: 'pack-register', component: PackregComponent, canActivate: [LoginserviceService] }, + { path: 'pack-track', component: PacktrackComponent, canActivate: [LoginserviceService] }, + { path: 'finance', component: FinanceComponent, canActivate: [LoginserviceService] }, + { path: 'receipt', component: ReceiptComponent, canActivate: [LoginserviceService] }, + { path: 'ship-quote', component: ShipQtComponent, canActivate: [LoginserviceService] }, + { path: 'recent-quote', component: RctQtComponent, canActivate: [LoginserviceService] }, + { path: 'edit', component: EditComponent, canActivate: [LoginserviceService] }, + { path: 'about', component: AboutComponent, canActivate: [LoginserviceService] }, + { path: 'forgetPassword', component: ForgetPasswordComponent }, + { path: "user-client", component: UserClientComponent, canActivate: [LoginserviceService] }, + { path: "visits", component: VisitsComponent, canActivate: [LoginserviceService] } ]; @NgModule({ diff --git a/frontend/main/src/app/app.module.ts b/frontend/main/src/app/app.module.ts index f8a5112..6d822bd 100644 --- a/frontend/main/src/app/app.module.ts +++ b/frontend/main/src/app/app.module.ts @@ -15,8 +15,6 @@ import { PackregComponent } from './packreg/packreg.component'; import { PacktrackComponent } from './packtrack/packtrack.component'; import { FinanceComponent } from './finance/finance.component'; import { ReceiptComponent } from './receipt/receipt.component'; -import { CostComponent } from './cost/cost.component'; -import { BalanceComponent } from './balance/balance.component'; import { ShipQtComponent } from './ship-qt/ship-qt.component'; import { RctQtComponent } from './rct-qt/rct-qt.component'; import { EditComponent } from './edit/edit.component'; @@ -40,8 +38,6 @@ import { VisitsComponent } from './visits/visits.component'; PacktrackComponent, FinanceComponent, ReceiptComponent, - CostComponent, - BalanceComponent, ShipQtComponent, RctQtComponent, EditComponent, diff --git a/frontend/main/src/app/balance/balance.component.css b/frontend/main/src/app/balance/balance.component.css deleted file mode 100644 index e69de29..0000000 diff --git a/frontend/main/src/app/balance/balance.component.html b/frontend/main/src/app/balance/balance.component.html deleted file mode 100644 index 7417076..0000000 --- a/frontend/main/src/app/balance/balance.component.html +++ /dev/null @@ -1 +0,0 @@ -

balance works!

diff --git a/frontend/main/src/app/balance/balance.component.spec.ts b/frontend/main/src/app/balance/balance.component.spec.ts deleted file mode 100644 index b6c6db2..0000000 --- a/frontend/main/src/app/balance/balance.component.spec.ts +++ /dev/null @@ -1,23 +0,0 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; - -import { BalanceComponent } from './balance.component'; - -describe('BalanceComponent', () => { - let component: BalanceComponent; - let fixture: ComponentFixture; - - beforeEach(async () => { - await TestBed.configureTestingModule({ - declarations: [ BalanceComponent ] - }) - .compileComponents(); - - fixture = TestBed.createComponent(BalanceComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/frontend/main/src/app/balance/balance.component.ts b/frontend/main/src/app/balance/balance.component.ts deleted file mode 100644 index e68d490..0000000 --- a/frontend/main/src/app/balance/balance.component.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { Component, OnInit } from '@angular/core'; - -@Component({ - selector: 'app-balance', - templateUrl: './balance.component.html', - styleUrls: ['./balance.component.css'] -}) -export class BalanceComponent implements OnInit { - - constructor() { } - - ngOnInit(): void { - } - -} diff --git a/frontend/main/src/app/carriers/carriers.component.ts b/frontend/main/src/app/carriers/carriers.component.ts index 750a853..fdb555d 100644 --- a/frontend/main/src/app/carriers/carriers.component.ts +++ b/frontend/main/src/app/carriers/carriers.component.ts @@ -1,6 +1,7 @@ import { HttpClient } from '@angular/common/http'; import { Component, OnInit } from '@angular/core'; import { Router } from '@angular/router'; +import { catchError } from 'rxjs'; import { CarrierService } from '../carrier.service'; import { QuoteService } from '../quote.service'; @@ -28,7 +29,12 @@ export class CarriersComponent implements OnInit { // this.carriers.push({name:"Correios", email:"correios@correios.com", cnpj:"7897987899789", taxValorFrete:0.078}) - this.carrierService.listCarrier().pipe().subscribe((response: any) => { + this.carrierService.listCarrier().pipe( + catchError((error)=>{ + return error + }) + + ).subscribe((response: any) => { console.log(response); diff --git a/frontend/main/src/app/cost/cost.component.css b/frontend/main/src/app/cost/cost.component.css deleted file mode 100644 index e69de29..0000000 diff --git a/frontend/main/src/app/cost/cost.component.html b/frontend/main/src/app/cost/cost.component.html deleted file mode 100644 index ae92bdd..0000000 --- a/frontend/main/src/app/cost/cost.component.html +++ /dev/null @@ -1 +0,0 @@ -

cost works!

diff --git a/frontend/main/src/app/cost/cost.component.spec.ts b/frontend/main/src/app/cost/cost.component.spec.ts deleted file mode 100644 index 67a6d8a..0000000 --- a/frontend/main/src/app/cost/cost.component.spec.ts +++ /dev/null @@ -1,23 +0,0 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; - -import { CostComponent } from './cost.component'; - -describe('CostComponent', () => { - let component: CostComponent; - let fixture: ComponentFixture; - - beforeEach(async () => { - await TestBed.configureTestingModule({ - declarations: [ CostComponent ] - }) - .compileComponents(); - - fixture = TestBed.createComponent(CostComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/frontend/main/src/app/cost/cost.component.ts b/frontend/main/src/app/cost/cost.component.ts deleted file mode 100644 index 47cd97c..0000000 --- a/frontend/main/src/app/cost/cost.component.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { Component, OnInit } from '@angular/core'; - -@Component({ - selector: 'app-cost', - templateUrl: './cost.component.html', - styleUrls: ['./cost.component.css'] -}) -export class CostComponent implements OnInit { - - constructor() { } - - ngOnInit(): void { - } - -} diff --git a/frontend/main/src/app/forget-password/forget-password.component.css b/frontend/main/src/app/forget-password/forget-password.component.css index e69de29..77b99f4 100644 --- a/frontend/main/src/app/forget-password/forget-password.component.css +++ b/frontend/main/src/app/forget-password/forget-password.component.css @@ -0,0 +1,290 @@ +@import url('https://fonts.googleapis.com/css?family=Poppins:400,500,600,700,800,900'); + +body{ + font-family: 'Poppins', sans-serif; + font-weight: 300; + font-size: 15px; + line-height: 1.7; + color: #c4c3ca; + background-color: #1f2029; + overflow-x: hidden; +} +a{ + cursor: pointer; + transition: all 200ms linear; +} +a:hover { + text-decoration: none; +} +.link { + color: #000000; +} +.link:hover { + color: #ffeba7; +} +p { + font-weight: 500; + font-size: 14px; + line-height: 1.7; +} +h4 { + font-weight: 600; +} +h6 span{ + padding: 0 20px; + text-transform: uppercase; + font-weight: 700; +} +.section{ + position: relative; + width: 100%; + display: block; + background-repeat: no-repeat; + background-size: cover; +} +.full-height{ + min-height: 100vh; +} +[type="checkbox"]:checked, +[type="checkbox"]:not(:checked){ + position: absolute; + left: -9999px; +} +.checkbox:checked + label, +.checkbox:not(:checked) + label{ + position: relative; + display: block; + text-align: center; + width: 60px; + height: 16px; + border-radius: 8px; + padding: 0; + margin: 10px auto; + cursor: pointer; + background-color: #ffeba7; +} +.checkbox:checked + label:before, +.checkbox:not(:checked) + label:before{ + position: absolute; + display: block; + width: 36px; + height: 36px; + border-radius: 50%; + color: #ffeba7; + background-color: #102770; + font-family: 'unicons'; + content: ''; + z-index: 20; + top: -10px; + left: -10px; + line-height: 36px; + text-align: center; + font-size: 24px; + transition: all 0.5s ease; +} +.checkbox:checked + label:before { + transform: translateX(44px) rotate(-270deg); +} + + +.card-3d-wrap { + position: relative; + width: 440px; + max-width: 100%; + height: 400px; + -webkit-transform-style: preserve-3d; + transform-style: preserve-3d; + perspective: 800px; + margin-top: 60px; +} +.card-3d-wrapper { + width: 100%; + height: 100%; + position:absolute; + top: 0; + left: 0; + -webkit-transform-style: preserve-3d; + transform-style: preserve-3d; + transition: all 600ms ease-out; +} +.card-front, .card-back { + width: 100%; + height: 100%; + background-color: #d9c19e; + background-position: bottom center; + background-repeat: no-repeat; + background-size: 300%; + position: absolute; + border-radius: 6px; + left: 0; + top: 0; + box-shadow: 10px 10px 5px #1f2029; + -webkit-transform-style: preserve-3d; + transform-style: preserve-3d; + -webkit-backface-visibility: hidden; + -moz-backface-visibility: hidden; + -o-backface-visibility: hidden; + backface-visibility: hidden; +} +.card-back { + transform: rotateY(180deg); +} +.checkbox:checked ~ .card-3d-wrap .card-3d-wrapper { + transform: rotateY(180deg); +} +.center-wrap{ + position: absolute; + width: 100%; + padding: 0 35px; + top: 50%; + left: 0; + transform: translate3d(0, -50%, 35px) perspective(100px); + z-index: 20; + display: block; +} + + +.form-group{ + position: relative; + display: block; + margin: 0; + padding: 0; +} +.form-style { + padding: 13px 20px; + padding-left: 55px; + height: 48px; + width: 100%; + font-weight: 500; + border-radius: 4px; + font-size: 14px; + line-height: 22px; + letter-spacing: 0.5px; + outline: none; + color: #c4c3ca; + background-color: #1f2029; + border: none; + -webkit-transition: all 200ms linear; + transition: all 200ms linear; + box-shadow: 0 4px 8px 0 rgba(21,21,21,.2); +} +.form-style:focus, +.form-style:active { + border: none; + outline: none; + box-shadow: 0 4px 8px 0 rgba(21,21,21,.2); +} +.input-icon { + position: absolute; + top: 0; + left: 18px; + height: 48px; + font-size: 24px; + line-height: 48px; + text-align: left; + color: #ffeba7; + -webkit-transition: all 200ms linear; + transition: all 200ms linear; +} + +.form-group input:-ms-input-placeholder { + color: #c4c3ca; + opacity: 0.7; + -webkit-transition: all 200ms linear; + transition: all 200ms linear; +} +.form-group input::-moz-placeholder { + color: #c4c3ca; + opacity: 0.7; + -webkit-transition: all 200ms linear; + transition: all 200ms linear; +} +.form-group input:-moz-placeholder { + color: #c4c3ca; + opacity: 0.7; + -webkit-transition: all 200ms linear; + transition: all 200ms linear; +} +.form-group input::-webkit-input-placeholder { + color: #c4c3ca; + opacity: 0.7; + -webkit-transition: all 200ms linear; + transition: all 200ms linear; +} +.form-group input:focus:-ms-input-placeholder { + opacity: 0; + -webkit-transition: all 200ms linear; + transition: all 200ms linear; +} +.form-group input:focus::-moz-placeholder { + opacity: 0; + -webkit-transition: all 200ms linear; + transition: all 200ms linear; +} +.form-group input:focus:-moz-placeholder { + opacity: 0; + -webkit-transition: all 200ms linear; + transition: all 200ms linear; +} +.form-group input:focus::-webkit-input-placeholder { + opacity: 0; + -webkit-transition: all 200ms linear; + transition: all 200ms linear; +} + +.btn{ + border-radius: 4px; + height: 44px; + font-size: 13px; + font-weight: 600; + text-transform: uppercase; + -webkit-transition : all 200ms linear; + transition: all 200ms linear; + padding: 0 30px; + letter-spacing: 1px; + display: -webkit-inline-flex; + display: -ms-inline-flexbox; + display: inline-flex; + -webkit-align-items: center; + -moz-align-items: center; + -ms-align-items: center; + align-items: center; + -webkit-justify-content: center; + -moz-justify-content: center; + -ms-justify-content: center; + justify-content: center; + -ms-flex-pack: center; + text-align: center; + border: none; + background-color: #ffeba7; + color: #102770; + box-shadow: 0 8px 24px 0 rgba(255,235,167,.2); +} +.btn:active, +.btn:focus{ + background-color: #102770; + color: #ffeba7; + box-shadow: 0 8px 24px 0 rgba(16,39,112,.2); +} +.btn:hover{ + background-color: #102770; + color: #ffeba7; + box-shadow: 0 8px 24px 0 rgba(16,39,112,.2); +} + + + + +.logo { + position: absolute; + top: 30px; + right: 30px; + display: block; + z-index: 100; + transition: all 250ms linear; +} +.logo img { + height: 26px; + width: auto; + display: block; +} diff --git a/frontend/main/src/app/forget-password/forget-password.component.html b/frontend/main/src/app/forget-password/forget-password.component.html index 7a8de22..878f6c6 100644 --- a/frontend/main/src/app/forget-password/forget-password.component.html +++ b/frontend/main/src/app/forget-password/forget-password.component.html @@ -1 +1,40 @@ -

forget-password works!

+
+
+
+
+
+
+
+
+
+
+

Recover Password

+
+ + +
+
+ + +
+
+ + +
+ + +

Try to login again

+
+
+
+
+
+
+
+
+
+
+ diff --git a/frontend/main/src/app/forget-password/forget-password.component.ts b/frontend/main/src/app/forget-password/forget-password.component.ts index 3a98106..a8e2518 100644 --- a/frontend/main/src/app/forget-password/forget-password.component.ts +++ b/frontend/main/src/app/forget-password/forget-password.component.ts @@ -1,4 +1,7 @@ +import { HttpClient } from '@angular/common/http'; import { Component, OnInit } from '@angular/core'; +import { Router } from '@angular/router'; +import { LoginserviceService } from '../loginservice.service'; @Component({ selector: 'app-forget-password', @@ -7,9 +10,28 @@ import { Component, OnInit } from '@angular/core'; }) export class ForgetPasswordComponent implements OnInit { - constructor() { } + readonly TMSLoginAPI: string = "http://localhost:8080" + + + + user!:string + password!:string + + constructor(private router:Router, public loginService:LoginserviceService, private http:HttpClient) { } ngOnInit(): void { } -} + submit():void{ + + if(this.user != null && this.password != null){ + + this.loginService.logging(this.user, this.password) + + }else{ + + alert('DIGITE TODOS OS CAMPOS OBRIGATΓ“RIOS!') + this.loginService.progress = false + + } + }} \ No newline at end of file diff --git a/frontend/main/src/app/ship-qt/ship-qt.component.ts b/frontend/main/src/app/ship-qt/ship-qt.component.ts index d304b9f..85b3d60 100644 --- a/frontend/main/src/app/ship-qt/ship-qt.component.ts +++ b/frontend/main/src/app/ship-qt/ship-qt.component.ts @@ -75,7 +75,12 @@ export class ShipQtComponent implements OnInit { if (this.cepOrigem != null && this.cepDestino != null && this.comprimento != null, this.altura != null, this.largura != null, this.peso != null) { this.quoteService.quote(this.cepOrigem, this.cepDestino) - .pipe() + .pipe( + catchError((error)=>{ + return error + }) + + ) .subscribe((response: any) => { console.log(response); diff --git a/frontend/main/src/app/user-client/user-client.component.html b/frontend/main/src/app/user-client/user-client.component.html index abe7264..d48d2e2 100644 --- a/frontend/main/src/app/user-client/user-client.component.html +++ b/frontend/main/src/app/user-client/user-client.component.html @@ -1 +1,183 @@ -

user-client works!

+
+ + + + + + + + + + + +
+
+ + + + + + + + + + + + + + + + + + + +
ItemNameE-mailCPFBirthdayAction
{{i+1}}{{user.name}}{{user.email}}{{user.document}}{{user.birth}} + + + + + + + + + + + + +
diff --git a/frontend/main/src/app/user-client/user-client.component.ts b/frontend/main/src/app/user-client/user-client.component.ts index e040787..700ff0d 100644 --- a/frontend/main/src/app/user-client/user-client.component.ts +++ b/frontend/main/src/app/user-client/user-client.component.ts @@ -1,4 +1,8 @@ +import { HttpClient } from '@angular/common/http'; import { Component, OnInit } from '@angular/core'; +import { Router } from '@angular/router'; +import { catchError } from 'rxjs'; +import { UsersService } from '../users.service'; @Component({ selector: 'app-user-client', @@ -7,9 +11,135 @@ import { Component, OnInit } from '@angular/core'; }) export class UserClientComponent implements OnInit { - constructor() { } + users!:Array + name!:string + email!:string + document!:string + birth!:string + id!: number + + + constructor(public usersService: UsersService, private router: Router, private http: HttpClient) { } ngOnInit(): void { + this.users = new Array() + this.usersService.listUsers().pipe( + catchError((error)=>{ + return error + }) + + ).subscribe((response: any) => { + + console.log(response); + + var count = Object.keys(response).length; + + for (let i = 0; i < count; i++) { + + this.id = response[i].id; + this.name = response[i].nome; + this.email = response[i].email; + this.document = response[i].document; + this.birth = response[i].birth; + + + this.users.push({id: this.id, name:this.name, email:this.email, document:this.document, birth:this.birth}); + + } + + this.name = ""; + this.email = ""; + this.document = ""; + this.birth = ""; + + }) + + } + + adicionar(name: string, email: string, document: string, birth: string) { + + + let build ={ + "nome":name, + "email":email, + "document":document, + // "birth":birth, + + } + + this.usersService.adicionar(build) + + setTimeout(() => { + this.ngOnInit(); + }, 500); + + // this.users.push({name:this.name, email:this.email, document:this.document, birth:this.birth}); + } + + deletar(id:number){ + + console.log(id); + + this.http.delete('http://localhost:8080/user/'+id).subscribe(); + + setTimeout(() => { + this.ngOnInit(); + }, 500); + + } + + alterar(){ + + } + + openModal(){ + + var modal = document.getElementById('modal2') + + modal?.setAttribute('style', 'display:block;') + + modal?.setAttribute('class', 'portfolio-modal modal fade show') + modal?.removeAttribute('aria-hidden') + + modal?.setAttribute('arial-modal', 'true') + } + closeModal(){ + var modal = document.getElementById('modal2') + + modal?.setAttribute('class', 'portfolio-modal modal fade') + setTimeout(()=>{ + modal?.setAttribute('style', 'display:none;') + },500) + + } + + openModalEdit(){ + + var modal = document.getElementById('modal3') + + modal?.setAttribute('style', 'display:block;') + + modal?.setAttribute('class', 'portfolio-modal modal fade show') + modal?.removeAttribute('aria-hidden') + + modal?.setAttribute('arial-modal', 'true') + + } + + closeModalEdit(){ + var modal = document.getElementById('modal3') + + modal?.setAttribute('class', 'portfolio-modal modal fade') + setTimeout(()=>{ + modal?.setAttribute('style', 'display:none;') + },500) + + } + + } + + + \ No newline at end of file diff --git a/frontend/main/src/app/users/users.component.ts b/frontend/main/src/app/users/users.component.ts index f73b082..e794843 100644 --- a/frontend/main/src/app/users/users.component.ts +++ b/frontend/main/src/app/users/users.component.ts @@ -1,6 +1,7 @@ import { HttpClient } from '@angular/common/http'; import { Component, OnInit } from '@angular/core'; import { Router } from '@angular/router'; +import { catchError } from 'rxjs'; import { UsersService } from '../users.service'; @Component({ @@ -20,7 +21,12 @@ id!: number ngOnInit(): void { this.users = new Array() - this.usersService.listUsers().pipe().subscribe((response: any) => { + this.usersService.listUsers().pipe( + catchError((error)=>{ + return error + }) + + ).subscribe((response: any) => { console.log(response); diff --git a/frontend/main/src/app/visits/visits.component.ts b/frontend/main/src/app/visits/visits.component.ts index 8b4267c..698e68d 100644 --- a/frontend/main/src/app/visits/visits.component.ts +++ b/frontend/main/src/app/visits/visits.component.ts @@ -1,6 +1,7 @@ import { HttpClient } from '@angular/common/http'; import { Component, OnInit } from '@angular/core'; import { Router } from '@angular/router'; +import { catchError } from 'rxjs'; import { VisitsService } from '../visits.service'; @Component({ @@ -25,7 +26,12 @@ export class VisitsComponent implements OnInit { this.visits = new Array() - this.visitsService.listVisits().pipe().subscribe((response: any) => { + this.visitsService.listVisits().pipe( + catchError((error)=>{ + return error + }) + + ).subscribe((response: any) => { console.log(response);