From 457613aa4216a83fda81db6dec774c8142c6285d Mon Sep 17 00:00:00 2001 From: bruno-roberto Date: Sun, 25 Sep 2022 13:27:23 -0300 Subject: [PATCH 1/8] up --- .../controllers/CountVisitorController.java | 5 +++ .../src/app/insight/insight.component.html | 44 +++++++++++-------- .../main/src/app/insight/insight.component.ts | 31 ++++++++++++- 3 files changed, 60 insertions(+), 20 deletions(-) create mode 100644 backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/controllers/CountVisitorController.java diff --git a/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/controllers/CountVisitorController.java b/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/controllers/CountVisitorController.java new file mode 100644 index 0000000..fb9c726 --- /dev/null +++ b/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/controllers/CountVisitorController.java @@ -0,0 +1,5 @@ +package br.com.entra21.teamroxo.TMSProject.controllers; + +public class CountVisitorController { + +} diff --git a/frontend/main/src/app/insight/insight.component.html b/frontend/main/src/app/insight/insight.component.html index ba3ab9d..e0c84b0 100644 --- a/frontend/main/src/app/insight/insight.component.html +++ b/frontend/main/src/app/insight/insight.component.html @@ -1,35 +1,41 @@
-
-
-

4

-

New Orders

+ +
+
+ +

+ + +

New Registers Packages

+
- More info + More info
-
+
+

12%

Bounce Rate

- More info + More info
-
+

4

User Registrations

@@ -37,27 +43,27 @@

4

- More info + More info
-
+
-

15

+

number

Visitors

- More info + More info
-
+

@@ -67,10 +73,10 @@

- -
@@ -120,7 +126,7 @@

4 5 6 - 7 + 7 8 9 @@ -146,7 +152,7 @@

21 22 23 - 24 + 24 @@ -197,8 +203,8 @@

class="month">JunJulAugSepOctSepOctNovDec diff --git a/frontend/main/src/app/insight/insight.component.ts b/frontend/main/src/app/insight/insight.component.ts index c351cd1..620eb70 100644 --- a/frontend/main/src/app/insight/insight.component.ts +++ b/frontend/main/src/app/insight/insight.component.ts @@ -1,4 +1,7 @@ import { Component, OnInit } from '@angular/core'; +import { Router } from '@angular/router'; +import { RctQtComponent } from '../rct-qt/rct-qt.component'; +import { HttpClient } from '@angular/common/http'; @Component({ selector: 'app-insight', @@ -6,10 +9,36 @@ import { Component, OnInit } from '@angular/core'; styleUrls: ['./insight.component.css'] }) export class InsightComponent implements OnInit { + count: any; - constructor() { } + constructor(private router:Router) { } ngOnInit(): void { } + register(){ + this.router.navigateByUrl('pack-register') + } + + clients(){ + this.router.navigateByUrl('users') + } + + + public get countVisitors() : any { + return this.countVisitors + } + + contador(){ + this.countVisitors + console.log(this.countVisitors); + + } + + + + + + + } From ba930e382ec33b3f93c1f83e97873658672f1d23 Mon Sep 17 00:00:00 2001 From: bruno-roberto Date: Sun, 25 Sep 2022 13:28:48 -0300 Subject: [PATCH 2/8] dash --- frontend/main/src/app/insight/insight.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/main/src/app/insight/insight.component.html b/frontend/main/src/app/insight/insight.component.html index e0c84b0..240abd4 100644 --- a/frontend/main/src/app/insight/insight.component.html +++ b/frontend/main/src/app/insight/insight.component.html @@ -5,7 +5,7 @@
-

+

10

New Registers Packages

From b858ce8769408386c8c81f43c27c9917aeb05492 Mon Sep 17 00:00:00 2001 From: bruno-roberto Date: Sun, 25 Sep 2022 13:32:25 -0300 Subject: [PATCH 3/8] Upando dash --- frontend/main/src/app/insight/insight.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/main/src/app/insight/insight.component.html b/frontend/main/src/app/insight/insight.component.html index 240abd4..33d73fd 100644 --- a/frontend/main/src/app/insight/insight.component.html +++ b/frontend/main/src/app/insight/insight.component.html @@ -20,7 +20,7 @@
-
+

