support multiple decks

Author: yarosla

README.md

@@ -3,12 +3,9 @@
 Open source implementation of planning poker game.
 
 - The game has three roles: admin, players, observers.
-- Cards: 0, 0.5, 1, 2, 3, 5, 10, 20, ? (configurable via `config.json`)
+- Multiple card decks configurable via `config.json`
 - Self-contained, can be run in closed intranet environments.
 
-The project is built on Angular 5. It uses [http-shared-storage](https://github.com/yarosla/httpstorage) 
-backend to store session data.
-
 ## Quick Start
 
 1. Download release archive from [Releases](https://github.com/yarosla/poker/releases) page. Unpack it.
@@ -21,7 +18,8 @@ backend to store session data.
 
 ## Technologies
 
-- Angular 5
+The project is built on Angular 5. It uses [http-shared-storage](https://github.com/yarosla/httpstorage) 
+backend to store session data.
 
 ## Author
 

package-lock.json

@@ -6,34 +6,34 @@
     "ng": "ng",
     "start": "ng serve",
     "build": "ng build --prod",
-    "release": "ng build --prod && rm -rf poker-release && mkdir poker-release && mv dist poker-release/poker && cp ../http-shared-storage/build/libs/http-shared-storage-1.0.jar poker-release && 7z a -tzip poker-release.zip poker-release",
+    "release": "ng build --prod && rm -rf poker-release poker-release.zip && mkdir poker-release && mv dist poker-release/poker && cp ../http-shared-storage/build/libs/http-shared-storage-1.0.jar poker-release && 7z a -tzip poker-release.zip poker-release",
     "test": "ng test",
     "lint": "ng lint",
     "e2e": "ng e2e"
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "^5.2.3",
-    "@angular/common": "^5.2.3",
-    "@angular/compiler": "^5.2.3",
-    "@angular/core": "^5.2.3",
-    "@angular/forms": "^5.2.3",
-    "@angular/http": "^5.2.3",
-    "@angular/platform-browser": "^5.2.3",
-    "@angular/platform-browser-dynamic": "^5.2.3",
-    "@angular/router": "^5.2.3",
+    "@angular/animations": "^5.2.5",
+    "@angular/common": "^5.2.5",
+    "@angular/compiler": "^5.2.5",
+    "@angular/core": "^5.2.5",
+    "@angular/forms": "^5.2.5",
+    "@angular/http": "^5.2.5",
+    "@angular/platform-browser": "^5.2.5",
+    "@angular/platform-browser-dynamic": "^5.2.5",
+    "@angular/router": "^5.2.5",
     "core-js": "^2.4.1",
     "rxjs": "^5.5.2",
     "ts-mockito": "^2.2.9",
     "zone.js": "^0.8.20"
   },
   "devDependencies": {
     "@angular/cli": "1.6.3",
-    "@angular/compiler-cli": "^5.2.3",
-    "@angular/language-service": "^5.2.3",
+    "@angular/compiler-cli": "^5.2.5",
+    "@angular/language-service": "^5.2.5",
     "@types/jasmine": "~2.5.53",
     "@types/jasminewd2": "~2.0.2",
-    "@types/node": "^6.0.96",
+    "@types/node": "^6.0.101",
     "codelyzer": "^4.1.0",
     "jasmine-core": "~2.6.2",
     "jasmine-spec-reporter": "~4.1.0",

package.json

@@ -3,10 +3,15 @@ import { HttpClient } from '@angular/common/http';
 import { ReplaySubject } from 'rxjs/ReplaySubject';
 import { Observable } from 'rxjs/Observable';
 
+export class Deck {
+  name: string;
+  cards: string[]
+}
+
 export class Config {
   httpStoreUrl: string;
   pollTimeout: number | string;
-  deck?: string[]
+  decks?: Deck[]
 }
 
 @Injectable()

src/app/config.service.ts

@@ -3,7 +3,7 @@ <h1>{{currentParticipant?.name || (isAdmin?'Admin':'Observer')}} @ {{session.nam
     <a routerLink="/join/{{sessionId}}" title="Invite more people to join"><i class="ti-share"></i></a></h1>
   <app-voting-pad *ngIf="votingStory && currentParticipant" [story]="votingStory"
                   [confirmedVote]="votingStory.votes[currentParticipant.id]"
-                  [deck]="deck"
+                  [deck]="session.deck"
                   (vote)="httpStorage.vote($event)"></app-voting-pad>
   <table>
     <tr>

src/app/game/game.component.html

@@ -8,7 +8,6 @@ import { GameComponent } from './game.component';
 import { HttpStorageService, Session } from '../http-storage.service';
 import { ActivatedRouteStub, RouterLinkStubDirective, RouterStub } from '../../testing/router-stubs';
 import { VotingPadComponent } from '../voting-pad/voting-pad.component';
-import { Config, ConfigService } from '../config.service';
 
 describe('GameComponent', () => {
   let component: GameComponent;
@@ -20,10 +19,6 @@ describe('GameComponent', () => {
   });
   when(httpStorageMock.sessionId).thenReturn('0abcd');
 
-  const configMock = mock(ConfigService);
-  const configObservable = Observable.of<Config>({ httpStoreUrl: '', pollTimeout: 0, deck: ['1'] });
-  when(configMock.getConfig()).thenReturn(configObservable);
-
   beforeEach(async(() => {
     const activatedRoute = new ActivatedRouteStub({}, [{ path: 'play' }, { path: '0abcd' }, { path: 'qwe' }]);
     TestBed.configureTestingModule({
@@ -33,7 +28,6 @@ describe('GameComponent', () => {
         { provide: HttpStorageService, useValue: instance(httpStorageMock) },
         { provide: Router, useClass: RouterStub },
         { provide: ActivatedRoute, useValue: activatedRoute },
-        { provide: ConfigService, useValue: instance(configMock) },
       ]
     })
       .compileComponents();

src/app/game/game.component.spec.ts

@@ -22,9 +22,8 @@ export class GameComponent implements OnInit {
   participants: Participant[];
   currentParticipant: Participant;
   votingStory: Story;
-  deck: string[] = ['0', '0.5', '1', '2', '3', '5', '10', '20'];
 
-  constructor(private httpStorage: HttpStorageService, private route: ActivatedRoute, private config: ConfigService) {
+  constructor(public httpStorage: HttpStorageService, private route: ActivatedRoute) {
   }
 
   ngOnInit() {
@@ -41,9 +40,6 @@ export class GameComponent implements OnInit {
       this.currentParticipant = this.participants.find(p => p.id === this.httpStorage.participantId);
       this.votingStory = session.stories.find(s => s.votingInProgress);
     });
-    this.config.getConfig().subscribe(conf => {
-      if (conf.deck) this.deck = conf.deck;
-    });
   }
 
   hideVote(story: Story, participant: Participant): boolean {

src/app/game/game.component.ts

@@ -63,15 +63,18 @@ export class Session {
   name: string;
   participants: Participant[] = [];
   stories: Story[] = [];
+  deck: string[] = ['0', '0.5', '1', '2', '3', '5', '10', '20'];
 
-  constructor(name?: string) {
+  constructor(name?: string, deck?: string[]) {
     this.name = name;
+    if (deck) this.deck = deck;
   }
 
   clone(): Session {
     const session = new Session(this.name);
     session.participants = this.participants.map(p => Participant.prototype.clone.call(p));
     session.stories = this.stories.map(s => Story.prototype.clone.call(s));
+    session.deck = this.deck.slice();
     return session;
   }
 }
@@ -119,14 +122,14 @@ export class HttpStorageService {
     console.debug('got state', this.state);
   };
 
-  startSession(name: string): Promise<Session> {
+  startSession(name: string, deck?: string[]): Promise<Session> {
     console.info('startSession', name);
     this.state = new State();
     return this.config.getConfig()
       .mergeMap(config => {
         const url = (config.httpStoreUrl || DEFAULT_URL);
         console.debug('sending POST', url);
-        return this.http.post<Session>(url, new Session(name), { observe: 'response' })
+        return this.http.post<Session>(url, new Session(name, deck), { observe: 'response' })
           .do(this.stateExtractor)
           .map((r: HttpResponse<Session>) => r.body);
       })

src/app/http-storage.service.ts

@@ -5,9 +5,15 @@ form button {
   cursor: pointer;
 }
 
-form input[type="text"]{
+form input[type="text"] {
   width: 300px;
   background-color: white;
   border: solid 1px #aaa;
   padding: 4px 6px;
 }
+
+form select {
+  background-color: white;
+  border: solid 1px #aaa;
+  padding: 3px 6px;
+}

src/app/new-session/new-session.component.css

@@ -1,3 +1,6 @@
 <form #theForm="ngForm"><input type="text" name="name" required [(ngModel)]="newSessionName" placeholder="Session name...">
-  <button type="submit" [disabled]="theForm.invalid || !newSessionName?.trim()" (click)="startSession(newSessionName.trim())">Start Session</button>
+  <select name="deck" [(ngModel)]="selectedDeck" [compareWith]="compareDecks">
+    <option *ngFor="let d of decks" [ngValue]="d">{{d.name}}</option>
+  </select>
+  <button type="submit" [disabled]="theForm.invalid || !newSessionName?.trim()" (click)="startSession()">Start Session</button>
 </form>

src/app/new-session/new-session.component.html

@@ -1,17 +1,27 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { ActivatedRoute, Router } from '@angular/router';
 import { FormsModule } from '@angular/forms';
-import { instance, mock } from 'ts-mockito';
+import { instance, mock, when } from 'ts-mockito';
 
 import { NewSessionComponent } from './new-session.component';
 import { HttpStorageService } from '../http-storage.service';
 import { ActivatedRouteStub, RouterStub } from '../../testing/router-stubs';
+import { Config, ConfigService } from '../config.service';
+import { Observable } from 'rxjs/Observable';
 
 describe('NewSessionComponent', () => {
   let component: NewSessionComponent;
   let fixture: ComponentFixture<NewSessionComponent>;
   const httpStorageMock = mock(HttpStorageService);
 
+  const configMock = mock(ConfigService);
+  const configObservable = Observable.of<Config>({
+    httpStoreUrl: '',
+    pollTimeout: 0,
+    decks: [{ name: '~', cards: ['1'] }]
+  });
+  when(configMock.getConfig()).thenReturn(configObservable);
+
   beforeEach(async(() => {
     const activatedRoute = new ActivatedRouteStub();
     TestBed.configureTestingModule({
@@ -21,6 +31,7 @@ describe('NewSessionComponent', () => {
         { provide: HttpStorageService, useValue: instance(httpStorageMock) },
         { provide: Router, useClass: RouterStub },
         { provide: ActivatedRoute, useValue: activatedRoute },
+        { provide: ConfigService, useValue: instance(configMock) },
       ]
     })
       .compileComponents();