From 4b0a5665378d062b3608acd7d21fb5273c0602b3 Mon Sep 17 00:00:00 2001 From: Paola Date: Wed, 28 Jul 2021 23:26:29 -0600 Subject: [PATCH 1/3] agregacion pagina principal y arreglo footer --- src/main/webapp/app/app.module.ts | 4 +- src/main/webapp/app/home/home.component.html | 16 +-- .../app/layouts/footer/footer.component.html | 2 +- .../app/layouts/footer/footer.component.ts | 26 +++- .../app/layouts/sidebar/sidebar.constants.ts | 3 + src/main/webapp/app/login/login.component.ts | 6 +- .../pagina-principal/pagina-princial.route.ts | 11 ++ .../pagina-principal.component.html | 120 ++++++++++++++++++ .../pagina-principal.component.scss | 13 ++ .../pagina-principal.component.spec.ts | 24 ++++ .../pagina-principal.component.ts | 112 ++++++++++++++++ .../pagina-principal.module.ts | 13 ++ 12 files changed, 335 insertions(+), 15 deletions(-) create mode 100644 src/main/webapp/app/pagina-principal/pagina-princial.route.ts create mode 100644 src/main/webapp/app/pagina-principal/pagina-principal.component.html create mode 100644 src/main/webapp/app/pagina-principal/pagina-principal.component.scss create mode 100644 src/main/webapp/app/pagina-principal/pagina-principal.component.spec.ts create mode 100644 src/main/webapp/app/pagina-principal/pagina-principal.component.ts create mode 100644 src/main/webapp/app/pagina-principal/pagina-principal.module.ts diff --git a/src/main/webapp/app/app.module.ts b/src/main/webapp/app/app.module.ts index 695bffe..7c6db5a 100644 --- a/src/main/webapp/app/app.module.ts +++ b/src/main/webapp/app/app.module.ts @@ -18,7 +18,7 @@ import { AppRoutingModule } from './app-routing.module'; import { HomeModule } from './home/home.module'; import { EntityRoutingModule } from './entities/entity-routing.module'; import { ReactiveFormsModule } from '@angular/forms'; - +import { PaginaPrincipalModule } from './pagina-principal/pagina-principal.module'; import { SocialLoginModule, SocialAuthServiceConfig } from 'angularx-social-login'; import { GoogleLoginProvider } from 'angularx-social-login'; // jhipster-needle-angular-add-module-import JHipster will add new module here @@ -32,6 +32,7 @@ import { FooterComponent } from './layouts/footer/footer.component'; import { PageRibbonComponent } from './layouts/profiles/page-ribbon.component'; import { ErrorComponent } from './layouts/error/error.component'; import { SidebarComponent } from './layouts/sidebar/sidebar.component'; +import { PaginaPrincipalComponent } from './pagina-principal/pagina-principal.component'; @NgModule({ imports: [ @@ -39,6 +40,7 @@ import { SidebarComponent } from './layouts/sidebar/sidebar.component'; BrowserModule, SharedModule, HomeModule, + PaginaPrincipalModule, // jhipster-needle-angular-add-module JHipster will add new module here EntityRoutingModule, AppRoutingModule, diff --git a/src/main/webapp/app/home/home.component.html b/src/main/webapp/app/home/home.component.html index b7739b0..6ce258b 100644 --- a/src/main/webapp/app/home/home.component.html +++ b/src/main/webapp/app/home/home.component.html @@ -36,7 +36,7 @@
- +
@@ -98,12 +98,10 @@

Encuestas