12%

From c775d2ff3bdb964b2edb22b0a9b82d126c5eb402 Mon Sep 17 00:00:00 2001 From: bruno-roberto Date: Sun, 25 Sep 2022 13:34:48 -0300 Subject: [PATCH 4/8] Dash --- .../main/src/app/insight/insight.component.html | 2 +- frontend/main/src/app/insight/insight.component.ts | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/frontend/main/src/app/insight/insight.component.html b/frontend/main/src/app/insight/insight.component.html index 33d73fd..f84ef4b 100644 --- a/frontend/main/src/app/insight/insight.component.html +++ b/frontend/main/src/app/insight/insight.component.html @@ -51,7 +51,7 @@

4

-

number

+

40

Visitors

diff --git a/frontend/main/src/app/insight/insight.component.ts b/frontend/main/src/app/insight/insight.component.ts index 620eb70..c293e1d 100644 --- a/frontend/main/src/app/insight/insight.component.ts +++ b/frontend/main/src/app/insight/insight.component.ts @@ -25,15 +25,15 @@ export class InsightComponent implements OnInit { } - public get countVisitors() : any { - return this.countVisitors - } + // public get countVisitors() : any { + // return this.countVisitors + // } - contador(){ - this.countVisitors - console.log(this.countVisitors); + // contador(){ + // this.countVisitors + // console.log(this.countVisitors); - } + // } From 77f60b09737739e6cad98cbf2248b19d4fdcbaff Mon Sep 17 00:00:00 2001 From: kaka-jaques Date: Sun, 25 Sep 2022 22:46:21 -0300 Subject: [PATCH 5/8] UPDATE API! --- .../controllers/CountVisitorController.java | 5 -- .../controllers/LoginController.java | 6 +- .../controllers/PessoaController.java | 2 +- .../controllers/QuoteController.java | 57 +++++++++++++++++++ .../controllers/ShipController.java | 4 +- .../interfaces/RecentQuoteRepository.java | 9 +++ .../interfaces/RegisterQuoteRepository.java | 9 +++ .../TMSProject/template/CountVisitors.java | 46 ++++++++++++--- .../TMSProject/template/GoogleAPI.java | 46 +++++++++++++++ .../TMSProject/template/RegisterQuote.java | 13 ++++- 10 files changed, 180 insertions(+), 17 deletions(-) delete mode 100644 backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/controllers/CountVisitorController.java create mode 100644 backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/controllers/QuoteController.java create mode 100644 backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/interfaces/RecentQuoteRepository.java create mode 100644 backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/interfaces/RegisterQuoteRepository.java create mode 100644 backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/template/GoogleAPI.java diff --git a/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/controllers/CountVisitorController.java b/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/controllers/CountVisitorController.java deleted file mode 100644 index fb9c726..0000000 --- a/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/controllers/CountVisitorController.java +++ /dev/null @@ -1,5 +0,0 @@ -package br.com.entra21.teamroxo.TMSProject.controllers; - -public class CountVisitorController { - -} diff --git a/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/controllers/LoginController.java b/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/controllers/LoginController.java index 54c26fa..c046bcb 100644 --- a/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/controllers/LoginController.java +++ b/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/controllers/LoginController.java @@ -1,5 +1,7 @@ package br.com.entra21.teamroxo.TMSProject.controllers; +import java.time.LocalDate; +import java.time.LocalTime; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -62,7 +64,9 @@ public List listAll() { if(!response.isEmpty()) { CountVisitors count = new CountVisitors(); - count.setCount(0); + count.setUser(credentials.getUser()); + count.setTime(LocalTime.now()); + count.setDate(LocalDate.now()); countVisitorsRepository.save(count); } diff --git a/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/controllers/PessoaController.java b/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/controllers/PessoaController.java index cb3313c..e8419e0 100644 --- a/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/controllers/PessoaController.java +++ b/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/controllers/PessoaController.java @@ -33,7 +33,7 @@ @RequestMapping("/user") public class PessoaController { - private final String PATH = "http://localhost:8080/users"; + private final String PATH = "http://localhost:8080/user"; @Autowired private PessoaRepository pessoaRepository; diff --git a/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/controllers/QuoteController.java b/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/controllers/QuoteController.java new file mode 100644 index 0000000..4f3f5a1 --- /dev/null +++ b/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/controllers/QuoteController.java @@ -0,0 +1,57 @@ +package br.com.entra21.teamroxo.TMSProject.controllers; + +import java.time.LocalDate; +import java.util.ArrayList; +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.CrossOrigin; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import br.com.entra21.teamroxo.TMSProject.interfaces.RecentQuoteRepository; +import br.com.entra21.teamroxo.TMSProject.interfaces.RegisterQuoteRepository; +import br.com.entra21.teamroxo.TMSProject.template.RecentQuote; +import br.com.entra21.teamroxo.TMSProject.template.RegisterQuote; + +@RestController +@CrossOrigin(origins = "*") +@RequestMapping("/quote") +public class QuoteController { + + @Autowired + private RegisterQuoteRepository registerQuoteRepository; + + @Autowired + private RecentQuoteRepository recentQuoteRepository; + + @PostMapping("/recent") + public RecentQuote recentPackage(@RequestBody RecentQuote quote) { + + return recentQuoteRepository.save(quote); + + } + + @PostMapping("/register") + public RegisterQuote registerPackage(@RequestBody RegisterQuote quote) { + + return registerQuoteRepository.save(quote); + + } + + @GetMapping("/go") + public int goingPackages() { + + List response = new ArrayList(registerQuoteRepository.findAll().stream() + .filter(quote -> (quote.getPost().plusDays(quote.getAwait()).isAfter(LocalDate.now()) || + quote.getPost().plusDays(quote.getAwait()).isEqual(LocalDate.now()))) + .toList()); + + return response.size(); + + } + +} diff --git a/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/controllers/ShipController.java b/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/controllers/ShipController.java index 64dfcd9..99cfde3 100644 --- a/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/controllers/ShipController.java +++ b/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/controllers/ShipController.java @@ -35,7 +35,7 @@ public ArrayList getGoogleAPI(@PathVariable ("cepOrigem") int param1, @P BufferedReader response = new BufferedReader(new InputStreamReader(get.getInputStream())); - ArrayList jsonEmString = converteJsonEmString(response); + String jsonEmString = converteJsonEmString(response); return jsonEmString; @@ -47,7 +47,7 @@ public ArrayList getGoogleAPI(@PathVariable ("cepOrigem") int param1, @P } - public static ArrayList converteJsonEmString(BufferedReader buffereReader) throws IOException { + public static String converteJsonEmString(BufferedReader buffereReader) throws IOException { String resposta; ArrayList json = new ArrayList<>(); diff --git a/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/interfaces/RecentQuoteRepository.java b/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/interfaces/RecentQuoteRepository.java new file mode 100644 index 0000000..2530b5e --- /dev/null +++ b/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/interfaces/RecentQuoteRepository.java @@ -0,0 +1,9 @@ +package br.com.entra21.teamroxo.TMSProject.interfaces; + +import org.springframework.data.jpa.repository.JpaRepository; + +import br.com.entra21.teamroxo.TMSProject.template.RecentQuote; + +public interface RecentQuoteRepository extends JpaRepository { + +} diff --git a/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/interfaces/RegisterQuoteRepository.java b/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/interfaces/RegisterQuoteRepository.java new file mode 100644 index 0000000..785a265 --- /dev/null +++ b/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/interfaces/RegisterQuoteRepository.java @@ -0,0 +1,9 @@ +package br.com.entra21.teamroxo.TMSProject.interfaces; + +import org.springframework.data.jpa.repository.JpaRepository; + +import br.com.entra21.teamroxo.TMSProject.template.RegisterQuote; + +public interface RegisterQuoteRepository extends JpaRepository { + +} diff --git a/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/template/CountVisitors.java b/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/template/CountVisitors.java index 6fb7bf5..5e17981 100644 --- a/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/template/CountVisitors.java +++ b/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/template/CountVisitors.java @@ -1,5 +1,8 @@ package br.com.entra21.teamroxo.TMSProject.template; +import java.time.LocalDate; +import java.time.LocalTime; + import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; @@ -13,23 +16,52 @@ public class CountVisitors { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) private Integer id; - private long count; + private String user; + private LocalDate date; + private LocalTime time; public CountVisitors() { super(); } - public CountVisitors(long count) { + public CountVisitors(Integer id, String user, LocalDate date, LocalTime time) { super(); - this.count = count; + this.id = id; + this.user = user; + this.date = date; + this.time = time; + } + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public String getUser() { + return user; + } + + public void setUser(String user) { + this.user = user; + } + + public LocalDate getDate() { + return date; + } + + public void setDate(LocalDate date) { + this.date = date; } - public long getCount() { - return count; + public LocalTime getTime() { + return time; } - public void setCount(long count) { - this.count = count; + public void setTime(LocalTime time) { + this.time = time; } } diff --git a/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/template/GoogleAPI.java b/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/template/GoogleAPI.java new file mode 100644 index 0000000..67625b9 --- /dev/null +++ b/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/template/GoogleAPI.java @@ -0,0 +1,46 @@ +package br.com.entra21.teamroxo.TMSProject.template; + +import java.util.List; + +public class GoogleAPI { + + private List geocoded_waypoints; + private List routes; + private String status; + + public GoogleAPI() { + super(); + } + + public GoogleAPI(List geocoded_waypoints, List routes, String status) { + super(); + this.geocoded_waypoints = geocoded_waypoints; + this.routes = routes; + this.status = status; + } + + public List getGeocoded_waypoints() { + return geocoded_waypoints; + } + + public void setGeocoded_waypoints(List geocoded_waypoints) { + this.geocoded_waypoints = geocoded_waypoints; + } + + public List getRoutes() { + return routes; + } + + public void setRoutes(List routes) { + this.routes = routes; + } + + public String getStatus() { + return status; + } + + public void setStatus(String status) { + this.status = status; + } + +} diff --git a/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/template/RegisterQuote.java b/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/template/RegisterQuote.java index c305a35..f922569 100644 --- a/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/template/RegisterQuote.java +++ b/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/template/RegisterQuote.java @@ -1,5 +1,7 @@ package br.com.entra21.teamroxo.TMSProject.template; +import java.time.LocalDate; + import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; @@ -15,6 +17,7 @@ public class RegisterQuote { private Integer id; private float price; private byte await; + private LocalDate post; private String origin; private String destiny; private byte carrier_id; @@ -26,7 +29,7 @@ public RegisterQuote() { } public RegisterQuote(Integer id, float price, byte await, String origin, String destiny, byte carrier_id, - float cub_height, int pessoa_id) { + float cub_height, int pessoa_id, boolean isGoing) { super(); this.id = id; this.price = price; @@ -102,4 +105,12 @@ public void setPessoa_id(int pessoa_id) { this.pessoa_id = pessoa_id; } + public LocalDate getPost() { + return post; + } + + public void setPost(LocalDate post) { + this.post = post; + } + } From 880ea84bca0faed7ebd1963e1436eedf427b5703 Mon Sep 17 00:00:00 2001 From: kaka-jaques Date: Sun, 25 Sep 2022 22:58:12 -0300 Subject: [PATCH 6/8] UPDATE API! --- .../TMSProject/controllers/ShipController.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/controllers/ShipController.java b/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/controllers/ShipController.java index 99cfde3..bc38975 100644 --- a/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/controllers/ShipController.java +++ b/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/controllers/ShipController.java @@ -16,6 +16,8 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import com.fasterxml.jackson.databind.util.JSONPObject; + @RestController @CrossOrigin(origins = "*") @RequestMapping("/ship") @@ -24,7 +26,7 @@ public class ShipController { final String GOOGLE = "https://maps.googleapis.com/maps/api/directions/json?origin="; @GetMapping("/{cepOrigem}/{cepDestino}") - public ArrayList getGoogleAPI(@PathVariable ("cepOrigem") int param1, @PathVariable ("cepDestino") int param2 ){ + public JSONPObject getGoogleAPI(@PathVariable ("cepOrigem") int param1, @PathVariable ("cepDestino") int param2 ){ try { @@ -37,7 +39,9 @@ public ArrayList getGoogleAPI(@PathVariable ("cepOrigem") int param1, @P String jsonEmString = converteJsonEmString(response); - return jsonEmString; + JSONPObject obj = new JSONPObject(jsonEmString, null); + + return obj; }catch (Exception e) { @@ -50,11 +54,11 @@ public ArrayList getGoogleAPI(@PathVariable ("cepOrigem") int param1, @P public static String converteJsonEmString(BufferedReader buffereReader) throws IOException { String resposta; - ArrayList json = new ArrayList<>(); + String json = ""; while ((resposta = buffereReader.readLine()) != null) { - json.add(resposta); + json += (resposta); } From a468716e27d71c49457a48ef8416357ab0144ca7 Mon Sep 17 00:00:00 2001 From: bruno-roberto Date: Sun, 25 Sep 2022 23:11:28 -0300 Subject: [PATCH 7/8] Dash --- .../src/app/insight/insight.component.html | 29 +++++++------ .../main/src/app/insight/insight.component.ts | 43 ++++++++++++------- 2 files changed, 43 insertions(+), 29 deletions(-) diff --git a/frontend/main/src/app/insight/insight.component.html b/frontend/main/src/app/insight/insight.component.html index f84ef4b..936871e 100644 --- a/frontend/main/src/app/insight/insight.component.html +++ b/frontend/main/src/app/insight/insight.component.html @@ -3,13 +3,9 @@
-
- -

