Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 3 additions & 1 deletion frontend/main/src/app/app-routing.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ 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';
import { VisitsComponent } from './visits/visits.component';

const routes: Routes = [
{ path: 'home', component:HomeComponent, canActivate:[LoginserviceService]},
Expand All @@ -36,7 +37,8 @@ const routes: Routes = [
{ path: 'edit', component:EditComponent, canActivate:[LoginserviceService]},
{ path: 'about', component:AboutComponent, canActivate:[LoginserviceService]},
{ path: 'forgetPassword', component:ForgetPasswordComponent},
{ path: "user-client", component:UserClientComponent, canActivate:[LoginserviceService]}
{ path: "user-client", component:UserClientComponent, canActivate:[LoginserviceService]},
{ path: "visits", component:VisitsComponent, canActivate:[LoginserviceService]}
];

@NgModule({
Expand Down
4 changes: 3 additions & 1 deletion frontend/main/src/app/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import { AboutComponent } from './about/about.component';
import { HttpClientModule } from "@angular/common/http";
import { ForgetPasswordComponent } from './forget-password/forget-password.component';
import { UserClientComponent } from './user-client/user-client.component';
import { VisitsComponent } from './visits/visits.component';

@NgModule({
declarations: [
Expand All @@ -46,7 +47,8 @@ import { UserClientComponent } from './user-client/user-client.component';
EditComponent,
AboutComponent,
ForgetPasswordComponent,
UserClientComponent
UserClientComponent,
VisitsComponent
],
imports: [
BrowserModule,
Expand Down
47 changes: 15 additions & 32 deletions frontend/main/src/app/body/body.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@
<div class="media">
<div class="media-body">
<h3 class="dropdown-item-title">
Relatório: Aniversantes do dia
Relatório: Aniversantes do dia
<span class="float-right text-sm text-danger"><i class="fas fa-star"></i></span>
</h3>
<p class="text-sm">Parabéns:</p>
<p class="text-sm text-muted">
<i class="far fa-clock mr-1" *ngFor="let aniversariante of birthnow; let i = index;">{{aniversariante}}</i>
<p class="text-sm text-muted" *ngFor="let aniversariante of aniversariantes; let i = index;">
<i class="fas fa-birthday-cake mr-1" ></i>{{aniversariante.nome}}
</p>
</div>
</div>
Expand All @@ -37,9 +37,9 @@ <h3 class="dropdown-item-title">
Relatório: Aniversariantes do mês
<span class="float-right text-sm text-danger"><i class="fas fa-star"></i></span>
</h3>
<p class="text-sm">{{birthmonth}}</p>
<p class="text-sm text-muted">
<i class="far fa-clock mr-1"></i>
<p class="text-sm"></p>
<p class="text-sm text-muted" *ngFor="let aniversariante of aniversariantesMes; let i = index;">
<i class="fas fa-birthday-cake mr-1"></i>{{aniversariante.nome}}
</p>
</div>
</div>
Expand All @@ -64,32 +64,7 @@ <h3 class="dropdown-item-title">
</div>
</li>

<li class="nav-item dropdown">
<a class="nav-link" data-toggle="dropdown" href="#">
<i class="far fa-bell"></i>
<span class="badge badge-warning navbar-badge">3</span>
</a>
<div class="dropdown-menu dropdown-menu-lg dropdown-menu-right">
<span class="dropdown-item dropdown-header">15 Notifications</span>
<div class="dropdown-divider"></div>
<a href="#" class="dropdown-item">
<i class="fas fa-envelope mr-2"></i> 4 new messages
<span class="float-right text-muted text-sm">3 mins</span>
</a>
<div class="dropdown-divider"></div>
<a href="#" class="dropdown-item">
<i class="fas fa-users mr-2"></i> 8 friend requests
<span class="float-right text-muted text-sm">12 hours</span>
</a>
<div class="dropdown-divider"></div>
<a href="#" class="dropdown-item">
<i class="fas fa-file mr-2"></i> 3 new reports
<span class="float-right text-muted text-sm">2 days</span>
</a>
<div class="dropdown-divider"></div>
<a href="#" class="dropdown-item dropdown-footer">See All Notifications</a>
</div>
</li>

</ul>
</nav>

Expand Down Expand Up @@ -196,6 +171,14 @@ <h3 class="dropdown-item-title">
</p>
</a>
</li>
<li class="nav-item">
<a href="#" routerLink="visits" class="nav-link">
<i class="nav-icon fas fa-building"></i>
<p>
Visits
</p>
</a>
</li>
</ul>
</nav>
</div>
Expand Down
41 changes: 27 additions & 14 deletions frontend/main/src/app/body/body.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,42 +12,55 @@ import { Observable } from 'rxjs';
})
export class BodyComponent implements OnInit {

readonly APIBirthNow: string = "http://localhost:8080/user/birthnow"
readonly APIBirthMonth: string = "http://localhost:8080/user/birthmonth"
readonly APIBirthNow: string = "http://localhost:8080/user/birthnow"

readonly APIBirthMonth: string = "http://localhost:8080/user/birthmonth"

birthnow! : string
birthmonth! : string
aniversariantes!: Array<any>
aniversariantesMes!: Array<any>
id!: number
nome!: string
email!: string
email!: string
birth!: Date
document!: string

constructor(public loginService:LoginserviceService, private router:Router, private http:HttpClient) { }

ngOnInit(): void {

this.aniversariantes = new Array()
this.aniversariantesMes = new Array()

this.http.get(this.APIBirthNow)
.subscribe((resultado:any) => {
this.birthnow = resultado

var count = Object.keys(resultado).length

for(let i=0;i<count;i++){

this.aniversariantes.push({id: resultado[i].id ,nome: resultado[i].nome, email: resultado[i].email, birth: resultado[i].birth, document: resultado[i].document})

}

});

this.http.get(this.APIBirthMonth)
.subscribe((resultado:any) => {
this.birthmonth=resultado
});

}
var count = Object.keys(resultado).length

sair(){
for(let i=0;i<count;i++){

this.loginService.succeed = false;
this.aniversariantesMes.push({id: resultado[i].id ,nome: resultado[i].nome, email: resultado[i].email, birth: resultado[i].birth, document: resultado[i].document})

}
}

});

aniversariante(){
this.aniversariantes.push ({id: this.id ,nome: this.nome, email: this.email, birth: this.birth, document: this.document})
}

}
sair(){

this.loginService.succeed = false;}}
4 changes: 2 additions & 2 deletions frontend/main/src/app/insight/insight.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -51,12 +51,12 @@ <h3>{{countClient}}</h3>
<div class="small-box bg-gradient-primary">
<div class="inner">
<h3>{{countVisitors}}</h3>
<p>Visitors</p>
<p>Visits</p>
</div>
<div class="icon">
<i class="ion ion-pie-graph"></i>
</div>
<a (click)="register()" class="small-box-footer">More info <i class="fas fa-arrow-circle-right"></i></a>
<a (click)="visits()" class="small-box-footer">More info <i class="fas fa-arrow-circle-right"></i></a>
</div>
</div>

Expand Down
7 changes: 6 additions & 1 deletion frontend/main/src/app/insight/insight.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,8 @@ export class InsightComponent implements OnInit {

this.http.get(this.APICountVisits)
.subscribe((resultado:any) => {
this.countVisitors=resultado
var count = Object.keys(resultado).length
this.countVisitors = count
});

this.http.get(this.APICountPackages)
Expand All @@ -61,5 +62,9 @@ export class InsightComponent implements OnInit {
this.router.navigateByUrl('users')
}

visits(){
this.router.navigateByUrl('visits')
}


}
Empty file.
18 changes: 18 additions & 0 deletions frontend/main/src/app/visits/visits.component.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<table>
<thead>
<th>ID</th>
<th>Data</th>
<th>Time</th>
<th>User</th>
<th>Bounce Rate</th>
</thead>
<tbody>
<tr *ngFor = "let visit of visits; let i = index">
<td>{{visit.id}}</td>
<td>{{visit.date}}</td>
<td>{{visit.time}}</td>
<td>{{visit.user}}</td>
<td>{{visit.bounceRate}}</td>
</tr>
</tbody>
</table>
23 changes: 23 additions & 0 deletions frontend/main/src/app/visits/visits.component.spec.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
import { ComponentFixture, TestBed } from '@angular/core/testing';

import { VisitsComponent } from './visits.component';

describe('VisitsComponent', () => {
let component: VisitsComponent;
let fixture: ComponentFixture<VisitsComponent>;

beforeEach(async () => {
await TestBed.configureTestingModule({
declarations: [ VisitsComponent ]
})
.compileComponents();

fixture = TestBed.createComponent(VisitsComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});

it('should create', () => {
expect(component).toBeTruthy();
});
});
33 changes: 33 additions & 0 deletions frontend/main/src/app/visits/visits.component.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
import { HttpClient } from '@angular/common/http';
import { Component, OnInit } from '@angular/core';
import { Router } from '@angular/router';

@Component({
selector: 'app-visits',
templateUrl: './visits.component.html',
styleUrls: ['./visits.component.css']
})
export class VisitsComponent implements OnInit {

readonly APICountVisits:string = "http://localhost:8080/user/countVisitors"

visits! : Array<any>

constructor(private router:Router, private http:HttpClient) { }

ngOnInit(): void {
this.visits = new Array()
this.http.get(this.APICountVisits)
.subscribe((resultado:any)=>{
var count = Object.keys(resultado).length
for(let i = 0; i<count; i++){

this.visits.push({id: resultado[i].id, date: resultado[i].date, time: resultado[i].time, user: resultado[i].user, bounceRate: resultado[i].bounce_rate })

}

})

}

}