From a75c7c4ebf079b85b26b295b6ebabfaab278ac5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20Iv=C3=A1n=20Solano=20Gonz=C3=A1lez?= Date: Fri, 14 Jan 2022 17:18:23 -0600 Subject: [PATCH] changes to admin files and adittion to some features to admin profile --- SintomApp.keystore | Bin 0 -> 2296 bytes prepareUpload.sh | 11 ++++++++ src/app/admin-page/admin-page.page.html | 32 ++++++++++++++++++++++-- src/app/admin-page/admin-page.page.ts | 12 ++++++++- src/app/app-routing.module.ts | 2 +- src/app/loggin/loggin.page.html | 2 +- src/app/loggin/loggin.page.ts | 14 ++++++++--- src/app/tab2/tab2.page.ts | 2 +- src/environments/environment.ts | 2 +- 9 files changed, 67 insertions(+), 10 deletions(-) create mode 100644 SintomApp.keystore create mode 100644 prepareUpload.sh diff --git a/SintomApp.keystore b/SintomApp.keystore new file mode 100644 index 0000000000000000000000000000000000000000..2c17691b00ca9d3573a047eb6ceea1984bacd9cb GIT binary patch literal 2296 zcmd5-`9IW)8lD+U1~ZsJCWI`fLz(Z`%F?mRGLzkqYnjL(j2dOlGTE1I7>q2}30XoI z*^4aM85AOgLSu;#g}6GOdp@7@C)^+2AD-uVe|SI7yB)3_u7N-x$Z>%G3K+%H*PrY| z^z%Dr!fZ=ZL_r`9FhFJh2_T?c@=!24SPsGu26KSesqC!&{bWH#Dl%S^ZreRy@5D5{ zH2qWz$BM|9$#{iFpE49brxx+OXe9uirTbx4bHedbyn0YIaiaWrzJ1t)j-&L%fObq_ z#;rGbZ@l`v_*{m?=m~MRFiNI#Ptm0x(vS9QSn)_3OcigyPIglKTwct~MJr}mTBgY& z*7uK(owPDW@n)AeKT0g?N9mn}G7Xu30nL9XnpxKUme$k38l`NX=b4I#0w3E>xw)UoA{dCp4{ zQiV&gJiJM(1Y$=v<*fd!tO{;ZIlkf6`j^WEBjKLqj{=_T*k}(Jn240yuQ+L&3R_%| zWV1UW1lCb`Q&k20mR9oibEm_#7N@&~&yl4T_OP}$=BK2#+@BTP%`Q z=?a8ucedPHbPLw&w|)GU@^KGumh8-FHV5+%+c(NKmMPoJTwHOcZoS#JK zI2^=tNt^z%T3e%{rK>DP#KASa!Fjum|BR=~vRQV4Vfu)O@yIosN-BLAyo5q)1$2_j z@6e=3Gb=+eQery>-?-Kn>{nvrsfRtp0k#dK>`@*p?quI4r%6L|=n|AmQnmN@qE!jQ zmN!;4YW(LrDaFugqu#c6Hyb}2zOqzxz88&Hg5C8vkXxavk9chLEX(9z4zR*>QGsTD zmD-1k?>HhcaqaLm4^~ywW|_Hs!+%`+hSI-z#t!gT$~uzZjt=TH1wE7MJnZkS<~ddO zeavaeJ+Uv)+%<9G%hVMI!LUOWsGoAl)!QALwG+!C9a&}*o_bpHlxMl!Wr6R9B2#rH zpxJU+HJJ1Tzl2cZD8>bLw5~r+zp4Ha2~TQwi5a|`1rbaO>NA4?R(T|$f?RQ#X(us{)ra6?+bgy>)fwD<${5bRD%|Exgz3=-D7v$bKC6m#(og$Z!|pIg zSlaQ$2M?F`4i3lBMKj#}C-YcTuurhF(2 zYZ-9PqJ{yIG1CD&`MO&_R<}HnkR8NRYq>Xiu(2Is8KUr5?8@ExPWFN^<>{`pG*3eY zDJmgpv@h<-_qjmd_|+W~DlKxRqy?r20ZW(KNo>G#l9} zs(;#|P{zx}Gmvj6P|x5VN4{%_*VvlwB%k05X=L=7yd6U9^Iq@INU0YDA=Sf!KXCG_Ne8YsvFVWbmV{kK>QsD8G&6pH1&}-YN$A5O}Yo+4kFMvjl>X z@1Fe0X-hZWg&A5bPuVcjtZkh+$c>>GQQJ;cy5RDSANNJ-gQ;hWJV-JRQq(qaDT@?~ zNB0GLE(N245#>@#!kjx_b5g9ynBK9V<6ZqTacEpV(mazt9aiWo%7J!obX%UK9pO}m zRep#`T0wc+ZiGbcDLZL=EBf$S75ybj%Kd~y^6B!Q$VuY_@1RlAU$>FNPC*4w1A*8o z04iH4K!v2_vq8WR2)idHZ4rP&VRA7>F}rXun41FxL`Gq`0T`6ch8>E6;O(%d0O4PN zlZW4c;!kuVOSoN^z;~1edb*OaNPzE`b^-;vLcHxt^!6kAV$s0KUmO>T&(Oe1LdTWp z?@jcTu(_gx#|i+*UlKQp8?U4HxAZs5hT_% zdJ?Xz2B-qq|H1#4GO6G*|1|LUy|7WiydZ!I=7LbcU{FL?D|gx*h4rEM39bOvpowW! z;l^O@1`TeZl4g>hr`_U?o2g*M5&n%AxQp?0$&TU7K}hO)B&}JF2s!-RH5AI%abMqh zHY_u(EF+ViA@}Nj)1(zmXC$_DqvTeZ72FRIwO*4yZDUzM6d<={>^k?V%PNM6*bK-_~zRwtSqxQ`BexL&w-$G&W}F8 z{0WYIZLsmONniNF>9leAs#o<*wz+)^BA=3tS!xhAFbG^A35Ww?$E_DbunVyZfVLGh zpMEX`a|VdI``$Zyt2GAy - adminPage + Administrador + + + - + + + + Carreras + + +
+ + + {{entry.name}} + + +
+ + + + + Secretarios + + + + + + + + diff --git a/src/app/admin-page/admin-page.page.ts b/src/app/admin-page/admin-page.page.ts index d292789..4d6d2cf 100644 --- a/src/app/admin-page/admin-page.page.ts +++ b/src/app/admin-page/admin-page.page.ts @@ -1,4 +1,5 @@ import { Component, OnInit } from '@angular/core'; +import { AuthService } from '../services/auth.service'; @Component({ selector: 'app-admin-page', @@ -6,10 +7,19 @@ import { Component, OnInit } from '@angular/core'; styleUrls: ['./admin-page.page.scss'], }) export class AdminPagePage implements OnInit { + + carrers = []; - constructor() { } + constructor(private auth:AuthService) { } ngOnInit() { + this.auth.store.get("user/get-careers").subscribe( + res => { + this.carrers = res; + this.carrers.forEach(element => { + console.log(element)}); + }); } + } diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index a08267e..73f22b5 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -20,7 +20,7 @@ const routes: Routes = [ loadChildren: () => import('./admintabs/admintabs.module').then( m => m.AdmintabsPageModule) }, { - path: 'admin-page', + path: 'admin', loadChildren: () => import('./admin-page/admin-page.module').then( m => m.AdminPagePageModule) }, ]; diff --git a/src/app/loggin/loggin.page.html b/src/app/loggin/loggin.page.html index 0066442..8b3311e 100644 --- a/src/app/loggin/loggin.page.html +++ b/src/app/loggin/loggin.page.html @@ -21,7 +21,7 @@ diff --git a/src/app/loggin/loggin.page.ts b/src/app/loggin/loggin.page.ts index 044514d..318b609 100644 --- a/src/app/loggin/loggin.page.ts +++ b/src/app/loggin/loggin.page.ts @@ -94,10 +94,12 @@ export class LogginPage implements OnInit { routeDirector(userRole){ console.log(userRole.details.authorities) - if(userRole.details.authorities[0]=== "ROLE_USER"){ + if(userRole.details.authorities[0]==="ROLE_USER"){ this.nav.navigateForward('/tabs/user'); - } else if (userRole.details.authorities[0]=== "ROLE_SECRETARY"){ + } else if (userRole.details.authorities[0]==="ROLE_SECRETARY"){ this.nav.navigateForward('/admintabs'); + } else if (userRole.details.authorities[0]==="ROLE_ADMIN"){ + this.nav.navigateForward('/admin'); } } @@ -114,7 +116,13 @@ export class LogginPage implements OnInit { value : JSON.stringify(data) }, }); - } + } else if (data.details.authorities[0]=== "ROLE_ADMIN"){ + this.router.navigate(['/admin'],{ + queryParams: { + value : JSON.stringify(data) + }, + }); + } } async presentAlertCredenciales() { diff --git a/src/app/tab2/tab2.page.ts b/src/app/tab2/tab2.page.ts index 79a2e30..0ca76a4 100644 --- a/src/app/tab2/tab2.page.ts +++ b/src/app/tab2/tab2.page.ts @@ -41,7 +41,7 @@ export class Tab2Page implements OnInit{ async presentToast() { const toast = await this.toast.create({ message: 'Sintomas enviados, gracias', - duration: 20000 + duration: 30000 }); toast.present(); } diff --git a/src/environments/environment.ts b/src/environments/environment.ts index 917c032..350dea5 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -4,7 +4,7 @@ export const environment = { production: false, - server: 'http://192.168.0.7:9707/' + server: 'http://192.168.0.9:9707/' }; /*