Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 8 additions & 2 deletions backend/TMSProject/pom.xml
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.7.3</version>
<relativePath/> <!-- lookup parent from repository -->
<relativePath /> <!-- lookup parent from repository -->
</parent>
<groupId>br.com.entra21.team-roxo</groupId>
<artifactId>TMSProject</artifactId>
Expand Down Expand Up @@ -38,6 +39,11 @@
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.13.3</version>
</dependency>
</dependencies>

<build>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,31 @@
package br.com.entra21.teamroxo.TMSProject;

import java.util.ArrayList;

import org.springframework.boot.CommandLineRunner;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;

import br.com.entra21.teamroxo.TMSProject.template.Pessoa;

@SpringBootApplication
public class TmsProjectApplication {
public class TmsProjectApplication implements CommandLineRunner {

public static ArrayList<Pessoa> pessoas=new ArrayList();

public static void main(String[] args) {
SpringApplication.run(TmsProjectApplication.class, args);
}

@Override
public void run(String... args) throws Exception {

pessoas.add(new Pessoa("Kalil", "kjfakhouri@gmail.com", (byte) 21));
pessoas.add(new Pessoa("Kalil", "kjfakhouri@gmail.com", (byte) 21));
pessoas.add(new Pessoa("Kalil", "kjfakhouri@gmail.com", (byte) 21));
pessoas.add(new Pessoa("Kalil", "kjfakhouri@gmail.com", (byte) 21));
pessoas.add(new Pessoa("Kalil", "kjfakhouri@gmail.com", (byte) 21));

}

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
package br.com.entra21.teamroxo.TMSProject.controllers;

import java.util.ArrayList;
import java.util.List;

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.RequestMapping;
import org.springframework.web.bind.annotation.ResponseStatus;
import org.springframework.web.bind.annotation.RestController;

import com.fasterxml.jackson.annotation.JsonInclude.Include;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;

import br.com.entra21.teamroxo.TMSProject.TmsProjectApplication;
import br.com.entra21.teamroxo.TMSProject.template.ItemNivel3;
import br.com.entra21.teamroxo.TMSProject.template.Pessoa;

@RestController
@CrossOrigin(origins = "*")
@RequestMapping("/login")
public class PessoaController {

private final String PATH = "http://localhost:8080/pessoas";

@GetMapping()
@ResponseStatus(code = HttpStatus.OK)
public List<Pessoa>listAll(){
return obterListaCompleta();
}

private List<Pessoa> obterListaCompleta() {

List<Pessoa> response = TmsProjectApplication.pessoas.stream().toList();
response.forEach(pessoa -> {
setMaturidadeNivel3(pessoa);
});

return response;

}

private void setMaturidadeNivel3(Pessoa pessoa) {

ArrayList<String> headers = new ArrayList();
headers.add("Accept : application/json");
headers.add("Content-type : application/json");
ObjectMapper mapper = new ObjectMapper();
mapper.setSerializationInclusion(Include.NON_NULL);

try {

pessoa.setLinks(null);
String json = mapper.writeValueAsString(pessoa);
pessoa.setLinks(new ArrayList<>());
pessoa.getLinks().add(new ItemNivel3("GET", PATH, null, null));
pessoa.getLinks().add(new ItemNivel3("GET", PATH + "/" + pessoa.getNome(), null, null));
pessoa.getLinks().add(new ItemNivel3("POST", PATH, headers, json));
pessoa.getLinks().add(new ItemNivel3("PUT", PATH + "/" + pessoa.getNome(), headers, json));

} catch (JsonProcessingException e) {

e.printStackTrace();

}

}

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
package br.com.entra21.teamroxo.TMSProject.template;

import java.util.ArrayList;

public class ItemNivel3 {

private String ref;
private String url;
private ArrayList<String> headers;
private String body;

public ItemNivel3() {
super();
}

public ItemNivel3(String ref, String url, ArrayList<String> headers, String body) {
super();
this.ref = ref;
this.url = url;
this.headers = headers;
this.body = body;
}

public String getRef() {
return ref;
}

public void setRef(String ref) {
this.ref = ref;
}

public String getUrl() {
return url;
}

public void setUrl(String url) {
this.url = url;
}

public ArrayList<String> getHeaders() {
return headers;
}

public void setHeaders(ArrayList<String> headers) {
this.headers = headers;
}

public String getBody() {
return body;
}

public void setBody(String body) {
this.body = body;
}




}
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
package br.com.entra21.teamroxo.TMSProject.template;

import java.util.ArrayList;

public class MaturidadeNivel3Richardson {

private ArrayList<ItemNivel3> links;

public MaturidadeNivel3Richardson() {
super();
}

public MaturidadeNivel3Richardson(ArrayList<ItemNivel3> links) {
super();
this.links = links;
}

public ArrayList<ItemNivel3> getLinks() {
return links;
}

public void setLinks(ArrayList<ItemNivel3> links) {
this.links = links;
}

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
package br.com.entra21.teamroxo.TMSProject.template;

public class Pessoa extends MaturidadeNivel3Richardson{

private String nome;
private String email;
private byte idade;



//CONSTRUCTORS

public Pessoa() {
super();
}

public Pessoa(String nome, String email, byte idade) {
super();
this.nome = nome;
this.idade = idade;
this.email = email;
}

// GETTERS...

public String getNome() {
return nome;
}

public void setNome(String nome) {
this.nome = nome;
}

public int getIdade() {
return idade;
}

public void setIdade(byte idade) {
this.idade = idade;
}

public String getEmail() {
return email;
}

public void setEmail(String email) {
this.email = email;
}

}
5 changes: 3 additions & 2 deletions frontend/main/src/app/home/home.component.css
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,10 @@
}
.card-body a{
color: white;
transition: ease-in-out 0.35s ;
transition: ease-in-out 200ms ;
cursor: pointer;
}
.card-body a:hover{
transition: ease-in-out 0.35s ;
transition: ease-in-out 200ms ;
color: lightslategrey;
}
2 changes: 1 addition & 1 deletion frontend/main/src/app/login/login.component.css
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ body{
background-color: #1f2029;
overflow-x: hidden;
}
a {
a{
cursor: pointer;
transition: all 200ms linear;
}
Expand Down
14 changes: 7 additions & 7 deletions frontend/main/src/app/login/login.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,15 @@ <h6 class="mb-0 pb-3"><span>Log In </span><span>Sign Up</span></h6>
<h4 class="mb-4 pb-3">Log In</h4>
<div class="form-group">
<input type="text" name="user" class="form-style" placeholder="User" id="user"
autocomplete="off" [(ngModel)]="user" required>
autocomplete="off" [(ngModel)]="user" required (keyup.enter)="submit()" [disabled]="loginService.progress">
<i class="input-icon uil uil-at"></i>
</div>
<div class="form-group mt-2">
<input type="password" name="password" class="form-style" placeholder="Password" id="password"
autocomplete="on" [(ngModel)]="password" required>
autocomplete="on" [(ngModel)]="password" required (keyup.enter)="submit()" [disabled]="loginService.progress">
<i class="input-icon uil uil-lock-alt"></i>
</div>
<a class="btn mt-4" id="submitButton" (click)="submit()">submit</a>
<button class="btn mt-4" id="submitButton" (click)="submit()" [disabled]="loginService.progress"> <i [ngClass]="{'fas fa-circle-notch fa-spin': loginService.progress}"></i>&nbsp;&nbsp;submit</button>
<p class="mb-0 mt-4 text-center"><a routerLink="forgetPassword" class="link">Forgot your password?</a></p>
</div>
</div>
Expand All @@ -33,20 +33,20 @@ <h4 class="mb-4 pb-3">Log In</h4>
<h4 class="mb-4 pb-3">Sign Up</h4>
<div class="form-group">
<input type="text" name="logname" class="form-style" placeholder="Your Full Name" id="name"
autocomplete="on" [(ngModel)]="nameReg" required>
autocomplete="on" [(ngModel)]="nameReg" required (keyup.enter)="register()" [disabled]="loginService.progress">
<i class="input-icon uil uil-user"></i>
</div>
<div class="form-group mt-2">
<input type="email" name="logemail" class="form-style" placeholder="Your Email" id="email"
autocomplete="on" [(ngModel)]="emailReg" required>
autocomplete="on" [(ngModel)]="emailReg" required (keyup.enter)="register()" [disabled]="loginService.progress">
<i class="input-icon uil uil-at"></i>
</div>
<div class="form-group mt-2">
<input type="password" name="logpass" class="form-style" placeholder="Your Password" id="password"
autocomplete="on" [(ngModel)]="passwordReg" required>
autocomplete="on" [(ngModel)]="passwordReg" required (keyup.enter)="register()" [disabled]="loginService.progress">
<i class="input-icon uil uil-lock-alt"></i>
</div>
<a class="btn mt-4" (click)="register()">submit</a>
<button class="btn mt-4" (click)="register()" [disabled]="loginService.progress"><i [ngClass]="{'fas fa-circle-notch fa-spin': loginService.progress}"></i>&nbsp;&nbsp;Register</button>
</div>
</div>
</div>
Expand Down
26 changes: 14 additions & 12 deletions frontend/main/src/app/login/login.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,11 @@ export class LoginComponent implements OnInit {
user!:string
password!:string

constructor(private router:Router, private loginService:LoginserviceService) { }
constructor(private router:Router, public loginService:LoginserviceService) { }

ngOnInit(): void {
this.loginService.succeed = false
document.addEventListener("keypress", function(e){
if(e.key === 'Enter'){
$('#submitButton')
alert('Ainda na luta pra fazer funcionar esse button pelo Enter')
}
})
this.loginService.progress = false
}

submit():void{
Expand All @@ -43,6 +38,7 @@ export class LoginComponent implements OnInit {
});
}else{
alert('DIGITE TODOS OS CAMPOS OBRIGATÓRIOS!')
this.loginService.progress = false
}
}

Expand All @@ -51,14 +47,20 @@ export class LoginComponent implements OnInit {
}

register(){
if(this.nameReg != null && this.passwordReg != null && this.emailReg != null){
this.loginService.succeed = true
this.router.navigateByUrl('home')
this.loginService.registering(this.nameReg, this.nameReg, this.passwordReg)
if(this.nameReg != null && this.emailReg != null && this.passwordReg != null){
this.loginService.registering(this.nameReg, this.emailReg, this.passwordReg)
.pipe(
catchError((error)=>{
return of(['Deu erro parcero é isso', 'tu não vai encontrar detalhe aqui','pode sair já...', error, 'só pq sou teu amigo vou deixar esse error ai'])
})
)
.subscribe((response)=>{
console.log('Running...', response);
});
}else{
alert('DIGITE TODOS OS CAMPOS OBRIGATÓRIOS!')
this.loginService.progress = false
}

}

}
Loading