From 1a64e443d66f608be8a75c74219e463199496b15 Mon Sep 17 00:00:00 2001
From: Mateus Felipe <mateusgoettems@gmail.com>
Date: Wed, 5 Oct 2022 19:52:22 -0300
Subject: [PATCH] Updated Visits table and Login > Dash

---
 .../main/src/app/body/body.component.html     |  4 +-
 .../main/src/app/login/login.component.ts     |  2 +-
 frontend/main/src/app/visits.service.spec.ts  | 16 +++++++
 frontend/main/src/app/visits.service.ts       | 23 ++++++++++
 .../main/src/app/visits/visits.component.html | 14 +++++-
 .../main/src/app/visits/visits.component.ts   | 45 +++++++++++++++----
 6 files changed, 90 insertions(+), 14 deletions(-)
 create mode 100644 frontend/main/src/app/visits.service.spec.ts
 create mode 100644 frontend/main/src/app/visits.service.ts

diff --git a/frontend/main/src/app/body/body.component.html b/frontend/main/src/app/body/body.component.html
index f010d99..6192e04 100644
--- a/frontend/main/src/app/body/body.component.html
+++ b/frontend/main/src/app/body/body.component.html
@@ -78,14 +78,14 @@ <h3 class="dropdown-item-title">
   <div class="sidebar">
     <nav class="mt-2">
       <ul class="nav nav-pills nav-sidebar flex-column" data-widget="treeview" role="menu" data-accordion="false">
-        <li class="nav-item">
+        <!-- <li class="nav-item">
           <a href="#" routerLink="home" class="nav-link">
             <i class="nav-icon fas fa-home"></i>
             <p>
               Home
             </p>
           </a>
-        </li>
+        </li> -->
         <li class="nav-item" [hidden]="!loginService.admin">
           <a href="" routerLink="dashboard" class="nav-link">
             <i class="nav-icon fas fa-chart-bar"></i>
diff --git a/frontend/main/src/app/login/login.component.ts b/frontend/main/src/app/login/login.component.ts
index 4545f57..cbb9791 100644
--- a/frontend/main/src/app/login/login.component.ts
+++ b/frontend/main/src/app/login/login.component.ts
@@ -44,7 +44,7 @@ export class LoginComponent implements OnInit {
   }
 
   gotoHome(){
-    this.router.navigateByUrl('home')
+    this.router.navigateByUrl('dashboard')
   }
 
   register(){
diff --git a/frontend/main/src/app/visits.service.spec.ts b/frontend/main/src/app/visits.service.spec.ts
new file mode 100644
index 0000000..0f62e0c
--- /dev/null
+++ b/frontend/main/src/app/visits.service.spec.ts
@@ -0,0 +1,16 @@
+import { TestBed } from '@angular/core/testing';
+
+import { VisitsService } from './visits.service';
+
+describe('VisitsService', () => {
+  let service: VisitsService;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+    service = TestBed.inject(VisitsService);
+  });
+
+  it('should be created', () => {
+    expect(service).toBeTruthy();
+  });
+});
diff --git a/frontend/main/src/app/visits.service.ts b/frontend/main/src/app/visits.service.ts
new file mode 100644
index 0000000..7dbd347
--- /dev/null
+++ b/frontend/main/src/app/visits.service.ts
@@ -0,0 +1,23 @@
+import { HttpClient } from '@angular/common/http';
+import { Injectable } from '@angular/core';
+import { Router } from '@angular/router';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class VisitsService {
+
+  readonly APICountVisits:string = "http://localhost:8080/user/countVisitors"
+
+  constructor(private router: Router, private http: HttpClient) { }
+
+
+  listVisits():any{
+
+    return this.http.get(this.APICountVisits)
+
+  }
+
+
+
+}
diff --git a/frontend/main/src/app/visits/visits.component.html b/frontend/main/src/app/visits/visits.component.html
index c542c19..7301ff6 100644
--- a/frontend/main/src/app/visits/visits.component.html
+++ b/frontend/main/src/app/visits/visits.component.html
@@ -1,18 +1,28 @@
-<table>
+<table class="table table-bordered">
     <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"> 
+
+    <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>
+
+
+
+
+
+
diff --git a/frontend/main/src/app/visits/visits.component.ts b/frontend/main/src/app/visits/visits.component.ts
index 2937a48..8b4267c 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 { VisitsService } from '../visits.service';
 
 @Component({
   selector: 'app-visits',
@@ -9,25 +10,51 @@ import { Router } from '@angular/router';
 })
 export class VisitsComponent implements OnInit {
 
-  readonly APICountVisits:string = "http://localhost:8080/user/countVisitors"
+  visits!: Array<any>
+  id!: number
+  date!: string
+  time!: number
+  user!: string
+  bounceRate!: boolean
+ 
+  
 
-  visits! : Array<any>
-
-  constructor(private router:Router, private http:HttpClient) { }
+  constructor(public visitsService: VisitsService, 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 })
+    this.visitsService.listVisits().pipe().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.date = response[i].date;
+        this.time = response[i].time;
+        this.user = response[i].user;
+        this.bounceRate = response[i].bounce_rate;   
+        
+        console.log(this.id);
+        console.log(this.date);
+        console.log(this.time);
+        console.log(this.user);
+        console.log(this.bounceRate);
         
+
+        this.visits.push({id: this.id, date: this.date, time: this.time, user: this.user, bounceRate: this.bounceRate })
+
       }
 
     })
 
+
   }
 
 }