From 457685063fd4b960441e482cc8b88fa8c972a7d2 Mon Sep 17 00:00:00 2001 From: Nicholas Soteropoulos Date: Mon, 14 Sep 2020 17:19:10 -0400 Subject: Fix mod ui build issues Change-Id: I4d002645240852a3a5f1964d9ffa2cac11c45b47 Signed-off-by: Nicholas Soteropoulos Issue-ID: DCAEGEN2-2317 Signed-off-by: Nicholas Soteropoulos --- mod2/ui/src/app/login/login.component.css | 25 +++++++++++ mod2/ui/src/app/login/login.component.html | 58 ++++++++++++++++++++++++ mod2/ui/src/app/login/login.component.spec.ts | 59 ++++++++++++++++++++++++ mod2/ui/src/app/login/login.component.ts | 65 +++++++++++++++++++++++++++ 4 files changed, 207 insertions(+) create mode 100644 mod2/ui/src/app/login/login.component.css create mode 100644 mod2/ui/src/app/login/login.component.html create mode 100644 mod2/ui/src/app/login/login.component.spec.ts create mode 100644 mod2/ui/src/app/login/login.component.ts (limited to 'mod2/ui/src/app/login') diff --git a/mod2/ui/src/app/login/login.component.css b/mod2/ui/src/app/login/login.component.css new file mode 100644 index 0000000..55e48a1 --- /dev/null +++ b/mod2/ui/src/app/login/login.component.css @@ -0,0 +1,25 @@ +/* + * # ============LICENSE_START======================================================= + * # Copyright (c) 2020 AT&T Intellectual Property. All rights reserved. + * # ================================================================================ + * # Licensed under the Apache License, Version 2.0 (the "License"); + * # you may not use this file except in compliance with the License. + * # You may obtain a copy of the License at + * # + * # http://www.apache.org/licenses/LICENSE-2.0 + * # + * # Unless required by applicable law or agreed to in writing, software + * # distributed under the License is distributed on an "AS IS" BASIS, + * # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * # See the License for the specific language governing permissions and + * # limitations under the License. + * # ============LICENSE_END========================================================= + */ + +.field-icon { + float:right; + left: -15px; + margin-top: 1px; + position: relative; + z-index: 2; +} \ No newline at end of file diff --git a/mod2/ui/src/app/login/login.component.html b/mod2/ui/src/app/login/login.component.html new file mode 100644 index 0000000..b98baff --- /dev/null +++ b/mod2/ui/src/app/login/login.component.html @@ -0,0 +1,58 @@ + + + +
+
+
+
+
+ + +
+
+
+ +
+
+
+ + + + +
+
+
+ + + + + +
+

Not a registered user? Contact the DCAE-MOD team at dcae-mod-team@att.com

+ Cick here to contact now +
+
+ diff --git a/mod2/ui/src/app/login/login.component.spec.ts b/mod2/ui/src/app/login/login.component.spec.ts new file mode 100644 index 0000000..5656be4 --- /dev/null +++ b/mod2/ui/src/app/login/login.component.spec.ts @@ -0,0 +1,59 @@ +/* + * # ============LICENSE_START======================================================= + * # Copyright (c) 2020 AT&T Intellectual Property. All rights reserved. + * # ================================================================================ + * # Licensed under the Apache License, Version 2.0 (the "License"); + * # you may not use this file except in compliance with the License. + * # You may obtain a copy of the License at + * # + * # http://www.apache.org/licenses/LICENSE-2.0 + * # + * # Unless required by applicable law or agreed to in writing, software + * # distributed under the License is distributed on an "AS IS" BASIS, + * # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * # See the License for the specific language governing permissions and + * # limitations under the License. + * # ============LICENSE_END========================================================= + */ + +import { HttpClientTestingModule } from '@angular/common/http/testing'; +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { FormsModule, ReactiveFormsModule } from '@angular/forms'; +import { RouterTestingModule } from '@angular/router/testing'; +import { JwtHelperService, JWT_OPTIONS } from '@auth0/angular-jwt'; +import { CardModule } from 'primeng/card'; + +import { LoginComponent } from './login.component'; + +describe('LoginComponent', () => { + let component: LoginComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [LoginComponent], + imports: [ + FormsModule, + ReactiveFormsModule, + CardModule, + HttpClientTestingModule, + RouterTestingModule + ], + providers: [ + { provide: JWT_OPTIONS, useValue: JWT_OPTIONS }, + JwtHelperService + ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(LoginComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/mod2/ui/src/app/login/login.component.ts b/mod2/ui/src/app/login/login.component.ts new file mode 100644 index 0000000..16cafee --- /dev/null +++ b/mod2/ui/src/app/login/login.component.ts @@ -0,0 +1,65 @@ +/* + * # ============LICENSE_START======================================================= + * # Copyright (c) 2020 AT&T Intellectual Property. All rights reserved. + * # ================================================================================ + * # Licensed under the Apache License, Version 2.0 (the "License"); + * # you may not use this file except in compliance with the License. + * # You may obtain a copy of the License at + * # + * # http://www.apache.org/licenses/LICENSE-2.0 + * # + * # Unless required by applicable law or agreed to in writing, software + * # distributed under the License is distributed on an "AS IS" BASIS, + * # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * # See the License for the specific language governing permissions and + * # limitations under the License. + * # ============LICENSE_END========================================================= + */ + +import { Component, OnInit } from '@angular/core'; +import { FormGroup, FormBuilder, Validators } from '@angular/forms'; +import { AuthService } from '../services/auth.service'; +import { User } from '../models/User'; +import { Router } from '@angular/router'; + +@Component({ + selector: 'app-login', + templateUrl: './login.component.html', + styleUrls: ['./login.component.css'] +}) + +export class LoginComponent implements OnInit { + + form: FormGroup; + hide: boolean=true; + + constructor(private fb: FormBuilder, private authService: AuthService, private router: Router) { } + + ngOnInit() { + this.form = this.fb.group({ + username: ['', [Validators.required]], + // uid: ['', [Validators.required]], + password: ['', [Validators.required]] + }); + } + + submit() { + this.authService.login(this.form.value as User).subscribe( + res => { + // if (this.authService.getUser().roles && this.authService.getUser().roles.includes("ROLE_USER")) { + // this.authService.isAdmin = false; + // } + if(this.authService.getUser().roles &&this.authService.getUser().roles.includes("ROLE_ADMIN")) { + this.authService.isAdmin = true; + } else { + this.authService.isAdmin = false; + } + this.router.navigate(['/home']); + }, + (err) => { + alert('User or Password is not correct, please re-enter'); + this.form.reset(); + } + ); + } +} -- cgit 1.2.3-korg