diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 280c8bc..e9dbe99 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -13,6 +13,7 @@ import { AuthenticationComponent } from './authentication/authentication.compone import { FrontpageComponent } from './frontpage/frontpage.component'; import { GeneratorSearchComponent } from './generator-search/generator-search.component'; import { SignUpComponent } from './sign-up/sign-up.component'; +import { VisualizeAllComponent } from './visualize-all/visualize-all.component'; @NgModule({ declarations: [ @@ -24,7 +25,8 @@ import { SignUpComponent } from './sign-up/sign-up.component'; AuthenticationComponent, FrontpageComponent, GeneratorSearchComponent, - SignUpComponent + SignUpComponent, + VisualizeAllComponent ], imports: [ BrowserModule, @@ -39,6 +41,7 @@ import { SignUpComponent } from './sign-up/sign-up.component'; {path: 'warnings', component: WarningsComponent}, {path: 'history', component: HistoryComponent}, {path: 'sign_up', component: SignUpComponent}, + {path: 'visualize-all', component: VisualizeAllComponent}, ]), diff --git a/src/app/generator-search/generator-search.component.css b/src/app/generator-search/generator-search.component.css index 66b75b5..276f91d 100644 --- a/src/app/generator-search/generator-search.component.css +++ b/src/app/generator-search/generator-search.component.css @@ -1,6 +1,14 @@ -/* div { - position: absolute; - top: 40%; - left: 50%; - transform: translate(-50%,-50%); -} */ \ No newline at end of file +h4#header { + margin-left: 110px; +} + +p#genInfo { + margin-left: 20px; +} + +a#genLink { + padding: 14px 25px; + margin: 10px; + display: inline-block; + text-decoration: none; +} \ No newline at end of file diff --git a/src/app/generator-search/generator-search.component.html b/src/app/generator-search/generator-search.component.html index 8e57740..b26ae9c 100644 --- a/src/app/generator-search/generator-search.component.html +++ b/src/app/generator-search/generator-search.component.html @@ -1,25 +1,18 @@
-

Search for a Generator

-
-
- - -
- -
+ +
- - -
- -
\ No newline at end of file diff --git a/src/app/generator-search/generator-search.component.ts b/src/app/generator-search/generator-search.component.ts index 5e7dd09..bd247b6 100644 --- a/src/app/generator-search/generator-search.component.ts +++ b/src/app/generator-search/generator-search.component.ts @@ -14,6 +14,14 @@ export class GeneratorSearchComponent implements OnInit { public generators$: Object; + goToGenerator(gen_id, org_id) { + this.router.navigateByUrl('/statistics'); + // console.log(gen_id); + // console.log(org_id); + localStorage.setItem('gen_id', gen_id); + localStorage.setItem('org_id', org_id); + } + ngOnInit() { const jsonToken = localStorage.getItem('auth_token'); try { diff --git a/src/app/header/header.component.html b/src/app/header/header.component.html index 5b1d5bc..1991a21 100644 --- a/src/app/header/header.component.html +++ b/src/app/header/header.component.html @@ -5,34 +5,27 @@ aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation"> + +
diff --git a/src/app/header/header.component.ts b/src/app/header/header.component.ts index 3ee4d0f..9f3e5e2 100644 --- a/src/app/header/header.component.ts +++ b/src/app/header/header.component.ts @@ -1,4 +1,5 @@ import { Component, OnInit } from '@angular/core'; +import { Router } from '@angular/router'; @Component({ selector: 'app-header', @@ -7,7 +8,34 @@ import { Component, OnInit } from '@angular/core'; }) export class HeaderComponent implements OnInit { - constructor() { } + constructor(private router: Router) { } + + resetAndClear() { + this.router.navigateByUrl('#'); + localStorage.clear(); + } + + resetGenerator() { + if (localStorage.getItem('auth_token') != null) { + this.router.navigateByUrl('/generator-search'); + localStorage.removeItem('gen_id'); + localStorage.removeItem('org_id'); + } else { + console.log('You need to log in'); + this.router.navigateByUrl('#'); + } + } + + resetGenAndVisualize() { + if (localStorage.getItem('auth_token') != null) { + this.router.navigateByUrl('/visualize-all'); + localStorage.removeItem('gen_id'); + localStorage.removeItem('org_id'); + } else { + console.log('You need to log in'); + this.router.navigateByUrl('#'); + } + } ngOnInit() { } diff --git a/src/app/visualize-all/visualize-all.component.css b/src/app/visualize-all/visualize-all.component.css new file mode 100644 index 0000000..e69de29 diff --git a/src/app/visualize-all/visualize-all.component.html b/src/app/visualize-all/visualize-all.component.html new file mode 100644 index 0000000..940637a --- /dev/null +++ b/src/app/visualize-all/visualize-all.component.html @@ -0,0 +1,3 @@ +

+ visualize-all works! +

diff --git a/src/app/visualize-all/visualize-all.component.spec.ts b/src/app/visualize-all/visualize-all.component.spec.ts new file mode 100644 index 0000000..1f9e063 --- /dev/null +++ b/src/app/visualize-all/visualize-all.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { VisualizeAllComponent } from './visualize-all.component'; + +describe('VisualizeAllComponent', () => { + let component: VisualizeAllComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ VisualizeAllComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(VisualizeAllComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/visualize-all/visualize-all.component.ts b/src/app/visualize-all/visualize-all.component.ts new file mode 100644 index 0000000..40bd866 --- /dev/null +++ b/src/app/visualize-all/visualize-all.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-visualize-all', + templateUrl: './visualize-all.component.html', + styleUrls: ['./visualize-all.component.css'] +}) +export class VisualizeAllComponent implements OnInit { + + constructor() { } + + ngOnInit() { + } + +}