diff --git a/frontend/main/src/app/about.service.ts b/frontend/main/src/app/about.service.ts
index 5d35f80..d74ac0e 100644
--- a/frontend/main/src/app/about.service.ts
+++ b/frontend/main/src/app/about.service.ts
@@ -7,7 +7,7 @@ import { Router } from '@angular/router';
})
export class AboutService {
- readonly API:string = "http://localhost:8080/aboutus"
+ readonly API:string = "http://35.199.78.13:8080/aboutus"
constructor(private router: Router, private http: HttpClient) { }
diff --git a/frontend/main/src/app/app-routing.module.ts b/frontend/main/src/app/app-routing.module.ts
index 31a041b..461f1e9 100644
--- a/frontend/main/src/app/app-routing.module.ts
+++ b/frontend/main/src/app/app-routing.module.ts
@@ -9,10 +9,8 @@ import { HomeComponent } from './home/home.component';
import { InsightComponent } from './insight/insight.component';
import { LoginComponent } from './login/login.component';
import { LoginserviceService } from './loginservice.service';
-import { PackregComponent } from './packreg/packreg.component';
import { PacktrackComponent } from './packtrack/packtrack.component';
import { RctQtComponent } from './rct-qt/rct-qt.component';
-import { ReceiptComponent } from './receipt/receipt.component';
import { ShipQtComponent } from './ship-qt/ship-qt.component';
import { UserClientComponent } from './user-client/user-client.component';
import { UsersComponent } from './users/users.component';
@@ -24,10 +22,8 @@ const routes: Routes = [
{ 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] },
diff --git a/frontend/main/src/app/app.module.ts b/frontend/main/src/app/app.module.ts
index 6d822bd..52b87b4 100644
--- a/frontend/main/src/app/app.module.ts
+++ b/frontend/main/src/app/app.module.ts
@@ -1,7 +1,6 @@
import { NgModule } from '@angular/core';
import { FormsModule } from '@angular/forms';
import { BrowserModule } from '@angular/platform-browser';
-
import { AppRoutingModule } from './app-routing.module';
import { AppComponent } from './app.component';
import { InsightComponent } from './insight/insight.component';
@@ -11,10 +10,8 @@ import { FooterComponent } from './footer/footer.component';
import { LoginComponent } from './login/login.component';
import { UsersComponent } from './users/users.component';
import { CarriersComponent } from './carriers/carriers.component';
-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 { ShipQtComponent } from './ship-qt/ship-qt.component';
import { RctQtComponent } from './rct-qt/rct-qt.component';
import { EditComponent } from './edit/edit.component';
@@ -34,10 +31,8 @@ import { VisitsComponent } from './visits/visits.component';
LoginComponent,
UsersComponent,
CarriersComponent,
- PackregComponent,
PacktrackComponent,
FinanceComponent,
- ReceiptComponent,
ShipQtComponent,
RctQtComponent,
EditComponent,
diff --git a/frontend/main/src/app/body/body.component.ts b/frontend/main/src/app/body/body.component.ts
index b84ea12..f02a454 100644
--- a/frontend/main/src/app/body/body.component.ts
+++ b/frontend/main/src/app/body/body.component.ts
@@ -4,7 +4,6 @@ import { LoginserviceService } from '../loginservice.service';
import { HttpClient } from '@angular/common/http';
import { Router } from '@angular/router';
import { catchError, Observable } from 'rxjs';
-import { NotificationService } from '../notification.service';
@Component({
selector: 'app-body',
@@ -13,9 +12,9 @@ import { NotificationService } from '../notification.service';
})
export class BodyComponent implements OnInit {
- readonly APIBirthNow: string = "http://localhost:8080/user/birthnow"
+ readonly APIBirthNow: string = "http://35.199.78.13:8080/user/birthnow"
- readonly APIBirthMonth: string = "http://localhost:8080/user/birthmonth"
+ readonly APIBirthMonth: string = "http://35.199.78.13:8080/user/birthmonth"
birthnow!: string
birthmonth!: string
@@ -29,7 +28,7 @@ export class BodyComponent implements OnInit {
birth!: string
document!: string
- constructor(public loginService: LoginserviceService, private router: Router, private http: HttpClient, private notify: NotificationService) { }
+ constructor(public loginService: LoginserviceService, private router: Router, private http: HttpClient) { }
ngOnInit(): void {
diff --git a/frontend/main/src/app/carrier.service.ts b/frontend/main/src/app/carrier.service.ts
index aada518..7be8d8a 100644
--- a/frontend/main/src/app/carrier.service.ts
+++ b/frontend/main/src/app/carrier.service.ts
@@ -7,7 +7,7 @@ import { Router } from '@angular/router';
})
export class CarrierService {
- apiURL:string = 'http://localhost:8080/carriers'
+ apiURL:string = 'http://35.199.78.13:8080/carriers'
constructor(private router: Router, private http: HttpClient) { }
@@ -21,9 +21,9 @@ export class CarrierService {
this.http.post(this.apiURL,object)
.subscribe((response)=>{
-
+
console.log(response);
-
+
})
@@ -33,8 +33,8 @@ export class CarrierService {
return this.http.get(this.apiURL+'/'+id)
-
-
+
+
}
diff --git a/frontend/main/src/app/carriers/carriers.component.html b/frontend/main/src/app/carriers/carriers.component.html
index 6ca8fbd..372e16d 100644
--- a/frontend/main/src/app/carriers/carriers.component.html
+++ b/frontend/main/src/app/carriers/carriers.component.html
@@ -116,7 +116,11 @@
New Carrier
-
+
+
+
+
+
@@ -180,10 +184,4 @@
Edit Carrier
-
-
-
-
-
-
-
\ No newline at end of file
+
diff --git a/frontend/main/src/app/carriers/carriers.component.ts b/frontend/main/src/app/carriers/carriers.component.ts
index fdb555d..2ad1012 100644
--- a/frontend/main/src/app/carriers/carriers.component.ts
+++ b/frontend/main/src/app/carriers/carriers.component.ts
@@ -33,7 +33,7 @@ export class CarriersComponent implements OnInit {
catchError((error)=>{
return error
})
-
+
).subscribe((response: any) => {
console.log(response);
@@ -86,65 +86,72 @@ export class CarriersComponent implements OnInit {
deletar(id:number){
console.log(id);
-
- this.http.delete('http://localhost:8080/carriers/'+id).subscribe();
-
+
+ this.http.delete('http://35.199.78.13:8080/carriers/'+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(){
+ openModalEdit(id:number,razao:string, taxa:string, email:string, cnpj:string){
+
+ this.id = id
+ this.razao = razao
+ this.taxa = taxa
+ this.email = email
+ this.cnpj = cnpj
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)
-
+
}
-
+
}
diff --git a/frontend/main/src/app/finance/finance.component.ts b/frontend/main/src/app/finance/finance.component.ts
index 51256b9..7bdda3a 100644
--- a/frontend/main/src/app/finance/finance.component.ts
+++ b/frontend/main/src/app/finance/finance.component.ts
@@ -11,7 +11,7 @@ import { LoginserviceService } from '../loginservice.service';
})
export class FinanceComponent implements OnInit {
- readonly packAPI: string = "http://localhost:8080/quote/packs/user/"
+ readonly packAPI: string = "http://35.199.78.13:8080/quote/packs/user/"
totalCost: number = 0
recentCost: number = 0
diff --git a/frontend/main/src/app/footer/footer.component.html b/frontend/main/src/app/footer/footer.component.html
index d29b371..07af3fa 100644
--- a/frontend/main/src/app/footer/footer.component.html
+++ b/frontend/main/src/app/footer/footer.component.html
@@ -1,5 +1,5 @@