diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app.routing.ts b/SessionCompanion/SessionCompanion/ClientApp/src/app.routing.ts index 934f5a4..947a2cb 100644 --- a/SessionCompanion/SessionCompanion/ClientApp/src/app.routing.ts +++ b/SessionCompanion/SessionCompanion/ClientApp/src/app.routing.ts @@ -5,6 +5,7 @@ import { RegistrationComponent } from './app/components/registration/registratio import {GameMasterDashboardComponent} from './app/components/game-master-dashboard/game-master-dashboard.component'; import {PlayerDashboardComponent} from './app/components/player-dashboard/player-dashboard.component'; import { SelectCharacterComponent } from './app/components/select-character/select-character.component'; +import {CreateCharacterComponent} from "./app/components/create-character/create-character.component"; const routes: Routes = [ { @@ -37,6 +38,11 @@ const routes: Routes = [ component: SelectCharacterComponent, pathMatch: 'full' }, + { + path: 'create-character', + component: CreateCharacterComponent, + pathMatch: 'full' + }, ]; export const appRoutingModule = RouterModule.forRoot(routes); diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app/app.module.ts b/SessionCompanion/SessionCompanion/ClientApp/src/app/app.module.ts index 9324316..1a90e4b 100644 --- a/SessionCompanion/SessionCompanion/ClientApp/src/app/app.module.ts +++ b/SessionCompanion/SessionCompanion/ClientApp/src/app/app.module.ts @@ -62,6 +62,7 @@ import { MessageDialogComponent } from './shared/message-dialog/message-dialog.c import { GameMasterTurntrackerComponent } from './components/game-master-turntracker/game-master-turntracker.component'; import { DragDropModule } from '@angular/cdk/drag-drop'; import { ChooseMonsterDialogComponent } from './components/choose-monster-dialog/choose-monster-dialog.component'; +import { CreateCharacterComponent } from './components/create-character/create-character.component'; @NgModule({ declarations: [ @@ -90,6 +91,7 @@ import { ChooseMonsterDialogComponent } from './components/choose-monster-dialog MessageDialogComponent, GameMasterTurntrackerComponent, ChooseMonsterDialogComponent, + CreateCharacterComponent, ], imports: [ BrowserModule.withServerTransition({ appId: 'ng-cli-universal' }), @@ -151,6 +153,7 @@ import { ChooseMonsterDialogComponent } from './components/choose-monster-dialog MessageDialogComponent, GameMasterTurntrackerComponent, ChooseMonsterDialogComponent, + CreateCharacterComponent, ], }) export class AppModule {} diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app/components/create-character/create-character.component.css b/SessionCompanion/SessionCompanion/ClientApp/src/app/components/create-character/create-character.component.css new file mode 100644 index 0000000..46fa919 --- /dev/null +++ b/SessionCompanion/SessionCompanion/ClientApp/src/app/components/create-character/create-character.component.css @@ -0,0 +1 @@ +@import "../../../styles.css"; diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app/components/create-character/create-character.component.html b/SessionCompanion/SessionCompanion/ClientApp/src/app/components/create-character/create-character.component.html new file mode 100644 index 0000000..ba6d2cd --- /dev/null +++ b/SessionCompanion/SessionCompanion/ClientApp/src/app/components/create-character/create-character.component.html @@ -0,0 +1,8 @@ +

create-character works!

+ diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app/components/create-character/create-character.component.spec.ts b/SessionCompanion/SessionCompanion/ClientApp/src/app/components/create-character/create-character.component.spec.ts new file mode 100644 index 0000000..5e30ca7 --- /dev/null +++ b/SessionCompanion/SessionCompanion/ClientApp/src/app/components/create-character/create-character.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { CreateCharacterComponent } from './create-character.component'; + +describe('CreateCharacterComponent', () => { + let component: CreateCharacterComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ CreateCharacterComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(CreateCharacterComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app/components/create-character/create-character.component.ts b/SessionCompanion/SessionCompanion/ClientApp/src/app/components/create-character/create-character.component.ts new file mode 100644 index 0000000..d4be4ba --- /dev/null +++ b/SessionCompanion/SessionCompanion/ClientApp/src/app/components/create-character/create-character.component.ts @@ -0,0 +1,19 @@ +import { Component, OnInit } from '@angular/core'; +import { Router } from '@angular/router'; + +@Component({ + selector: 'app-create-character', + templateUrl: './create-character.component.html', + styleUrls: ['./create-character.component.css'] +}) +export class CreateCharacterComponent implements OnInit { + + constructor(private router: Router) { } + + ngOnInit() { + } + + onCreateCharacterButton() { + this.router.navigate(['select-character']); + } +} diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app/components/select-character/select-character.component.css b/SessionCompanion/SessionCompanion/ClientApp/src/app/components/select-character/select-character.component.css index 41aa481..725318b 100644 --- a/SessionCompanion/SessionCompanion/ClientApp/src/app/components/select-character/select-character.component.css +++ b/SessionCompanion/SessionCompanion/ClientApp/src/app/components/select-character/select-character.component.css @@ -69,3 +69,8 @@ input { padding-top: 5%; } } + +.mat-divider--custom-style { + background-color: #9e8b6e; + box-shadow: 0 1px 0 0 #d8d8d8; +} diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app/components/select-character/select-character.component.html b/SessionCompanion/SessionCompanion/ClientApp/src/app/components/select-character/select-character.component.html index 5eae2cc..ae3a7f7 100644 --- a/SessionCompanion/SessionCompanion/ClientApp/src/app/components/select-character/select-character.component.html +++ b/SessionCompanion/SessionCompanion/ClientApp/src/app/components/select-character/select-character.component.html @@ -1,15 +1,26 @@
arrow_back -
Select character
+
Select character
+ - account_circle -
{{character.name}}
+
{{character.name}}
arrow_forward
{{character.className}} level: {{character.level}}
- +
+
or
+
Create character
+ + + + account_circle +
Create character
+ arrow_forward +
+
+
diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app/components/select-character/select-character.component.ts b/SessionCompanion/SessionCompanion/ClientApp/src/app/components/select-character/select-character.component.ts index bb796df..1c725a1 100644 --- a/SessionCompanion/SessionCompanion/ClientApp/src/app/components/select-character/select-character.component.ts +++ b/SessionCompanion/SessionCompanion/ClientApp/src/app/components/select-character/select-character.component.ts @@ -46,4 +46,8 @@ export class SelectCharacterComponent implements OnInit { this.store.dispatch(new ClearUserId()); this.router.navigate(['login']); } + + onCreateCharacter() { + this.router.navigate(['create-character']); + } }