From 7a0061eeb1d2018857a78dcff9674df2076c0999 Mon Sep 17 00:00:00 2001 From: Tykayn Date: Tue, 27 Apr 2021 13:04:32 +0200 Subject: [PATCH] fixes for building in prod --- src/app/core/models/choice.model.ts | 3 ++ src/app/core/models/poll.model.ts | 2 +- src/app/core/services/mocking.service.ts | 39 +------------------ .../visibility/visibility.component.html | 1 - .../pages/visibility/visibility.component.ts | 2 +- .../old-stuff/services/config.service.ts | 7 ++-- .../add-answer/add-answer.component.html | 2 +- .../add-answer/add-answer.component.ts | 6 +-- .../participation-routing.module.ts | 4 +- 9 files changed, 15 insertions(+), 51 deletions(-) diff --git a/src/app/core/models/choice.model.ts b/src/app/core/models/choice.model.ts index bb5f14f3..e1dca02a 100644 --- a/src/app/core/models/choice.model.ts +++ b/src/app/core/models/choice.model.ts @@ -8,6 +8,9 @@ export class Choice { public score: number; public enabled: boolean; public url?: string; + public yes?: any; + public no?: any; + public maybe?: any; constructor( public participants: Map> = new Map>([ diff --git a/src/app/core/models/poll.model.ts b/src/app/core/models/poll.model.ts index 38167d51..f2d5c4f5 100644 --- a/src/app/core/models/poll.model.ts +++ b/src/app/core/models/poll.model.ts @@ -44,7 +44,7 @@ export class Poll { public allowed_answers = []; - public modification_policy = []; + public modification_policy = 'everybody'; public dateChoices: Choice[] = []; // sets of days as strings, config to set identical time for days in a special days poll diff --git a/src/app/core/services/mocking.service.ts b/src/app/core/services/mocking.service.ts index 707b46f5..bea5a899 100644 --- a/src/app/core/services/mocking.service.ts +++ b/src/app/core/services/mocking.service.ts @@ -1,10 +1,6 @@ import { Injectable } from '@angular/core'; import { BehaviorSubject, Observable } from 'rxjs'; - -import { UserRole } from '../enums/user-role.enum'; -import { Choice } from '../models/choice.model'; import { Poll } from '../models/poll.model'; -import { User } from '../models/user.model'; import { ApiService } from './api.service'; import { UserService } from './user.service'; import { UuidService } from './uuid.service'; @@ -18,38 +14,7 @@ export class MockingService { constructor(private apiService: ApiService, private userService: UserService, private uuidService: UuidService) {} - public async init(): Promise { - const pollsAvailable = await this.apiService.getAllAvailablePolls(); - this._pollsAvailables.next(pollsAvailable); + public async init(): Promise {} - if (this._pollsAvailables.getValue() && this._pollsAvailables.getValue().length > 0) { - // arbitrary choose first owner available - const currentUser = this._pollsAvailables.getValue()[0].owner; - currentUser.polls = [this._pollsAvailables.getValue()[0]]; - this.userService.updateUser(currentUser); - } else { - this.loadMock(); - } - } - - public loadMock(): void { - const owner = new User('TOTO', 'toto@gafam.com', [], UserRole.REGISTERED); - - const poll1: Poll = new Poll(owner, this.uuidService.getUUID(), 'Quand le picnic ?', 'Pour faire la teuf'); - const poll2: Poll = new Poll( - owner, - this.uuidService.getUUID(), - 'On fait quoi à la soirée ?', - 'Balancez vos idées' - ); - - poll1.choices = [new Choice('mardi prochain'), new Choice('mercredi')]; - poll2.choices = [new Choice('jeux'), new Choice('danser'), new Choice('discuter en picolant')]; - - this._pollsAvailables.next([poll1, poll2]); - owner.polls = [poll1, poll2]; - this.userService.updateUser(owner); - - console.info('MOCKING user', { user: owner }); - } + public loadMock(): void {} } diff --git a/src/app/features/old-stuff/pages/visibility/visibility.component.html b/src/app/features/old-stuff/pages/visibility/visibility.component.html index 14abb51a..1244f37e 100644 --- a/src/app/features/old-stuff/pages/visibility/visibility.component.html +++ b/src/app/features/old-stuff/pages/visibility/visibility.component.html @@ -105,7 +105,6 @@ {{ '/vote/poll/slug/' + config.customUrl }} -