Skip to content

Atualizações no Edit e no About Us #45

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 2 commits into from
Oct 1, 2022
Merged

Atualizações no Edit e no About Us #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eeaab0b
Atualizações no Edit e no About Us
Cristian-Baade Oct 1, 2022
d56d46d
Merge branch 'quasela' into cristian
kaka-jaques Oct 1, 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
19 changes: 10 additions & 9 deletions frontend/main/src/app/about/about.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@
<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://mail.google.com/mail/u/0/?fs=1&to=brunorobertopds@gmail.com&su=CONTACT BY SITE TIME ROXO - HELLO BRUNO ROBERTO&body=Olá+Bruno%20Roberto,+Tudo+bem?&tf=cm" target="_blank"
><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>
><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>
Expand All @@ -26,7 +26,7 @@ <h4>Cristian Schauffert</h4>
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>
><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>
Expand All @@ -42,7 +42,7 @@ <h4>Kalil J. Fakhouri</h4>
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>
><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>
Expand All @@ -53,12 +53,13 @@ <h4>Kalil J. Fakhouri</h4>
<h4>Mateus Felipe</h4>
<div class="text-muted">Lead Developer</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://mail.google.com/mail/u/0/?fs=1&to=mateusgoettems@gmail.com
&su=CONTACT BY SITE TIME ROXO - HELLO MATEUS FELIPE&body=Olá+Mateus%20Felipe,+Tudo+bem?&tf=cm" target="_blank"
><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>
><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>
target="_blank" ><i class="fab fa-linkedin-in"></i></a>
</div>
</div>
</div>
Expand Down
16 changes: 8 additions & 8 deletions frontend/main/src/app/edit/edit.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,36 +7,36 @@ <h1>Edit your information</h1>

<label for="Name">Name:</label>
<div class="input-group">
<input type="text" class="form-control" name="Name" id="name" placeholder="Name" required>
<input value={{name}} type="text" class="form-control" name="Name" id="name" placeholder="Name" required>

</div>

<label for="User">User:</label>
<div class="input-group">
<input type="text" class="form-control" name="User" id="user" placeholder="User" required>
<input value={{user}} type="text" class="form-control" name="User" id="user" placeholder="User" required>

</div>

<label for="nascimento">Birthday:</label>
<div> <input type="date" class="form-control" name="birthday" id="birthday" placeholder="Birthday" required>
<div> <input value={{birth}} type="date" class="form-control" name="birthday" id="birthday" placeholder="Birthday" required>
</div>

<label for="documento">Document:</label>
<div>
<input type="number" class="form-control" name="Document" id="document" placeholder="Document" required>
<input value={{document}} type="number" class="form-control" name="Document" id="document" placeholder="Document" required>

</div>


<div>
<label for="email">Email:</label>
<input required type="email" name="email" id="email" placeholder="Email:" class="form-control">
<input value={{email}} required type="email" name="email" id="email" placeholder="Email" class="form-control">

</div>

<div>
<label for="senha">Senha:</label>
<input value="" required type="password" name="password" id="password" placeholder="Password:"
<label for="senha">Password:</label>
<input value={{password}} required type="password" name="password" id="password" placeholder="Password"
class="form-control">


Expand All @@ -46,6 +46,6 @@ <h1>Edit your information</h1>


<div class="card-footer">
<!-- <button class="btn btn-primary mr-2" (click)="alterar()">Alterar</button> -->
<button class="btn btn-primary mr-2" (click)="alterar()">Alterar</button>
</div>
</div>
15 changes: 13 additions & 2 deletions frontend/main/src/app/edit/edit.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { Component, OnInit } from '@angular/core';
import { Router } from '@angular/router';
import { LoginserviceService } from '../loginservice.service';

@Component({
selector: 'app-edit',
Expand All @@ -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()
}

Expand Down
92 changes: 50 additions & 42 deletions frontend/main/src/app/loginservice.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,30 +11,35 @@ import { LoginComponent } from './login/login.component';
export class LoginserviceService implements CanActivate {

readonly TMSLoginAPI: string = "http://localhost:8080"
readonly APIBounceInit:string = "http://localhost:8080/login/init"
readonly APIBounceInit: string = "http://localhost:8080/login/init"

nome!: string
user!: string
email!: string
password!: string
birth!: Date
document!: string
succeed!: boolean
progress!: boolean
admin!:boolean
enterprise!:boolean
admin!: boolean
enterprise!: boolean
pessoaID!: number
adminEnter:boolean = false
pessoaID!:number

idBounce!:number
userBounce!:string
dateBounce!:string
timeBounce!:string
idBounce!: number
userBounce!: string
dateBounce!: string
timeBounce!: string

constructor(private router: Router, private http: HttpClient) { }

logging(user: string, password: string) {

this.progress = true

let build:any = {
'user':user,
'senha':password
let build: any = {
'user': user,
'senha': password
}

this.http.post(this.TMSLoginAPI +'/login', build)
Expand Down Expand Up @@ -69,50 +74,53 @@ export class LoginserviceService implements CanActivate {
console.log(resp);
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
})

let bounce: any = {
"user": response[0].user
}

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
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

Expand Down