Skip to content

Kaka #37

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kaka-jaques merged 3 commits into from
Sep 29, 2022
Merged

Kaka #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f9c9eff
UPDATE!
kaka-jaques Sep 28, 2022
92a3e42
Merge branch 'quasela' of https://github.com/Team-Roxo/Project_TMS_Fu…
kaka-jaques Sep 29, 2022
7ac0742
UPDATE!
kaka-jaques Sep 29, 2022
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
45 changes: 34 additions & 11 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@
>
>><b>3.1. <a href="#soft_google"> GOOGLE CLOUD</b></a>
>>
>>><b>3.1.1. Google API</b>
>>><b>3.1.1. <a href="#google_api"> Google API </a></b>
>>>
>>>><b>3.1.1.1. Directions API</b>
>>>><b>3.1.1.1. <a href="#directions"> Directions API </a></b>
>>>>
>>>><b>3.1.1.2. Distance Matrix API</b>
>>>><b>3.1.1.2. <a href="#distance"> Distance Matrix API </a></b>
>>>>
>>>>
>>>><b>3.1.1.3. Compute Engine API</b>
Expand Down Expand Up @@ -109,7 +109,7 @@

## 1 - RESUMO

<details id="resume">
<details open id="resume">
<summary> <b>1.1 - Da Licença, Disponibilidade e Finalidade </b> </summary>

#### &nbsp;&nbsp;&nbsp;&nbsp; Esse projeto foi desenvolvido pelo grupo Roxo da Turma Java Noturno de 2022, composto por <b>Bruno Roberto, Cristian Schauffert, Kalil Fakhouri e Mateus Felipe</b> com a mentoria do <b> professor Oliota</b>, visando apenas a demonstração dos conhecimentos técnicos adquiridos durante o curso e a apresentação da etapa final à empresas.
Expand All @@ -122,7 +122,7 @@

</details>

<details id="stack">
<details open id="stack">
<summary> <b>1.2 - Das Tecnologias Utilizadas</b> </summary>

#### &nbsp;&nbsp;&nbsp;&nbsp; Durante o curso foi utilizado diversas tecnologias, métodos ágeis e ferramentas de desenvolvimento tais como:
Expand Down Expand Up @@ -156,7 +156,7 @@
<details open id="org_geral">
<summary><b>2.1 - Visão Geral</b></summary>

#### &nbsp;&nbsp;&nbsp;&nbsp;
#### &nbsp;&nbsp;&nbsp;&nbsp;

</details>

Expand All @@ -175,9 +175,32 @@
<summary><b>3.1 - GOOGLE CLOUD</b></summary>
<br>

>## <b>3.1.1 - Google API
>>### <b>3.1.1.1 - Directions API </b>
>>
>>#### &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Directions API
<a href="#">Clique aqui para aprender a configurar o Google Cloud</a>

</summary>
>## <b id="google_api"> 3.1.1 - Google API </b>
>>### <b id="directions"> 3.1.1.1 - Directions API </b>
>>
>>#### &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 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.
>>
>> #### &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Esta API aceita tanto endereços do tipo texto como também latitudes e longitudes previamente formatadas de acordo com o padrão estabelecido.
>>
>>### <b id="distance">3.1.1.2 - Distance Matrix API </b>
>>
>>#### &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 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.
>>
>> #### &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 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.
>>
>>### <b id="compute"> 3.1.1.3 - Compute Engine API </b>
>>
>> #### &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 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.
>> #### &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 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.
>>
</details>
9 changes: 9 additions & 0 deletions backend/TMSProject/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,15 @@
<artifactId>jackson-databind</artifactId>
<version>2.13.3</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-security</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-test</artifactId>
<scope>test</scope>
</dependency>
</dependencies>

<build>
Expand Down
29 changes: 13 additions & 16 deletions ...nd/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/TmsProjectApplication.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,27 +1,16 @@
package br.com.entra21.teamroxo.TMSProject;

import java.util.ArrayList;

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 br.com.entra21.teamroxo.TMSProject.interfaces.PessoaRepository;
import br.com.entra21.teamroxo.TMSProject.template.Login;
import br.com.entra21.teamroxo.TMSProject.template.Pessoa;
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;