10

- - -

New Registers Packages

- +
+

New packages

+
@@ -22,14 +18,15 @@
-

+

12%

Bounce Rate

+
- More info + More info
@@ -37,8 +34,10 @@

12%

-

4

-

User Registrations

+ +

{{countClient}}

+

Registered Users

+
@@ -51,13 +50,13 @@

4

-

40

+

{{countVisitors/2}}

Visitors

- More info + More info
@@ -83,6 +82,7 @@

+
@@ -152,7 +152,8 @@

21 22 23 - 24 + 24 diff --git a/frontend/main/src/app/insight/insight.component.ts b/frontend/main/src/app/insight/insight.component.ts index c293e1d..25ce337 100644 --- a/frontend/main/src/app/insight/insight.component.ts +++ b/frontend/main/src/app/insight/insight.component.ts @@ -2,6 +2,7 @@ import { Component, OnInit } from '@angular/core'; import { Router } from '@angular/router'; import { RctQtComponent } from '../rct-qt/rct-qt.component'; import { HttpClient } from '@angular/common/http'; +import { Observable } from 'rxjs'; @Component({ selector: 'app-insight', @@ -9,11 +10,31 @@ import { HttpClient } from '@angular/common/http'; styleUrls: ['./insight.component.css'] }) export class InsightComponent implements OnInit { - count: any; - constructor(private router:Router) { } + readonly TMSLoginAPI: string = "http://localhost:8080/user/countClients" + + readonly apiURL:string = "http://localhost:8080/user/countVisitors" + + countClient!: number + countVisitors!: number + + constructor(private router:Router, private http:HttpClient) { + + } ngOnInit(): void { + + this.http.get(this.TMSLoginAPI) + .subscribe((resultado:any) => { + this.countClient=resultado + }); + + this.http.get(this.apiURL) + .subscribe((resultado:any) => { + this.countVisitors=resultado + }); + + } register(){ @@ -24,21 +45,13 @@ export class InsightComponent implements OnInit { this.router.navigateByUrl('users') } + // countClients() { + // this.http.get(`${this.TMSLoginAPI}/countClients`).subscribe(resultado => console.log(resultado)); + // return ; - // public get countVisitors() : any { - // return this.countVisitors // } - - // contador(){ - // this.countVisitors - // console.log(this.countVisitors); - + // countVisitors(){ + // this.http.get(`${this.apiURL}/countVisitors`).subscribe(resultado => console.log(resultado)); // } - - - - - - } From f07ebf521051a535b0b34e5ce32b8d74474bbccc Mon Sep 17 00:00:00 2001 From: kaka-jaques Date: Sun, 25 Sep 2022 23:50:04 -0300 Subject: [PATCH 8/8] UPDATE README AND FRONTEND SERVICES! --- README.md | 45 ++++++++++++++++++- .../main/src/app/body/body.component.html | 2 +- frontend/main/src/app/loginservice.service.ts | 4 ++ 3 files changed, 48 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 1c057c6..564293b 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,43 @@ -# Project_TMS_Fullstack_Entra21 -Projeto Final utilizando todas as tecnologias que aprendemos no curso da Entra21 - Blusoft +# TMS PROJECT - ENTRA21 FULLSTACK DEV + +--- +## SUMÁRIO + +sumario + +## RESUMO + +
+ Licença e Disponibilidade + +####      Esse projeto foi desenvolvido sem fins lucrativos, apenas para apresentação e demonstração dos conhecimentos técnicos adquiridos durante o curso do programa Entra21 - Blusoft na etapa final. + +####      + +
+ +
+ Das Tecnologias + +####      Durante o curso foi utilizado diversas tecnologias, métodos ágeis e ferramentas de desenvolvimento tais como: + +> #### Linguagens: +>> * ##### kaka-JAVA Java +>> * ##### kaka-js JavaScript +>> * ##### kaka-ts TypeScript +>> * ##### kaka-CSS CSS +> # +> #### Tecnologias: +>> * ##### kaka-vscode Spring Boot +>> * ##### kaka-Angular Angular +>> * ##### kaka-vscode MySQL +> # +> #### Ferramentas: +>> * ##### Eclipse IDE +>> * ##### kaka-vscode Visual Studio Code +>> * ##### Postman +>> * ##### kaka-vscode Google Cloud +> # +> #### Metodologia: +>> * ##### kaka-vscode Trello - Kanban + diff --git a/frontend/main/src/app/body/body.component.html b/frontend/main/src/app/body/body.component.html index 725cb64..1a907f1 100644 --- a/frontend/main/src/app/body/body.component.html +++ b/frontend/main/src/app/body/body.component.html @@ -111,7 +111,7 @@

-
  • +

  • Dashboard

    diff --git a/frontend/main/src/app/loginservice.service.ts b/frontend/main/src/app/loginservice.service.ts index d7999d2..b4a75ed 100644 --- a/frontend/main/src/app/loginservice.service.ts +++ b/frontend/main/src/app/loginservice.service.ts @@ -14,6 +14,8 @@ export class LoginserviceService implements CanActivate { readonly TMSLoginAPI: string = "http://localhost:8080" succeed!: boolean progress: boolean = false + admin:boolean = false + enterprise:boolean = false constructor(private router: Router, private http: HttpClient) { } @@ -38,6 +40,8 @@ export class LoginserviceService implements CanActivate { .subscribe((resp:any) =>{ console.log(resp); this.user = resp.nome + this.admin = resp.admin + this.enterprise = resp.enterprise }) return response })