diff --git a/README.md b/README.md index ac800c8..8177a70 100644 --- a/README.md +++ b/README.md @@ -10,25 +10,22 @@ > >2. ORGANIZAÇÃO DO PROJETO > ->>2.1. Fluxograma +>>2.1. Visão Geral +>> +>>2.2. Fluxograma > >3. SOFTWARE > ->>3.1. GOOGLE CLOUD +>>3.1. GOOGLE CLOUD >> >>>3.1.1. Google API >>> >>>>3.1.1.1. Directions API ->>>>> ->>>>>3.1.1.1.1. Visão Geral ->>>>> +>>>> >>>>3.1.1.2. Distance Matrix API >>>> ->>>>>3.1.1.2.1. Visão Geral >>>> >>>>3.1.1.3. Compute Engine API ->>>>> ->>>>>3.1.1.3.1. Visão Geral >>> >>>3.1.2. Instâncias Virtuais >>> @@ -42,9 +39,48 @@ >>>> >>>>3.1.3.2 Instalação e Implementação >>> ->> >>3.2. FRONTEND >> +>>>3.2.1. Componentes +>>>> +>>>>3.2.1.1. Login +>>>>> +>>>>>3.2.1.1.1. CanActivate +>>>>> +>>>>>3.2.1.1.2. HttpClient +>>>> +>>>>3.2.1.2. Home +>>>> +>>>>3.2.1.3. Dashboard +>>>>> +>>>>>3.2.1.3.1. Contador de Clientes e Visitantes +>>>>> +>>>>>3.2.1.3.2. Registro de Pacotes +>>>>> +>>>>>3.2.1.3.3. Bounce Rate +>>>> +>>>>3.2.1.4. Users +>>>> +>>>>3.2.1.5. Pacotes +>>>>> +>>>>>3.2.1.5.1. Recent Quote +>>>>> +>>>>>3.2.1.5.2. Register Quote +>>>>> +>>>>>3.2.1.5.3. Tracking Package +>>> +>>>3.2.2. Services +>>>> +>>>>3.2.2.1. Login Service +>>>> +>>>>3.2.2.2. Quote Service +>>> +>>>3.2.3. Segurança (A analisar) +>>>> +>>>>3.2.3.1. Dados do Login +>>>> +>>>>3.2.3.2. Encriptação dos Dados +>> >>3.3. BACKEND >>> >>>3.3.1. Spring Boot @@ -73,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. @@ -86,7 +122,7 @@
-
+
1.2 - Das Tecnologias Utilizadas ####      Durante o curso foi utilizado diversas tecnologias, métodos ágeis e ferramentas de desenvolvimento tais como: @@ -112,3 +148,36 @@ > #### Metodologia: >> * ##### kaka-vscode Trello - Kanban +
+

+ +# 2 - ORGANIZAÇÃO DO PROJETO + +
+2.1 - Visão Geral + +####      + +
+ +
+2.2 - Fluxograma + + + +
+ +

+ +# 3 - SOFTWARE + +
+3.1 - GOOGLE CLOUD +
+ +>## 3.1.1 - Google API +>>### 3.1.1.1 - Directions API +>> +>>####         Directions API + + \ No newline at end of file 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 5a0e7ea..63fa876 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 @@ -5,6 +5,8 @@ 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; @@ -26,4 +28,11 @@ public List listCarriers(){ } + @PostMapping() + public Carriers postCarrier(@RequestBody Carriers carrier) { + + return carriersRepository.save(carrier); + + } + } 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 2608b55..0828913 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.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.util.JSONPObject; @RestController @@ -26,28 +28,30 @@ public class ShipController { final String GOOGLE = "https://maps.googleapis.com/maps/api/directions/json?origin="; @GetMapping("/{cepOrigem}/{cepDestino}") - public JSONPObject getGoogleAPI(@PathVariable ("cepOrigem") int param1, @PathVariable ("cepDestino") int param2 ){ + public JsonNode getGoogleAPI(@PathVariable ("cepOrigem") int param1, @PathVariable ("cepDestino") int param2 ){ try { - - String APIUrl = GOOGLE+param1+"&destination="+param2+"&key=AIzaSyCKNjLUI0d01M0SfoDjIov4vZlR3DprotM"; - - URL url = new URL(APIUrl); - HttpsURLConnection get = (HttpsURLConnection) url.openConnection(); - - BufferedReader response = new BufferedReader(new InputStreamReader(get.getInputStream())); - - String jsonEmString = converteJsonEmString(response); - - JSONPObject obj = new JSONPObject(jsonEmString, null); - - return obj; - - }catch (Exception e) { - - return null; - - } + + String APIUrl = GOOGLE+param1+"&destination="+param2+"&key=AIzaSyCKNjLUI0d01M0SfoDjIov4vZlR3DprotM"; + + URL url = new URL(APIUrl); + HttpsURLConnection get = (HttpsURLConnection) url.openConnection(); + + BufferedReader response = new BufferedReader(new InputStreamReader(get.getInputStream())); + + String jsonEmString = converteJsonEmString(response); + + ObjectMapper mapper = new ObjectMapper(); + JsonNode node = mapper.readTree(jsonEmString); + + + return node; + + }catch (Exception e) { + + return null; + + } }