@SpringBootApplication
@SpringBootApplication(exclude = {SecurityAutoConfiguration.class})
public class TmsProjectApplication implements CommandLineRunner {

private static PessoaRepository pessoaRepository;

public static ArrayList<Login> login = new ArrayList();

@Autowired
private JdbcTemplate jdbc;

public static void main(String[] args) {
SpringApplication.run(TmsProjectApplication.class, args);
}
Expand All @@ -30,5 +19,13 @@ public static void main(String[] args) {
public void run(String... args) throws Exception {

}

@Bean
public PasswordEncoder getPasswordEncoder() {

BCryptPasswordEncoder encoder = new BCryptPasswordEncoder();
return encoder;

}

}
6 changes: 2 additions & 4 deletions ...Project/src/main/java/br/com/entra21/teamroxo/TMSProject/controllers/LoginController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,8 @@ public List<Login> listAll() {
@ResponseStatus(code = HttpStatus.OK)
public @ResponseBody List<Login> login(@RequestBody Login credentials){

List<Login> response = new ArrayList<Login>(loginRepository.findAll()).stream()
.filter(login -> (login.getUser().equals(credentials.getUser())) &&
login.getSenha().equals(credentials.getSenha()))
.toList();
List<Login> response = loginRepository.findLogin(credentials.getUser(), credentials.getSenha()).stream().toList();

response.forEach(pessoa -> {
setMaturidadeLvl3(pessoa);
});
Expand Down
5 changes: 0 additions & 5 deletions ...SProject/src/main/java/br/com/entra21/teamroxo/TMSProject/controllers/ShipController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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 = "*")
Expand Down
11 changes: 11 additions & 0 deletions ...SProject/src/main/java/br/com/entra21/teamroxo/TMSProject/interfaces/LoginRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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<Login, Integer> {

@Query("FROM Login WHERE user = :usuario and senha = :password")
List<Login> findLogin(@Param("usuario") String usuario, @Param("password") String password);

}
89 changes: 88 additions & 1 deletion frontend/main/src/app/about/about.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,88 @@
<p>about works!</p>
<div class="card">
<div class="card-body">
<div class="row text-center">
<div class="col">
<img class="rounded-circle mx-auto d-block"
src="https://media-exp1.licdn.com/dms/image/C4D03AQHpEUqoKMocbA/profile-displayphoto-shrink_200_200/0/1621444583042?e=1668038400&v=beta&t=vKPLKQ_80zHvfvd1sH7yu5FupIZKVQrSTHiusAH4hy4"
alt="">
<h4>Bruno Roberto</h4>
<div class="text-muted">Frontend Dev.</div>
<br>
<a class="btn btn-dark btn-social mx-2" href="" target="_blank"
aria-label="Parveen Anand Email Profile"><i class="fas fa-envelope"></i></a>
<a class="btn btn-dark btn-social mx-2" href="https://github.com/bruno-roberto" target="_blank"
aria-label="Parveen Anand Github Profile"><i class="fab fa-github"></i></a>
<a class="btn btn-dark btn-social mx-2" href="https://www.linkedin.com/in/bruno-roberto-49941a186/"
target="_blank" aria-label="Parveen Anand LinkedIn Profile"><i class="fab fa-linkedin-in"></i></a>
</div>
<div class="col">
<img class="rounded-circle mx-auto d-block"
src="https://media-exp1.licdn.com/dms/image/C4E03AQEy5dyQP7F1Eg/profile-displayphoto-shrink_200_200/0/1650741055374?e=1668038400&v=beta&t=RJ4Gtvig8AQsLJwI69CQ2NRBtNie330BOuSvl6fmxTM"
alt="">
<h4>Cristian Schauffert</h4>
<div class="text-muted">Web Designer</div>
<br>
<a class="btn btn-dark btn-social mx-2"
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"><i class="fas fa-envelope"></i></a>
<a class="btn btn-dark btn-social mx-2" href="https://github.com/Cristian-Baade" target="_blank"
aria-label="Parveen Anand Github Profile"><i class="fab fa-github"></i></a>
<a class="btn btn-dark btn-social mx-2"
href="https://www.linkedin.com/in/cristian-schauffert-a818ba238/" target="_blank"
aria-label="Parveen Anand LinkedIn Profile"><i class="fab fa-linkedin-in"></i></a>
</div>
<div class="col">
<img class="rounded-circle mx-auto d-block"
src="https://media-exp1.licdn.com/dms/image/C4D03AQFASq3_Un9xjg/profile-displayphoto-shrink_200_200/0/1659021750145?e=1668038400&v=beta&t=Y3mXW4Ah-53S5ozBMsItnMsDrOIWYRfn-BggIzZhXqA"
alt="">
<h4>Kalil J. Fakhouri</h4>
<div class="text-muted">Lead Developer</div>
<br>
<a class="btn btn-dark btn-social mx-2"
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"><i class="fas fa-envelope"></i></a>
<a class="btn btn-dark btn-social mx-2" href="github.com/kaka-jaques" target="_blank"
aria-label="Parveen Anand Github Profile"><i class="fab fa-github"></i></a>
<a class="btn btn-dark btn-social mx-2" href="https://www.linkedin.com/in/kalil-j-fakhouri-1744b321a/"
target="_blank" aria-label="Parveen Anand LinkedIn Profile"><i class="fab fa-linkedin-in"></i></a>
</div>
<div class="col">
<img class="rounded-circle mx-auto d-block"
src="https://media-exp1.licdn.com/dms/image/C4E03AQH4Njl7ibZX0g/profile-displayphoto-shrink_200_200/0/1624701369216?e=1668038400&v=beta&t=xKA-Mewgk1XM5bmTu8aM7AJUqL-Sz2_LVzUm8AZkFdo"
alt="">
<h4>Mateus Felipe</h4>
<div class="text-muted">Lead Developer</div>
<br>
<a class="btn btn-dark btn-social mx-2" href="https://mail.google.com/mail/u/0/?fs=1&to=mateusgoettems@gmail.com&su=CONTACT BY SITE TIME ROXO - HELLO MATEUS&body=Olá+Mateus%20Felipe,+Tudo+bem?&tf=cm" target="_blank"
aria-label="Parveen Anand Email Profile"><i class="fas fa-envelope"></i></a>
<a class="btn btn-dark btn-social mx-2" href="https://github.com/mat-felipe" target="_blank"
aria-label="Parveen Anand Github Profile"><i class="fab fa-github"></i></a>
<a class="btn btn-dark btn-social mx-2" href="https://www.linkedin.com/in/mateusgoettems/"
target="_blank" aria-label="Parveen Anand LinkedIn Profile"><i class="fab fa-linkedin-in"></i></a>
</div>
</div>
</div>
</div>
<div class="card">
<div class="card-body">
<h1>Sobre o Projeto</h1>
<hr>
<h3>Licença,Disponibilidade e finalidade</h3>
<br>
<h5> 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.
<br><br>
A cópia do recurso está disponível a todos, podendo ser modificada e alterada. Fica proibida a venda,
distribuição ou repasse da mesma.
A maioria dos recurso e tecnologias são de código livre (open-source) ou teste de avaliação por tempo
determinado (Google Cloud), afim de trazer a melhor experiência do uso de um software funcional.
<br><br>
Devido ao nosso objetivo de comprovar os conhecimentos adquiridos, algumas partes do software são simulados
devido ao tempo e resposta que levaria na realidade, acelerando, assim, o processo de entrega, por exemplo, para que
possa ser vista em tempo real o processamento de dados, tanto localmente quanto em nuvem.

</h5>
</div>
</div>
51 changes: 11 additions & 40 deletions frontend/main/src/app/body/body.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,68 +148,39 @@ <h3 class="dropdown-item-title">
</a>
<ul class="nav nav-treeview">
<li class="nav-item">
<a routerLink="pack-register" class="nav-link">
<a routerLink="ship-quote" class="nav-link">
<i class="far fa-circle nav-icon"></i>
<p>Register</p>
<p>Shipping Quote</p>
</a>
</li>
<li class="nav-item">
<a routerLink="pack-track" class="nav-link">
<a routerLink="recent-quote" class="nav-link">
<i class="far fa-circle nav-icon"></i>
<p>Tracking</p>
<p>Recents Quotes</p>
</a>
</li>
</ul>
</li>
<li class="nav-item">
<a href="" routerLink="finance" class="nav-link">
<i class="nav-icon fas fa-dollar-sign"></i>
<p>Finance
<i class="right fas fa-angle-left"></i>
</p>
</a>
<ul class="nav nav-treeview">
<li class="nav-item">
<a routerLink="receipt" class="nav-link">
<i class="far fa-circle nav-icon"></i>
<p>Receipt</p>
</a>
</li>
<li class="nav-item">
<a routerLink="cost" class="nav-link">
<a routerLink="pack-register" class="nav-link">
<i class="far fa-circle nav-icon"></i>
<p>Cost</p>
<p>Register</p>
</a>
</li>
<li class="nav-item">
<a routerLink="balance" class="nav-link">
<a routerLink="pack-track" class="nav-link">
<i class="far fa-circle nav-icon"></i>
<p>Balance</p>
<p>Tracking</p>
</a>
</li>
</ul>
</li>
<li class="nav-item">
<a href="" class="nav-link">
<i class="nav-icon fas fa-truck"></i>
<p>Quotes
<i class="right fas fa-angle-left"></i>
<a href="" routerLink="finance" class="nav-link">
<i class="nav-icon fas fa-dollar-sign"></i>
<p>Finance
</p>
</a>
<ul class="nav nav-treeview">
<li class="nav-item">
<a routerLink="ship-quote" class="nav-link">
<i class="far fa-circle nav-icon"></i>
<p>Shipping Quote</p>
</a>
</li>
<li class="nav-item">
<a routerLink="recent-quote" class="nav-link">
<i class="far fa-circle nav-icon"></i>
<p>Recents Quotes</p>
</a>
</li>
</ul>
</li>
<li class="nav-item">
<a href="#" routerLink="about" class="nav-link">
Expand Down
Loading