From 77879bd8882800bd1ad9c64c12a1dd3d4d9b9638 Mon Sep 17 00:00:00 2001 From: "martinbobbio1@gmail.com" Date: Fri, 9 Nov 2018 11:21:04 -0300 Subject: [PATCH] Control de errores, validaciones, guard --- src/app/app.module.ts | 8 +-- src/app/app.routes.ts | 2 +- src/app/auth/login.component.ts | 6 +- src/app/auth/register.component.ts | 7 ++- .../breadcumbs/breadcumbs.component.html | 0 .../breadcumbs/breadcumbs.component.ts | 0 src/app/components/components.module.ts | 53 ++++++++++++++++ .../graphic-bar/graphic-bar.component.html | 5 ++ .../graphic-bar/graphic-bar.component.ts | 19 ++++++ .../header/header.component.html | 44 ++----------- .../header/header.component.ts | 7 ++- .../nopagefound/nopagefound.component.css | 18 ++++++ .../nopagefound/nopagefound.component.html | 10 +++ .../nopagefound/nopagefound.component.ts | 4 +- .../sidebar/sidebar.component.html | 0 .../sidebar/sidebar.component.ts | 1 + src/app/guards/admin.guard.ts | 18 ++++++ src/app/pages/graphic/graphic.component.html | 4 +- src/app/pages/graphic/graphic.component.ts | 53 ++++++++-------- src/app/pages/pages.module.ts | 28 ++++----- src/app/pages/pages.routes.ts | 5 +- src/app/pages/rxjs/rxjs.component.ts | 2 - src/app/pages/search/search.component.html | 62 +++++++++++++++++++ src/app/pages/search/search.component.ts | 39 ++++++++++++ src/app/services/service.index.ts | 3 +- src/app/services/service.module.ts | 5 +- src/app/services/sidebar/sidebar.service.ts | 28 +++------ src/app/services/user/user.service.ts | 33 +++++++--- .../nopagefound/nopagefound.component.html | 3 - src/app/shared/shared.module.ts | 34 ---------- 30 files changed, 334 insertions(+), 167 deletions(-) rename src/app/{shared => components}/breadcumbs/breadcumbs.component.html (100%) rename src/app/{shared => components}/breadcumbs/breadcumbs.component.ts (100%) create mode 100644 src/app/components/components.module.ts create mode 100644 src/app/components/graphic-bar/graphic-bar.component.html create mode 100644 src/app/components/graphic-bar/graphic-bar.component.ts rename src/app/{shared => components}/header/header.component.html (72%) rename src/app/{shared => components}/header/header.component.ts (67%) create mode 100644 src/app/components/nopagefound/nopagefound.component.css create mode 100644 src/app/components/nopagefound/nopagefound.component.html rename src/app/{shared => components}/nopagefound/nopagefound.component.ts (77%) rename src/app/{shared => components}/sidebar/sidebar.component.html (100%) rename src/app/{shared => components}/sidebar/sidebar.component.ts (93%) create mode 100644 src/app/guards/admin.guard.ts create mode 100644 src/app/pages/search/search.component.html create mode 100644 src/app/pages/search/search.component.ts delete mode 100644 src/app/shared/nopagefound/nopagefound.component.html delete mode 100644 src/app/shared/shared.module.ts diff --git a/src/app/app.module.ts b/src/app/app.module.ts index c7e7331..b71fba4 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -1,15 +1,13 @@ -//Angular +//Modules import { BrowserModule } from '@angular/platform-browser'; import { NgModule } from '@angular/core'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; +import { PagesModule } from './pages/pages.module'; +import { ServiceModule } from './services/service.module'; //Routes import { APP_ROUTES } from './app.routes'; -//Modules -import { PagesModule } from './pages/pages.module'; -import { ServiceModule } from './services/service.module'; - //Components import { AppComponent } from './app.component'; import { LoginComponent } from './auth/login.component'; diff --git a/src/app/app.routes.ts b/src/app/app.routes.ts index 56a20ca..3986089 100644 --- a/src/app/app.routes.ts +++ b/src/app/app.routes.ts @@ -2,7 +2,7 @@ import { Routes,RouterModule } from '@angular/router'; import { LoginComponent } from './auth/login.component'; import { RegisterComponent } from './auth/register.component'; -import { NopagefoundComponent } from './shared/nopagefound/nopagefound.component'; +import { NopagefoundComponent } from './components/nopagefound/nopagefound.component'; const appRoutes:Routes = [ { path: 'login', component:LoginComponent }, diff --git a/src/app/auth/login.component.ts b/src/app/auth/login.component.ts index 2f77e21..750b893 100644 --- a/src/app/auth/login.component.ts +++ b/src/app/auth/login.component.ts @@ -4,7 +4,7 @@ import { NgForm } from "@angular/forms"; import { UserService } from "../services/service.index"; import { User } from "../models/user.model"; import { environment } from "../../environments/environment.prod"; -import { element } from "protractor"; +import { Title } from "@angular/platform-browser"; declare function initPlugins(); declare const gapi: any; @@ -19,12 +19,14 @@ export class LoginComponent implements OnInit { remember: boolean = false; auth2: any; - constructor(public router: Router, public _userService: UserService) {} + constructor(public router: Router, public _userService: UserService, public titlePage:Title) {} ngOnInit() { initPlugins(); this.googleInit(); + this.titlePage.setTitle(`${environment.name} - Login`); + this.email = localStorage.getItem("email") || ""; if (this.email.length > 1) { this.remember = true; diff --git a/src/app/auth/register.component.ts b/src/app/auth/register.component.ts index d05c5a2..3623e21 100644 --- a/src/app/auth/register.component.ts +++ b/src/app/auth/register.component.ts @@ -3,8 +3,9 @@ import { FormGroup, FormControl, Validators } from "@angular/forms"; import { UserService } from "../services/service.index"; import { User } from '../models/user.model'; import { Router } from '@angular/router'; - import swal from 'sweetalert'; +import { Title } from "@angular/platform-browser"; +import { environment } from "../../environments/environment"; declare function initPlugins(); @Component({ @@ -15,9 +16,11 @@ declare function initPlugins(); export class RegisterComponent implements OnInit { form: FormGroup; - constructor(public _userService:UserService, public router:Router) { + constructor(public _userService:UserService, public router:Router, public titlePage:Title) { initPlugins(); + this.titlePage.setTitle(`${environment.name} - Register`); + this.form = new FormGroup( { name: new FormControl(null, Validators.required), diff --git a/src/app/shared/breadcumbs/breadcumbs.component.html b/src/app/components/breadcumbs/breadcumbs.component.html similarity index 100% rename from src/app/shared/breadcumbs/breadcumbs.component.html rename to src/app/components/breadcumbs/breadcumbs.component.html diff --git a/src/app/shared/breadcumbs/breadcumbs.component.ts b/src/app/components/breadcumbs/breadcumbs.component.ts similarity index 100% rename from src/app/shared/breadcumbs/breadcumbs.component.ts rename to src/app/components/breadcumbs/breadcumbs.component.ts diff --git a/src/app/components/components.module.ts b/src/app/components/components.module.ts new file mode 100644 index 0000000..e57368d --- /dev/null +++ b/src/app/components/components.module.ts @@ -0,0 +1,53 @@ +//Modules +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { FormsModule } from '@angular/forms'; +import { RouterModule } from '@angular/router'; + +//Graphics Angular +import { ChartsModule } from 'ng2-charts'; + +//Components +import { NopagefoundComponent } from '../components/nopagefound/nopagefound.component'; +import { HeaderComponent } from '../components/header/header.component'; +import { SidebarComponent } from '../components/sidebar/sidebar.component'; +import { BreadcumbsComponent } from '../components/breadcumbs/breadcumbs.component'; +import { IncrementorComponent } from '../components/incrementor/incrementor.component'; +import { ModalUploadComponent } from '../components/modal-upload/modal-upload.component'; +import { GraphicDonutComponent } from '../components/graphic-donut/graphic-donut.component'; +import { GraphicBarComponent } from '../components/graphic-bar/graphic-bar.component'; +import { PipesModule } from '../pipes/pipes.module'; + +@NgModule({ + imports:[ + RouterModule, + CommonModule, + PipesModule, + FormsModule, + ChartsModule + ], + declarations:[ + NopagefoundComponent, + HeaderComponent, + SidebarComponent, + BreadcumbsComponent, + IncrementorComponent, + ModalUploadComponent, + GraphicDonutComponent, + GraphicBarComponent, + ], + exports:[ + NopagefoundComponent, + HeaderComponent, + SidebarComponent, + BreadcumbsComponent, + IncrementorComponent, + ModalUploadComponent, + GraphicDonutComponent, + GraphicBarComponent, + ] +}) + +export class ComponentsModule{ + +} \ No newline at end of file diff --git a/src/app/components/graphic-bar/graphic-bar.component.html b/src/app/components/graphic-bar/graphic-bar.component.html new file mode 100644 index 0000000..c254985 --- /dev/null +++ b/src/app/components/graphic-bar/graphic-bar.component.html @@ -0,0 +1,5 @@ +

{{title}}

+ +
+ +
\ No newline at end of file diff --git a/src/app/components/graphic-bar/graphic-bar.component.ts b/src/app/components/graphic-bar/graphic-bar.component.ts new file mode 100644 index 0000000..7635f3c --- /dev/null +++ b/src/app/components/graphic-bar/graphic-bar.component.ts @@ -0,0 +1,19 @@ +import { Component, OnInit, Input } from '@angular/core'; + +@Component({ + selector: 'app-graphic-bar', + templateUrl: './graphic-bar.component.html', + styles: [] +}) +export class GraphicBarComponent implements OnInit { + + @Input('chartLabels') barChartLabels:string[] = []; + @Input('chartData') barChartData:number[] = []; + @Input() title:string; + + constructor() { } + + ngOnInit() { + } + +} diff --git a/src/app/shared/header/header.component.html b/src/app/components/header/header.component.html similarity index 72% rename from src/app/shared/header/header.component.html rename to src/app/components/header/header.component.html index 1ba6b74..edd2ce2 100644 --- a/src/app/shared/header/header.component.html +++ b/src/app/components/header/header.component.html @@ -1,51 +1,27 @@