-
+
+ +
{{ encuesta.nombre }}
@@ -116,14 +114,14 @@
Fecha Publicada    {{ + >Fecha de inicio    {{ encuesta.fechaPublicacion | formatShortDatetime | titlecase }}
Fecha de Finalización   Fecha de finalización     {{ encuesta.fechaFinalizar | formatShortDatetime | titlecase }}
diff --git a/src/main/webapp/app/layouts/footer/footer.component.html b/src/main/webapp/app/layouts/footer/footer.component.html index f5fbd22..3e9b625 100644 --- a/src/main/webapp/app/layouts/footer/footer.component.html +++ b/src/main/webapp/app/layouts/footer/footer.component.html @@ -1,4 +1,4 @@ -
+

Copyright © Derechos reservados - Desarrollado por diff --git a/src/main/webapp/app/layouts/footer/footer.component.ts b/src/main/webapp/app/layouts/footer/footer.component.ts index 6ed7057..b358bba 100644 --- a/src/main/webapp/app/layouts/footer/footer.component.ts +++ b/src/main/webapp/app/layouts/footer/footer.component.ts @@ -1,8 +1,32 @@ import { Component } from '@angular/core'; +import { Account } from '../../core/auth/account.model'; +import { takeUntil } from 'rxjs/operators'; +import { AccountService } from '../../core/auth/account.service'; +import { Subject } from 'rxjs'; @Component({ selector: 'jhi-footer', templateUrl: './footer.component.html', styleUrls: ['./footer.component.scss'], }) -export class FooterComponent {} +export class FooterComponent { + account: Account | null = null; + notAccount: boolean = true; + private readonly destroy$ = new Subject(); + + constructor(protected accountService: AccountService) {} + + ngOnInit(): void { + this.accountService + .getAuthenticationState() + .pipe(takeUntil(this.destroy$)) + .subscribe(account => { + if (account !== null) { + this.account = account; + this.notAccount = false; + } else { + this.notAccount = true; + } + }); + } +} diff --git a/src/main/webapp/app/layouts/sidebar/sidebar.constants.ts b/src/main/webapp/app/layouts/sidebar/sidebar.constants.ts index 8d46c5c..132e293 100644 --- a/src/main/webapp/app/layouts/sidebar/sidebar.constants.ts +++ b/src/main/webapp/app/layouts/sidebar/sidebar.constants.ts @@ -22,6 +22,8 @@ export const ADMIN_ROUTES: RouteInfo[] = [ // type: 'link', // icontype: 'nc-icon nc-chart-bar-32', // }, + + { path: '/pagina-principal', title: 'Inicio', type: 'link', icontype: 'nc-icon nc-world-2' }, { path: '/encuesta', title: 'Encuestas', @@ -55,6 +57,7 @@ export const ADMIN_ROUTES: RouteInfo[] = [ ]; export const USER_ROUTES: RouteInfo[] = [ + { path: '/pagina-principal', title: 'Inicio', type: 'link', icontype: 'nc-icon nc-world-2' }, { path: '/encuesta', title: 'Encuestas', diff --git a/src/main/webapp/app/login/login.component.ts b/src/main/webapp/app/login/login.component.ts index 2c79da7..f85105d 100644 --- a/src/main/webapp/app/login/login.component.ts +++ b/src/main/webapp/app/login/login.component.ts @@ -55,7 +55,7 @@ export class LoginComponent implements OnInit, AfterViewInit { // if already authenticated then navigate to home page this.accountService.identity().subscribe(() => { if (this.accountService.isAuthenticated()) { - this.router.navigate(['']); + this.router.navigate(['/pagina-principal']); } }); } @@ -90,7 +90,7 @@ export class LoginComponent implements OnInit, AfterViewInit { if (!this.router.getCurrentNavigation()) { this.localStorageService.store('IsGoogle', 'true'); // There were no routing during login (eg from navigationToStoredUrl) - this.router.navigate(['']); + this.router.navigate(['/pagina-principal']); } }, response => { @@ -173,7 +173,7 @@ export class LoginComponent implements OnInit, AfterViewInit { this.authenticationError = false; if (!this.router.getCurrentNavigation()) { // There were no routing during login (eg from navigationToStoredUrl) - this.router.navigate(['']); + this.router.navigate(['/pagina-principal']); } // } }, diff --git a/src/main/webapp/app/pagina-principal/pagina-princial.route.ts b/src/main/webapp/app/pagina-principal/pagina-princial.route.ts new file mode 100644 index 0000000..f486126 --- /dev/null +++ b/src/main/webapp/app/pagina-principal/pagina-princial.route.ts @@ -0,0 +1,11 @@ +import { Route, RouterModule } from '@angular/router'; + +import { PaginaPrincipalComponent } from './pagina-principal.component'; + +export const PAGINA_PRINCIPAL_ROUTE: Route = { + path: 'pagina-principal', + component: PaginaPrincipalComponent, + data: { + pageTitle: 'paginaPrincipal.title', + }, +}; diff --git a/src/main/webapp/app/pagina-principal/pagina-principal.component.html b/src/main/webapp/app/pagina-principal/pagina-principal.component.html new file mode 100644 index 0000000..389d914 --- /dev/null +++ b/src/main/webapp/app/pagina-principal/pagina-principal.component.html @@ -0,0 +1,120 @@ +

+
+
+
+

Inicio

+ + + + + + + + +
+ + + + + + + + +
+
+
+ +
+
+ + + + +
+

Encuestas

+ +
+ +
+ + + + +
+
+
+ + +
diff --git a/src/main/webapp/app/pagina-principal/pagina-principal.component.scss b/src/main/webapp/app/pagina-principal/pagina-principal.component.scss new file mode 100644 index 0000000..5634ec9 --- /dev/null +++ b/src/main/webapp/app/pagina-principal/pagina-principal.component.scss @@ -0,0 +1,13 @@ +.social-box { + display: inline-block; + width: 3em; + height: 4em; + margin-left: 2.7em; + text-align: center; + font-size: 130px; + opacity: 0.3; +} + +.container div:last-child { + margin-right: 0; +} diff --git a/src/main/webapp/app/pagina-principal/pagina-principal.component.spec.ts b/src/main/webapp/app/pagina-principal/pagina-principal.component.spec.ts new file mode 100644 index 0000000..cbef3cc --- /dev/null +++ b/src/main/webapp/app/pagina-principal/pagina-principal.component.spec.ts @@ -0,0 +1,24 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { PaginaPrincipalComponent } from './pagina-principal.component'; + +describe('PaginaPrincipalComponent', () => { + let component: PaginaPrincipalComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [PaginaPrincipalComponent], + }).compileComponents(); + }); + + beforeEach(() => { + fixture = TestBed.createComponent(PaginaPrincipalComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/main/webapp/app/pagina-principal/pagina-principal.component.ts b/src/main/webapp/app/pagina-principal/pagina-principal.component.ts new file mode 100644 index 0000000..4dbdfcb --- /dev/null +++ b/src/main/webapp/app/pagina-principal/pagina-principal.component.ts @@ -0,0 +1,112 @@ +import { Component, OnInit } from '@angular/core'; +import { Account } from '../core/auth/account.model'; +import { takeUntil } from 'rxjs/operators'; +import { EncuestaService } from '../entities/encuesta/service/encuesta.service'; +import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; +import { CategoriaService } from '../entities/categoria/service/categoria.service'; +import { UsuarioExtraService } from '../entities/usuario-extra/service/usuario-extra.service'; +import { ActivatedRoute, Router } from '@angular/router'; +import { FormBuilder } from '@angular/forms'; +import { AccountService } from '../core/auth/account.service'; +import { HttpResponse } from '@angular/common/http'; +import { IEncuesta } from '../entities/encuesta/encuesta.model'; +import { UsuarioExtra } from '../entities/usuario-extra/usuario-extra.model'; +import { Subject } from 'rxjs'; + +import { faPollH, faCalendarAlt, faStar, faListAlt, faFileAlt } from '@fortawesome/free-solid-svg-icons'; +import { ICategoria } from '../entities/categoria/categoria.model'; + +@Component({ + selector: 'jhi-pagina-principal', + templateUrl: './pagina-principal.component.html', + styleUrls: ['./pagina-principal.component.scss'], +}) +export class PaginaPrincipalComponent implements OnInit { + public searchString: string; + public searchCategoria: string; + categorias?: ICategoria[]; + account: Account | null = null; + public searchEncuestaPublica: string; + notAccount: boolean = true; + usuarioExtra: UsuarioExtra | null = null; + encuestas?: IEncuesta[]; + + isLoading = false; + private readonly destroy$ = new Subject(); + + faStar = faStar; + faCalendarAlt = faCalendarAlt; + faPollH = faPollH; + faListAlt = faListAlt; + faFileAlt = faFileAlt; + + constructor( + protected encuestaService: EncuestaService, + protected modalService: NgbModal, + protected categoriaService: CategoriaService, + protected usuarioExtraService: UsuarioExtraService, + protected activatedRoute: ActivatedRoute, + protected fb: FormBuilder, + protected accountService: AccountService, + protected router: Router + ) { + this.searchEncuestaPublica = ''; + this.searchString = ''; + this.searchCategoria = ''; + } + + ngOnInit(): void { + this.searchEncuestaPublica = ''; + this.accountService + .getAuthenticationState() + .pipe(takeUntil(this.destroy$)) + .subscribe(account => { + if (account !== null) { + this.account = account; + this.notAccount = false; + } else { + this.notAccount = true; + } + }); + this.loadAll(); + this.loadAllCategorias(); + } + + ngOnDestroy(): void { + this.destroy$.next(); + this.destroy$.complete(); + } + + loadAll(): void { + this.isLoading = true; + + this.encuestaService.query().subscribe( + (res: HttpResponse) => { + this.isLoading = false; + const tmpEncuestas = res.body ?? []; + this.encuestas = tmpEncuestas.filter(e => e.estado === 'ACTIVE' && e.acceso === 'PUBLIC'); + }, + () => { + this.isLoading = false; + } + ); + } + + loadAllCategorias(): void { + this.isLoading = true; + + this.categoriaService.query().subscribe( + (res: HttpResponse) => { + this.isLoading = false; + this.categorias = res.body ?? []; + }, + () => { + this.isLoading = false; + } + ); + } + + trackId(index: number, item: IEncuesta): number { + return item.id!; + } +} diff --git a/src/main/webapp/app/pagina-principal/pagina-principal.module.ts b/src/main/webapp/app/pagina-principal/pagina-principal.module.ts new file mode 100644 index 0000000..15c5894 --- /dev/null +++ b/src/main/webapp/app/pagina-principal/pagina-principal.module.ts @@ -0,0 +1,13 @@ +import { NgModule } from '@angular/core'; +import { RouterModule } from '@angular/router'; + +import { SharedModule } from 'app/shared/shared.module'; + +import { PAGINA_PRINCIPAL_ROUTE } from './pagina-princial.route'; +import { PaginaPrincipalComponent } from './pagina-principal.component'; + +@NgModule({ + imports: [SharedModule, RouterModule.forChild([PAGINA_PRINCIPAL_ROUTE])], + declarations: [PaginaPrincipalComponent], +}) +export class PaginaPrincipalModule {} From ceb589ac2011cc96dd45d8fba1cf1c1085bdfa16 Mon Sep 17 00:00:00 2001 From: Paola Date: Wed, 28 Jul 2021 23:38:49 -0600 Subject: [PATCH 2/3] eliminar punto en archivo activate --- .../account/activate/activate.component.html | 4 ++-- .../pagina-principal.component.spec.ts | 24 ------------------- 2 files changed, 2 insertions(+), 26 deletions(-) delete mode 100644 src/main/webapp/app/pagina-principal/pagina-principal.component.spec.ts diff --git a/src/main/webapp/app/account/activate/activate.component.html b/src/main/webapp/app/account/activate/activate.component.html index 74c6d96..f82d848 100644 --- a/src/main/webapp/app/account/activate/activate.component.html +++ b/src/main/webapp/app/account/activate/activate.component.html @@ -32,8 +32,8 @@
. + create account +
diff --git a/src/main/webapp/app/pagina-principal/pagina-principal.component.spec.ts b/src/main/webapp/app/pagina-principal/pagina-principal.component.spec.ts deleted file mode 100644 index cbef3cc..0000000 --- a/src/main/webapp/app/pagina-principal/pagina-principal.component.spec.ts +++ /dev/null @@ -1,24 +0,0 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; - -import { PaginaPrincipalComponent } from './pagina-principal.component'; - -describe('PaginaPrincipalComponent', () => { - let component: PaginaPrincipalComponent; - let fixture: ComponentFixture; - - beforeEach(async () => { - await TestBed.configureTestingModule({ - declarations: [PaginaPrincipalComponent], - }).compileComponents(); - }); - - beforeEach(() => { - fixture = TestBed.createComponent(PaginaPrincipalComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); From 34c10768137eb493f70715218e9ed75ae6140d1b Mon Sep 17 00:00:00 2001 From: Mariela Bonilla Date: Thu, 29 Jul 2021 20:17:16 -0600 Subject: [PATCH 3/3] fix de del forbidden de la lista de encuesta y la fecha de vista previa --- .../detail/encuesta-detail.component.html | 4 +- .../encuesta/list/encuesta.component.ts | 64 ++++++++++--------- 2 files changed, 36 insertions(+), 32 deletions(-) diff --git a/src/main/webapp/app/entities/encuesta/detail/encuesta-detail.component.html b/src/main/webapp/app/entities/encuesta/detail/encuesta-detail.component.html index 45592c2..db1881b 100644 --- a/src/main/webapp/app/entities/encuesta/detail/encuesta-detail.component.html +++ b/src/main/webapp/app/entities/encuesta/detail/encuesta-detail.component.html @@ -141,7 +141,7 @@ >{{ encuesta.fechaPublicacion === undefined ? 'Sin publicar' - : (encuesta.fechaFinalizada | formatShortDatetime | lowercase) + : (encuesta.fechaPublicacion | formatShortDatetime | lowercase) }}

@@ -157,7 +157,7 @@ {{ encuesta.fechaFinalizar === undefined ? 'Sin fecha de finalización' - : (encuesta.fechaFinalizada | formatShortDatetime | lowercase) + : (encuesta.fechaFinalizar | formatShortDatetime | lowercase) }} diff --git a/src/main/webapp/app/entities/encuesta/list/encuesta.component.ts b/src/main/webapp/app/entities/encuesta/list/encuesta.component.ts index afb3beb..2e92f8a 100644 --- a/src/main/webapp/app/entities/encuesta/list/encuesta.component.ts +++ b/src/main/webapp/app/entities/encuesta/list/encuesta.component.ts @@ -124,12 +124,16 @@ export class EncuestaComponent implements OnInit, AfterViewInit { loadAll(): void { this.isLoading = true; - this.usuarioExtraService - .retrieveAllPublicUsers() - .pipe(finalize(() => this.loadPublicUser())) - .subscribe(res => { - this.userSharedCollection = res; - }); + if (this.isAdmin()) { + this.usuarioExtraService + .retrieveAllPublicUsers() + .pipe(finalize(() => this.loadPublicUser())) + .subscribe(res => { + this.userSharedCollection = res; + }); + } else { + this.loadEncuestas(); + } } loadPublicUser(): void { @@ -144,30 +148,7 @@ export class EncuestaComponent implements OnInit, AfterViewInit { loadUserExtras() { this.usuarioExtraService .query() - .pipe( - finalize(() => - this.encuestaService.query().subscribe( - (res: HttpResponse) => { - this.isLoading = false; - const tmpEncuestas = res.body ?? []; - if (this.isAdmin()) { - this.encuestas = tmpEncuestas.filter(e => e.estado !== EstadoEncuesta.DELETED); - - this.encuestas.forEach(e => { - e.usuarioExtra = this.usuarioExtrasSharedCollection?.find(pU => pU.id == e.usuarioExtra?.id); - }); - } else { - this.encuestas = tmpEncuestas - .filter(e => e.usuarioExtra?.id === this.usuarioExtra?.id) - .filter(e => e.estado !== EstadoEncuesta.DELETED); - } - }, - () => { - this.isLoading = false; - } - ) - ) - ) + .pipe(finalize(() => this.loadEncuestas())) .subscribe( (res: HttpResponse) => { this.isLoading = false; @@ -182,6 +163,29 @@ export class EncuestaComponent implements OnInit, AfterViewInit { ); } + loadEncuestas() { + this.encuestaService.query().subscribe( + (res: HttpResponse) => { + this.isLoading = false; + const tmpEncuestas = res.body ?? []; + if (this.isAdmin()) { + this.encuestas = tmpEncuestas.filter(e => e.estado !== EstadoEncuesta.DELETED); + + this.encuestas.forEach(e => { + e.usuarioExtra = this.usuarioExtrasSharedCollection?.find(pU => pU.id == e.usuarioExtra?.id); + }); + } else { + this.encuestas = tmpEncuestas + .filter(e => e.usuarioExtra?.id === this.usuarioExtra?.id) + .filter(e => e.estado !== EstadoEncuesta.DELETED); + } + }, + () => { + this.isLoading = false; + } + ); + } + ngOnInit(): void { this.searchString = ''; this.accesoEncuesta = '';