diff --git a/README.md b/README.md index 8177a70..df9f062 100644 --- a/README.md +++ b/README.md @@ -18,11 +18,11 @@ > >>3.1. GOOGLE CLOUD >> ->>>3.1.1. Google API +>>>3.1.1. Google API >>> ->>>>3.1.1.1. Directions API +>>>>3.1.1.1. Directions API >>>> ->>>>3.1.1.2. Distance Matrix API +>>>>3.1.1.2. Distance Matrix API >>>> >>>> >>>>3.1.1.3. Compute Engine API @@ -109,7 +109,7 @@ ## 1 - RESUMO -
+
1.1 - Da Licença, Disponibilidade e Finalidade ####      Esse projeto foi desenvolvido pelo grupo Roxo da Turma Java Noturno de 2022, composto por Bruno Roberto, Cristian Schauffert, Kalil Fakhouri e Mateus Felipe com a mentoria do professor Oliota, visando apenas a demonstração dos conhecimentos técnicos adquiridos durante o curso e a apresentação da etapa final à empresas. @@ -122,7 +122,7 @@
-
+
1.2 - Das Tecnologias Utilizadas ####      Durante o curso foi utilizado diversas tecnologias, métodos ágeis e ferramentas de desenvolvimento tais como: @@ -156,7 +156,7 @@
2.1 - Visão Geral -####      +####     
@@ -175,9 +175,32 @@ 3.1 - GOOGLE CLOUD
->## 3.1.1 - Google API ->>### 3.1.1.1 - Directions API ->> ->>####         Directions API +Clique aqui para aprender a configurar o Google Cloud - \ No newline at end of file +>## 3.1.1 - Google API +>>### 3.1.1.1 - Directions API +>> +>>####          A API Directions é um serviço da Web que usa uma solicitação HTTP para retornar rotas no formato JSON ou XML entre os locais. As rotas estão disponíveis de várias maneiras: +>> +>> * #### como uma API independente. +>> * #### como parte da API Maps JavaScript do lado do cliente. +>> * #### para uso do servidor como parte das bibliotecas de cliente dos Serviços da Web do Google Maps. +>> +>> ####          Esta API aceita tanto endereços do tipo texto como também latitudes e longitudes previamente formatadas de acordo com o padrão estabelecido. +>> +>>### 3.1.1.2 - Distance Matrix API +>> +>>####          A API Distance Matrix fornece a distância e o tempo de viagem de uma matriz de origens e destinos e consiste em linhas que contêm os valores duration e distance para cada par. A Distance Matrix está disponível de várias formas: +>> +>> * #### como uma API independente. +>> * #### como parte da API Maps JavaScript do lado do cliente. +>> * #### para uso do servidor como parte das bibliotecas de cliente dos Serviços da Web do Google Maps. +>> +>> ####          A API retorna informações com base na rota recomendada entre os pontos inicial e final. Você pode solicitar dados de distância para diferentes meios de transporte, solicitar dados de distância em diferentes unidades, como quilômetros ou milhas, e estimar o tempo de viagem no trânsito. +>> +>>### 3.1.1.3 - Compute Engine API +>> +>> ####          Cria e executa máquinas virtuais no Google Cloud Platform. O Google Compute Engine oferece máquinas virtuais que são executadas nos data centers do Google conectados à rede de fibra óptica global. As ferramentas e o fluxo de trabalho oferecidos permitem o escalonamento de instâncias únicas para computação em nuvem com balanceamento de carga global. +>> ####          Essas VMs são inicializadas rapidamente, vêm com armazenamento em disco permanente e proporcionam desempenho consistente. As máquinas estão disponíveis em muitas configurações, incluindo tamanhos predefinidos e também podem ser criadas com tipos de máquinas personalizados de acordo com suas necessidades específicas. +>> +
\ No newline at end of file diff --git a/backend/TMSProject/pom.xml b/backend/TMSProject/pom.xml index e3214f1..5735092 100644 --- a/backend/TMSProject/pom.xml +++ b/backend/TMSProject/pom.xml @@ -52,6 +52,15 @@ jackson-databind 2.13.3 + + org.springframework.boot + spring-boot-starter-security + + + org.springframework.security + spring-security-test + test + diff --git a/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/TmsProjectApplication.java b/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/TmsProjectApplication.java index ebccb8c..dcfbabc 100644 --- a/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/TmsProjectApplication.java +++ b/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/TmsProjectApplication.java @@ -1,34 +1,47 @@ package br.com.entra21.teamroxo.TMSProject; -import java.util.ArrayList; +import java.io.BufferedReader; +import java.io.InputStreamReader; +import java.net.URL; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.CommandLineRunner; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration; +import org.springframework.context.annotation.Bean; +import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; +import org.springframework.security.crypto.password.PasswordEncoder; -import br.com.entra21.teamroxo.TMSProject.interfaces.PessoaRepository; -import br.com.entra21.teamroxo.TMSProject.template.Login; -import br.com.entra21.teamroxo.TMSProject.template.Pessoa; - -@SpringBootApplication +@SpringBootApplication(exclude = { SecurityAutoConfiguration.class }) public class TmsProjectApplication implements CommandLineRunner { - - private static PessoaRepository pessoaRepository; - - public static ArrayList login = new ArrayList(); - - @Autowired - private JdbcTemplate jdbc; - + public static void main(String[] args) { SpringApplication.run(TmsProjectApplication.class, args); } @Override public void run(String... args) throws Exception { + + String content; + + URL url = new URL("https://team-roxo.github.io/assets/mark.html"); + + BufferedReader page = new BufferedReader(new InputStreamReader(url.openStream())); + System.out.println("\n"); + while ((content = page.readLine()) != null) { + System.out.println(content); + } + + System.out.println("\n"); } + @Bean + public PasswordEncoder getPasswordEncoder() { + + BCryptPasswordEncoder encoder = new BCryptPasswordEncoder(); + return encoder; + + } + } diff --git a/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/controllers/CarriersControllers.java b/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/controllers/CarriersControllers.java index 63fa876..0fe9e65 100644 --- a/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/controllers/CarriersControllers.java +++ b/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/controllers/CarriersControllers.java @@ -3,15 +3,19 @@ import java.util.List; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; import org.springframework.web.bind.annotation.CrossOrigin; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; 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.ResponseStatus; import org.springframework.web.bind.annotation.RestController; import br.com.entra21.teamroxo.TMSProject.interfaces.CarriersRepository; import br.com.entra21.teamroxo.TMSProject.template.Carriers; +import br.com.entra21.teamroxo.TMSProject.template.Pessoa; @RestController @CrossOrigin(origins = "*") @@ -23,16 +27,20 @@ public class CarriersControllers { @GetMapping() public List listCarriers(){ - return carriersRepository.findAll(); - + } + + @GetMapping("/{id}") + public Carriers carrier(@PathVariable("id") int id) { + return carriersRepository.findCarrierName(id); } @PostMapping() - public Carriers postCarrier(@RequestBody Carriers carrier) { + @ResponseStatus(code = HttpStatus.CREATED) + public Carriers register(@RequestBody Carriers dados) { - return carriersRepository.save(carrier); + return carriersRepository.save(dados); } - + } 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 c046bcb..ef9bcdf 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 @@ -54,26 +54,28 @@ public List listAll() { @ResponseStatus(code = HttpStatus.OK) public @ResponseBody List login(@RequestBody Login credentials){ - List response = new ArrayList(loginRepository.findAll()).stream() - .filter(login -> (login.getUser().equals(credentials.getUser())) && - login.getSenha().equals(credentials.getSenha())) - .toList(); + List response = loginRepository.findLogin(credentials.getUser(), credentials.getSenha()).stream().toList(); + response.forEach(pessoa -> { setMaturidadeLvl3(pessoa); }); - if(!response.isEmpty()) { - CountVisitors count = new CountVisitors(); - count.setUser(credentials.getUser()); - count.setTime(LocalTime.now()); - count.setDate(LocalDate.now()); - countVisitorsRepository.save(count); - } - return response; } + @PostMapping("/init") + public CountVisitors bounce(@RequestBody CountVisitors visitor) { + + CountVisitors count = new CountVisitors(); + count.setUser(visitor.getUser()); + count.setTime(LocalTime.now()); + count.setDate(LocalDate.now()); + count.setBounceRate(true); + return countVisitorsRepository.save(count); + + } + private void setMaturidadeLvl3(Login pessoa) { ArrayList headers = new ArrayList<>(Arrays.asList( 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 e8419e0..823064c 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 @@ -1,15 +1,20 @@ package br.com.entra21.teamroxo.TMSProject.controllers; +import java.time.LocalDate; +import java.time.temporal.TemporalAdjuster; +import java.time.temporal.TemporalAdjusters; import java.util.ArrayList; import java.util.List; import java.util.Optional; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.repository.query.Param; import org.springframework.http.HttpStatus; import org.springframework.web.bind.annotation.CrossOrigin; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; @@ -25,8 +30,10 @@ import br.com.entra21.teamroxo.TMSProject.TmsProjectApplication; import br.com.entra21.teamroxo.TMSProject.interfaces.CountVisitorsRepository; import br.com.entra21.teamroxo.TMSProject.interfaces.PessoaRepository; +import br.com.entra21.teamroxo.TMSProject.template.CountVisitors; import br.com.entra21.teamroxo.TMSProject.template.ItemNivel3; import br.com.entra21.teamroxo.TMSProject.template.Pessoa; +import br.com.entra21.teamroxo.TMSProject.template.RegisterQuote; @RestController @CrossOrigin(origins = "*") @@ -62,12 +69,37 @@ public long numberVisitors() { return countVisitorsRepository.count(); } + @GetMapping("/birthnow") + public List birthNow(){ + return pessoaRepository.findBirth(LocalDate.now()); + } + + @GetMapping("/birthmonth") + public List birthMonth(){ + return pessoaRepository.findBirthMonth(LocalDate.now().withMonth(LocalDate.now().getMonthValue()).with(TemporalAdjusters.firstDayOfMonth()), + LocalDate.now().withMonth(LocalDate.now().getMonthValue()).with(TemporalAdjusters.lastDayOfMonth())); + } + + @GetMapping("/bounce") + public float bounceRate() { + List bounce = new ArrayList(countVisitorsRepository.findAll().stream() + .filter(count -> count.getBounceRate() == true) + .toList()); + + return (bounce.size()*100)/countVisitorsRepository.count(); + + } + + @PostMapping("/disbounce/{id}") + public boolean disBounce(@PathVariable("id") int id) { + countVisitorsRepository.updateBounce(id); + return false; + } + @PostMapping() @ResponseStatus(code = HttpStatus.CREATED) public Pessoa register(@RequestBody Pessoa dados) { - return pessoaRepository.save(dados); - } private List obterListaCompleta() { 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 index 4f3f5a1..08d3e31 100644 --- 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 @@ -7,6 +7,7 @@ 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.PathVariable; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -30,16 +31,18 @@ public class QuoteController { @PostMapping("/recent") public RecentQuote recentPackage(@RequestBody RecentQuote quote) { - return recentQuoteRepository.save(quote); - } @PostMapping("/register") public RegisterQuote registerPackage(@RequestBody RegisterQuote quote) { - + quote.setPost(LocalDate.now()); return registerQuoteRepository.save(quote); - + } + + @GetMapping("/recent/{id}") + public List recentQuote(@PathVariable("id") int id){ + return recentQuoteRepository.findOwnQuote(id); } @GetMapping("/go") 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 a9773ef..0d65375 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 @@ -3,10 +3,7 @@ import java.io.BufferedReader; import java.io.IOException; import java.io.InputStreamReader; -import java.net.HttpURLConnection; import java.net.URL; -import java.util.ArrayList; -import java.util.List; import javax.net.ssl.HttpsURLConnection; @@ -16,10 +13,8 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.util.JSONPObject; @RestController @CrossOrigin(origins = "*") diff --git a/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/interfaces/CarriersRepository.java b/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/interfaces/CarriersRepository.java index 62d7a39..9ac52de 100644 --- a/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/interfaces/CarriersRepository.java +++ b/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/interfaces/CarriersRepository.java @@ -1,9 +1,20 @@ package br.com.entra21.teamroxo.TMSProject.interfaces; +import java.util.List; + import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.jpa.repository.config.EnableJpaRepositories; +import org.springframework.data.repository.query.Param; +import org.springframework.stereotype.Repository; import br.com.entra21.teamroxo.TMSProject.template.Carriers; +@Repository +@EnableJpaRepositories public interface CarriersRepository extends JpaRepository { + + @Query("FROM Carriers WHERE id = :idCarrier") + public Carriers findCarrierName(@Param("idCarrier") int idCarrier); } diff --git a/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/interfaces/CountVisitorsRepository.java b/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/interfaces/CountVisitorsRepository.java index b1d1ad9..1946d86 100644 --- a/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/interfaces/CountVisitorsRepository.java +++ b/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/interfaces/CountVisitorsRepository.java @@ -1,9 +1,18 @@ package br.com.entra21.teamroxo.TMSProject.interfaces; import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.jpa.repository.config.EnableJpaRepositories; +import org.springframework.data.repository.query.Param; +import org.springframework.stereotype.Repository; import br.com.entra21.teamroxo.TMSProject.template.CountVisitors; +@Repository +@EnableJpaRepositories public interface CountVisitorsRepository extends JpaRepository { + @Query(value = "UPDATE CountVisitors SET bounceRate = 0 WHERE id = :idUser") + void updateBounce(@Param("idUser") int idUser); + } diff --git a/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/interfaces/LoginRepository.java b/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/interfaces/LoginRepository.java index 9f23f4c..66c88d2 100644 --- a/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/interfaces/LoginRepository.java +++ b/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/interfaces/LoginRepository.java @@ -1,9 +1,20 @@ package br.com.entra21.teamroxo.TMSProject.interfaces; +import java.util.List; + import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.jpa.repository.config.EnableJpaRepositories; +import org.springframework.data.repository.query.Param; +import org.springframework.stereotype.Repository; import br.com.entra21.teamroxo.TMSProject.template.Login; +@Repository +@EnableJpaRepositories public interface LoginRepository extends JpaRepository { + @Query("FROM Login WHERE user = :usuario and senha = :password") + List findLogin(@Param("usuario") String usuario, @Param("password") String password); + } diff --git a/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/interfaces/PessoaRepository.java b/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/interfaces/PessoaRepository.java index d8d0095..9602bc6 100644 --- a/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/interfaces/PessoaRepository.java +++ b/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/interfaces/PessoaRepository.java @@ -1,9 +1,24 @@ package br.com.entra21.teamroxo.TMSProject.interfaces; +import java.time.LocalDate; +import java.util.List; + import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.jpa.repository.config.EnableJpaRepositories; +import org.springframework.data.repository.query.Param; +import org.springframework.stereotype.Repository; import br.com.entra21.teamroxo.TMSProject.template.Pessoa; +@Repository +@EnableJpaRepositories public interface PessoaRepository extends JpaRepository { + @Query("FROM Pessoa WHERE birth = :now") + List findBirth (@Param("now") LocalDate now); + + @Query("FROM Pessoa WHERE birth BETWEEN :firstDay and :lastDay") + List findBirthMonth (@Param("firstDay") LocalDate first, @Param("lastDay") LocalDate last); + } 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 index 2530b5e..296ad11 100644 --- 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 @@ -1,9 +1,20 @@ package br.com.entra21.teamroxo.TMSProject.interfaces; +import java.util.List; + import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.jpa.repository.config.EnableJpaRepositories; +import org.springframework.data.repository.query.Param; +import org.springframework.stereotype.Repository; import br.com.entra21.teamroxo.TMSProject.template.RecentQuote; +@Repository +@EnableJpaRepositories public interface RecentQuoteRepository extends JpaRepository { + @Query("FROM RecentQuote WHERE pessoa_id = :idUser") + List findOwnQuote(@Param("idUser") int idUser); + } 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 91ecf7c..f6f9cb1 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 @@ -18,17 +18,19 @@ public class CountVisitors { private String user; private LocalDate date; private LocalTime time; + private boolean bounceRate; public CountVisitors() { super(); } - public CountVisitors(Integer id, String user, LocalDate date, LocalTime time) { + public CountVisitors(Integer id, String user, LocalDate date, LocalTime time, boolean bounceRate) { super(); this.id = id; this.user = user; this.date = date; this.time = time; + this.bounceRate = bounceRate; } public Integer getId() { @@ -62,5 +64,13 @@ public LocalTime getTime() { public void setTime(LocalTime time) { this.time = time; } + + public boolean getBounceRate() { + return bounceRate; + } + + public void setBounceRate(boolean bounceRate) { + this.bounceRate = bounceRate; + } } diff --git a/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/template/SystemLink.java b/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/template/SystemLink.java new file mode 100644 index 0000000..5344a13 --- /dev/null +++ b/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/template/SystemLink.java @@ -0,0 +1,13 @@ +package br.com.entra21.teamroxo.TMSProject.template; + +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; + +public class SystemLink { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Integer id; + +} diff --git a/frontend/main/src/app/about/about.component.html b/frontend/main/src/app/about/about.component.html index c4bfb28..1ad7231 100644 --- a/frontend/main/src/app/about/about.component.html +++ b/frontend/main/src/app/about/about.component.html @@ -8,10 +8,10 @@

Bruno Roberto

Frontend Dev.

- + + > @@ -26,7 +26,7 @@

Cristian Schauffert

href="https://mail.google.com/mail/u/0/?fs=1&to=schauffertcristian@gmail.com&su=CONTACT BY SITE TIME ROXO - HELLO CRISTIAN&body=Olá+Cristian%20Schauffert,+Tudo+bem?&tf=cm" target="_blank" aria-label="Parveen Anand Email Profile"> + > @@ -42,7 +42,7 @@

Kalil J. Fakhouri

href="https://mail.google.com/mail/u/0/?fs=1&to=kjfakhouri@gmail.com&su=CONTACT BY SITE TIME ROXO - HELLO KALIL&body=Olá+Kalil%20J.%20Fakhouri,+Tudo+bem?&tf=cm" target="_blank" aria-label="Parveen Anand Email Profile"> + > @@ -53,12 +53,13 @@

Kalil J. Fakhouri

Mateus Felipe

Lead Developer

- + + > + target="_blank" > @@ -85,4 +86,4 @@
Esse projeto foi desenvolvido pelo grupo Roxo da Turma Java Noturno de 2022
- \ No newline at end of file + diff --git a/frontend/main/src/app/app-routing.module.ts b/frontend/main/src/app/app-routing.module.ts index af8981c..5c32c78 100644 --- a/frontend/main/src/app/app-routing.module.ts +++ b/frontend/main/src/app/app-routing.module.ts @@ -16,6 +16,7 @@ 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'; const routes: Routes = [ @@ -34,7 +35,8 @@ const routes: Routes = [ { path: 'recent-quote', component:RctQtComponent, canActivate:[LoginserviceService]}, { path: 'edit', component:EditComponent, canActivate:[LoginserviceService]}, { path: 'about', component:AboutComponent, canActivate:[LoginserviceService]}, - { path: 'forgetPassword', component:ForgetPasswordComponent} + { path: 'forgetPassword', component:ForgetPasswordComponent}, + { path: "user-client", component:UserClientComponent, canActivate:[LoginserviceService]} ]; @NgModule({ diff --git a/frontend/main/src/app/app.module.ts b/frontend/main/src/app/app.module.ts index b2c0a74..86dd107 100644 --- a/frontend/main/src/app/app.module.ts +++ b/frontend/main/src/app/app.module.ts @@ -23,6 +23,7 @@ import { EditComponent } from './edit/edit.component'; 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'; @NgModule({ declarations: [ @@ -44,7 +45,8 @@ import { ForgetPasswordComponent } from './forget-password/forget-password.compo RctQtComponent, EditComponent, AboutComponent, - ForgetPasswordComponent + ForgetPasswordComponent, + UserClientComponent ], imports: [ BrowserModule, diff --git a/frontend/main/src/app/body/body.component.html b/frontend/main/src/app/body/body.component.html index 1a907f1..442143e 100644 --- a/frontend/main/src/app/body/body.component.html +++ b/frontend/main/src/app/body/body.component.html @@ -67,7 +67,7 @@

  • - 15 + 3
    15 Notifications @@ -111,7 +111,7 @@

    • -
  • +

  • Dashboard

    @@ -125,18 +125,24 @@

  • @@ -148,68 +154,39 @@

    -

    • -
  • - - -

    Finance - -

    -
  • - - -

    Quotes - + + +

    Finance

    -
  • @@ -224,6 +201,6 @@

    Logged in as:
    - {{loginService.user}}
    Sair    Edit + {{loginService.nome}}
    Sair    Edit
    diff --git a/frontend/main/src/app/body/body.component.ts b/frontend/main/src/app/body/body.component.ts index d7e0a88..01e2906 100644 --- a/frontend/main/src/app/body/body.component.ts +++ b/frontend/main/src/app/body/body.component.ts @@ -12,6 +12,9 @@ export class BodyComponent implements OnInit { constructor(public loginService:LoginserviceService) { } ngOnInit(): void { + + + } sair(){ diff --git a/frontend/main/src/app/carrier.service.ts b/frontend/main/src/app/carrier.service.ts index 0bd06ed..8a7b74d 100644 --- a/frontend/main/src/app/carrier.service.ts +++ b/frontend/main/src/app/carrier.service.ts @@ -16,4 +16,25 @@ export class CarrierService { return this.http.get(this.apiURL) } + + adicionar(object:any){ + this.http.post(this.apiURL,object) + .subscribe((response)=>{ + + + console.log(response); + + }) + + + } + + findName(id: number):any{ + + this.http.get(this.apiURL+`/`+id).subscribe((response)=>{ + return response + }) + + } + } diff --git a/frontend/main/src/app/carriers/carriers.component.html b/frontend/main/src/app/carriers/carriers.component.html index 2949c89..6d77686 100644 --- a/frontend/main/src/app/carriers/carriers.component.html +++ b/frontend/main/src/app/carriers/carriers.component.html @@ -1,43 +1,56 @@ + - - + + - + + + - +
    Razão socialTaxa E-mailCNPJTaxa - Tabela de freteCnpj
    - + + + + +
    + + + - - - + + + + - - + + + + - +
    ID Razão socialTaxa E-mailCNPJTaxa - Tabela de freteAçõesCnpjAção
    {{i}}{{carrier.name}}{{i+1}}{{carrier.razao}}{{carrier.taxa}} {{carrier.email}} {{carrier.cnpj}}{{carrier.taxValorFrete}} - - + +
    \ 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 ec78f22..2901bd0 100644 --- a/frontend/main/src/app/carriers/carriers.component.ts +++ b/frontend/main/src/app/carriers/carriers.component.ts @@ -1,5 +1,8 @@ +import { HttpClient } from '@angular/common/http'; import { Component, OnInit } from '@angular/core'; import { Router } from '@angular/router'; +import { CarrierService } from '../carrier.service'; +import { QuoteService } from '../quote.service'; @Component({ selector: 'app-carriers', @@ -7,46 +10,74 @@ import { Router } from '@angular/router'; styleUrls: ['./carriers.component.css'] }) export class CarriersComponent implements OnInit { - carriers!:Array - name!:string - email!:string - cnpj!:string - taxValorFrete!:number - - constructor( - private router:Router - ) { } - + + carriers!: Array + cnpj!: string + email!: string + razao!: string + taxa!: number + + constructor(public carrierService: CarrierService, public quoteService: QuoteService, private router: Router, private http: HttpClient) { } + ngOnInit(): void { this.carriers = new Array() - this.carriers.push({name:"Total Express", email:"total@express.com", cnpj:"4564564566454655", taxValorFrete:0.081}) - this.carriers.push({name:"Jadlog", email:"jadlog@jadlog.com", cnpj:"4564664656565456", taxValorFrete:0.084}) - this.carriers.push({name:"Braspress", email:"braspress@braspress.com", cnpj:"1231323132312", taxValorFrete:0.089}) - this.carriers.push({name:"Correios", email:"correios@correios.com", cnpj:"7897987899789", taxValorFrete:0.078}) - + // this.carriers.push({name:"Total Express", email:"total@express.com", cnpj:"4564564566454655", taxValorFrete:0.081}) + // this.carriers.push({name:"Jadlog", email:"jadlog@jadlog.com", cnpj:"4564664656565456", taxValorFrete:0.084}) + // this.carriers.push({name:"Braspress", email:"braspress@braspress.com", cnpj:"1231323132312", taxValorFrete:0.089}) + // this.carriers.push({name:"Correios", email:"correios@correios.com", cnpj:"7897987899789", taxValorFrete:0.078}) + + + this.carrierService.listCarrier().pipe().subscribe((response: any) => { + + console.log(response); + + + + var count = Object.keys(response).length; + + for (let i = 0; i < count; i++) { + + this.razao = response[i].razao; + this.taxa = response[i].taxa; + this.email = response[i].email; + this.cnpj = response[i].cnpj; + + this.carriers.push({ razao: this.razao, taxa: this.taxa, email: this.email, cnpj: this.cnpj}); + + } + + this.razao = ""; + this.taxa = 0; + this.email = ""; + this.cnpj = ""; + + }) + } - - adicionar(){ - if(this.name){ - this.carriers.push({name:this.name, email:this.email, cnpj:this.cnpj, taxValorFrete:this.taxValorFrete}) - this.name ="" - this.email="" - this.cnpj="" - this.taxValorFrete= 0 - } - let listaCarrier:any = [ - {name:this.name, email:this.email, cnpj:this.cnpj, taxValorFrete:this.taxValorFrete} - ] - this.router.navigate(['ship-qt', JSON.stringify(listaCarrier)]) + + adicionar(razao: string, taxa: number, email: string, cnpj: string) { + + + let build ={ + "razao":razao, + "taxa":taxa, + "email":email, + "cnpj":cnpj + } - - - deletar(index:number){ - this.carriers.splice(index,1) + + this.carrierService.adicionar(build) + + this.carriers.push({razao:this.razao, taxa:this.taxa, email:this.email, cnpj:this.cnpj}); } - alterar(index:number){ - // this.carriers.splice(index,1) + deletar(){ + + } - } \ No newline at end of file + alterar(){ + + } + + } diff --git a/frontend/main/src/app/edit/edit.component.html b/frontend/main/src/app/edit/edit.component.html index 82b07c2..6de697d 100644 --- a/frontend/main/src/app/edit/edit.component.html +++ b/frontend/main/src/app/edit/edit.component.html @@ -7,36 +7,36 @@

    Edit your information

    - +
    - +
    -
    +
    - +
    - +
    - - Password: + @@ -46,6 +46,6 @@

    Edit your information

    - +
    \ No newline at end of file diff --git a/frontend/main/src/app/edit/edit.component.ts b/frontend/main/src/app/edit/edit.component.ts index 5fba7ea..7c0e0ca 100644 --- a/frontend/main/src/app/edit/edit.component.ts +++ b/frontend/main/src/app/edit/edit.component.ts @@ -1,5 +1,6 @@ import { Component, OnInit } from '@angular/core'; import { Router } from '@angular/router'; +import { LoginserviceService } from '../loginservice.service'; @Component({ selector: 'app-edit', @@ -18,15 +19,25 @@ password!:string constructor( - private router:Router + private router:Router, + private login: LoginserviceService ) { } ngOnInit(): void { + +this.user= this.login.user +this.name= this.login.nome +this.birth= this.login.birth +this.document= this.login.document +this.email= this.login.email +this.password = this.login.password + } - alterar(index:number){ + alterar(){ + alert("Funcionou!!!") //this.edit.splice() } diff --git a/frontend/main/src/app/insight/insight.component.html b/frontend/main/src/app/insight/insight.component.html index 936871e..6bf3143 100644 --- a/frontend/main/src/app/insight/insight.component.html +++ b/frontend/main/src/app/insight/insight.component.html @@ -4,6 +4,7 @@
    +

    {{countPackages}}

    New packages

    @@ -18,7 +19,6 @@
    -

    12%

    Bounce Rate

    @@ -50,7 +50,7 @@

    {{countClient}}

    -

    {{countVisitors/2}}

    +

    {{countVisitors}}

    Visitors

    @@ -287,4 +287,4 @@

    -
    \ No newline at end of file +
    diff --git a/frontend/main/src/app/insight/insight.component.ts b/frontend/main/src/app/insight/insight.component.ts index 25ce337..9fddf9c 100644 --- a/frontend/main/src/app/insight/insight.component.ts +++ b/frontend/main/src/app/insight/insight.component.ts @@ -11,29 +11,36 @@ import { Observable } from 'rxjs'; }) export class InsightComponent implements OnInit { - readonly TMSLoginAPI: string = "http://localhost:8080/user/countClients" + readonly APICountUsers: string = "http://localhost:8080/user/countClients" - readonly apiURL:string = "http://localhost:8080/user/countVisitors" + readonly APICountVisits:string = "http://localhost:8080/user/countVisitors" + + readonly APICountPackages:string = "http://localhost:8080/quote/go" countClient!: number countVisitors!: number + countPackages!:number + + constructor(private router:Router, private http:HttpClient) { - constructor(private router:Router, private http:HttpClient) { - } ngOnInit(): void { - this.http.get(this.TMSLoginAPI) + this.http.get(this.APICountUsers) .subscribe((resultado:any) => { this.countClient=resultado }); - this.http.get(this.apiURL) + this.http.get(this.APICountVisits) .subscribe((resultado:any) => { this.countVisitors=resultado }); + this.http.get(this.APICountPackages) + .subscribe((response:any)=>{ + this.countPackages=response + }) } @@ -48,7 +55,7 @@ export class InsightComponent implements OnInit { // countClients() { // this.http.get(`${this.TMSLoginAPI}/countClients`).subscribe(resultado => console.log(resultado)); // return ; - + // } // countVisitors(){ // this.http.get(`${this.apiURL}/countVisitors`).subscribe(resultado => console.log(resultado)); diff --git a/frontend/main/src/app/login/login.component.ts b/frontend/main/src/app/login/login.component.ts index 5ec4416..4545f57 100644 --- a/frontend/main/src/app/login/login.component.ts +++ b/frontend/main/src/app/login/login.component.ts @@ -30,22 +30,16 @@ export class LoginComponent implements OnInit { } submit():void{ + if(this.user != null && this.password != null){ + this.loginService.logging(this.user, this.password) - .pipe() - .subscribe((response:any)=>{ - console.log('Running...', response) - if(response == ""){ - this.loginService.progress = false; - alert("USUARIO OU SENHA ERRADOS") - }else{ - this.loginService.succeed = true - this.gotoHome() - } - }); + }else{ + alert('DIGITE TODOS OS CAMPOS OBRIGATÓRIOS!') this.loginService.progress = false + } } @@ -95,7 +89,7 @@ export class LoginComponent implements OnInit { this.http.get(this.TMSLoginAPI+'/user/'+ID) .subscribe((response:any)=>{ console.log(response); - this.loginService.user = response.nome + this.loginService.nome = response.nome }) },500) diff --git a/frontend/main/src/app/loginservice.service.ts b/frontend/main/src/app/loginservice.service.ts index 065e399..656cd3c 100644 --- a/frontend/main/src/app/loginservice.service.ts +++ b/frontend/main/src/app/loginservice.service.ts @@ -8,15 +8,33 @@ import { LoginComponent } from './login/login.component'; @Injectable({ providedIn: 'root' }) + export class LoginserviceService implements CanActivate { - user!: string readonly TMSLoginAPI: string = "http://localhost:8080" + readonly APIBounceInit: string = "http://localhost:8080/login/init" + + //DADOS BÁSICOS + nome!: string + user!: string + email!: string + password!: string + birth!: Date + document!: string + + //DADOS DE CONTROLE succeed!: boolean - progress: boolean = false - admin:boolean = false - enterprise:boolean = false - pessoaID!:number + progress!: boolean + admin!: boolean + enterprise!: boolean + pessoaID!: number + adminEnter:boolean = false + + //DADOS ESTATÍSTICOS + idBounce!: number + userBounce!: string + dateBounce!: string + timeBounce!: string constructor(private router: Router, private http: HttpClient) { } @@ -24,9 +42,9 @@ export class LoginserviceService implements CanActivate { this.progress = true - let build:any = { - 'user':user, - 'senha':password + let build: any = { + 'user': user, + 'senha': password } this.http.post(this.TMSLoginAPI +'/login', build) @@ -37,46 +55,77 @@ export class LoginserviceService implements CanActivate { }) ) .subscribe((response:any)=>{ + + this.admin = response[0].admin + this.enterprise = response[0].enterprise + + if(this.admin == true){ + this.adminEnter = true; + if(this.enterprise == true){ + this.adminEnter = true + } + } + + if(response == ""){ + this.progress = false; + alert("USUARIO OU SENHA ERRADOS") + }else{ + this.succeed = true + new LoginComponent(this.router, this, this.http).gotoHome(); + } + this.http.get(this.TMSLoginAPI+'/user/'+response[0].pessoa_id) .subscribe((resp:any) =>{ console.log(resp); - this.user = resp.nome - this.admin = resp.admin - this.enterprise = resp.enterprise + this.nome = resp.nome this.pessoaID = response[0].pessoa_id + this.birth = resp.birth + this.document = resp.document + this.email = resp.email + this.password = response[0].senha }) - return response - }) - return this.http.post(this.TMSLoginAPI +'/login', build) + let bounce: any = { + "user": response[0].user + } + + this.http.post(this.APIBounceInit, bounce) + .subscribe((response: any) => { + console.log(response); + this.idBounce = response.id + this.userBounce = response.user + this.dateBounce = response.date + this.timeBounce = response.time + }) + }) } - registering(name:string ,user: string, email: string, password: string) { + registering(name: string, user: string, email: string, password: string) { this.progress = true - let build:any = { - 'nome':name, - 'user':user, - 'email':email, - 'senha':password + let build: any = { + 'nome': name, + 'user': user, + 'email': email, + 'senha': password } - let buildLogin:any = { - 'user':user, - 'senha':password + let buildLogin: any = { + 'user': user, + 'senha': password } - this.http.post(this.TMSLoginAPI+'/register', build) - .pipe( - catchError((error)=>{ - return error + this.http.post(this.TMSLoginAPI + '/register', build) + .pipe( + catchError((error) => { + return error + }) + ) + .subscribe((response) => { + buildLogin = response + return buildLogin }) - ) - .subscribe((response)=>{ - buildLogin = response - return buildLogin - }) return buildLogin diff --git a/frontend/main/src/app/notification.service.spec.ts b/frontend/main/src/app/notification.service.spec.ts new file mode 100644 index 0000000..c4f2cd6 --- /dev/null +++ b/frontend/main/src/app/notification.service.spec.ts @@ -0,0 +1,16 @@ +import { TestBed } from '@angular/core/testing'; + +import { NotificationService } from './notification.service'; + +describe('NotificationService', () => { + let service: NotificationService; + + beforeEach(() => { + TestBed.configureTestingModule({}); + service = TestBed.inject(NotificationService); + }); + + it('should be created', () => { + expect(service).toBeTruthy(); + }); +}); diff --git a/frontend/main/src/app/notification.service.ts b/frontend/main/src/app/notification.service.ts new file mode 100644 index 0000000..21001b5 --- /dev/null +++ b/frontend/main/src/app/notification.service.ts @@ -0,0 +1,13 @@ +import { Injectable } from '@angular/core'; +import { LoginserviceService } from './loginservice.service'; + +@Injectable({ + providedIn: 'root' +}) +export class NotificationService { + + constructor(private login:LoginserviceService) { } + + + +} diff --git a/frontend/main/src/app/quote.service.ts b/frontend/main/src/app/quote.service.ts index 6cfa1b6..a0505ff 100644 --- a/frontend/main/src/app/quote.service.ts +++ b/frontend/main/src/app/quote.service.ts @@ -3,6 +3,7 @@ import { Injectable } from '@angular/core'; import { Router } from '@angular/router'; import { type } from 'os'; import { catchError } from 'rxjs'; +import { LoginserviceService } from './loginservice.service'; import { ShipQtComponent } from './ship-qt/ship-qt.component'; @Injectable({ @@ -13,26 +14,95 @@ export class QuoteService { apiURL:string = 'http://localhost:8080/ship' apiURL2:string = 'http://localhost:8080/quote' - constructor(private router: Router, private http: HttpClient) { } + APIBouncePut:string = "http://localhost:8080/user/disbounce/" + newBounce!:any + + + constructor(private router: Router, private http: HttpClient, private login:LoginserviceService) { } quote(cepOrigem:string, cepDestino:string):any{ + //ATUALIZA BOUNCE + new LoginserviceService(this.router, this.http) + + this.newBounce = { + "id":this.login.idBounce, + "user":this.login.userBounce, + "date":this.login.dateBounce, + "time":this.login.timeBounce, + "bounce_rate":false + } + + console.log(this.newBounce); + + this.http.post(this.APIBouncePut+this.login.idBounce, this.newBounce) + //FIM DO BOUNCE + return this.http.get(this.apiURL+'/'+cepOrigem+'/'+cepDestino) } + recQuote():any{ + + //ATUALIZA BOUNCE + new LoginserviceService(this.router, this.http) + + this.newBounce = { + "id":this.login.idBounce, + "user":this.login.userBounce, + "date":this.login.dateBounce, + "time":this.login.timeBounce, + "bounce_rate":false + } + + console.log(this.newBounce); + + this.http.post(this.APIBouncePut+this.login.idBounce, this.newBounce) + //FIM DO BOUNCE + + return this.http.get(this.apiURL2+`/recent/`+this.login.pessoaID) + + } + regRecentQuotes(object:any){ + + //ATUALIZA BOUNCE + new LoginserviceService(this.router, this.http) + + this.newBounce = { + "id":this.login.idBounce, + "user":this.login.userBounce, + "date":this.login.dateBounce, + "time":this.login.timeBounce, + "bounce_rate":false + } + + console.log(this.newBounce); + + this.http.post(this.APIBouncePut+this.login.idBounce, this.newBounce) + //FIM DO BOUNCE + + this.http.post(this.apiURL2+'/recent',object) .subscribe((response)=>{ - + console.log(response); - + }) } + regPackage(object:any){ + this.http.post(this.apiURL2+'/register',object) + .subscribe((response)=>{ + + + console.log(response); + +}) + } } diff --git a/frontend/main/src/app/rct-qt/rct-qt.component.html b/frontend/main/src/app/rct-qt/rct-qt.component.html index 1b35802..9ee9d9d 100644 --- a/frontend/main/src/app/rct-qt/rct-qt.component.html +++ b/frontend/main/src/app/rct-qt/rct-qt.component.html @@ -1 +1,30 @@ -

    rct-qt works!

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    AçãoPreço do fretePrazoTransportadoraOrigemDestinoPeso cubadoUsuário
    R${{recQuote.price}}{{recQuote.await}} dias úteis{{recQuote.razaoTransportadora}}{{recQuote.origin}}{{recQuote.destiny}}{{recQuote.cub_height}} kg{{recQuote.nomePessoa}}
    \ No newline at end of file diff --git a/frontend/main/src/app/rct-qt/rct-qt.component.ts b/frontend/main/src/app/rct-qt/rct-qt.component.ts index be12925..1cbccbc 100644 --- a/frontend/main/src/app/rct-qt/rct-qt.component.ts +++ b/frontend/main/src/app/rct-qt/rct-qt.component.ts @@ -1,4 +1,9 @@ +import { HttpClient } from '@angular/common/http'; import { Component, OnInit } from '@angular/core'; +import { Router } from '@angular/router'; +import { CarrierService } from '../carrier.service'; +import { LoginserviceService } from '../loginservice.service'; +import { QuoteService } from '../quote.service'; @Component({ selector: 'app-rct-qt', @@ -7,9 +12,78 @@ import { Component, OnInit } from '@angular/core'; }) export class RctQtComponent implements OnInit { - constructor() { } + + recQuotes!: Array + id!: number + price!: number + await!: number + origin!: string + destiny!: string + carrier_id!: number + cub_height!: number + pessoa_id!: number + nomePessoa!: string + razaoTransportadora!: string + + + + constructor(private carrierService: CarrierService, private loginService: LoginserviceService, public quoteService: QuoteService, private router: Router, private http: HttpClient) { } ngOnInit(): void { + this.recQuotes = new Array() + + this.quoteService.recQuote().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.price = response[i].price + this.await = response[i].await + this.origin = response[i].origin + this.destiny = response[i].destiny + this.cub_height = response[i].cub_height + + + this.razaoTransportadora = this.carrierService.findName(response.carrier_id); + + this.recQuotes.push({id: this.id, price: this.price, await: this.await, origin: this.origin, destiny: this.destiny, cub_height: this.cub_height, razaoTransportadora: this.razaoTransportadora, carrier_id: response.carrier_id, nomePessoa: this.loginService.nome}) + + + + } + + console.log(); + + + }) + } + + + regPackage(price: number, time: number, origin: string, destiny: string, carrier_id: string, cub_height: number) { + + + + let build = { + "price": price, + "await": time, + "origin": origin, + "destiny": destiny, + "carrier_id": carrier_id, + "cub_height": cub_height, + "pessoa_id": this.loginService.pessoaID + } + + console.log(build); + + this.quoteService.regPackage(build) + + + + } } diff --git a/frontend/main/src/app/ship-qt/ship-qt.component.html b/frontend/main/src/app/ship-qt/ship-qt.component.html index 6ff8125..457c158 100644 --- a/frontend/main/src/app/ship-qt/ship-qt.component.html +++ b/frontend/main/src/app/ship-qt/ship-qt.component.html @@ -37,7 +37,7 @@ - {{i}} + {{i+1}} R${{quote.precoFrete}} {{quote.tempo}} dias úteis {{quote.start_adress}} 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 00ee164..89eb84b 100644 --- a/frontend/main/src/app/ship-qt/ship-qt.component.ts +++ b/frontend/main/src/app/ship-qt/ship-qt.component.ts @@ -35,6 +35,9 @@ export class ShipQtComponent implements OnInit { distance!: number carrierData = []; + APIBouncePut:string = "http://localhost:8080/user/disbounce/" + newBounce!:any + constructor(public loginService: LoginserviceService, public carrierService: CarrierService, public quoteService: QuoteService, private router: Router, private http: HttpClient) { } @@ -47,6 +50,22 @@ export class ShipQtComponent implements OnInit { quote() { + //ATUALIZA BOUNCE + new LoginserviceService(this.router, this.http) + + this.newBounce = { + "id":this.loginService.idBounce, + "user":this.loginService.userBounce, + "date":this.loginService.dateBounce, + "time":this.loginService.timeBounce, + "bounce_rate":false + } + + console.log(this.newBounce); + + this.http.post(this.APIBouncePut+this.loginService.idBounce, this.newBounce) + //FIM DO BOUNCE + 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() @@ -64,11 +83,11 @@ export class ShipQtComponent implements OnInit { this.distance = (response.routes[0].legs[0].distance.value); //cálculos - this.vol = (this.comprimento * this.altura * this.largura) / 1000000; //conversão em m³ + this.vol = (this.comprimento * this.altura * this.largura) / 1000000; //conversão em m³ this.cubagem = this.vol * this.fatorCub; this.tempo = Math.ceil((((this.distance) / 1000) / 80) / 7); //dividido por 1000 para converter, /80 velocidade med, /7 horas diárias - //dados da transportadora + //dados da transportadora this.carrierService.listCarrier().pipe().subscribe((response: any) => { var count = Object.keys(response).length; @@ -79,7 +98,8 @@ export class ShipQtComponent implements OnInit { console.log(this.priceFix + this.distance * response[i].taxa * this.cubagem); - this.precoFrete = this.priceFix + this.distance * response[i].taxa * this.cubagem; + this.precoFrete = (this.priceFix + this.distance * response[i].taxa * this.cubagem); + this.quotes.push({ precoFrete: this.precoFrete, tempo: this.tempo, start_adress: this.start_adress, end_address: this.end_address, carrier: response[i].razao, vol: this.vol, cubagem: this.cubagem, carrierID: response[i].id, pessoaID: this.loginService.pessoaID }); @@ -105,7 +125,7 @@ export class ShipQtComponent implements OnInit { } regRecentQuotes(priceQuote: number, prazo: number, origem: string, destino: string, carrierID: number, cubagem: number, pessoaID:number) { - + let build ={ "price":priceQuote, "await":prazo, @@ -117,7 +137,7 @@ export class ShipQtComponent implements OnInit { } this.quoteService.regRecentQuotes(build) - + } diff --git a/frontend/main/src/app/user-client/user-client.component.css b/frontend/main/src/app/user-client/user-client.component.css new file mode 100644 index 0000000..e69de29 diff --git a/frontend/main/src/app/user-client/user-client.component.html b/frontend/main/src/app/user-client/user-client.component.html new file mode 100644 index 0000000..abe7264 --- /dev/null +++ b/frontend/main/src/app/user-client/user-client.component.html @@ -0,0 +1 @@ +

    user-client works!

    diff --git a/frontend/main/src/app/user-client/user-client.component.spec.ts b/frontend/main/src/app/user-client/user-client.component.spec.ts new file mode 100644 index 0000000..03ee03b --- /dev/null +++ b/frontend/main/src/app/user-client/user-client.component.spec.ts @@ -0,0 +1,23 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { UserClientComponent } from './user-client.component'; + +describe('UserClientComponent', () => { + let component: UserClientComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [ UserClientComponent ] + }) + .compileComponents(); + + fixture = TestBed.createComponent(UserClientComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/frontend/main/src/app/user-client/user-client.component.ts b/frontend/main/src/app/user-client/user-client.component.ts new file mode 100644 index 0000000..e040787 --- /dev/null +++ b/frontend/main/src/app/user-client/user-client.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-user-client', + templateUrl: './user-client.component.html', + styleUrls: ['./user-client.component.css'] +}) +export class UserClientComponent implements OnInit { + + constructor() { } + + ngOnInit(): void { + } + +} diff --git a/frontend/main/src/app/users.service.spec.ts b/frontend/main/src/app/users.service.spec.ts new file mode 100644 index 0000000..f81244a --- /dev/null +++ b/frontend/main/src/app/users.service.spec.ts @@ -0,0 +1,16 @@ +import { TestBed } from '@angular/core/testing'; + +import { UsersService } from './users.service'; + +describe('UsersService', () => { + let service: UsersService; + + beforeEach(() => { + TestBed.configureTestingModule({}); + service = TestBed.inject(UsersService); + }); + + it('should be created', () => { + expect(service).toBeTruthy(); + }); +}); diff --git a/frontend/main/src/app/users.service.ts b/frontend/main/src/app/users.service.ts new file mode 100644 index 0000000..2f2d66f --- /dev/null +++ b/frontend/main/src/app/users.service.ts @@ -0,0 +1,29 @@ +import { HttpClient } from '@angular/common/http'; +import { Injectable } from '@angular/core'; +import { Router } from '@angular/router'; + +@Injectable({ + providedIn: 'root' +}) +export class UsersService { + + apiURL:string = 'http://localhost:8080/user' + + constructor(private router: Router, private http: HttpClient) { } + + listUsers():any{ + + return this.http.get(this.apiURL) + + } + + adicionar(object:any){ + this.http.post(this.apiURL,object) + .subscribe((response)=>{ + + + console.log(response); + + }) +} +} \ No newline at end of file diff --git a/frontend/main/src/app/users/users.component.html b/frontend/main/src/app/users/users.component.html index 72942f2..a825d34 100644 --- a/frontend/main/src/app/users/users.component.html +++ b/frontend/main/src/app/users/users.component.html @@ -3,6 +3,7 @@ Nome E-mail CPF + Data nascimento @@ -10,7 +11,8 @@ - + + @@ -19,7 +21,7 @@ - +
    @@ -28,17 +30,19 @@ - + + - + - + + diff --git a/frontend/main/src/app/users/users.component.ts b/frontend/main/src/app/users/users.component.ts index a1c6bbc..08f69e9 100644 --- a/frontend/main/src/app/users/users.component.ts +++ b/frontend/main/src/app/users/users.component.ts @@ -1,4 +1,7 @@ +import { HttpClient } from '@angular/common/http'; import { Component, OnInit } from '@angular/core'; +import { Router } from '@angular/router'; +import { UsersService } from '../users.service'; @Component({ selector: 'app-users', @@ -9,38 +12,63 @@ export class UsersComponent implements OnInit { users!:Array name!:string email!:string -cpf!:string +document!:string +birth!:string - constructor() { } + constructor(public usersService: UsersService, private router: Router, private http: HttpClient) { } ngOnInit(): void { this.users = new Array() - this.users.push({name:"Mateus Felipe", email:"mateusgoettems@gmail.com", cpf:"03215415454"}) - this.users.push({name:"Bruno Roberto", email:"bruno@gmail.com", cpf:"03215415454"}) - this.users.push({name:"Cristian Schaufer", email:"cristian@gmail.com", cpf:"03215415454"}) - this.users.push({name:"Kalil", email:"kalil@gmail.com", cpf:"03215415454"}) + this.usersService.listUsers().pipe().subscribe((response: any) => { + console.log(response); + + var count = Object.keys(response).length; + + for (let i = 0; i < count; i++) { + + this.name = response[i].nome; + this.email = response[i].email; + this.document = response[i].document; + this.birth = response[i].birth; + + + this.users.push({name:this.name, email:this.email, document:this.document, birth:this.birth}); + + } + + this.name = ""; + this.email = ""; + this.document = ""; + this.birth = ""; + + }) + } - adicionar(){ - if(this.name != null && this.email != null && this.cpf != null){ - this.users.push({name:this.name, email:this.email, cpf:this.cpf}) - this.name ="" - this.email="" - this.cpf="" - }else{ - alert('DIGITE TODOS OS DADOS!') - } + adicionar(name: string, email: string, document: string, birth: string) { + + + let build ={ + "nome":name, + "email":email, + "document":document, + // "birth":birth, + } + this.usersService.adicionar(build) - deletar(index:number){ - this.users.splice(index,1) + this.users.push({name:this.name, email:this.email, document:this.document, birth:this.birth}); } - alterar(index:number){ - // this.users.splice(index,1) + deletar(){ + } + alterar(){ + + } + } diff --git a/mark.html b/mark.html new file mode 100644 index 0000000..77af944 --- /dev/null +++ b/mark.html @@ -0,0 +1,13 @@ +$$$$$$$$\ $$\ $$\ $$$$$$\ $$$$$$$\ $$\ +\__$$ __|$$$\ $$$ |$$ __$$\ $$ __$$\ $$ | + $$ | $$$$\ $$$$ |$$ / \__| $$ | $$ | $$$$$$\ $$$$$$\ $$\ $$$$$$\ $$$$$$$\ $$$$$$\ + $$ | $$\$$\$$ $$ |\$$$$$$\ $$$$$$$ |$$ __$$\ $$ __$$\ \__|$$ __$$\ $$ _____|\_$$ _| + $$ | $$ \$$$ $$ | \____$$\ $$ ____/ $$ | \__|$$ / $$ |$$\ $$$$$$$$ |$$ / $$ | + $$ | $$ |\$ /$$ |$$\ $$ | $$ | $$ | $$ | $$ |$$ |$$ ____|$$ | $$ |$$\ + $$ | $$ | \_/ $$ |\$$$$$$ | $$ | $$ | \$$$$$$ |$$ |\$$$$$$$\ \$$$$$$$\ \$$$$ | + \__| \__| \__| \______/ \__| \__| \______/ $$ | \_______| \_______| \____/ + $$\ $$ | + \$$$$$$ | + \______/ + +Developed with ❤️ by Team Roxo!
    Nome E-mail CPFAçõesData nascimentoAção
    {{i}}{{i+1}} {{user.name}} {{user.email}}{{user.cpf}}{{user.document}}{{user.birth}} - - + +