Skip to content

Commit a1747cc

Browse files
oculosdanilooculosdanilo
authored
merge preview
2 parents 2bbaedc + baddd79 commit a1747cc

6 files changed

+83
-147
lines changed

Diff for: ‎src/app/app-routing.module.ts

-3
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import {HomeComponent} from './paginaHome/home/home.component';
55
import {cookies} from './cookies.service';
66
import {ColabComponent} from './paginaEntrada/colab/colab.component';
77
import {InfoComponent} from './paginaHome/info/info.component';
8-
import {AssetsjsonComponent} from './paginaEntrada/assetsjson/assetsjson.component';
98

109
function sim(): any {
1110
if (new cookies().get('u') != null || sessionStorage.getItem('u') != null) {
@@ -19,8 +18,6 @@ const routes: Routes = [
1918
{path: '', component: sim()},
2019
{path: 'colab', component: ColabComponent, outlet: 'popup'},
2120
{path: 'gato/:gato', component: InfoComponent, outlet: 'popup'},
22-
23-
{path: '.well-known/assetslinks.json', component: AssetsjsonComponent},
2421
];
2522

2623
@NgModule({

Diff for: ‎src/app/paginaEntrada/assetsjson/assetsjson.component.html

Whitespace-only changes.

Diff for: ‎src/app/paginaEntrada/assetsjson/assetsjson.component.scss

Whitespace-only changes.

Diff for: ‎src/app/paginaEntrada/assetsjson/assetsjson.component.spec.ts

-23
This file was deleted.

Diff for: ‎src/app/paginaEntrada/assetsjson/assetsjson.component.ts

-34
This file was deleted.

Diff for: ‎src/app/paginaEntrada/login/login.component.ts

+83-87
Original file line numberDiff line numberDiff line change
@@ -42,99 +42,95 @@ export class LoginComponent {
4242
entrar: boolean = false;
4343
cadastrar: boolean = false;
4444

45-
ngOnInit() {
46-
$('#cadastrar').on('click', async (): Promise<void> => {
47-
const formData = new FormData(
48-
document.querySelector('form') as HTMLFormElement
45+
async entrarAct() {
46+
const formData = new FormData(
47+
document.querySelector('form') as HTMLFormElement
48+
);
49+
const valores: FormDataEntryValue[] = [...formData.values()];
50+
const inputData: Input = {
51+
user: valores[0].toString(),
52+
senha: valores[1].toString(),
53+
lembrar: valores[2] != null,
54+
};
55+
56+
if (this.validateLogin()) {
57+
$('#entrar, #cadastrar').attr('disabled', 'true');
58+
this.entrar = true;
59+
60+
const resposta: AuthResponse = await this.database.autenticacao(
61+
inputData.user,
62+
inputData.senha
4963
);
50-
const valores: FormDataEntryValue[] = [...formData.values()];
51-
const inputData: Input = {
52-
user: valores[0].toString(),
53-
senha: valores[1].toString(),
54-
lembrar: valores[2] != null,
55-
};
56-
57-
if (this.validateLogin()) {
58-
$('#entrar, #cadastrar').attr('disabled', 'true');
59-
this.cadastrar = true;
60-
61-
if ((await this.database.getUser(inputData.user)) != null) {
62-
$('#cadastrar').removeAttr('disabled');
63-
this.cadastrar = false;
64-
$('#jaExiste').css('transform', 'scaleY(1)');
65-
setTimeout(() => {
66-
$('#jaExiste').css('transform', 'scaleY(0)');
67-
}, 5000);
64+
if (!resposta.autenticado) {
65+
$('#cadastrar, #entrar').removeAttr('disabled');
66+
this.entrar = false;
67+
68+
switch (resposta.motivoRejeicao) {
69+
case Motivo.naoExiste:
70+
$('#naoExiste').css('transform', 'scaleY(1)');
71+
setTimeout(() => {
72+
$('#naoExiste').css('transform', 'scaleY(0)');
73+
}, 5000);
74+
break;
75+
case Motivo.senhaIncorreta:
76+
$('#senhaIncorreta').css('transform', 'scaleY(1)');
77+
setTimeout(() => {
78+
$('#senhaIncorreta').css('transform', 'scaleY(0)');
79+
}, 5000);
80+
break;
81+
default:
82+
$('#desconhecido').css('transform', 'scaleY(1)');
83+
setTimeout(() => {
84+
$('#desconhecido').css('transform', 'scaleY(0)');
85+
}, 5000);
86+
break;
87+
}
88+
} else {
89+
if (inputData.lembrar) {
90+
this.cookies.set('u', btoa(inputData.user), 365);
6891
} else {
69-
await this.database.createUser(inputData.user, {
70-
senha: btoa(inputData.senha),
71-
});
72-
document.querySelector('form')?.reset();
73-
$('#cadastrar, #entrar').removeAttr('disabled');
74-
this.cadastrar = false;
75-
$('#sucessoCadastro').css('transform', 'scaleY(1)');
76-
setTimeout(() => {
77-
$('#sucessoCadastro').css('transform', 'scaleY(0)');
78-
}, 7000);
92+
sessionStorage.setItem('u', btoa(inputData.user));
7993
}
94+
location.reload();
8095
}
81-
});
96+
}
97+
}
8298

83-
$('#entrar').on('click', async () => {
84-
const formData = new FormData(
85-
document.querySelector('form') as HTMLFormElement
86-
);
87-
const valores: FormDataEntryValue[] = [...formData.values()];
88-
const inputData: Input = {
89-
user: valores[0].toString(),
90-
senha: valores[1].toString(),
91-
lembrar: valores[2] != null,
92-
};
93-
94-
if (this.validateLogin()) {
95-
$('#entrar, #cadastrar').attr('disabled', 'true');
96-
this.entrar = true;
97-
98-
const resposta: AuthResponse = await this.database.autenticacao(
99-
inputData.user,
100-
inputData.senha
101-
);
102-
if (!resposta.autenticado) {
103-
switch (resposta.motivoRejeicao) {
104-
case Motivo.naoExiste:
105-
$('#naoExiste').css('transform', 'scaleY(1)');
106-
setTimeout(() => {
107-
$('#naoExiste').css('transform', 'scaleY(0)');
108-
}, 5000);
109-
break;
110-
case Motivo.senhaIncorreta:
111-
$('#senhaIncorreta').css('transform', 'scaleY(1)');
112-
setTimeout(() => {
113-
$('#senhaIncorreta').css('transform', 'scaleY(0)');
114-
}, 5000);
115-
break;
116-
default:
117-
$('#desconhecido').css('transform', 'scaleY(1)');
118-
setTimeout(() => {
119-
$('#desconhecido').css('transform', 'scaleY(0)');
120-
}, 5000);
121-
break;
122-
}
123-
$('#cadastrar, #entrar').removeAttr('disabled');
124-
this.entrar = false;
125-
} else {
126-
$('#cadastrar, #entrar').removeAttr('disabled');
127-
this.entrar = false;
128-
129-
if (inputData.lembrar) {
130-
this.cookies.set('u', btoa(inputData.user), 365);
131-
} else {
132-
sessionStorage.setItem('u', btoa(inputData.user));
133-
}
134-
location.reload();
135-
}
99+
async cadastrarAct() {
100+
const formData = new FormData(
101+
document.querySelector('form') as HTMLFormElement
102+
);
103+
const valores: FormDataEntryValue[] = [...formData.values()];
104+
const inputData: Input = {
105+
user: valores[0].toString(),
106+
senha: valores[1].toString(),
107+
lembrar: valores[2] != null,
108+
};
109+
110+
if (this.validateLogin()) {
111+
$('#entrar, #cadastrar').attr('disabled', 'true');
112+
this.cadastrar = true;
113+
114+
if ((await this.database.getUser(inputData.user)) != null) {
115+
$('#cadastrar, #entrar').removeAttr('disabled');
116+
this.cadastrar = false;
117+
$('#jaExiste').css('transform', 'scaleY(1)');
118+
setTimeout(() => {
119+
$('#jaExiste').css('transform', 'scaleY(0)');
120+
}, 5000);
121+
} else {
122+
await this.database.createUser(inputData.user, {
123+
senha: btoa(inputData.senha),
124+
});
125+
document.querySelector('form')?.reset();
126+
$('#cadastrar, #entrar').removeAttr('disabled');
127+
this.cadastrar = false;
128+
$('#sucessoCadastro').css('transform', 'scaleY(1)');
129+
setTimeout(() => {
130+
$('#sucessoCadastro').css('transform', 'scaleY(0)');
131+
}, 7000);
136132
}
137-
});
133+
}
138134
}
139135

140136
f(e: Event) {

0 commit comments

Comments
 (0)