peter/doneit-web
1
0
Fork 0
mirror of https://code.equilibrium.co.ao/ITO/doneit-web.git synced 2026-04-19 21:06:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'developer' of bitbucket.org:equilibriumito/gabinete-digital into developer

Browse Source
This commit is contained in:
Peter Maquiran
2021-06-09 15:33:16 +01:00
parent 34022cf51a 05b5bfc807
commit c7481bbc0f
4 changed files with 90 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/login/login.page.html
+12 -3
View File
@@ -1,9 +1,18 @@
<ion-content class="text-white">
<div class="main-wrapper">
<div class="wrapper" *ngIf="userLoginPreference != 'pin' && userLoginPreference != 'fingerprint' && !setPint">
<div class="div-logo">
<img src='assets/images/logo-no-bg.png' alt='logo'>
</div>
<div class="bg-1 d-flex justify-center align-center">
<div class="bg-2 d-flex justify-center align-center">
<div class="bg-3 d-flex justify-center align-center">
<div class="bg-4 d-flex justify-center align-center">
<div class="div-logo">
<img src='assets/images/fullLogo.png' alt='logo'>
</div>
</div>
</div>
</div>
</div>
<h3 class="center text-white">Inicie a sessão</h3>
<form class="form">
<p class="form-label text-white">Nome de utilizador</p>
src/app/pages/login/login.page.scss
+51 -5
View File
@@ -23,10 +23,55 @@ ion-content{
margin: auto !important;
overflow: auto;
}
.logo{
width: 400px;
height: 400px;
background-image: url("/assets/background/auth.svg");
background-position: center;
background-repeat: no-repeat;
}
.bg-1{
width: 250px;
height: 250px;
overflow: auto;
border-radius: 50%;
background: #4cb9f825;
margin: auto;
.bg-2{
width: 225px;
height: 225px;
overflow: auto;
border-radius: 50%;
background: #61bdf2b4;
margin: auto;
.bg-3{
width: 200px;
height: 200px;
overflow: auto;
border-radius: 50%;
background: #96d3f8be;
margin: auto;
.bg-4{
width: 175px;
height: 175px;
overflow: auto;
border-radius: 50%;
background: rgba(255, 255, 255, 0.918);
padding: 15px;
margin: auto;
.bg-4 img{
width: 100%;
}
}
}
}
}
.div-logo{
width: 200px;
width: 200px !important;
margin: 0 auto;
padding-bottom: 15px;
}
.div-logo img{
width: 100%;
@@ -71,7 +116,7 @@ ion-item{
border: 0!important;
}
.div-logo {
/* .div-logo {
background: transparent;
width: em(140px);
justify-content: center;
@@ -80,7 +125,7 @@ ion-item{
.div-logo img{
width: 100%;
margin: 0px auto;
}
} */
@@ -141,10 +186,11 @@ ion-item{
align-items: center;
justify-content: center;
background-image: url("/assets/background/auth.svg");
background-size: 686px 674px;
background-size: 596px 584px;
background-position: center;
background-position-y: 78px;
background-position-y: 160px;
background-repeat: no-repeat;
margin: auto;
}
.voltar{
src/app/pages/login/login.page.ts
+5 -2
View File
@@ -118,7 +118,10 @@ export class LoginPage implements OnInit {
domainName: environment.domain,
BasicAuthKey: ""
}
if (await this.authService.login(this.userattempt)) {
let attempt = await this.authService.login(this.userattempt);
console.log(JSON.stringify(attempt));
if (attempt) {
//this.loginRocketChat();
this.authService.loginChat(this.userattempt);
//this.getToken();
@@ -132,7 +135,7 @@ export class LoginPage implements OnInit {
}
else {
this.toastService.badRequest('O nome de utilizador e palavra-passe estão incorretas ou verifique a sua conexão com a internet e volte a tentar');
this.toastService.badRequest('O nome de utilizador e/ou palavra-passe estão incorretas ou verifique a sua conexão com a internet e volte a tentar');
}
}
else{
src/app/services/auth.service.ts
+22 -16
View File
@@ -51,29 +51,35 @@ export class AuthService {
}
const service = environment.apiURL + "userauthentication/GetValidateAuth";
let result: boolean | PromiseLike<boolean>;
let result: boolean | PromiseLike<boolean> = false;
let response: any;
result = await this.http.get<boolean>(service, options).toPromise();
response = await this.http.post<User>(environment.apiURL + "UserAuthentication/Login", '', this.opts).toPromise();
try {
result = await this.http.get<boolean>(service, options).toPromise();
response = await this.http.post<User>(environment.apiURL + "UserAuthentication/Login", '', this.opts).toPromise();
console.log(response)
console.log(response);
if (result) {
if (result) {
if( response.RoleID == 100000014) {
response.Profile = 'PR'
} else if(response.RoleID == 100000011) {
response.Profile = 'MDGPR'
}
response.BasicAuthKey = user.BasicAuthKey
this.ValidatedUser = response;
if( response.RoleID == 100000014) {
response.Profile = 'PR'
} else if(response.RoleID == 100000011) {
response.Profile = 'MDGPR'
localStorage.setItem('user', JSON.stringify(response));
this.storageService.store(AuthConnstants.USER, response);
return result;
}
response.BasicAuthKey = user.BasicAuthKey
this.ValidatedUser = response;
localStorage.setItem('user', JSON.stringify(response));
this.storageService.store(AuthConnstants.USER, response);
} catch (error) {
return result;
}
return result;
}
logout(){