From bdeca6efbe527dd488ac73e5da09cc76691fc3f8 Mon Sep 17 00:00:00 2001 From: ngawron Date: Thu, 3 Dec 2020 21:03:58 +0100 Subject: [PATCH 1/6] SES-74 added basic structure to the code --- .../ClientApp/src/app.routing.ts | 6 +-- .../ClientApp/src/app/app.component.html | 2 +- .../ClientApp/src/app/app.module.ts | 12 +++-- .../game-master-dashboard.component.css | 0 .../game-master-dashboard.component.html | 0 .../game-master-dashboard.component.ts | 18 ++++++++ .../nav-menu/nav-menu.component.html | 44 ------------------- .../player-dashboard.component.css | 0 .../player-dashboard.component.html | 0 .../player-dashboard.component.ts | 18 ++++++++ .../registration/registration.component.css | 0 .../registration/registration.component.html | 0 .../registration/registration.component.ts | 18 ++++++++ .../select-role.component.css} | 0 .../select-role/select-role.component.html | 2 + .../select-role/select-role.component.ts | 18 ++++++++ .../components/sign-in/sign-in.component.css | 0 .../components/sign-in/sign-in.component.html | 0 .../sign-in.component.ts} | 8 ++-- .../game-master-dashboard-page.component.css | 0 .../game-master-dashboard-page.component.html | 0 .../game-master-dashboard-page.component.ts | 9 ++++ .../src/app/pages/home/home.component.html | 14 ------ .../src/app/pages/home/home.component.ts | 8 ---- .../master-page/master-page.component.css | 0 .../master-page/master-page.component.html | 2 + .../master-page/master-page.component.ts | 9 ++++ .../player-dashboard-page.component.css | 0 .../player-dashboard-page.component.html | 0 .../player-dashboard-page.component.ts | 9 ++++ .../registration-page.component.css | 0 .../registration-page.component.html | 0 .../registration-page.component.ts | 9 ++++ .../sign-in-page/sign-in-page.component.css | 0 .../sign-in-page/sign-in-page.component.html | 0 .../sign-in-page/sign-in-page.component.ts | 9 ++++ 36 files changed, 134 insertions(+), 81 deletions(-) create mode 100644 SessionCompanion/SessionCompanion/ClientApp/src/app/components/game-master-dashboard/game-master-dashboard.component.css create mode 100644 SessionCompanion/SessionCompanion/ClientApp/src/app/components/game-master-dashboard/game-master-dashboard.component.html create mode 100644 SessionCompanion/SessionCompanion/ClientApp/src/app/components/game-master-dashboard/game-master-dashboard.component.ts delete mode 100644 SessionCompanion/SessionCompanion/ClientApp/src/app/components/nav-menu/nav-menu.component.html create mode 100644 SessionCompanion/SessionCompanion/ClientApp/src/app/components/player-dashboard/player-dashboard.component.css create mode 100644 SessionCompanion/SessionCompanion/ClientApp/src/app/components/player-dashboard/player-dashboard.component.html create mode 100644 SessionCompanion/SessionCompanion/ClientApp/src/app/components/player-dashboard/player-dashboard.component.ts create mode 100644 SessionCompanion/SessionCompanion/ClientApp/src/app/components/registration/registration.component.css create mode 100644 SessionCompanion/SessionCompanion/ClientApp/src/app/components/registration/registration.component.html create mode 100644 SessionCompanion/SessionCompanion/ClientApp/src/app/components/registration/registration.component.ts rename SessionCompanion/SessionCompanion/ClientApp/src/app/components/{nav-menu/nav-menu.component.css => select-role/select-role.component.css} (100%) create mode 100644 SessionCompanion/SessionCompanion/ClientApp/src/app/components/select-role/select-role.component.html create mode 100644 SessionCompanion/SessionCompanion/ClientApp/src/app/components/select-role/select-role.component.ts create mode 100644 SessionCompanion/SessionCompanion/ClientApp/src/app/components/sign-in/sign-in.component.css create mode 100644 SessionCompanion/SessionCompanion/ClientApp/src/app/components/sign-in/sign-in.component.html rename SessionCompanion/SessionCompanion/ClientApp/src/app/components/{nav-menu/nav-menu.component.ts => sign-in/sign-in.component.ts} (56%) create mode 100644 SessionCompanion/SessionCompanion/ClientApp/src/app/pages/game-master-dashboard-page/game-master-dashboard-page.component.css create mode 100644 SessionCompanion/SessionCompanion/ClientApp/src/app/pages/game-master-dashboard-page/game-master-dashboard-page.component.html create mode 100644 SessionCompanion/SessionCompanion/ClientApp/src/app/pages/game-master-dashboard-page/game-master-dashboard-page.component.ts delete mode 100644 SessionCompanion/SessionCompanion/ClientApp/src/app/pages/home/home.component.html delete mode 100644 SessionCompanion/SessionCompanion/ClientApp/src/app/pages/home/home.component.ts create mode 100644 SessionCompanion/SessionCompanion/ClientApp/src/app/pages/master-page/master-page.component.css create mode 100644 SessionCompanion/SessionCompanion/ClientApp/src/app/pages/master-page/master-page.component.html create mode 100644 SessionCompanion/SessionCompanion/ClientApp/src/app/pages/master-page/master-page.component.ts create mode 100644 SessionCompanion/SessionCompanion/ClientApp/src/app/pages/player-dashboard-page/player-dashboard-page.component.css create mode 100644 SessionCompanion/SessionCompanion/ClientApp/src/app/pages/player-dashboard-page/player-dashboard-page.component.html create mode 100644 SessionCompanion/SessionCompanion/ClientApp/src/app/pages/player-dashboard-page/player-dashboard-page.component.ts create mode 100644 SessionCompanion/SessionCompanion/ClientApp/src/app/pages/registration-page/registration-page.component.css create mode 100644 SessionCompanion/SessionCompanion/ClientApp/src/app/pages/registration-page/registration-page.component.html create mode 100644 SessionCompanion/SessionCompanion/ClientApp/src/app/pages/registration-page/registration-page.component.ts create mode 100644 SessionCompanion/SessionCompanion/ClientApp/src/app/pages/sign-in-page/sign-in-page.component.css create mode 100644 SessionCompanion/SessionCompanion/ClientApp/src/app/pages/sign-in-page/sign-in-page.component.html create mode 100644 SessionCompanion/SessionCompanion/ClientApp/src/app/pages/sign-in-page/sign-in-page.component.ts diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app.routing.ts b/SessionCompanion/SessionCompanion/ClientApp/src/app.routing.ts index 0d8d551..8c2c92b 100644 --- a/SessionCompanion/SessionCompanion/ClientApp/src/app.routing.ts +++ b/SessionCompanion/SessionCompanion/ClientApp/src/app.routing.ts @@ -1,10 +1,10 @@ -import {RouterModule, Routes} from '@angular/router'; -import {HomeComponent} from './app/pages/home/home.component'; +import { RouterModule, Routes } from '@angular/router'; +import { MasterPageComponent } from './app/pages/master-page/master-page.component'; const routes: Routes = [ { path: '', - component: HomeComponent, + component: MasterPageComponent, pathMatch: 'full' }, ]; diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app/app.component.html b/SessionCompanion/SessionCompanion/ClientApp/src/app/app.component.html index 7173845..928e0cc 100644 --- a/SessionCompanion/SessionCompanion/ClientApp/src/app/app.component.html +++ b/SessionCompanion/SessionCompanion/ClientApp/src/app/app.component.html @@ -1,6 +1,6 @@ -
+
diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app/app.module.ts b/SessionCompanion/SessionCompanion/ClientApp/src/app/app.module.ts index 5588648..9e807dc 100644 --- a/SessionCompanion/SessionCompanion/ClientApp/src/app/app.module.ts +++ b/SessionCompanion/SessionCompanion/ClientApp/src/app/app.module.ts @@ -2,19 +2,17 @@ import { BrowserModule } from '@angular/platform-browser'; import { NgModule } from '@angular/core'; import { FormsModule } from '@angular/forms'; import { HttpClientModule } from '@angular/common/http'; -import { RouterModule } from '@angular/router'; - import { AppComponent } from './app.component'; -import { NavMenuComponent } from './components/nav-menu/nav-menu.component'; -import { HomeComponent } from './pages/home/home.component'; -import {appRoutingModule} from '../app.routing'; +import { SelectRoleComponent } from './components/select-role/select-role.component'; +import { MasterPageComponent } from './pages/master-page/master-page.component'; +import { appRoutingModule } from '../app.routing'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; @NgModule({ declarations: [ AppComponent, - NavMenuComponent, - HomeComponent + SelectRoleComponent, + MasterPageComponent ], imports: [ BrowserModule.withServerTransition({ appId: 'ng-cli-universal' }), diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app/components/game-master-dashboard/game-master-dashboard.component.css b/SessionCompanion/SessionCompanion/ClientApp/src/app/components/game-master-dashboard/game-master-dashboard.component.css new file mode 100644 index 0000000..e69de29 diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app/components/game-master-dashboard/game-master-dashboard.component.html b/SessionCompanion/SessionCompanion/ClientApp/src/app/components/game-master-dashboard/game-master-dashboard.component.html new file mode 100644 index 0000000..e69de29 diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app/components/game-master-dashboard/game-master-dashboard.component.ts b/SessionCompanion/SessionCompanion/ClientApp/src/app/components/game-master-dashboard/game-master-dashboard.component.ts new file mode 100644 index 0000000..0a3c585 --- /dev/null +++ b/SessionCompanion/SessionCompanion/ClientApp/src/app/components/game-master-dashboard/game-master-dashboard.component.ts @@ -0,0 +1,18 @@ +import { Component } from '@angular/core'; + +@Component({ + selector: 'app-game-master-dashboard', + templateUrl: './game-master-dashboard.component.html', + styleUrls: ['./game-master-dashboard.component.css'] +}) +export class GameMasterDashboardComponent { + isExpanded = false; + + collapse() { + this.isExpanded = false; + } + + toggle() { + this.isExpanded = !this.isExpanded; + } +} diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app/components/nav-menu/nav-menu.component.html b/SessionCompanion/SessionCompanion/ClientApp/src/app/components/nav-menu/nav-menu.component.html deleted file mode 100644 index 6996e00..0000000 --- a/SessionCompanion/SessionCompanion/ClientApp/src/app/components/nav-menu/nav-menu.component.html +++ /dev/null @@ -1,44 +0,0 @@ -
- -
diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app/components/player-dashboard/player-dashboard.component.css b/SessionCompanion/SessionCompanion/ClientApp/src/app/components/player-dashboard/player-dashboard.component.css new file mode 100644 index 0000000..e69de29 diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app/components/player-dashboard/player-dashboard.component.html b/SessionCompanion/SessionCompanion/ClientApp/src/app/components/player-dashboard/player-dashboard.component.html new file mode 100644 index 0000000..e69de29 diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app/components/player-dashboard/player-dashboard.component.ts b/SessionCompanion/SessionCompanion/ClientApp/src/app/components/player-dashboard/player-dashboard.component.ts new file mode 100644 index 0000000..9ed3789 --- /dev/null +++ b/SessionCompanion/SessionCompanion/ClientApp/src/app/components/player-dashboard/player-dashboard.component.ts @@ -0,0 +1,18 @@ +import { Component } from '@angular/core'; + +@Component({ + selector: 'app-player-dashboard', + templateUrl: './player-dashboard.component.html', + styleUrls: ['./player-dashboard.component.css'] +}) +export class PlayerDashboardComponent { + isExpanded = false; + + collapse() { + this.isExpanded = false; + } + + toggle() { + this.isExpanded = !this.isExpanded; + } +} diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app/components/registration/registration.component.css b/SessionCompanion/SessionCompanion/ClientApp/src/app/components/registration/registration.component.css new file mode 100644 index 0000000..e69de29 diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app/components/registration/registration.component.html b/SessionCompanion/SessionCompanion/ClientApp/src/app/components/registration/registration.component.html new file mode 100644 index 0000000..e69de29 diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app/components/registration/registration.component.ts b/SessionCompanion/SessionCompanion/ClientApp/src/app/components/registration/registration.component.ts new file mode 100644 index 0000000..ce4f498 --- /dev/null +++ b/SessionCompanion/SessionCompanion/ClientApp/src/app/components/registration/registration.component.ts @@ -0,0 +1,18 @@ +import { Component } from '@angular/core'; + +@Component({ + selector: 'app-registration', + templateUrl: './registration.component.html', + styleUrls: ['./registration.component.css'] +}) +export class RegistrationComponent { + isExpanded = false; + + collapse() { + this.isExpanded = false; + } + + toggle() { + this.isExpanded = !this.isExpanded; + } +} diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app/components/nav-menu/nav-menu.component.css b/SessionCompanion/SessionCompanion/ClientApp/src/app/components/select-role/select-role.component.css similarity index 100% rename from SessionCompanion/SessionCompanion/ClientApp/src/app/components/nav-menu/nav-menu.component.css rename to SessionCompanion/SessionCompanion/ClientApp/src/app/components/select-role/select-role.component.css diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app/components/select-role/select-role.component.html b/SessionCompanion/SessionCompanion/ClientApp/src/app/components/select-role/select-role.component.html new file mode 100644 index 0000000..f91b131 --- /dev/null +++ b/SessionCompanion/SessionCompanion/ClientApp/src/app/components/select-role/select-role.component.html @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app/components/select-role/select-role.component.ts b/SessionCompanion/SessionCompanion/ClientApp/src/app/components/select-role/select-role.component.ts new file mode 100644 index 0000000..eecb8d0 --- /dev/null +++ b/SessionCompanion/SessionCompanion/ClientApp/src/app/components/select-role/select-role.component.ts @@ -0,0 +1,18 @@ +import { Component } from '@angular/core'; + +@Component({ + selector: 'app-select-role', + templateUrl: './select-role.component.html', + styleUrls: ['./select-role.component.css'] +}) +export class SelectRoleComponent { + isExpanded = false; + + collapse() { + this.isExpanded = false; + } + + toggle() { + this.isExpanded = !this.isExpanded; + } +} diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app/components/sign-in/sign-in.component.css b/SessionCompanion/SessionCompanion/ClientApp/src/app/components/sign-in/sign-in.component.css new file mode 100644 index 0000000..e69de29 diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app/components/sign-in/sign-in.component.html b/SessionCompanion/SessionCompanion/ClientApp/src/app/components/sign-in/sign-in.component.html new file mode 100644 index 0000000..e69de29 diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app/components/nav-menu/nav-menu.component.ts b/SessionCompanion/SessionCompanion/ClientApp/src/app/components/sign-in/sign-in.component.ts similarity index 56% rename from SessionCompanion/SessionCompanion/ClientApp/src/app/components/nav-menu/nav-menu.component.ts rename to SessionCompanion/SessionCompanion/ClientApp/src/app/components/sign-in/sign-in.component.ts index 327a374..b1b1961 100644 --- a/SessionCompanion/SessionCompanion/ClientApp/src/app/components/nav-menu/nav-menu.component.ts +++ b/SessionCompanion/SessionCompanion/ClientApp/src/app/components/sign-in/sign-in.component.ts @@ -1,11 +1,11 @@ import { Component } from '@angular/core'; @Component({ - selector: 'app-nav-menu', - templateUrl: './nav-menu.component.html', - styleUrls: ['./nav-menu.component.css'] + selector: 'app-sign-in', + templateUrl: './sign-in.component.html', + styleUrls: ['./sign-in.component.css'] }) -export class NavMenuComponent { +export class SignInComponent { isExpanded = false; collapse() { diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/game-master-dashboard-page/game-master-dashboard-page.component.css b/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/game-master-dashboard-page/game-master-dashboard-page.component.css new file mode 100644 index 0000000..e69de29 diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/game-master-dashboard-page/game-master-dashboard-page.component.html b/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/game-master-dashboard-page/game-master-dashboard-page.component.html new file mode 100644 index 0000000..e69de29 diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/game-master-dashboard-page/game-master-dashboard-page.component.ts b/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/game-master-dashboard-page/game-master-dashboard-page.component.ts new file mode 100644 index 0000000..13253e6 --- /dev/null +++ b/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/game-master-dashboard-page/game-master-dashboard-page.component.ts @@ -0,0 +1,9 @@ +import { Component } from '@angular/core'; + +@Component({ + selector: 'app-game-master-dashboard', + templateUrl: './game-master-dashboard.component.html', + styleUrls: ['./game-master-dashboard.component.css'] +}) +export class GameMasterDashboardPageComponent { +} diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/home/home.component.html b/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/home/home.component.html deleted file mode 100644 index f74c2e7..0000000 --- a/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/home/home.component.html +++ /dev/null @@ -1,14 +0,0 @@ -

Hello, world!

-

Welcome to your new single-page application, built with:

- -

To help you get started, we've also set up:

- -

The ClientApp subdirectory is a standard Angular CLI application. If you open a command prompt in that directory, you can run any ng command (e.g., ng test), or use npm to install extra packages into it.

diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/home/home.component.ts b/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/home/home.component.ts deleted file mode 100644 index 2747b30..0000000 --- a/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/home/home.component.ts +++ /dev/null @@ -1,8 +0,0 @@ -import { Component } from '@angular/core'; - -@Component({ - selector: 'app-home', - templateUrl: './home.component.html', -}) -export class HomeComponent { -} diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/master-page/master-page.component.css b/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/master-page/master-page.component.css new file mode 100644 index 0000000..e69de29 diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/master-page/master-page.component.html b/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/master-page/master-page.component.html new file mode 100644 index 0000000..f517200 --- /dev/null +++ b/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/master-page/master-page.component.html @@ -0,0 +1,2 @@ +

Hello on the Session Companion

+

Choose your role

diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/master-page/master-page.component.ts b/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/master-page/master-page.component.ts new file mode 100644 index 0000000..4c8d913 --- /dev/null +++ b/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/master-page/master-page.component.ts @@ -0,0 +1,9 @@ +import { Component } from '@angular/core'; + +@Component({ + selector: 'app-master-page', + templateUrl: './master-page.component.html', + styleUrls: ['./master-page.component.css'], +}) +export class MasterPageComponent { +} diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/player-dashboard-page/player-dashboard-page.component.css b/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/player-dashboard-page/player-dashboard-page.component.css new file mode 100644 index 0000000..e69de29 diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/player-dashboard-page/player-dashboard-page.component.html b/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/player-dashboard-page/player-dashboard-page.component.html new file mode 100644 index 0000000..e69de29 diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/player-dashboard-page/player-dashboard-page.component.ts b/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/player-dashboard-page/player-dashboard-page.component.ts new file mode 100644 index 0000000..b540b38 --- /dev/null +++ b/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/player-dashboard-page/player-dashboard-page.component.ts @@ -0,0 +1,9 @@ +import { Component } from '@angular/core'; + +@Component({ + selector: 'app-player-dashboard-page', + templateUrl: './player-dashboard-page.component.html', + styleUrls: ['./player-dashboard-page.component.css'] +}) +export class PlayerDashboardPageComponent { +} diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/registration-page/registration-page.component.css b/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/registration-page/registration-page.component.css new file mode 100644 index 0000000..e69de29 diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/registration-page/registration-page.component.html b/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/registration-page/registration-page.component.html new file mode 100644 index 0000000..e69de29 diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/registration-page/registration-page.component.ts b/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/registration-page/registration-page.component.ts new file mode 100644 index 0000000..5161472 --- /dev/null +++ b/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/registration-page/registration-page.component.ts @@ -0,0 +1,9 @@ +import { Component } from '@angular/core'; + +@Component({ + selector: 'app-registration-page', + templateUrl: './registration-page.component.html', + styleUrls: ['./registration-page.component.css'], +}) +export class RegistrationPageComponent { +} diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/sign-in-page/sign-in-page.component.css b/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/sign-in-page/sign-in-page.component.css new file mode 100644 index 0000000..e69de29 diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/sign-in-page/sign-in-page.component.html b/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/sign-in-page/sign-in-page.component.html new file mode 100644 index 0000000..e69de29 diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/sign-in-page/sign-in-page.component.ts b/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/sign-in-page/sign-in-page.component.ts new file mode 100644 index 0000000..aced320 --- /dev/null +++ b/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/sign-in-page/sign-in-page.component.ts @@ -0,0 +1,9 @@ +import { Component } from '@angular/core'; + +@Component({ + selector: 'app-sign-in-page', + templateUrl: './sign-in-page.component.html', + styleUrls: ['./sign-in-page.component.css'] +}) +export class SignInPageComponent { +} From afe73424dfecfd5294602e200b4ed47093a72bd8 Mon Sep 17 00:00:00 2001 From: ngawron Date: Thu, 3 Dec 2020 22:31:43 +0100 Subject: [PATCH 2/6] SES-74 created master-page with - select role --- .../ClientApp/src/app/app.module.ts | 4 ++ .../select-role/select-role.component.css | 53 +++++++++++++++---- .../select-role/select-role.component.html | 6 ++- .../master-page/master-page.component.css | 5 ++ .../master-page/master-page.component.html | 3 +- 5 files changed, 56 insertions(+), 15 deletions(-) diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app/app.module.ts b/SessionCompanion/SessionCompanion/ClientApp/src/app/app.module.ts index 9e807dc..36f279e 100644 --- a/SessionCompanion/SessionCompanion/ClientApp/src/app/app.module.ts +++ b/SessionCompanion/SessionCompanion/ClientApp/src/app/app.module.ts @@ -7,6 +7,8 @@ import { SelectRoleComponent } from './components/select-role/select-role.compon import { MasterPageComponent } from './pages/master-page/master-page.component'; import { appRoutingModule } from '../app.routing'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; +import { MatButtonModule } from '@angular/material/button'; +import { MatCardModule } from '@angular/material/card'; @NgModule({ declarations: [ @@ -20,6 +22,8 @@ import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; FormsModule, appRoutingModule, BrowserAnimationsModule, + MatButtonModule, + MatCardModule, ], providers: [], bootstrap: [AppComponent] diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app/components/select-role/select-role.component.css b/SessionCompanion/SessionCompanion/ClientApp/src/app/components/select-role/select-role.component.css index 10389ef..4500b88 100644 --- a/SessionCompanion/SessionCompanion/ClientApp/src/app/components/select-role/select-role.component.css +++ b/SessionCompanion/SessionCompanion/ClientApp/src/app/components/select-role/select-role.component.css @@ -1,18 +1,49 @@ -a.navbar-brand { - white-space: normal; - text-align: center; - word-break: break-all; +.container { + display: flex; + justify-content: center; + align-items: center; + flex-wrap: wrap; + padding: 10%; } -html { - font-size: 14px; +.button { + border-radius: 15px; } -@media (min-width: 768px) { - html { - font-size: 16px; + +#player-button { + background-color: #2699fb; +} + +#game-master-button { + background-color: #440505; +} + +.font { + color: #ffffff; + font-weight: bold; + font-style: italic, oblique; +} + +@media (max-width: 768px) { + .button { + margin: 10px; + padding: 10px; + width: 328px; + height: 101px; + } + .font { + font-size: 20px; } } -.box-shadow { - box-shadow: 0 .25rem .75rem rgba(0, 0, 0, .05); +@media (min-width: 768px) { + .button { + margin: 20px; + padding: 20px; + width: 658px; + height: 202px; + } + .font { + font-size: 40px; + } } diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app/components/select-role/select-role.component.html b/SessionCompanion/SessionCompanion/ClientApp/src/app/components/select-role/select-role.component.html index f91b131..47b866b 100644 --- a/SessionCompanion/SessionCompanion/ClientApp/src/app/components/select-role/select-role.component.html +++ b/SessionCompanion/SessionCompanion/ClientApp/src/app/components/select-role/select-role.component.html @@ -1,2 +1,4 @@ - - \ No newline at end of file +
+ + +
diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/master-page/master-page.component.css b/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/master-page/master-page.component.css index e69de29..fc10c63 100644 --- a/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/master-page/master-page.component.css +++ b/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/master-page/master-page.component.css @@ -0,0 +1,5 @@ +.container { + display: flex; + justify-content: center; + align-items: center; +} diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/master-page/master-page.component.html b/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/master-page/master-page.component.html index f517200..584204e 100644 --- a/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/master-page/master-page.component.html +++ b/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/master-page/master-page.component.html @@ -1,2 +1 @@ -

Hello on the Session Companion

-

Choose your role

+
From 6cb742caa2150ae2c4b793085f81720672245039 Mon Sep 17 00:00:00 2001 From: ngawron Date: Sat, 5 Dec 2020 18:50:48 +0100 Subject: [PATCH 3/6] deleted unused files, added changes after PR, fixed database property --- .../SessionCompanion/ClientApp/src/app.routing.ts | 4 ++-- .../ClientApp/src/app/app.component.html | 1 - .../SessionCompanion/ClientApp/src/app/app.component.ts | 2 +- .../SessionCompanion/ClientApp/src/app/app.module.ts | 4 +--- .../game-master-dashboard-page.component.css | 0 .../game-master-dashboard-page.component.html | 0 .../game-master-dashboard-page.component.ts | 9 --------- .../src/app/pages/master-page/master-page.component.css | 5 ----- .../src/app/pages/master-page/master-page.component.html | 1 - .../src/app/pages/master-page/master-page.component.ts | 9 --------- .../player-dashboard-page.component.css | 0 .../player-dashboard-page.component.html | 0 .../player-dashboard-page.component.ts | 9 --------- .../registration-page/registration-page.component.css | 0 .../registration-page/registration-page.component.html | 0 .../registration-page/registration-page.component.ts | 9 --------- .../app/pages/sign-in-page/sign-in-page.component.css | 0 .../app/pages/sign-in-page/sign-in-page.component.html | 0 .../src/app/pages/sign-in-page/sign-in-page.component.ts | 9 --------- SessionCompanion/SessionCompanion/appsettings.json | 2 +- 20 files changed, 5 insertions(+), 59 deletions(-) delete mode 100644 SessionCompanion/SessionCompanion/ClientApp/src/app/pages/game-master-dashboard-page/game-master-dashboard-page.component.css delete mode 100644 SessionCompanion/SessionCompanion/ClientApp/src/app/pages/game-master-dashboard-page/game-master-dashboard-page.component.html delete mode 100644 SessionCompanion/SessionCompanion/ClientApp/src/app/pages/game-master-dashboard-page/game-master-dashboard-page.component.ts delete mode 100644 SessionCompanion/SessionCompanion/ClientApp/src/app/pages/master-page/master-page.component.css delete mode 100644 SessionCompanion/SessionCompanion/ClientApp/src/app/pages/master-page/master-page.component.html delete mode 100644 SessionCompanion/SessionCompanion/ClientApp/src/app/pages/master-page/master-page.component.ts delete mode 100644 SessionCompanion/SessionCompanion/ClientApp/src/app/pages/player-dashboard-page/player-dashboard-page.component.css delete mode 100644 SessionCompanion/SessionCompanion/ClientApp/src/app/pages/player-dashboard-page/player-dashboard-page.component.html delete mode 100644 SessionCompanion/SessionCompanion/ClientApp/src/app/pages/player-dashboard-page/player-dashboard-page.component.ts delete mode 100644 SessionCompanion/SessionCompanion/ClientApp/src/app/pages/registration-page/registration-page.component.css delete mode 100644 SessionCompanion/SessionCompanion/ClientApp/src/app/pages/registration-page/registration-page.component.html delete mode 100644 SessionCompanion/SessionCompanion/ClientApp/src/app/pages/registration-page/registration-page.component.ts delete mode 100644 SessionCompanion/SessionCompanion/ClientApp/src/app/pages/sign-in-page/sign-in-page.component.css delete mode 100644 SessionCompanion/SessionCompanion/ClientApp/src/app/pages/sign-in-page/sign-in-page.component.html delete mode 100644 SessionCompanion/SessionCompanion/ClientApp/src/app/pages/sign-in-page/sign-in-page.component.ts diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app.routing.ts b/SessionCompanion/SessionCompanion/ClientApp/src/app.routing.ts index 8c2c92b..27afbf3 100644 --- a/SessionCompanion/SessionCompanion/ClientApp/src/app.routing.ts +++ b/SessionCompanion/SessionCompanion/ClientApp/src/app.routing.ts @@ -1,10 +1,10 @@ import { RouterModule, Routes } from '@angular/router'; -import { MasterPageComponent } from './app/pages/master-page/master-page.component'; +import { SelectRoleComponent } from './app/components/select-role/select-role.component'; const routes: Routes = [ { path: '', - component: MasterPageComponent, + component: SelectRoleComponent, pathMatch: 'full' }, ]; diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app/app.component.html b/SessionCompanion/SessionCompanion/ClientApp/src/app/app.component.html index 928e0cc..d2e8ce1 100644 --- a/SessionCompanion/SessionCompanion/ClientApp/src/app/app.component.html +++ b/SessionCompanion/SessionCompanion/ClientApp/src/app/app.component.html @@ -1,6 +1,5 @@
-
diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app/app.component.ts b/SessionCompanion/SessionCompanion/ClientApp/src/app/app.component.ts index 0a40b8c..b7b309e 100644 --- a/SessionCompanion/SessionCompanion/ClientApp/src/app/app.component.ts +++ b/SessionCompanion/SessionCompanion/ClientApp/src/app/app.component.ts @@ -5,5 +5,5 @@ import { Component } from '@angular/core'; templateUrl: './app.component.html' }) export class AppComponent { - title = 'app'; + title = 'Session Companion'; } diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app/app.module.ts b/SessionCompanion/SessionCompanion/ClientApp/src/app/app.module.ts index 36f279e..b5176ce 100644 --- a/SessionCompanion/SessionCompanion/ClientApp/src/app/app.module.ts +++ b/SessionCompanion/SessionCompanion/ClientApp/src/app/app.module.ts @@ -4,7 +4,6 @@ import { FormsModule } from '@angular/forms'; import { HttpClientModule } from '@angular/common/http'; import { AppComponent } from './app.component'; import { SelectRoleComponent } from './components/select-role/select-role.component'; -import { MasterPageComponent } from './pages/master-page/master-page.component'; import { appRoutingModule } from '../app.routing'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { MatButtonModule } from '@angular/material/button'; @@ -14,10 +13,9 @@ import { MatCardModule } from '@angular/material/card'; declarations: [ AppComponent, SelectRoleComponent, - MasterPageComponent ], imports: [ - BrowserModule.withServerTransition({ appId: 'ng-cli-universal' }), + BrowserModule.withServerTransition({ appId: 'ng-cli-universal' }), HttpClientModule, FormsModule, appRoutingModule, diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/game-master-dashboard-page/game-master-dashboard-page.component.css b/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/game-master-dashboard-page/game-master-dashboard-page.component.css deleted file mode 100644 index e69de29..0000000 diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/game-master-dashboard-page/game-master-dashboard-page.component.html b/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/game-master-dashboard-page/game-master-dashboard-page.component.html deleted file mode 100644 index e69de29..0000000 diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/game-master-dashboard-page/game-master-dashboard-page.component.ts b/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/game-master-dashboard-page/game-master-dashboard-page.component.ts deleted file mode 100644 index 13253e6..0000000 --- a/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/game-master-dashboard-page/game-master-dashboard-page.component.ts +++ /dev/null @@ -1,9 +0,0 @@ -import { Component } from '@angular/core'; - -@Component({ - selector: 'app-game-master-dashboard', - templateUrl: './game-master-dashboard.component.html', - styleUrls: ['./game-master-dashboard.component.css'] -}) -export class GameMasterDashboardPageComponent { -} diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/master-page/master-page.component.css b/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/master-page/master-page.component.css deleted file mode 100644 index fc10c63..0000000 --- a/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/master-page/master-page.component.css +++ /dev/null @@ -1,5 +0,0 @@ -.container { - display: flex; - justify-content: center; - align-items: center; -} diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/master-page/master-page.component.html b/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/master-page/master-page.component.html deleted file mode 100644 index 584204e..0000000 --- a/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/master-page/master-page.component.html +++ /dev/null @@ -1 +0,0 @@ -
diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/master-page/master-page.component.ts b/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/master-page/master-page.component.ts deleted file mode 100644 index 4c8d913..0000000 --- a/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/master-page/master-page.component.ts +++ /dev/null @@ -1,9 +0,0 @@ -import { Component } from '@angular/core'; - -@Component({ - selector: 'app-master-page', - templateUrl: './master-page.component.html', - styleUrls: ['./master-page.component.css'], -}) -export class MasterPageComponent { -} diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/player-dashboard-page/player-dashboard-page.component.css b/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/player-dashboard-page/player-dashboard-page.component.css deleted file mode 100644 index e69de29..0000000 diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/player-dashboard-page/player-dashboard-page.component.html b/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/player-dashboard-page/player-dashboard-page.component.html deleted file mode 100644 index e69de29..0000000 diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/player-dashboard-page/player-dashboard-page.component.ts b/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/player-dashboard-page/player-dashboard-page.component.ts deleted file mode 100644 index b540b38..0000000 --- a/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/player-dashboard-page/player-dashboard-page.component.ts +++ /dev/null @@ -1,9 +0,0 @@ -import { Component } from '@angular/core'; - -@Component({ - selector: 'app-player-dashboard-page', - templateUrl: './player-dashboard-page.component.html', - styleUrls: ['./player-dashboard-page.component.css'] -}) -export class PlayerDashboardPageComponent { -} diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/registration-page/registration-page.component.css b/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/registration-page/registration-page.component.css deleted file mode 100644 index e69de29..0000000 diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/registration-page/registration-page.component.html b/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/registration-page/registration-page.component.html deleted file mode 100644 index e69de29..0000000 diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/registration-page/registration-page.component.ts b/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/registration-page/registration-page.component.ts deleted file mode 100644 index 5161472..0000000 --- a/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/registration-page/registration-page.component.ts +++ /dev/null @@ -1,9 +0,0 @@ -import { Component } from '@angular/core'; - -@Component({ - selector: 'app-registration-page', - templateUrl: './registration-page.component.html', - styleUrls: ['./registration-page.component.css'], -}) -export class RegistrationPageComponent { -} diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/sign-in-page/sign-in-page.component.css b/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/sign-in-page/sign-in-page.component.css deleted file mode 100644 index e69de29..0000000 diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/sign-in-page/sign-in-page.component.html b/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/sign-in-page/sign-in-page.component.html deleted file mode 100644 index e69de29..0000000 diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/sign-in-page/sign-in-page.component.ts b/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/sign-in-page/sign-in-page.component.ts deleted file mode 100644 index aced320..0000000 --- a/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/sign-in-page/sign-in-page.component.ts +++ /dev/null @@ -1,9 +0,0 @@ -import { Component } from '@angular/core'; - -@Component({ - selector: 'app-sign-in-page', - templateUrl: './sign-in-page.component.html', - styleUrls: ['./sign-in-page.component.css'] -}) -export class SignInPageComponent { -} diff --git a/SessionCompanion/SessionCompanion/appsettings.json b/SessionCompanion/SessionCompanion/appsettings.json index cb23b68..cff3ff5 100644 --- a/SessionCompanion/SessionCompanion/appsettings.json +++ b/SessionCompanion/SessionCompanion/appsettings.json @@ -1,6 +1,6 @@ { "ConnectionStrings": { - "DefaultConnection": "Server=(localdb)\\mssqllocaldb;Database=SessionCompanion;Trusted_Connection=True;MultipleActiveResultSets=true" + "DefaultConnection": "Server=.\\SQLEXPRESS;Database=SessionCompanion;Trusted_Connection=True;MultipleActiveResultSets=true" }, "Logging": { "LogLevel": { From b2387e0cc0a29206647cd6213f916bd5c0729d81 Mon Sep 17 00:00:00 2001 From: ngawron Date: Thu, 3 Dec 2020 21:03:58 +0100 Subject: [PATCH 4/6] SES-74 added basic structure to the code --- .../ClientApp/src/app.routing.ts | 6 +-- .../ClientApp/src/app/app.component.html | 2 +- .../ClientApp/src/app/app.module.ts | 12 +++-- .../game-master-dashboard.component.css | 0 .../game-master-dashboard.component.html | 0 .../game-master-dashboard.component.ts | 18 ++++++++ .../nav-menu/nav-menu.component.html | 44 ------------------- .../player-dashboard.component.css | 0 .../player-dashboard.component.html | 0 .../player-dashboard.component.ts | 18 ++++++++ .../registration/registration.component.css | 0 .../registration/registration.component.html | 0 .../registration/registration.component.ts | 18 ++++++++ .../select-role.component.css} | 0 .../select-role/select-role.component.html | 2 + .../select-role/select-role.component.ts | 18 ++++++++ .../components/sign-in/sign-in.component.css | 0 .../components/sign-in/sign-in.component.html | 0 .../sign-in.component.ts} | 8 ++-- .../game-master-dashboard-page.component.css | 0 .../game-master-dashboard-page.component.html | 0 .../game-master-dashboard-page.component.ts | 9 ++++ .../src/app/pages/home/home.component.html | 14 ------ .../src/app/pages/home/home.component.ts | 8 ---- .../master-page/master-page.component.css | 0 .../master-page/master-page.component.html | 2 + .../master-page/master-page.component.ts | 9 ++++ .../player-dashboard-page.component.css | 0 .../player-dashboard-page.component.html | 0 .../player-dashboard-page.component.ts | 9 ++++ .../registration-page.component.css | 0 .../registration-page.component.html | 0 .../registration-page.component.ts | 9 ++++ .../sign-in-page/sign-in-page.component.css | 0 .../sign-in-page/sign-in-page.component.html | 0 .../sign-in-page/sign-in-page.component.ts | 9 ++++ 36 files changed, 134 insertions(+), 81 deletions(-) create mode 100644 SessionCompanion/SessionCompanion/ClientApp/src/app/components/game-master-dashboard/game-master-dashboard.component.css create mode 100644 SessionCompanion/SessionCompanion/ClientApp/src/app/components/game-master-dashboard/game-master-dashboard.component.html create mode 100644 SessionCompanion/SessionCompanion/ClientApp/src/app/components/game-master-dashboard/game-master-dashboard.component.ts delete mode 100644 SessionCompanion/SessionCompanion/ClientApp/src/app/components/nav-menu/nav-menu.component.html create mode 100644 SessionCompanion/SessionCompanion/ClientApp/src/app/components/player-dashboard/player-dashboard.component.css create mode 100644 SessionCompanion/SessionCompanion/ClientApp/src/app/components/player-dashboard/player-dashboard.component.html create mode 100644 SessionCompanion/SessionCompanion/ClientApp/src/app/components/player-dashboard/player-dashboard.component.ts create mode 100644 SessionCompanion/SessionCompanion/ClientApp/src/app/components/registration/registration.component.css create mode 100644 SessionCompanion/SessionCompanion/ClientApp/src/app/components/registration/registration.component.html create mode 100644 SessionCompanion/SessionCompanion/ClientApp/src/app/components/registration/registration.component.ts rename SessionCompanion/SessionCompanion/ClientApp/src/app/components/{nav-menu/nav-menu.component.css => select-role/select-role.component.css} (100%) create mode 100644 SessionCompanion/SessionCompanion/ClientApp/src/app/components/select-role/select-role.component.html create mode 100644 SessionCompanion/SessionCompanion/ClientApp/src/app/components/select-role/select-role.component.ts create mode 100644 SessionCompanion/SessionCompanion/ClientApp/src/app/components/sign-in/sign-in.component.css create mode 100644 SessionCompanion/SessionCompanion/ClientApp/src/app/components/sign-in/sign-in.component.html rename SessionCompanion/SessionCompanion/ClientApp/src/app/components/{nav-menu/nav-menu.component.ts => sign-in/sign-in.component.ts} (56%) create mode 100644 SessionCompanion/SessionCompanion/ClientApp/src/app/pages/game-master-dashboard-page/game-master-dashboard-page.component.css create mode 100644 SessionCompanion/SessionCompanion/ClientApp/src/app/pages/game-master-dashboard-page/game-master-dashboard-page.component.html create mode 100644 SessionCompanion/SessionCompanion/ClientApp/src/app/pages/game-master-dashboard-page/game-master-dashboard-page.component.ts delete mode 100644 SessionCompanion/SessionCompanion/ClientApp/src/app/pages/home/home.component.html delete mode 100644 SessionCompanion/SessionCompanion/ClientApp/src/app/pages/home/home.component.ts create mode 100644 SessionCompanion/SessionCompanion/ClientApp/src/app/pages/master-page/master-page.component.css create mode 100644 SessionCompanion/SessionCompanion/ClientApp/src/app/pages/master-page/master-page.component.html create mode 100644 SessionCompanion/SessionCompanion/ClientApp/src/app/pages/master-page/master-page.component.ts create mode 100644 SessionCompanion/SessionCompanion/ClientApp/src/app/pages/player-dashboard-page/player-dashboard-page.component.css create mode 100644 SessionCompanion/SessionCompanion/ClientApp/src/app/pages/player-dashboard-page/player-dashboard-page.component.html create mode 100644 SessionCompanion/SessionCompanion/ClientApp/src/app/pages/player-dashboard-page/player-dashboard-page.component.ts create mode 100644 SessionCompanion/SessionCompanion/ClientApp/src/app/pages/registration-page/registration-page.component.css create mode 100644 SessionCompanion/SessionCompanion/ClientApp/src/app/pages/registration-page/registration-page.component.html create mode 100644 SessionCompanion/SessionCompanion/ClientApp/src/app/pages/registration-page/registration-page.component.ts create mode 100644 SessionCompanion/SessionCompanion/ClientApp/src/app/pages/sign-in-page/sign-in-page.component.css create mode 100644 SessionCompanion/SessionCompanion/ClientApp/src/app/pages/sign-in-page/sign-in-page.component.html create mode 100644 SessionCompanion/SessionCompanion/ClientApp/src/app/pages/sign-in-page/sign-in-page.component.ts diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app.routing.ts b/SessionCompanion/SessionCompanion/ClientApp/src/app.routing.ts index 0d8d551..8c2c92b 100644 --- a/SessionCompanion/SessionCompanion/ClientApp/src/app.routing.ts +++ b/SessionCompanion/SessionCompanion/ClientApp/src/app.routing.ts @@ -1,10 +1,10 @@ -import {RouterModule, Routes} from '@angular/router'; -import {HomeComponent} from './app/pages/home/home.component'; +import { RouterModule, Routes } from '@angular/router'; +import { MasterPageComponent } from './app/pages/master-page/master-page.component'; const routes: Routes = [ { path: '', - component: HomeComponent, + component: MasterPageComponent, pathMatch: 'full' }, ]; diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app/app.component.html b/SessionCompanion/SessionCompanion/ClientApp/src/app/app.component.html index 7173845..928e0cc 100644 --- a/SessionCompanion/SessionCompanion/ClientApp/src/app/app.component.html +++ b/SessionCompanion/SessionCompanion/ClientApp/src/app/app.component.html @@ -1,6 +1,6 @@ -
+
diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app/app.module.ts b/SessionCompanion/SessionCompanion/ClientApp/src/app/app.module.ts index 5588648..9e807dc 100644 --- a/SessionCompanion/SessionCompanion/ClientApp/src/app/app.module.ts +++ b/SessionCompanion/SessionCompanion/ClientApp/src/app/app.module.ts @@ -2,19 +2,17 @@ import { BrowserModule } from '@angular/platform-browser'; import { NgModule } from '@angular/core'; import { FormsModule } from '@angular/forms'; import { HttpClientModule } from '@angular/common/http'; -import { RouterModule } from '@angular/router'; - import { AppComponent } from './app.component'; -import { NavMenuComponent } from './components/nav-menu/nav-menu.component'; -import { HomeComponent } from './pages/home/home.component'; -import {appRoutingModule} from '../app.routing'; +import { SelectRoleComponent } from './components/select-role/select-role.component'; +import { MasterPageComponent } from './pages/master-page/master-page.component'; +import { appRoutingModule } from '../app.routing'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; @NgModule({ declarations: [ AppComponent, - NavMenuComponent, - HomeComponent + SelectRoleComponent, + MasterPageComponent ], imports: [ BrowserModule.withServerTransition({ appId: 'ng-cli-universal' }), diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app/components/game-master-dashboard/game-master-dashboard.component.css b/SessionCompanion/SessionCompanion/ClientApp/src/app/components/game-master-dashboard/game-master-dashboard.component.css new file mode 100644 index 0000000..e69de29 diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app/components/game-master-dashboard/game-master-dashboard.component.html b/SessionCompanion/SessionCompanion/ClientApp/src/app/components/game-master-dashboard/game-master-dashboard.component.html new file mode 100644 index 0000000..e69de29 diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app/components/game-master-dashboard/game-master-dashboard.component.ts b/SessionCompanion/SessionCompanion/ClientApp/src/app/components/game-master-dashboard/game-master-dashboard.component.ts new file mode 100644 index 0000000..0a3c585 --- /dev/null +++ b/SessionCompanion/SessionCompanion/ClientApp/src/app/components/game-master-dashboard/game-master-dashboard.component.ts @@ -0,0 +1,18 @@ +import { Component } from '@angular/core'; + +@Component({ + selector: 'app-game-master-dashboard', + templateUrl: './game-master-dashboard.component.html', + styleUrls: ['./game-master-dashboard.component.css'] +}) +export class GameMasterDashboardComponent { + isExpanded = false; + + collapse() { + this.isExpanded = false; + } + + toggle() { + this.isExpanded = !this.isExpanded; + } +} diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app/components/nav-menu/nav-menu.component.html b/SessionCompanion/SessionCompanion/ClientApp/src/app/components/nav-menu/nav-menu.component.html deleted file mode 100644 index 6996e00..0000000 --- a/SessionCompanion/SessionCompanion/ClientApp/src/app/components/nav-menu/nav-menu.component.html +++ /dev/null @@ -1,44 +0,0 @@ -
- -
diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app/components/player-dashboard/player-dashboard.component.css b/SessionCompanion/SessionCompanion/ClientApp/src/app/components/player-dashboard/player-dashboard.component.css new file mode 100644 index 0000000..e69de29 diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app/components/player-dashboard/player-dashboard.component.html b/SessionCompanion/SessionCompanion/ClientApp/src/app/components/player-dashboard/player-dashboard.component.html new file mode 100644 index 0000000..e69de29 diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app/components/player-dashboard/player-dashboard.component.ts b/SessionCompanion/SessionCompanion/ClientApp/src/app/components/player-dashboard/player-dashboard.component.ts new file mode 100644 index 0000000..9ed3789 --- /dev/null +++ b/SessionCompanion/SessionCompanion/ClientApp/src/app/components/player-dashboard/player-dashboard.component.ts @@ -0,0 +1,18 @@ +import { Component } from '@angular/core'; + +@Component({ + selector: 'app-player-dashboard', + templateUrl: './player-dashboard.component.html', + styleUrls: ['./player-dashboard.component.css'] +}) +export class PlayerDashboardComponent { + isExpanded = false; + + collapse() { + this.isExpanded = false; + } + + toggle() { + this.isExpanded = !this.isExpanded; + } +} diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app/components/registration/registration.component.css b/SessionCompanion/SessionCompanion/ClientApp/src/app/components/registration/registration.component.css new file mode 100644 index 0000000..e69de29 diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app/components/registration/registration.component.html b/SessionCompanion/SessionCompanion/ClientApp/src/app/components/registration/registration.component.html new file mode 100644 index 0000000..e69de29 diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app/components/registration/registration.component.ts b/SessionCompanion/SessionCompanion/ClientApp/src/app/components/registration/registration.component.ts new file mode 100644 index 0000000..ce4f498 --- /dev/null +++ b/SessionCompanion/SessionCompanion/ClientApp/src/app/components/registration/registration.component.ts @@ -0,0 +1,18 @@ +import { Component } from '@angular/core'; + +@Component({ + selector: 'app-registration', + templateUrl: './registration.component.html', + styleUrls: ['./registration.component.css'] +}) +export class RegistrationComponent { + isExpanded = false; + + collapse() { + this.isExpanded = false; + } + + toggle() { + this.isExpanded = !this.isExpanded; + } +} diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app/components/nav-menu/nav-menu.component.css b/SessionCompanion/SessionCompanion/ClientApp/src/app/components/select-role/select-role.component.css similarity index 100% rename from SessionCompanion/SessionCompanion/ClientApp/src/app/components/nav-menu/nav-menu.component.css rename to SessionCompanion/SessionCompanion/ClientApp/src/app/components/select-role/select-role.component.css diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app/components/select-role/select-role.component.html b/SessionCompanion/SessionCompanion/ClientApp/src/app/components/select-role/select-role.component.html new file mode 100644 index 0000000..f91b131 --- /dev/null +++ b/SessionCompanion/SessionCompanion/ClientApp/src/app/components/select-role/select-role.component.html @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app/components/select-role/select-role.component.ts b/SessionCompanion/SessionCompanion/ClientApp/src/app/components/select-role/select-role.component.ts new file mode 100644 index 0000000..eecb8d0 --- /dev/null +++ b/SessionCompanion/SessionCompanion/ClientApp/src/app/components/select-role/select-role.component.ts @@ -0,0 +1,18 @@ +import { Component } from '@angular/core'; + +@Component({ + selector: 'app-select-role', + templateUrl: './select-role.component.html', + styleUrls: ['./select-role.component.css'] +}) +export class SelectRoleComponent { + isExpanded = false; + + collapse() { + this.isExpanded = false; + } + + toggle() { + this.isExpanded = !this.isExpanded; + } +} diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app/components/sign-in/sign-in.component.css b/SessionCompanion/SessionCompanion/ClientApp/src/app/components/sign-in/sign-in.component.css new file mode 100644 index 0000000..e69de29 diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app/components/sign-in/sign-in.component.html b/SessionCompanion/SessionCompanion/ClientApp/src/app/components/sign-in/sign-in.component.html new file mode 100644 index 0000000..e69de29 diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app/components/nav-menu/nav-menu.component.ts b/SessionCompanion/SessionCompanion/ClientApp/src/app/components/sign-in/sign-in.component.ts similarity index 56% rename from SessionCompanion/SessionCompanion/ClientApp/src/app/components/nav-menu/nav-menu.component.ts rename to SessionCompanion/SessionCompanion/ClientApp/src/app/components/sign-in/sign-in.component.ts index 327a374..b1b1961 100644 --- a/SessionCompanion/SessionCompanion/ClientApp/src/app/components/nav-menu/nav-menu.component.ts +++ b/SessionCompanion/SessionCompanion/ClientApp/src/app/components/sign-in/sign-in.component.ts @@ -1,11 +1,11 @@ import { Component } from '@angular/core'; @Component({ - selector: 'app-nav-menu', - templateUrl: './nav-menu.component.html', - styleUrls: ['./nav-menu.component.css'] + selector: 'app-sign-in', + templateUrl: './sign-in.component.html', + styleUrls: ['./sign-in.component.css'] }) -export class NavMenuComponent { +export class SignInComponent { isExpanded = false; collapse() { diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/game-master-dashboard-page/game-master-dashboard-page.component.css b/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/game-master-dashboard-page/game-master-dashboard-page.component.css new file mode 100644 index 0000000..e69de29 diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/game-master-dashboard-page/game-master-dashboard-page.component.html b/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/game-master-dashboard-page/game-master-dashboard-page.component.html new file mode 100644 index 0000000..e69de29 diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/game-master-dashboard-page/game-master-dashboard-page.component.ts b/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/game-master-dashboard-page/game-master-dashboard-page.component.ts new file mode 100644 index 0000000..13253e6 --- /dev/null +++ b/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/game-master-dashboard-page/game-master-dashboard-page.component.ts @@ -0,0 +1,9 @@ +import { Component } from '@angular/core'; + +@Component({ + selector: 'app-game-master-dashboard', + templateUrl: './game-master-dashboard.component.html', + styleUrls: ['./game-master-dashboard.component.css'] +}) +export class GameMasterDashboardPageComponent { +} diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/home/home.component.html b/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/home/home.component.html deleted file mode 100644 index f74c2e7..0000000 --- a/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/home/home.component.html +++ /dev/null @@ -1,14 +0,0 @@ -

Hello, world!

-

Welcome to your new single-page application, built with:

- -

To help you get started, we've also set up:

-
    -
  • Client-side navigation. For example, click Counter then Back to return here.
  • -
  • Angular CLI integration. In development mode, there's no need to run ng serve. It runs in the background automatically, so your client-side resources are dynamically built on demand and the page refreshes when you modify any file.
  • -
  • Efficient production builds. In production mode, development-time features are disabled, and your dotnet publish configuration automatically invokes ng build to produce minified, ahead-of-time compiled JavaScript files.
  • -
-

The ClientApp subdirectory is a standard Angular CLI application. If you open a command prompt in that directory, you can run any ng command (e.g., ng test), or use npm to install extra packages into it.

diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/home/home.component.ts b/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/home/home.component.ts deleted file mode 100644 index 2747b30..0000000 --- a/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/home/home.component.ts +++ /dev/null @@ -1,8 +0,0 @@ -import { Component } from '@angular/core'; - -@Component({ - selector: 'app-home', - templateUrl: './home.component.html', -}) -export class HomeComponent { -} diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/master-page/master-page.component.css b/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/master-page/master-page.component.css new file mode 100644 index 0000000..e69de29 diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/master-page/master-page.component.html b/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/master-page/master-page.component.html new file mode 100644 index 0000000..f517200 --- /dev/null +++ b/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/master-page/master-page.component.html @@ -0,0 +1,2 @@ +

Hello on the Session Companion

+

Choose your role

diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/master-page/master-page.component.ts b/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/master-page/master-page.component.ts new file mode 100644 index 0000000..4c8d913 --- /dev/null +++ b/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/master-page/master-page.component.ts @@ -0,0 +1,9 @@ +import { Component } from '@angular/core'; + +@Component({ + selector: 'app-master-page', + templateUrl: './master-page.component.html', + styleUrls: ['./master-page.component.css'], +}) +export class MasterPageComponent { +} diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/player-dashboard-page/player-dashboard-page.component.css b/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/player-dashboard-page/player-dashboard-page.component.css new file mode 100644 index 0000000..e69de29 diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/player-dashboard-page/player-dashboard-page.component.html b/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/player-dashboard-page/player-dashboard-page.component.html new file mode 100644 index 0000000..e69de29 diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/player-dashboard-page/player-dashboard-page.component.ts b/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/player-dashboard-page/player-dashboard-page.component.ts new file mode 100644 index 0000000..b540b38 --- /dev/null +++ b/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/player-dashboard-page/player-dashboard-page.component.ts @@ -0,0 +1,9 @@ +import { Component } from '@angular/core'; + +@Component({ + selector: 'app-player-dashboard-page', + templateUrl: './player-dashboard-page.component.html', + styleUrls: ['./player-dashboard-page.component.css'] +}) +export class PlayerDashboardPageComponent { +} diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/registration-page/registration-page.component.css b/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/registration-page/registration-page.component.css new file mode 100644 index 0000000..e69de29 diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/registration-page/registration-page.component.html b/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/registration-page/registration-page.component.html new file mode 100644 index 0000000..e69de29 diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/registration-page/registration-page.component.ts b/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/registration-page/registration-page.component.ts new file mode 100644 index 0000000..5161472 --- /dev/null +++ b/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/registration-page/registration-page.component.ts @@ -0,0 +1,9 @@ +import { Component } from '@angular/core'; + +@Component({ + selector: 'app-registration-page', + templateUrl: './registration-page.component.html', + styleUrls: ['./registration-page.component.css'], +}) +export class RegistrationPageComponent { +} diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/sign-in-page/sign-in-page.component.css b/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/sign-in-page/sign-in-page.component.css new file mode 100644 index 0000000..e69de29 diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/sign-in-page/sign-in-page.component.html b/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/sign-in-page/sign-in-page.component.html new file mode 100644 index 0000000..e69de29 diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/sign-in-page/sign-in-page.component.ts b/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/sign-in-page/sign-in-page.component.ts new file mode 100644 index 0000000..aced320 --- /dev/null +++ b/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/sign-in-page/sign-in-page.component.ts @@ -0,0 +1,9 @@ +import { Component } from '@angular/core'; + +@Component({ + selector: 'app-sign-in-page', + templateUrl: './sign-in-page.component.html', + styleUrls: ['./sign-in-page.component.css'] +}) +export class SignInPageComponent { +} From b5c37e40e4d50dbc2f966b6ef39e8e3e4c62fd1a Mon Sep 17 00:00:00 2001 From: ngawron Date: Thu, 3 Dec 2020 22:31:43 +0100 Subject: [PATCH 5/6] SES-74 created master-page with - select role --- .../ClientApp/src/app/app.module.ts | 4 ++ .../select-role/select-role.component.css | 53 +++++++++++++++---- .../select-role/select-role.component.html | 6 ++- .../master-page/master-page.component.css | 5 ++ .../master-page/master-page.component.html | 3 +- 5 files changed, 56 insertions(+), 15 deletions(-) diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app/app.module.ts b/SessionCompanion/SessionCompanion/ClientApp/src/app/app.module.ts index 9e807dc..36f279e 100644 --- a/SessionCompanion/SessionCompanion/ClientApp/src/app/app.module.ts +++ b/SessionCompanion/SessionCompanion/ClientApp/src/app/app.module.ts @@ -7,6 +7,8 @@ import { SelectRoleComponent } from './components/select-role/select-role.compon import { MasterPageComponent } from './pages/master-page/master-page.component'; import { appRoutingModule } from '../app.routing'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; +import { MatButtonModule } from '@angular/material/button'; +import { MatCardModule } from '@angular/material/card'; @NgModule({ declarations: [ @@ -20,6 +22,8 @@ import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; FormsModule, appRoutingModule, BrowserAnimationsModule, + MatButtonModule, + MatCardModule, ], providers: [], bootstrap: [AppComponent] diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app/components/select-role/select-role.component.css b/SessionCompanion/SessionCompanion/ClientApp/src/app/components/select-role/select-role.component.css index 10389ef..4500b88 100644 --- a/SessionCompanion/SessionCompanion/ClientApp/src/app/components/select-role/select-role.component.css +++ b/SessionCompanion/SessionCompanion/ClientApp/src/app/components/select-role/select-role.component.css @@ -1,18 +1,49 @@ -a.navbar-brand { - white-space: normal; - text-align: center; - word-break: break-all; +.container { + display: flex; + justify-content: center; + align-items: center; + flex-wrap: wrap; + padding: 10%; } -html { - font-size: 14px; +.button { + border-radius: 15px; } -@media (min-width: 768px) { - html { - font-size: 16px; + +#player-button { + background-color: #2699fb; +} + +#game-master-button { + background-color: #440505; +} + +.font { + color: #ffffff; + font-weight: bold; + font-style: italic, oblique; +} + +@media (max-width: 768px) { + .button { + margin: 10px; + padding: 10px; + width: 328px; + height: 101px; + } + .font { + font-size: 20px; } } -.box-shadow { - box-shadow: 0 .25rem .75rem rgba(0, 0, 0, .05); +@media (min-width: 768px) { + .button { + margin: 20px; + padding: 20px; + width: 658px; + height: 202px; + } + .font { + font-size: 40px; + } } diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app/components/select-role/select-role.component.html b/SessionCompanion/SessionCompanion/ClientApp/src/app/components/select-role/select-role.component.html index f91b131..47b866b 100644 --- a/SessionCompanion/SessionCompanion/ClientApp/src/app/components/select-role/select-role.component.html +++ b/SessionCompanion/SessionCompanion/ClientApp/src/app/components/select-role/select-role.component.html @@ -1,2 +1,4 @@ - - \ No newline at end of file +
+ + +
diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/master-page/master-page.component.css b/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/master-page/master-page.component.css index e69de29..fc10c63 100644 --- a/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/master-page/master-page.component.css +++ b/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/master-page/master-page.component.css @@ -0,0 +1,5 @@ +.container { + display: flex; + justify-content: center; + align-items: center; +} diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/master-page/master-page.component.html b/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/master-page/master-page.component.html index f517200..584204e 100644 --- a/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/master-page/master-page.component.html +++ b/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/master-page/master-page.component.html @@ -1,2 +1 @@ -

Hello on the Session Companion

-

Choose your role

+
From ceb836d7347907f8ec737c25b08d1602b3e77165 Mon Sep 17 00:00:00 2001 From: ngawron Date: Sat, 5 Dec 2020 18:50:48 +0100 Subject: [PATCH 6/6] deleted unused files, added changes after PR, fixed database property --- .../SessionCompanion/ClientApp/src/app.routing.ts | 4 ++-- .../ClientApp/src/app/app.component.html | 1 - .../SessionCompanion/ClientApp/src/app/app.component.ts | 2 +- .../SessionCompanion/ClientApp/src/app/app.module.ts | 4 +--- .../game-master-dashboard-page.component.css | 0 .../game-master-dashboard-page.component.html | 0 .../game-master-dashboard-page.component.ts | 9 --------- .../src/app/pages/master-page/master-page.component.css | 5 ----- .../src/app/pages/master-page/master-page.component.html | 1 - .../src/app/pages/master-page/master-page.component.ts | 9 --------- .../player-dashboard-page.component.css | 0 .../player-dashboard-page.component.html | 0 .../player-dashboard-page.component.ts | 9 --------- .../registration-page/registration-page.component.css | 0 .../registration-page/registration-page.component.html | 0 .../registration-page/registration-page.component.ts | 9 --------- .../app/pages/sign-in-page/sign-in-page.component.css | 0 .../app/pages/sign-in-page/sign-in-page.component.html | 0 .../src/app/pages/sign-in-page/sign-in-page.component.ts | 9 --------- SessionCompanion/SessionCompanion/appsettings.json | 2 +- 20 files changed, 5 insertions(+), 59 deletions(-) delete mode 100644 SessionCompanion/SessionCompanion/ClientApp/src/app/pages/game-master-dashboard-page/game-master-dashboard-page.component.css delete mode 100644 SessionCompanion/SessionCompanion/ClientApp/src/app/pages/game-master-dashboard-page/game-master-dashboard-page.component.html delete mode 100644 SessionCompanion/SessionCompanion/ClientApp/src/app/pages/game-master-dashboard-page/game-master-dashboard-page.component.ts delete mode 100644 SessionCompanion/SessionCompanion/ClientApp/src/app/pages/master-page/master-page.component.css delete mode 100644 SessionCompanion/SessionCompanion/ClientApp/src/app/pages/master-page/master-page.component.html delete mode 100644 SessionCompanion/SessionCompanion/ClientApp/src/app/pages/master-page/master-page.component.ts delete mode 100644 SessionCompanion/SessionCompanion/ClientApp/src/app/pages/player-dashboard-page/player-dashboard-page.component.css delete mode 100644 SessionCompanion/SessionCompanion/ClientApp/src/app/pages/player-dashboard-page/player-dashboard-page.component.html delete mode 100644 SessionCompanion/SessionCompanion/ClientApp/src/app/pages/player-dashboard-page/player-dashboard-page.component.ts delete mode 100644 SessionCompanion/SessionCompanion/ClientApp/src/app/pages/registration-page/registration-page.component.css delete mode 100644 SessionCompanion/SessionCompanion/ClientApp/src/app/pages/registration-page/registration-page.component.html delete mode 100644 SessionCompanion/SessionCompanion/ClientApp/src/app/pages/registration-page/registration-page.component.ts delete mode 100644 SessionCompanion/SessionCompanion/ClientApp/src/app/pages/sign-in-page/sign-in-page.component.css delete mode 100644 SessionCompanion/SessionCompanion/ClientApp/src/app/pages/sign-in-page/sign-in-page.component.html delete mode 100644 SessionCompanion/SessionCompanion/ClientApp/src/app/pages/sign-in-page/sign-in-page.component.ts diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app.routing.ts b/SessionCompanion/SessionCompanion/ClientApp/src/app.routing.ts index 8c2c92b..27afbf3 100644 --- a/SessionCompanion/SessionCompanion/ClientApp/src/app.routing.ts +++ b/SessionCompanion/SessionCompanion/ClientApp/src/app.routing.ts @@ -1,10 +1,10 @@ import { RouterModule, Routes } from '@angular/router'; -import { MasterPageComponent } from './app/pages/master-page/master-page.component'; +import { SelectRoleComponent } from './app/components/select-role/select-role.component'; const routes: Routes = [ { path: '', - component: MasterPageComponent, + component: SelectRoleComponent, pathMatch: 'full' }, ]; diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app/app.component.html b/SessionCompanion/SessionCompanion/ClientApp/src/app/app.component.html index 928e0cc..d2e8ce1 100644 --- a/SessionCompanion/SessionCompanion/ClientApp/src/app/app.component.html +++ b/SessionCompanion/SessionCompanion/ClientApp/src/app/app.component.html @@ -1,6 +1,5 @@
-
diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app/app.component.ts b/SessionCompanion/SessionCompanion/ClientApp/src/app/app.component.ts index 0a40b8c..b7b309e 100644 --- a/SessionCompanion/SessionCompanion/ClientApp/src/app/app.component.ts +++ b/SessionCompanion/SessionCompanion/ClientApp/src/app/app.component.ts @@ -5,5 +5,5 @@ import { Component } from '@angular/core'; templateUrl: './app.component.html' }) export class AppComponent { - title = 'app'; + title = 'Session Companion'; } diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app/app.module.ts b/SessionCompanion/SessionCompanion/ClientApp/src/app/app.module.ts index 36f279e..b5176ce 100644 --- a/SessionCompanion/SessionCompanion/ClientApp/src/app/app.module.ts +++ b/SessionCompanion/SessionCompanion/ClientApp/src/app/app.module.ts @@ -4,7 +4,6 @@ import { FormsModule } from '@angular/forms'; import { HttpClientModule } from '@angular/common/http'; import { AppComponent } from './app.component'; import { SelectRoleComponent } from './components/select-role/select-role.component'; -import { MasterPageComponent } from './pages/master-page/master-page.component'; import { appRoutingModule } from '../app.routing'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { MatButtonModule } from '@angular/material/button'; @@ -14,10 +13,9 @@ import { MatCardModule } from '@angular/material/card'; declarations: [ AppComponent, SelectRoleComponent, - MasterPageComponent ], imports: [ - BrowserModule.withServerTransition({ appId: 'ng-cli-universal' }), + BrowserModule.withServerTransition({ appId: 'ng-cli-universal' }), HttpClientModule, FormsModule, appRoutingModule, diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/game-master-dashboard-page/game-master-dashboard-page.component.css b/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/game-master-dashboard-page/game-master-dashboard-page.component.css deleted file mode 100644 index e69de29..0000000 diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/game-master-dashboard-page/game-master-dashboard-page.component.html b/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/game-master-dashboard-page/game-master-dashboard-page.component.html deleted file mode 100644 index e69de29..0000000 diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/game-master-dashboard-page/game-master-dashboard-page.component.ts b/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/game-master-dashboard-page/game-master-dashboard-page.component.ts deleted file mode 100644 index 13253e6..0000000 --- a/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/game-master-dashboard-page/game-master-dashboard-page.component.ts +++ /dev/null @@ -1,9 +0,0 @@ -import { Component } from '@angular/core'; - -@Component({ - selector: 'app-game-master-dashboard', - templateUrl: './game-master-dashboard.component.html', - styleUrls: ['./game-master-dashboard.component.css'] -}) -export class GameMasterDashboardPageComponent { -} diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/master-page/master-page.component.css b/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/master-page/master-page.component.css deleted file mode 100644 index fc10c63..0000000 --- a/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/master-page/master-page.component.css +++ /dev/null @@ -1,5 +0,0 @@ -.container { - display: flex; - justify-content: center; - align-items: center; -} diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/master-page/master-page.component.html b/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/master-page/master-page.component.html deleted file mode 100644 index 584204e..0000000 --- a/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/master-page/master-page.component.html +++ /dev/null @@ -1 +0,0 @@ -
diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/master-page/master-page.component.ts b/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/master-page/master-page.component.ts deleted file mode 100644 index 4c8d913..0000000 --- a/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/master-page/master-page.component.ts +++ /dev/null @@ -1,9 +0,0 @@ -import { Component } from '@angular/core'; - -@Component({ - selector: 'app-master-page', - templateUrl: './master-page.component.html', - styleUrls: ['./master-page.component.css'], -}) -export class MasterPageComponent { -} diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/player-dashboard-page/player-dashboard-page.component.css b/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/player-dashboard-page/player-dashboard-page.component.css deleted file mode 100644 index e69de29..0000000 diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/player-dashboard-page/player-dashboard-page.component.html b/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/player-dashboard-page/player-dashboard-page.component.html deleted file mode 100644 index e69de29..0000000 diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/player-dashboard-page/player-dashboard-page.component.ts b/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/player-dashboard-page/player-dashboard-page.component.ts deleted file mode 100644 index b540b38..0000000 --- a/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/player-dashboard-page/player-dashboard-page.component.ts +++ /dev/null @@ -1,9 +0,0 @@ -import { Component } from '@angular/core'; - -@Component({ - selector: 'app-player-dashboard-page', - templateUrl: './player-dashboard-page.component.html', - styleUrls: ['./player-dashboard-page.component.css'] -}) -export class PlayerDashboardPageComponent { -} diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/registration-page/registration-page.component.css b/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/registration-page/registration-page.component.css deleted file mode 100644 index e69de29..0000000 diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/registration-page/registration-page.component.html b/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/registration-page/registration-page.component.html deleted file mode 100644 index e69de29..0000000 diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/registration-page/registration-page.component.ts b/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/registration-page/registration-page.component.ts deleted file mode 100644 index 5161472..0000000 --- a/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/registration-page/registration-page.component.ts +++ /dev/null @@ -1,9 +0,0 @@ -import { Component } from '@angular/core'; - -@Component({ - selector: 'app-registration-page', - templateUrl: './registration-page.component.html', - styleUrls: ['./registration-page.component.css'], -}) -export class RegistrationPageComponent { -} diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/sign-in-page/sign-in-page.component.css b/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/sign-in-page/sign-in-page.component.css deleted file mode 100644 index e69de29..0000000 diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/sign-in-page/sign-in-page.component.html b/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/sign-in-page/sign-in-page.component.html deleted file mode 100644 index e69de29..0000000 diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/sign-in-page/sign-in-page.component.ts b/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/sign-in-page/sign-in-page.component.ts deleted file mode 100644 index aced320..0000000 --- a/SessionCompanion/SessionCompanion/ClientApp/src/app/pages/sign-in-page/sign-in-page.component.ts +++ /dev/null @@ -1,9 +0,0 @@ -import { Component } from '@angular/core'; - -@Component({ - selector: 'app-sign-in-page', - templateUrl: './sign-in-page.component.html', - styleUrls: ['./sign-in-page.component.css'] -}) -export class SignInPageComponent { -} diff --git a/SessionCompanion/SessionCompanion/appsettings.json b/SessionCompanion/SessionCompanion/appsettings.json index d9cfdc6..3c00971 100644 --- a/SessionCompanion/SessionCompanion/appsettings.json +++ b/SessionCompanion/SessionCompanion/appsettings.json @@ -1,6 +1,6 @@ { "ConnectionStrings": { - "DefaultConnection": "Server=(localdb)\\mssqllocaldb;Database=SessionCompanion;Trusted_Connection=True;MultipleActiveResultSets=true" + "DefaultConnection": "Server=.\\SQLEXPRESS;Database=SessionCompanion;Trusted_Connection=True;MultipleActiveResultSets=true" }, "Logging": { "LogLevel": {