diff --git a/SessionCompanion/SessionCompanion/ClientApp/package-lock.json b/SessionCompanion/SessionCompanion/ClientApp/package-lock.json index 9fe4ffb..8b03e92 100644 --- a/SessionCompanion/SessionCompanion/ClientApp/package-lock.json +++ b/SessionCompanion/SessionCompanion/ClientApp/package-lock.json @@ -2610,6 +2610,36 @@ } } }, + "@ngrx/store": { + "version": "10.1.1", + "resolved": "https://registry.npmjs.org/@ngrx/store/-/store-10.1.1.tgz", + "integrity": "sha512-JiSC1Y6yR2H5/FVgEDeQjXdzn20ru1Vw/4NnISHcwHT3tAn/cpT28cIh24r6HMCSqBwaqGLgCdpoi0TR2ZLkRQ==", + "requires": { + "tslib": "^2.0.0" + }, + "dependencies": { + "tslib": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.3.tgz", + "integrity": "sha512-uZtkfKblCEQtZKBF6EBXVZeQNl82yqtDQdv+eck8u7tdPxjLu2/lp5/uPW+um2tpuxINHWy3GhiccY7QgEaVHQ==" + } + } + }, + "@ngrx/store-devtools": { + "version": "10.1.1", + "resolved": "https://registry.npmjs.org/@ngrx/store-devtools/-/store-devtools-10.1.1.tgz", + "integrity": "sha512-w6hsuUqOndZHnRzFaONpzjgNKIPT8wCRejhru+ZyK/L/Q9zRSyBuKLhZLf/zhZXd0qx0vHjjxltDcKoEXNfviQ==", + "requires": { + "tslib": "^2.0.0" + }, + "dependencies": { + "tslib": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.3.tgz", + "integrity": "sha512-uZtkfKblCEQtZKBF6EBXVZeQNl82yqtDQdv+eck8u7tdPxjLu2/lp5/uPW+um2tpuxINHWy3GhiccY7QgEaVHQ==" + } + } + }, "@ngtools/webpack": { "version": "8.3.26", "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-8.3.26.tgz", diff --git a/SessionCompanion/SessionCompanion/ClientApp/package.json b/SessionCompanion/SessionCompanion/ClientApp/package.json index dd2400f..19b8d9f 100644 --- a/SessionCompanion/SessionCompanion/ClientApp/package.json +++ b/SessionCompanion/SessionCompanion/ClientApp/package.json @@ -1,62 +1,64 @@ -{ - "name": "sessioncompanion", - "version": "0.0.0", - "scripts": { - "ng": "ng", - "start": "ng serve", - "build": "ng build", - "build:ssr": "ng run SessionCompanion:server:dev", - "test": "ng test", - "lint": "ng lint", - "e2e": "ng e2e" - }, - "private": true, - "dependencies": { - "@angular/animations": "8.2.12", - "@angular/cdk": "~8.2.3", - "@angular/common": "8.2.12", - "@angular/compiler": "8.2.12", - "@angular/core": "8.2.12", - "@angular/forms": "8.2.12", - "@angular/material": "^8.2.3", - "@angular/platform-browser": "8.2.12", - "@angular/platform-browser-dynamic": "8.2.12", - "@angular/platform-server": "8.2.12", - "@angular/router": "8.2.12", - "@microsoft/signalr": "^5.0.0", - "@nguniversal/module-map-ngfactory-loader": "8.1.1", - "aspnet-prerendering": "^3.0.1", - "bootstrap": "^4.3.1", - "core-js": "^3.3.3", - "hammerjs": "^2.0.8", - "jquery": "3.4.1", - "oidc-client": "^1.9.1", - "popper.js": "^1.16.0", - "rxjs": "^6.5.3", - "zone.js": "0.9.1" - }, - "devDependencies": { - "@angular-devkit/build-angular": "^0.803.26", - "@angular/cli": "^8.3.26", - "@angular/compiler-cli": "^8.2.14", - "@angular/language-service": "^8.2.12", - "@types/jasmine": "~3.4.4", - "@types/jasminewd2": "~2.0.8", - "@types/node": "~12.11.6", - "codelyzer": "^5.2.0", - "jasmine-core": "~3.5.0", - "jasmine-spec-reporter": "~4.2.1", - "karma": "^5.0.2", - "karma-chrome-launcher": "~3.1.0", - "karma-coverage-istanbul-reporter": "~2.1.0", - "karma-jasmine": "~2.0.1", - "karma-jasmine-html-reporter": "^1.4.2", - "typescript": "3.5.3" - }, - "optionalDependencies": { - "node-sass": "^4.12.0", - "protractor": "~5.4.2", - "ts-node": "~8.4.1", - "tslint": "~5.20.0" - } -} +{ + "name": "sessioncompanion", + "version": "0.0.0", + "scripts": { + "ng": "ng", + "start": "ng serve", + "build": "ng build", + "build:ssr": "ng run SessionCompanion:server:dev", + "test": "ng test", + "lint": "ng lint", + "e2e": "ng e2e" + }, + "private": true, + "dependencies": { + "@angular/animations": "8.2.12", + "@angular/cdk": "~8.2.3", + "@angular/common": "8.2.12", + "@angular/compiler": "8.2.12", + "@angular/core": "8.2.12", + "@angular/forms": "8.2.12", + "@angular/material": "^8.2.3", + "@angular/platform-browser": "8.2.12", + "@angular/platform-browser-dynamic": "8.2.12", + "@angular/platform-server": "8.2.12", + "@angular/router": "8.2.12", + "@microsoft/signalr": "^5.0.0", + "@ngrx/store": "^10.1.1", + "@ngrx/store-devtools": "^10.1.1", + "@nguniversal/module-map-ngfactory-loader": "8.1.1", + "aspnet-prerendering": "^3.0.1", + "bootstrap": "^4.3.1", + "core-js": "^3.3.3", + "hammerjs": "^2.0.8", + "jquery": "3.4.1", + "oidc-client": "^1.9.1", + "popper.js": "^1.16.0", + "rxjs": "^6.5.3", + "zone.js": "0.9.1" + }, + "devDependencies": { + "@angular-devkit/build-angular": "^0.803.26", + "@angular/cli": "^8.3.26", + "@angular/compiler-cli": "^8.2.14", + "@angular/language-service": "^8.2.12", + "@types/jasmine": "~3.4.4", + "@types/jasminewd2": "~2.0.8", + "@types/node": "~12.11.6", + "codelyzer": "^5.2.0", + "jasmine-core": "~3.5.0", + "jasmine-spec-reporter": "~4.2.1", + "karma": "^5.0.2", + "karma-chrome-launcher": "~3.1.0", + "karma-coverage-istanbul-reporter": "~2.1.0", + "karma-jasmine": "~2.0.1", + "karma-jasmine-html-reporter": "^1.4.2", + "typescript": "3.5.3" + }, + "optionalDependencies": { + "node-sass": "^4.12.0", + "protractor": "~5.4.2", + "ts-node": "~8.4.1", + "tslint": "~5.20.0" + } +} diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app.routing.ts b/SessionCompanion/SessionCompanion/ClientApp/src/app.routing.ts index 5fe70f9..684f3c4 100644 --- a/SessionCompanion/SessionCompanion/ClientApp/src/app.routing.ts +++ b/SessionCompanion/SessionCompanion/ClientApp/src/app.routing.ts @@ -23,7 +23,7 @@ const routes: Routes = [ pathMatch: 'full' }, { - path: 'gamemaster', + path: 'game-master', component: GameMasterDashboardComponent, pathMatch: 'full' }, diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app/app.module.ts b/SessionCompanion/SessionCompanion/ClientApp/src/app/app.module.ts index 65581ca..6bed2fc 100644 --- a/SessionCompanion/SessionCompanion/ClientApp/src/app/app.module.ts +++ b/SessionCompanion/SessionCompanion/ClientApp/src/app/app.module.ts @@ -21,6 +21,11 @@ import { MatIconModule, MatSidenavModule, MatToolbarModule, MatListModule } from '@angular/material'; import {UserService} from '../services/user.service'; +import { StoreModule } from '@ngrx/store'; +import { StoreDevtoolsModule } from '@ngrx/store-devtools'; +import { reducers} from './reducers'; +import {AppReducer} from './store/reducers/app.reducer'; +import {environment} from '../environments/environment'; @NgModule({ declarations: [ @@ -49,6 +54,10 @@ BrowserModule.withServerTransition({ appId: 'ng-cli-universal' }), MatSidenavModule, MatToolbarModule, MatListModule, + StoreModule.forRoot({appState: AppReducer}), + StoreDevtoolsModule.instrument({ + logOnly: environment.production + }) ], providers: [ UserService 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 97f14c4..b14ebbf 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,4 +1,4 @@