diff --git a/backend/TMSFullstackProject/src/main/java/br/com/teamroxo/entra21/TMSFullstackProject/List/Localizations.java b/backend/TMSFullstackProject/src/main/java/br/com/teamroxo/entra21/TMSFullstackProject/List/Localizations.java deleted file mode 100644 index bfb6337..0000000 --- a/backend/TMSFullstackProject/src/main/java/br/com/teamroxo/entra21/TMSFullstackProject/List/Localizations.java +++ /dev/null @@ -1,81 +0,0 @@ -package br.com.teamroxo.entra21.TMSFullstackProject.List; - -import java.util.Objects; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; - -import br.com.teamroxo.entra21.TMSFullstackProject.template.Pacotes; - -@Entity -public class Localizations { - - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - private Long id; - - @Column - private String remetente; - - @Column - private String destinatario; - - @ManyToOne - public Pacotes pack; - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public String getRemetente() { - return remetente; - } - - public void setRemetente(String remetente) { - this.remetente = remetente; - } - - public String getDestinatario() { - return destinatario; - } - - public void setDestinatario(String destinatario) { - this.destinatario = destinatario; - } - - public Pacotes getPack() { - return pack; - } - - public void setPack(Pacotes pack) { - this.pack = pack; - } - - @Override - public int hashCode() { - return Objects.hash(id); - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; - Localizations other = (Localizations) obj; - return Objects.equals(id, other.id); - } - - - -} diff --git a/backend/TMSFullstackProject/src/main/java/br/com/teamroxo/entra21/TMSFullstackProject/controller/APIController.java b/backend/TMSFullstackProject/src/main/java/br/com/teamroxo/entra21/TMSFullstackProject/controller/APIController.java deleted file mode 100644 index 7f0ff8b..0000000 --- a/backend/TMSFullstackProject/src/main/java/br/com/teamroxo/entra21/TMSFullstackProject/controller/APIController.java +++ /dev/null @@ -1,35 +0,0 @@ -package br.com.teamroxo.entra21.TMSFullstackProject.controller; - -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; -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.ResponseStatus; -import org.springframework.web.bind.annotation.RestController; - -import br.com.teamroxo.entra21.TMSFullstackProject.database.PacoteDados; -import br.com.teamroxo.entra21.TMSFullstackProject.template.Pacotes; - -@RestController -@RequestMapping("/tms") -public class APIController { - - @Autowired - private PacoteDados pacoteDados; - - @GetMapping(value = "/all") - public List getAll(){ - return pacoteDados.findAll(); - } - - @PostMapping(value = "/add") - @ResponseStatus(code = HttpStatus.CREATED) - public Pacotes post(@RequestBody Pacotes pacotes) { - return pacoteDados.save(pacotes); - } - -} diff --git a/backend/TMSFullstackProject/src/main/java/br/com/teamroxo/entra21/TMSFullstackProject/controller/CorsConfiguration.java b/backend/TMSFullstackProject/src/main/java/br/com/teamroxo/entra21/TMSFullstackProject/controller/CorsConfiguration.java deleted file mode 100644 index 6d71144..0000000 --- a/backend/TMSFullstackProject/src/main/java/br/com/teamroxo/entra21/TMSFullstackProject/controller/CorsConfiguration.java +++ /dev/null @@ -1,18 +0,0 @@ -package br.com.teamroxo.entra21.TMSFullstackProject.controller; - -import org.springframework.context.annotation.Configuration; -import org.springframework.web.servlet.config.annotation.CorsRegistry; -import org.springframework.web.servlet.config.annotation.EnableWebMvc; -import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; - -@Configuration -@EnableWebMvc -public class CorsConfiguration implements WebMvcConfigurer { - - public void addCorsMapping(CorsRegistry registry) { - registry.addMapping("/**") - .allowedOrigins("*") - .allowedMethods("GET", "POST", "DELETE"); - } - -} diff --git a/backend/TMSFullstackProject/src/main/java/br/com/teamroxo/entra21/TMSFullstackProject/database/PacoteDados.java b/backend/TMSFullstackProject/src/main/java/br/com/teamroxo/entra21/TMSFullstackProject/database/PacoteDados.java deleted file mode 100644 index b3491f1..0000000 --- a/backend/TMSFullstackProject/src/main/java/br/com/teamroxo/entra21/TMSFullstackProject/database/PacoteDados.java +++ /dev/null @@ -1,10 +0,0 @@ -package br.com.teamroxo.entra21.TMSFullstackProject.database; - -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; -import br.com.teamroxo.entra21.TMSFullstackProject.template.Pacotes; - -@Repository -public interface PacoteDados extends JpaRepository{ - -} diff --git a/backend/TMSFullstackProject/src/main/java/br/com/teamroxo/entra21/TMSFullstackProject/template/Pacotes.java b/backend/TMSFullstackProject/src/main/java/br/com/teamroxo/entra21/TMSFullstackProject/template/Pacotes.java deleted file mode 100644 index b8bac57..0000000 --- a/backend/TMSFullstackProject/src/main/java/br/com/teamroxo/entra21/TMSFullstackProject/template/Pacotes.java +++ /dev/null @@ -1,104 +0,0 @@ -package br.com.teamroxo.entra21.TMSFullstackProject.template; - -import java.time.LocalDate; -import java.util.List; -import java.util.Objects; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.OneToMany; - -import br.com.teamroxo.entra21.TMSFullstackProject.List.Localizations; - -@Entity -public class Pacotes { - - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - private Long id; - - @Column - private String codigo; - - @Column - private Float price; - - @Column - private Float weight; - - @Column - private LocalDate envio; - - @Column - @OneToMany(mappedBy = "pack", targetEntity = Localizations.class) - private List enderecos; - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public String getCodigo() { - return codigo; - } - - public void setCodigo(String codigo) { - this.codigo = codigo; - } - - public Float getPrice() { - return price; - } - - public void setPrice(Float price) { - this.price = price; - } - - public Float getWeight() { - return weight; - } - - public void setWeight(Float weight) { - this.weight = weight; - } - - public LocalDate getEnvio() { - return envio; - } - - public void setEnvio(LocalDate envio) { - this.envio = envio; - } - - public List getEnderecos() { - return enderecos; - } - - public void setEnderecos(List enderecos) { - this.enderecos = enderecos; - } - - @Override - public int hashCode() { - return Objects.hash(id); - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; - Pacotes other = (Pacotes) obj; - return Objects.equals(id, other.id); - } - -} diff --git a/backend/TMSFullstackProject/src/main/resources/application.properties b/backend/TMSFullstackProject/src/main/resources/application.properties deleted file mode 100644 index 3175b2b..0000000 --- a/backend/TMSFullstackProject/src/main/resources/application.properties +++ /dev/null @@ -1,2 +0,0 @@ -spring.jpa.hibernate.ddl-auto = create-drop -hibernate.dialect=org.hibernate.dialect.MySQL8Dialect \ No newline at end of file diff --git a/backend/TMSFullstackProject/.gitignore b/backend/TMSProject/.gitignore similarity index 100% rename from backend/TMSFullstackProject/.gitignore rename to backend/TMSProject/.gitignore diff --git a/backend/TMSFullstackProject/.mvn/wrapper/maven-wrapper.jar b/backend/TMSProject/.mvn/wrapper/maven-wrapper.jar similarity index 100% rename from backend/TMSFullstackProject/.mvn/wrapper/maven-wrapper.jar rename to backend/TMSProject/.mvn/wrapper/maven-wrapper.jar diff --git a/backend/TMSFullstackProject/.mvn/wrapper/maven-wrapper.properties b/backend/TMSProject/.mvn/wrapper/maven-wrapper.properties similarity index 100% rename from backend/TMSFullstackProject/.mvn/wrapper/maven-wrapper.properties rename to backend/TMSProject/.mvn/wrapper/maven-wrapper.properties diff --git a/backend/TMSFullstackProject/mvnw b/backend/TMSProject/mvnw similarity index 100% rename from backend/TMSFullstackProject/mvnw rename to backend/TMSProject/mvnw diff --git a/backend/TMSFullstackProject/mvnw.cmd b/backend/TMSProject/mvnw.cmd similarity index 100% rename from backend/TMSFullstackProject/mvnw.cmd rename to backend/TMSProject/mvnw.cmd diff --git a/backend/TMSFullstackProject/pom.xml b/backend/TMSProject/pom.xml similarity index 56% rename from backend/TMSFullstackProject/pom.xml rename to backend/TMSProject/pom.xml index d6f8a96..87e1808 100644 --- a/backend/TMSFullstackProject/pom.xml +++ b/backend/TMSProject/pom.xml @@ -1,24 +1,25 @@ - + 4.0.0 org.springframework.boot spring-boot-starter-parent 2.7.3 - + - br.com.teamroxo.entra21 - TMSFullstackProject + br.com.entra21.team-roxo + TMSProject 0.0.1-SNAPSHOT - TMSFullstackProject - Projeto Final do Curso Entra21 + TMSProject + Projeto Final do Entra21 - 18 + 17 org.springframework.boot - spring-boot-starter-data-jpa + spring-boot-starter-web @@ -28,8 +29,8 @@ true - com.h2database - h2 + mysql + mysql-connector-java runtime @@ -37,10 +38,6 @@ spring-boot-starter-test test - - org.springframework.boot - spring-boot-starter-web - @@ -48,16 +45,8 @@ org.springframework.boot spring-boot-maven-plugin - - - - org.projectlombok - lombok - - - - \ No newline at end of file + diff --git a/backend/TMSFullstackProject/src/main/java/br/com/teamroxo/entra21/TMSFullstackProject/TmsFullstackProjectApplication.java b/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/TmsProjectApplication.java similarity index 53% rename from backend/TMSFullstackProject/src/main/java/br/com/teamroxo/entra21/TMSFullstackProject/TmsFullstackProjectApplication.java rename to backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/TmsProjectApplication.java index 4d8c007..b711e04 100644 --- a/backend/TMSFullstackProject/src/main/java/br/com/teamroxo/entra21/TMSFullstackProject/TmsFullstackProjectApplication.java +++ b/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/TmsProjectApplication.java @@ -1,13 +1,13 @@ -package br.com.teamroxo.entra21.TMSFullstackProject; +package br.com.entra21.teamroxo.TMSProject; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @SpringBootApplication -public class TmsFullstackProjectApplication { +public class TmsProjectApplication { public static void main(String[] args) { - SpringApplication.run(TmsFullstackProjectApplication.class, args); + SpringApplication.run(TmsProjectApplication.class, args); } } diff --git a/backend/TMSProject/src/main/resources/application.properties b/backend/TMSProject/src/main/resources/application.properties new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/backend/TMSProject/src/main/resources/application.properties @@ -0,0 +1 @@ + diff --git a/backend/TMSFullstackProject/src/test/java/br/com/teamroxo/entra21/TMSFullstackProject/TmsFullstackProjectApplicationTests.java b/backend/TMSProject/src/test/java/br/com/entra21/teamroxo/TMSProject/TmsProjectApplicationTests.java similarity index 60% rename from backend/TMSFullstackProject/src/test/java/br/com/teamroxo/entra21/TMSFullstackProject/TmsFullstackProjectApplicationTests.java rename to backend/TMSProject/src/test/java/br/com/entra21/teamroxo/TMSProject/TmsProjectApplicationTests.java index 182d57b..d513eb9 100644 --- a/backend/TMSFullstackProject/src/test/java/br/com/teamroxo/entra21/TMSFullstackProject/TmsFullstackProjectApplicationTests.java +++ b/backend/TMSProject/src/test/java/br/com/entra21/teamroxo/TMSProject/TmsProjectApplicationTests.java @@ -1,10 +1,10 @@ -package br.com.teamroxo.entra21.TMSFullstackProject; +package br.com.entra21.teamroxo.TMSProject; import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; @SpringBootTest -class TmsFullstackProjectApplicationTests { +class TmsProjectApplicationTests { @Test void contextLoads() { diff --git a/frontend/main/src/app/home/home.component.css b/frontend/main/src/app/home/home.component.css index 79766e3..2e1dae3 100644 --- a/frontend/main/src/app/home/home.component.css +++ b/frontend/main/src/app/home/home.component.css @@ -5,9 +5,11 @@ margin-left: 100px; margin-top: 80px; } -.card-body ul li a{ +.card-body a{ color: white; + transition: ease-in-out 0.35s ; } -.card-body ul li a:hover{ +.card-body a:hover{ + transition: ease-in-out 0.35s ; color: lightslategrey; } diff --git a/frontend/main/src/app/home/home.component.html b/frontend/main/src/app/home/home.component.html index c25cb1a..8afae69 100644 --- a/frontend/main/src/app/home/home.component.html +++ b/frontend/main/src/app/home/home.component.html @@ -15,9 +15,10 @@

Where do you want to go?

-
-

  Dashboards

-



Click here to go to Dashboards!

+
+

+   Dashboards

+



Click here to go to Dashboards!

@@ -28,10 +29,10 @@

  User


@@ -44,10 +45,10 @@

  Packages


@@ -59,17 +60,17 @@

  Packages

-

  Finance

+

  Finance


@@ -82,10 +83,10 @@

  Quotes


@@ -93,9 +94,9 @@

  Quotes

-
+

  About us

-



Click here to go to About Us

+



Click here to go to About Us

diff --git a/frontend/main/src/app/home/home.component.ts b/frontend/main/src/app/home/home.component.ts index 007fef0..0654891 100644 --- a/frontend/main/src/app/home/home.component.ts +++ b/frontend/main/src/app/home/home.component.ts @@ -1,4 +1,6 @@ import { Component, OnInit } from '@angular/core'; +import { Router } from '@angular/router'; +import { RctQtComponent } from '../rct-qt/rct-qt.component'; @Component({ selector: 'app-home', @@ -7,9 +9,57 @@ import { Component, OnInit } from '@angular/core'; }) export class HomeComponent implements OnInit { - constructor() { } + constructor(private router:Router) { } ngOnInit(): void { } + dashboard(){ + this.router.navigateByUrl('dashboard') + } + + clients(){ + this.router.navigateByUrl('users') + } + + carriers(){ + this.router.navigateByUrl('carriers') + } + + register(){ + this.router.navigateByUrl('pack-register') + } + + tracking(){ + this.router.navigateByUrl('pack-track') + } + + finance(){ + this.router.navigateByUrl('finance') + } + + receipt(){ + this.router.navigateByUrl('receipt') + } + + cost(){ + this.router.navigateByUrl('cost') + } + + balance(){ + this.router.navigateByUrl('balance') + } + + shpQt(){ + this.router.navigateByUrl('ship-quote') + } + + rctQt(){ + this.router.navigateByUrl('recent-quote') + } + + about(){ + this.router.navigateByUrl('about') + } + }