From 7ce824ea8eb80b9a1df1ef3d431e3e6f42fd758e Mon Sep 17 00:00:00 2001 From: Cathy Hu Date: Mon, 24 Aug 2020 15:36:23 +0200 Subject: [PATCH] [frontend] Add initial design for dashboard --- kibicara-frontend/src/app/app.module.ts | 2 ++ .../src/app/core/auth/error.interceptor.ts | 10 ++++-- .../app/dashboard/board/board.component.html | 18 ++++++++++ .../app/dashboard/board/board.component.scss | 7 ++++ .../dashboard/board/board.component.spec.ts | 24 +++++++++++++ .../app/dashboard/board/board.component.ts | 25 +++++++++++++ .../board/hoodpage/hoodpage.component.html | 1 + .../hoodpage/hoodpage.component.scss} | 0 .../board/hoodpage/hoodpage.component.spec.ts | 24 +++++++++++++ .../board/hoodpage/hoodpage.component.ts | 12 +++++++ .../badwords/badwords.component.html | 11 ++++++ .../badwords/badwords.component.scss | 0 .../badwords/badwords.component.spec.ts | 24 +++++++++++++ .../badwords/badwords.component.ts | 19 ++++++++++ .../hoodsettings/hoodsettings.component.html | 35 +++++++++++++++++++ .../hoodsettings/hoodsettings.component.scss | 21 +++++++++++ .../hoodsettings.component.spec.ts | 24 +++++++++++++ .../hoodsettings/hoodsettings.component.ts | 14 ++++++++ .../trigger/trigger.component.html | 11 ++++++ .../trigger/trigger.component.scss | 0 .../trigger/trigger.component.spec.ts | 24 +++++++++++++ .../hoodsettings/trigger/trigger.component.ts | 12 +++++++ .../board/platforms/platforms.component.html | 1 + .../board/platforms/platforms.component.scss | 0 .../platforms/platforms.component.spec.ts | 24 +++++++++++++ .../board/platforms/platforms.component.ts | 12 +++++++ .../app/dashboard/dashboard-routing.module.ts | 4 +-- .../src/app/dashboard/dashboard.module.ts | 24 ++++++++++--- .../app/dashboard/hoods/hoods.component.html | 2 +- .../settingspage/settingspage.component.html | 1 - .../settingspage.component.spec.ts | 25 ------------- .../settingspage/settingspage.component.ts | 15 -------- .../src/app/hoodpage/hoodpage.component.ts | 15 +++----- .../app/shared/material/material.module.ts | 23 ++++++++++-- .../option-card/option-card.component.html | 12 +++++++ .../option-card/option-card.component.scss | 0 .../option-card/option-card.component.spec.ts | 24 +++++++++++++ .../option-card/option-card.component.ts | 14 ++++++++ .../src/app/shared/shared.module.ts | 10 ++++-- 39 files changed, 460 insertions(+), 64 deletions(-) create mode 100644 kibicara-frontend/src/app/dashboard/board/board.component.html create mode 100644 kibicara-frontend/src/app/dashboard/board/board.component.scss create mode 100644 kibicara-frontend/src/app/dashboard/board/board.component.spec.ts create mode 100644 kibicara-frontend/src/app/dashboard/board/board.component.ts create mode 100644 kibicara-frontend/src/app/dashboard/board/hoodpage/hoodpage.component.html rename kibicara-frontend/src/app/dashboard/{settingspage/settingspage.component.scss => board/hoodpage/hoodpage.component.scss} (100%) create mode 100644 kibicara-frontend/src/app/dashboard/board/hoodpage/hoodpage.component.spec.ts create mode 100644 kibicara-frontend/src/app/dashboard/board/hoodpage/hoodpage.component.ts create mode 100644 kibicara-frontend/src/app/dashboard/board/hoodsettings/badwords/badwords.component.html create mode 100644 kibicara-frontend/src/app/dashboard/board/hoodsettings/badwords/badwords.component.scss create mode 100644 kibicara-frontend/src/app/dashboard/board/hoodsettings/badwords/badwords.component.spec.ts create mode 100644 kibicara-frontend/src/app/dashboard/board/hoodsettings/badwords/badwords.component.ts create mode 100644 kibicara-frontend/src/app/dashboard/board/hoodsettings/hoodsettings.component.html create mode 100644 kibicara-frontend/src/app/dashboard/board/hoodsettings/hoodsettings.component.scss create mode 100644 kibicara-frontend/src/app/dashboard/board/hoodsettings/hoodsettings.component.spec.ts create mode 100644 kibicara-frontend/src/app/dashboard/board/hoodsettings/hoodsettings.component.ts create mode 100644 kibicara-frontend/src/app/dashboard/board/hoodsettings/trigger/trigger.component.html create mode 100644 kibicara-frontend/src/app/dashboard/board/hoodsettings/trigger/trigger.component.scss create mode 100644 kibicara-frontend/src/app/dashboard/board/hoodsettings/trigger/trigger.component.spec.ts create mode 100644 kibicara-frontend/src/app/dashboard/board/hoodsettings/trigger/trigger.component.ts create mode 100644 kibicara-frontend/src/app/dashboard/board/platforms/platforms.component.html create mode 100644 kibicara-frontend/src/app/dashboard/board/platforms/platforms.component.scss create mode 100644 kibicara-frontend/src/app/dashboard/board/platforms/platforms.component.spec.ts create mode 100644 kibicara-frontend/src/app/dashboard/board/platforms/platforms.component.ts delete mode 100644 kibicara-frontend/src/app/dashboard/settingspage/settingspage.component.html delete mode 100644 kibicara-frontend/src/app/dashboard/settingspage/settingspage.component.spec.ts delete mode 100644 kibicara-frontend/src/app/dashboard/settingspage/settingspage.component.ts create mode 100644 kibicara-frontend/src/app/shared/option-card/option-card.component.html create mode 100644 kibicara-frontend/src/app/shared/option-card/option-card.component.scss create mode 100644 kibicara-frontend/src/app/shared/option-card/option-card.component.spec.ts create mode 100644 kibicara-frontend/src/app/shared/option-card/option-card.component.ts diff --git a/kibicara-frontend/src/app/app.module.ts b/kibicara-frontend/src/app/app.module.ts index bf4ac6b..6a41d2b 100644 --- a/kibicara-frontend/src/app/app.module.ts +++ b/kibicara-frontend/src/app/app.module.ts @@ -19,6 +19,7 @@ import { ReactiveFormsModule } from '@angular/forms'; import { AuthTokenInterceptor } from './core/auth/auth-token.interceptor'; import { ConfirmComponent } from './auth/confirm/confirm.component'; import { ErrorInterceptor } from './core/auth/error.interceptor'; +import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; @NgModule({ declarations: [ @@ -39,6 +40,7 @@ import { ErrorInterceptor } from './core/auth/error.interceptor'; ApiModule, HttpClientModule, ReactiveFormsModule, + BrowserAnimationsModule, ], providers: [ { provide: BASE_PATH, useValue: environment.API_BASE_PATH }, diff --git a/kibicara-frontend/src/app/core/auth/error.interceptor.ts b/kibicara-frontend/src/app/core/auth/error.interceptor.ts index c05da9d..b8adc78 100644 --- a/kibicara-frontend/src/app/core/auth/error.interceptor.ts +++ b/kibicara-frontend/src/app/core/auth/error.interceptor.ts @@ -4,6 +4,7 @@ import { HttpHandler, HttpEvent, HttpInterceptor, + HttpErrorResponse, } from '@angular/common/http'; import { Observable, throwError } from 'rxjs'; import { LoginService } from './login.service'; @@ -19,10 +20,15 @@ export class ErrorInterceptor implements HttpInterceptor { next: HttpHandler ): Observable> { return next.handle(request).pipe( - catchError((err) => { - if (err.status === 401) { + catchError((err: HttpErrorResponse) => { + if (err.error instanceof ProgressEvent) { + // TODO Add spinner/overlay in app to prevent user input + console.log('Networkerror'); + } else if (err.status === 401) { this.loginService.logout(); location.reload(true); + } else if (err.status === 404) { + this.router.navigate(['/404']); } const error = err.error.message || err.statusText; return throwError(error); diff --git a/kibicara-frontend/src/app/dashboard/board/board.component.html b/kibicara-frontend/src/app/dashboard/board/board.component.html new file mode 100644 index 0000000..a8a1234 --- /dev/null +++ b/kibicara-frontend/src/app/dashboard/board/board.component.html @@ -0,0 +1,18 @@ +
+ + Dashboard: {{ (hood$ | async).name }} + Lorem ipsum + + + + + + + + + + + + + +
diff --git a/kibicara-frontend/src/app/dashboard/board/board.component.scss b/kibicara-frontend/src/app/dashboard/board/board.component.scss new file mode 100644 index 0000000..e3a7432 --- /dev/null +++ b/kibicara-frontend/src/app/dashboard/board/board.component.scss @@ -0,0 +1,7 @@ +.mat-card { + box-shadow: none; +} + +.dashboard { + margin: 10px; +} diff --git a/kibicara-frontend/src/app/dashboard/board/board.component.spec.ts b/kibicara-frontend/src/app/dashboard/board/board.component.spec.ts new file mode 100644 index 0000000..b6349c9 --- /dev/null +++ b/kibicara-frontend/src/app/dashboard/board/board.component.spec.ts @@ -0,0 +1,24 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { BoardComponent } from './board.component'; + +describe('BoardComponent', () => { + let component: BoardComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [BoardComponent], + }).compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(BoardComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/kibicara-frontend/src/app/dashboard/board/board.component.ts b/kibicara-frontend/src/app/dashboard/board/board.component.ts new file mode 100644 index 0000000..c1a75b3 --- /dev/null +++ b/kibicara-frontend/src/app/dashboard/board/board.component.ts @@ -0,0 +1,25 @@ +import { Component, OnInit } from '@angular/core'; +import { ActivatedRoute } from '@angular/router'; +import { HoodsService, BodyHood } from 'src/app/core/api'; +import { first } from 'rxjs/operators'; +import { Observable } from 'rxjs'; + +@Component({ + selector: 'app-board', + templateUrl: './board.component.html', + styleUrls: ['./board.component.scss'], +}) +export class BoardComponent implements OnInit { + hoodId: number; + hood$: Observable; + + constructor( + private route: ActivatedRoute, + private hoodService: HoodsService + ) {} + + ngOnInit(): void { + this.hoodId = this.route.snapshot.params['id']; + this.hood$ = this.hoodService.getHood(this.hoodId); + } +} diff --git a/kibicara-frontend/src/app/dashboard/board/hoodpage/hoodpage.component.html b/kibicara-frontend/src/app/dashboard/board/hoodpage/hoodpage.component.html new file mode 100644 index 0000000..bad613f --- /dev/null +++ b/kibicara-frontend/src/app/dashboard/board/hoodpage/hoodpage.component.html @@ -0,0 +1 @@ +

hoodpage works!

diff --git a/kibicara-frontend/src/app/dashboard/settingspage/settingspage.component.scss b/kibicara-frontend/src/app/dashboard/board/hoodpage/hoodpage.component.scss similarity index 100% rename from kibicara-frontend/src/app/dashboard/settingspage/settingspage.component.scss rename to kibicara-frontend/src/app/dashboard/board/hoodpage/hoodpage.component.scss diff --git a/kibicara-frontend/src/app/dashboard/board/hoodpage/hoodpage.component.spec.ts b/kibicara-frontend/src/app/dashboard/board/hoodpage/hoodpage.component.spec.ts new file mode 100644 index 0000000..5d8e6fc --- /dev/null +++ b/kibicara-frontend/src/app/dashboard/board/hoodpage/hoodpage.component.spec.ts @@ -0,0 +1,24 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { HoodpageComponent } from './hoodpage.component'; + +describe('HoodpageComponent', () => { + let component: HoodpageComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [HoodpageComponent], + }).compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(HoodpageComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/kibicara-frontend/src/app/dashboard/board/hoodpage/hoodpage.component.ts b/kibicara-frontend/src/app/dashboard/board/hoodpage/hoodpage.component.ts new file mode 100644 index 0000000..897571d --- /dev/null +++ b/kibicara-frontend/src/app/dashboard/board/hoodpage/hoodpage.component.ts @@ -0,0 +1,12 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-hoodpage', + templateUrl: './hoodpage.component.html', + styleUrls: ['./hoodpage.component.scss'], +}) +export class HoodpageComponent implements OnInit { + constructor() {} + + ngOnInit(): void {} +} diff --git a/kibicara-frontend/src/app/dashboard/board/hoodsettings/badwords/badwords.component.html b/kibicara-frontend/src/app/dashboard/board/hoodsettings/badwords/badwords.component.html new file mode 100644 index 0000000..bc3af20 --- /dev/null +++ b/kibicara-frontend/src/app/dashboard/board/hoodsettings/badwords/badwords.component.html @@ -0,0 +1,11 @@ + + Badwords + Lorem ipsum dolor sit amet, consectetur adipiscing elit. + +
+ +
+
+
diff --git a/kibicara-frontend/src/app/dashboard/board/hoodsettings/badwords/badwords.component.scss b/kibicara-frontend/src/app/dashboard/board/hoodsettings/badwords/badwords.component.scss new file mode 100644 index 0000000..e69de29 diff --git a/kibicara-frontend/src/app/dashboard/board/hoodsettings/badwords/badwords.component.spec.ts b/kibicara-frontend/src/app/dashboard/board/hoodsettings/badwords/badwords.component.spec.ts new file mode 100644 index 0000000..2e91e8d --- /dev/null +++ b/kibicara-frontend/src/app/dashboard/board/hoodsettings/badwords/badwords.component.spec.ts @@ -0,0 +1,24 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { BadwordsComponent } from './badwords.component'; + +describe('BadwordsComponent', () => { + let component: BadwordsComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [BadwordsComponent], + }).compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(BadwordsComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/kibicara-frontend/src/app/dashboard/board/hoodsettings/badwords/badwords.component.ts b/kibicara-frontend/src/app/dashboard/board/hoodsettings/badwords/badwords.component.ts new file mode 100644 index 0000000..6c997ee --- /dev/null +++ b/kibicara-frontend/src/app/dashboard/board/hoodsettings/badwords/badwords.component.ts @@ -0,0 +1,19 @@ +import { Component, OnInit, Input } from '@angular/core'; +import { BadwordsService, BodyBadWord } from 'src/app/core/api'; +import { Observable } from 'rxjs'; + +@Component({ + selector: 'app-badwords', + templateUrl: './badwords.component.html', + styleUrls: ['./badwords.component.scss'], +}) +export class BadwordsComponent implements OnInit { + @Input() hoodId; + badwords$: Observable; + + constructor(private badwordService: BadwordsService) {} + + ngOnInit(): void { + //this.badwords$ = this.badwordService.getBadwords(this.hoodId); + } +} diff --git a/kibicara-frontend/src/app/dashboard/board/hoodsettings/hoodsettings.component.html b/kibicara-frontend/src/app/dashboard/board/hoodsettings/hoodsettings.component.html new file mode 100644 index 0000000..9224fce --- /dev/null +++ b/kibicara-frontend/src/app/dashboard/board/hoodsettings/hoodsettings.component.html @@ -0,0 +1,35 @@ +
+
+ + + + + info + + + How to use triggers and badwords to filter messages + + +

+ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Proin nisi + enim, semper at metus dapibus, mattis rutrum risus. Nam sit amet + venenatis ipsum. Nulla accumsan blandit est, vel dignissim nisl + consectetur in. Phasellus pretium vulputate lorem, ornare lobortis est + euismod ut. Nullam sit amet malesuada diam. Sed condimentum felis eu + scelerisque fringilla. Mauris vel sapien et nisl faucibus rutrum. Ut + dictum erat nec mattis tristique. Suspendisse ultrices tempus + facilisis. Fusce ac quam tempus sapien commodo vehicula. Suspendisse + viverra accumsan nunc, lacinia sagittis augue porttitor non. Cras + auctor, lorem sed convallis bibendum, odio sapien blandit nisl, sed + pulvinar augue risus a ligula. In dui massa, fringilla eu dolor eu, + volutpat varius lorem. Vivamus et molestie eros. +

+
+
+
+ +
+ + +
+
diff --git a/kibicara-frontend/src/app/dashboard/board/hoodsettings/hoodsettings.component.scss b/kibicara-frontend/src/app/dashboard/board/hoodsettings/hoodsettings.component.scss new file mode 100644 index 0000000..4d8663b --- /dev/null +++ b/kibicara-frontend/src/app/dashboard/board/hoodsettings/hoodsettings.component.scss @@ -0,0 +1,21 @@ +.container { + display: grid; + grid-template-columns: 1fr 1fr; + gap: 10px; + @media (max-width: 600px) { + grid-template-columns: 1fr; + } +} + +.container-item { + align-items: center; +} + +.settings { + margin: 1%; +} + +.explanation { + margin-top: 10px; + margin-bottom: 10px; +} diff --git a/kibicara-frontend/src/app/dashboard/board/hoodsettings/hoodsettings.component.spec.ts b/kibicara-frontend/src/app/dashboard/board/hoodsettings/hoodsettings.component.spec.ts new file mode 100644 index 0000000..1a09f43 --- /dev/null +++ b/kibicara-frontend/src/app/dashboard/board/hoodsettings/hoodsettings.component.spec.ts @@ -0,0 +1,24 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { HoodsettingsComponent } from './hoodsettings.component'; + +describe('HoodsettingsComponent', () => { + let component: HoodsettingsComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [HoodsettingsComponent], + }).compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(HoodsettingsComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/kibicara-frontend/src/app/dashboard/board/hoodsettings/hoodsettings.component.ts b/kibicara-frontend/src/app/dashboard/board/hoodsettings/hoodsettings.component.ts new file mode 100644 index 0000000..5c2ae9a --- /dev/null +++ b/kibicara-frontend/src/app/dashboard/board/hoodsettings/hoodsettings.component.ts @@ -0,0 +1,14 @@ +import { Component, OnInit, Input } from '@angular/core'; + +@Component({ + selector: 'app-hoodsettings', + templateUrl: './hoodsettings.component.html', + styleUrls: ['./hoodsettings.component.scss'], +}) +export class HoodsettingsComponent implements OnInit { + @Input() hoodId; + + constructor() {} + + ngOnInit(): void {} +} diff --git a/kibicara-frontend/src/app/dashboard/board/hoodsettings/trigger/trigger.component.html b/kibicara-frontend/src/app/dashboard/board/hoodsettings/trigger/trigger.component.html new file mode 100644 index 0000000..cfc32f2 --- /dev/null +++ b/kibicara-frontend/src/app/dashboard/board/hoodsettings/trigger/trigger.component.html @@ -0,0 +1,11 @@ + + Triggers + Lorem ipsum dolor sit amet, consectetur adipiscing elit. + +
+ +
+
+
diff --git a/kibicara-frontend/src/app/dashboard/board/hoodsettings/trigger/trigger.component.scss b/kibicara-frontend/src/app/dashboard/board/hoodsettings/trigger/trigger.component.scss new file mode 100644 index 0000000..e69de29 diff --git a/kibicara-frontend/src/app/dashboard/board/hoodsettings/trigger/trigger.component.spec.ts b/kibicara-frontend/src/app/dashboard/board/hoodsettings/trigger/trigger.component.spec.ts new file mode 100644 index 0000000..ace72ab --- /dev/null +++ b/kibicara-frontend/src/app/dashboard/board/hoodsettings/trigger/trigger.component.spec.ts @@ -0,0 +1,24 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { TriggerComponent } from './trigger.component'; + +describe('TriggerComponent', () => { + let component: TriggerComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [TriggerComponent], + }).compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(TriggerComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/kibicara-frontend/src/app/dashboard/board/hoodsettings/trigger/trigger.component.ts b/kibicara-frontend/src/app/dashboard/board/hoodsettings/trigger/trigger.component.ts new file mode 100644 index 0000000..9a1772a --- /dev/null +++ b/kibicara-frontend/src/app/dashboard/board/hoodsettings/trigger/trigger.component.ts @@ -0,0 +1,12 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-trigger', + templateUrl: './trigger.component.html', + styleUrls: ['./trigger.component.scss'], +}) +export class TriggerComponent implements OnInit { + constructor() {} + + ngOnInit(): void {} +} diff --git a/kibicara-frontend/src/app/dashboard/board/platforms/platforms.component.html b/kibicara-frontend/src/app/dashboard/board/platforms/platforms.component.html new file mode 100644 index 0000000..8e46a98 --- /dev/null +++ b/kibicara-frontend/src/app/dashboard/board/platforms/platforms.component.html @@ -0,0 +1 @@ +

platforms works!

diff --git a/kibicara-frontend/src/app/dashboard/board/platforms/platforms.component.scss b/kibicara-frontend/src/app/dashboard/board/platforms/platforms.component.scss new file mode 100644 index 0000000..e69de29 diff --git a/kibicara-frontend/src/app/dashboard/board/platforms/platforms.component.spec.ts b/kibicara-frontend/src/app/dashboard/board/platforms/platforms.component.spec.ts new file mode 100644 index 0000000..e453ff7 --- /dev/null +++ b/kibicara-frontend/src/app/dashboard/board/platforms/platforms.component.spec.ts @@ -0,0 +1,24 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { PlatformsComponent } from './platforms.component'; + +describe('PlatformsComponent', () => { + let component: PlatformsComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [PlatformsComponent], + }).compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(PlatformsComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/kibicara-frontend/src/app/dashboard/board/platforms/platforms.component.ts b/kibicara-frontend/src/app/dashboard/board/platforms/platforms.component.ts new file mode 100644 index 0000000..4a8c94f --- /dev/null +++ b/kibicara-frontend/src/app/dashboard/board/platforms/platforms.component.ts @@ -0,0 +1,12 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-platforms', + templateUrl: './platforms.component.html', + styleUrls: ['./platforms.component.scss'], +}) +export class PlatformsComponent implements OnInit { + constructor() {} + + ngOnInit(): void {} +} diff --git a/kibicara-frontend/src/app/dashboard/dashboard-routing.module.ts b/kibicara-frontend/src/app/dashboard/dashboard-routing.module.ts index 2e4ee40..a16a8c9 100644 --- a/kibicara-frontend/src/app/dashboard/dashboard-routing.module.ts +++ b/kibicara-frontend/src/app/dashboard/dashboard-routing.module.ts @@ -2,8 +2,8 @@ import { NgModule } from '@angular/core'; import { Routes, RouterModule } from '@angular/router'; import { DashboardComponent } from './dashboard.component'; import { HoodsComponent } from './hoods/hoods.component'; -import { SettingspageComponent } from './settingspage/settingspage.component'; import { AuthGuard } from '../core/auth/auth.guard'; +import { BoardComponent } from './board/board.component'; const routes: Routes = [ { @@ -11,7 +11,7 @@ const routes: Routes = [ component: DashboardComponent, children: [ { path: '', component: HoodsComponent }, - { path: 'settings', component: SettingspageComponent }, + { path: 'hoods/:id', component: BoardComponent }, ], canActivate: [AuthGuard], }, diff --git a/kibicara-frontend/src/app/dashboard/dashboard.module.ts b/kibicara-frontend/src/app/dashboard/dashboard.module.ts index 336d563..b8e8bd0 100644 --- a/kibicara-frontend/src/app/dashboard/dashboard.module.ts +++ b/kibicara-frontend/src/app/dashboard/dashboard.module.ts @@ -1,12 +1,28 @@ import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; import { HoodsComponent } from './hoods/hoods.component'; -import { SettingspageComponent } from './settingspage/settingspage.component'; import { DashboardComponent } from './dashboard.component'; import { DashboardRoutingModule } from './dashboard-routing.module'; +import { HoodsettingsComponent } from './board/hoodsettings/hoodsettings.component'; +import { PlatformsComponent } from './board/platforms/platforms.component'; +import { HoodpageComponent } from './board/hoodpage/hoodpage.component'; +import { BoardComponent } from './board/board.component'; +import { MaterialModule } from '../shared/material/material.module'; +import { TriggerComponent } from './board/hoodsettings/trigger/trigger.component'; +import { BadwordsComponent } from './board/hoodsettings/badwords/badwords.component'; +import { SharedModule } from '../shared/shared.module'; +import { CommonModule } from '@angular/common'; @NgModule({ - declarations: [HoodsComponent, SettingspageComponent, DashboardComponent], - imports: [CommonModule, DashboardRoutingModule], + declarations: [ + HoodsComponent, + DashboardComponent, + HoodsettingsComponent, + PlatformsComponent, + HoodpageComponent, + BoardComponent, + TriggerComponent, + BadwordsComponent, + ], + imports: [DashboardRoutingModule, MaterialModule, SharedModule, CommonModule], }) export class DashboardModule {} diff --git a/kibicara-frontend/src/app/dashboard/hoods/hoods.component.html b/kibicara-frontend/src/app/dashboard/hoods/hoods.component.html index 7f6d047..eed2ef6 100644 --- a/kibicara-frontend/src/app/dashboard/hoods/hoods.component.html +++ b/kibicara-frontend/src/app/dashboard/hoods/hoods.component.html @@ -1,2 +1,2 @@

hoods works!

-
{{ item.name }}
+ diff --git a/kibicara-frontend/src/app/dashboard/settingspage/settingspage.component.html b/kibicara-frontend/src/app/dashboard/settingspage/settingspage.component.html deleted file mode 100644 index 1b14cbf..0000000 --- a/kibicara-frontend/src/app/dashboard/settingspage/settingspage.component.html +++ /dev/null @@ -1 +0,0 @@ -

settingspage works!

diff --git a/kibicara-frontend/src/app/dashboard/settingspage/settingspage.component.spec.ts b/kibicara-frontend/src/app/dashboard/settingspage/settingspage.component.spec.ts deleted file mode 100644 index 51018ee..0000000 --- a/kibicara-frontend/src/app/dashboard/settingspage/settingspage.component.spec.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - -import { SettingspageComponent } from './settingspage.component'; - -describe('SettingspageComponent', () => { - let component: SettingspageComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [ SettingspageComponent ] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(SettingspageComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/kibicara-frontend/src/app/dashboard/settingspage/settingspage.component.ts b/kibicara-frontend/src/app/dashboard/settingspage/settingspage.component.ts deleted file mode 100644 index c11da9a..0000000 --- a/kibicara-frontend/src/app/dashboard/settingspage/settingspage.component.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { Component, OnInit } from '@angular/core'; - -@Component({ - selector: 'app-settingspage', - templateUrl: './settingspage.component.html', - styleUrls: ['./settingspage.component.scss'] -}) -export class SettingspageComponent implements OnInit { - - constructor() { } - - ngOnInit(): void { - } - -} diff --git a/kibicara-frontend/src/app/hoodpage/hoodpage.component.ts b/kibicara-frontend/src/app/hoodpage/hoodpage.component.ts index b2d22cf..3445bf5 100644 --- a/kibicara-frontend/src/app/hoodpage/hoodpage.component.ts +++ b/kibicara-frontend/src/app/hoodpage/hoodpage.component.ts @@ -14,23 +14,18 @@ export class HoodpageComponent implements OnInit { constructor( private route: ActivatedRoute, private router: Router, - private readonly hoodService: HoodsService + private readonly hoodsService: HoodsService ) {} ngOnInit(): void { const hoodId = this.route.snapshot.params['id']; if (hoodId) { - this.hoodService + this.hoodsService .getHood(hoodId) .pipe(first()) - .subscribe( - (data) => { - this.hood = data; - }, - (error) => { - this.router.navigate(['/404']); - } - ); + .subscribe((data) => { + this.hood = data; + }); } } } diff --git a/kibicara-frontend/src/app/shared/material/material.module.ts b/kibicara-frontend/src/app/shared/material/material.module.ts index f87d858..219ca7f 100644 --- a/kibicara-frontend/src/app/shared/material/material.module.ts +++ b/kibicara-frontend/src/app/shared/material/material.module.ts @@ -3,10 +3,29 @@ import { MatToolbarModule } from '@angular/material/toolbar'; import { MatButtonModule } from '@angular/material/button'; import { MatIconModule } from '@angular/material/icon'; import { MatMenuModule } from '@angular/material/menu'; +import { MatTabsModule } from '@angular/material/tabs'; +import { MatCardModule } from '@angular/material/card'; +import { MatExpansionModule } from '@angular/material/expansion'; @NgModule({ declarations: [], - imports: [MatButtonModule, MatIconModule, MatMenuModule, MatToolbarModule], - exports: [MatButtonModule, MatIconModule, MatMenuModule, MatToolbarModule], + imports: [ + MatButtonModule, + MatIconModule, + MatMenuModule, + MatToolbarModule, + MatTabsModule, + MatCardModule, + MatExpansionModule, + ], + exports: [ + MatButtonModule, + MatIconModule, + MatMenuModule, + MatToolbarModule, + MatTabsModule, + MatCardModule, + MatExpansionModule, + ], }) export class MaterialModule {} diff --git a/kibicara-frontend/src/app/shared/option-card/option-card.component.html b/kibicara-frontend/src/app/shared/option-card/option-card.component.html new file mode 100644 index 0000000..c1b64b7 --- /dev/null +++ b/kibicara-frontend/src/app/shared/option-card/option-card.component.html @@ -0,0 +1,12 @@ +

option-card works!

+ + + test + + + + diff --git a/kibicara-frontend/src/app/shared/option-card/option-card.component.scss b/kibicara-frontend/src/app/shared/option-card/option-card.component.scss new file mode 100644 index 0000000..e69de29 diff --git a/kibicara-frontend/src/app/shared/option-card/option-card.component.spec.ts b/kibicara-frontend/src/app/shared/option-card/option-card.component.spec.ts new file mode 100644 index 0000000..5b7c47a --- /dev/null +++ b/kibicara-frontend/src/app/shared/option-card/option-card.component.spec.ts @@ -0,0 +1,24 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { OptionCardComponent } from './option-card.component'; + +describe('OptionCardComponent', () => { + let component: OptionCardComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [OptionCardComponent], + }).compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(OptionCardComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/kibicara-frontend/src/app/shared/option-card/option-card.component.ts b/kibicara-frontend/src/app/shared/option-card/option-card.component.ts new file mode 100644 index 0000000..83bd287 --- /dev/null +++ b/kibicara-frontend/src/app/shared/option-card/option-card.component.ts @@ -0,0 +1,14 @@ +import { Component, OnInit, Input } from '@angular/core'; + +@Component({ + selector: 'app-option-card', + templateUrl: './option-card.component.html', + styleUrls: ['./option-card.component.scss'], +}) +export class OptionCardComponent implements OnInit { + @Input() option; + + constructor() {} + + ngOnInit(): void {} +} diff --git a/kibicara-frontend/src/app/shared/shared.module.ts b/kibicara-frontend/src/app/shared/shared.module.ts index 163d34b..1169524 100644 --- a/kibicara-frontend/src/app/shared/shared.module.ts +++ b/kibicara-frontend/src/app/shared/shared.module.ts @@ -2,10 +2,16 @@ import { NgModule } from '@angular/core'; import { ToolbarComponent } from './toolbar/toolbar.component'; import { MaterialModule } from './material/material.module'; import { NotFoundComponent } from './not-found/not-found.component'; +import { OptionCardComponent } from './option-card/option-card.component'; @NgModule({ - declarations: [ToolbarComponent, NotFoundComponent], + declarations: [ToolbarComponent, NotFoundComponent, OptionCardComponent], imports: [MaterialModule], - exports: [ToolbarComponent, NotFoundComponent, MaterialModule], + exports: [ + ToolbarComponent, + NotFoundComponent, + OptionCardComponent, + MaterialModule, + ], }) export class SharedModule {}