From ab23b9b2566cbd328bf9a510202c39fcd046634c Mon Sep 17 00:00:00 2001 From: Baptiste Lemoine Date: Wed, 5 Feb 2020 10:54:30 +0100 Subject: [PATCH] :zap: split poll display components --- src/app/app.module.ts | 6 + src/app/config/PollConfig.ts | 2 +- .../poll-display/poll-display.component.html | 223 ++++++------------ .../poll-display/poll-display.component.ts | 1 - .../visibility/visibility.component.html | 10 +- .../choices-list/choices-list.component.html | 28 +++ .../choices-list/choices-list.component.scss | 0 .../choices-list.component.spec.ts | 25 ++ .../choices-list/choices-list.component.ts | 15 ++ .../comments-list.component.html | 61 +++++ .../comments-list.component.scss | 0 .../comments-list.component.spec.ts | 25 ++ .../comments-list/comments-list.component.ts | 15 ++ .../navigation/navigation.component.html | 1 + .../navigation/navigation.component.scss | 0 .../navigation/navigation.component.spec.ts | 25 ++ .../voting/navigation/navigation.component.ts | 15 ++ .../voting-choice.component.scss | 10 - .../voting-navigation.component.html | 34 +++ .../voting-navigation.component.scss | 0 .../voting-navigation.component.spec.ts | 25 ++ .../voting-navigation.component.ts | 14 ++ 22 files changed, 362 insertions(+), 173 deletions(-) create mode 100644 src/app/pages/voting/choices-list/choices-list.component.html create mode 100644 src/app/pages/voting/choices-list/choices-list.component.scss create mode 100644 src/app/pages/voting/choices-list/choices-list.component.spec.ts create mode 100644 src/app/pages/voting/choices-list/choices-list.component.ts create mode 100644 src/app/pages/voting/comments-list/comments-list.component.html create mode 100644 src/app/pages/voting/comments-list/comments-list.component.scss create mode 100644 src/app/pages/voting/comments-list/comments-list.component.spec.ts create mode 100644 src/app/pages/voting/comments-list/comments-list.component.ts create mode 100644 src/app/pages/voting/navigation/navigation.component.html create mode 100644 src/app/pages/voting/navigation/navigation.component.scss create mode 100644 src/app/pages/voting/navigation/navigation.component.spec.ts create mode 100644 src/app/pages/voting/navigation/navigation.component.ts create mode 100644 src/app/pages/voting/voting-navigation/voting-navigation.component.html create mode 100644 src/app/pages/voting/voting-navigation/voting-navigation.component.scss create mode 100644 src/app/pages/voting/voting-navigation/voting-navigation.component.spec.ts create mode 100644 src/app/pages/voting/voting-navigation/voting-navigation.component.ts diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 4e01729a..8a64480c 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -54,6 +54,9 @@ import {ConfirmDialogModule} from 'primeng/confirmdialog'; import {DialogModule} from 'primeng/dialog'; import {DateValueAccessorModule} from "angular-date-value-accessor"; import {CopyTextComponent} from './ui/copy-text/copy-text.component'; +import { CommentsListComponent } from './pages/voting/comments-list/comments-list.component'; +import { ChoicesListComponent } from './pages/voting/choices-list/choices-list.component'; +import { VotingNavigationComponent } from './pages/voting/voting-navigation/voting-navigation.component'; export class MyMissingTranslationHandler implements MissingTranslationHandler { handle(params: MissingTranslationHandlerParams) { @@ -97,6 +100,9 @@ export function HttpLoaderFactory(http: HttpClient) { ResettableInputDirective, ErasableInputComponent, CopyTextComponent, + CommentsListComponent, + ChoicesListComponent, + VotingNavigationComponent, ], imports: [ diff --git a/src/app/config/PollConfig.ts b/src/app/config/PollConfig.ts index 623a7771..acd81d1f 100644 --- a/src/app/config/PollConfig.ts +++ b/src/app/config/PollConfig.ts @@ -56,7 +56,7 @@ export class PollConfig { urlAdmin = environment.baseHref + '/#/admin/d65es45fd45sdf45sd345f312sdf31sgfd345'; adminKey = ''; // key to change config of the poll owner_modifier_token = ''; // key to change a vote stack - canModifyAnswers = 1;// everybody, self, nobody (= just admin) + canModifyAnswers = true;// bool for the frontend selector whoModifiesAnswers = "everybody";// everybody, self, nobody (= just admin) whoCanChangeAnswers = 'everybody';// everybody, self, nobody (= just admin) dateList: any = defaultDates; // sets of days as strings, config to set identical time for days in a special days poll diff --git a/src/app/pages/poll-display/poll-display.component.html b/src/app/pages/poll-display/poll-display.component.html index 94eb5d8c..30e5c211 100644 --- a/src/app/pages/poll-display/poll-display.component.html +++ b/src/app/pages/poll-display/poll-display.component.html @@ -1,162 +1,73 @@ -
-
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
- - - - -
-
- - -
-
- - -
-
- - -
- -
-

Laisser un commentaire

- - - - -
- -
- -
- + class="poll" +>
- - - + class='loading' + *ngIf='config.loading' > +
-
-
-

Partager le sondage +
+
+ + +
-

-

Pour partager le sondage, vous pouvez diffuser ce lien : - - {{config.currentPoll.urlPublic}} - -

+
+ +
+
+ + +
+ +
+ +
+
+ + + +
+
+
+
+ + No current poll available +
+
- -

- Exporter/Imprimer -

- - diff --git a/src/app/pages/poll-display/poll-display.component.ts b/src/app/pages/poll-display/poll-display.component.ts index a41cb023..a40d38a3 100644 --- a/src/app/pages/poll-display/poll-display.component.ts +++ b/src/app/pages/poll-display/poll-display.component.ts @@ -31,7 +31,6 @@ export class PollDisplayComponent extends BaseComponent implements OnInit { ngOnInit() { - this.config.exportCSV(); } diff --git a/src/app/pages/visibility/visibility.component.html b/src/app/pages/visibility/visibility.component.html index 979015c1..873b1a25 100644 --- a/src/app/pages/visibility/visibility.component.html +++ b/src/app/pages/visibility/visibility.component.html @@ -66,10 +66,10 @@ name="modificationAbility" id="modificationAbility" [(ngModel)]="config.canModifyAnswers" > - - @@ -77,15 +77,15 @@ {{"visibility.archiving_end"|translate}} - + {{"visibility.modfiy_their"|translate}} + + + +
+

Laisser un commentaire

+ + + + +
+ +
+ +
+ +
+ + + +
+
diff --git a/src/app/pages/voting/comments-list/comments-list.component.scss b/src/app/pages/voting/comments-list/comments-list.component.scss new file mode 100644 index 00000000..e69de29b diff --git a/src/app/pages/voting/comments-list/comments-list.component.spec.ts b/src/app/pages/voting/comments-list/comments-list.component.spec.ts new file mode 100644 index 00000000..7d816e53 --- /dev/null +++ b/src/app/pages/voting/comments-list/comments-list.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { CommentsListComponent } from './comments-list.component'; + +describe('CommentsListComponent', () => { + let component: CommentsListComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ CommentsListComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(CommentsListComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/pages/voting/comments-list/comments-list.component.ts b/src/app/pages/voting/comments-list/comments-list.component.ts new file mode 100644 index 00000000..7ba3e09f --- /dev/null +++ b/src/app/pages/voting/comments-list/comments-list.component.ts @@ -0,0 +1,15 @@ +import {Component} from '@angular/core'; +import {ConfigService} from "../../../services/config.service"; + +@Component({ + selector: 'framadate-comments-list', + templateUrl: './comments-list.component.html', + styleUrls: ['./comments-list.component.scss'] +}) +export class CommentsListComponent { + + constructor(public config: ConfigService) { + + } + +} diff --git a/src/app/pages/voting/navigation/navigation.component.html b/src/app/pages/voting/navigation/navigation.component.html new file mode 100644 index 00000000..499146eb --- /dev/null +++ b/src/app/pages/voting/navigation/navigation.component.html @@ -0,0 +1 @@ +

navigation works!

diff --git a/src/app/pages/voting/navigation/navigation.component.scss b/src/app/pages/voting/navigation/navigation.component.scss new file mode 100644 index 00000000..e69de29b diff --git a/src/app/pages/voting/navigation/navigation.component.spec.ts b/src/app/pages/voting/navigation/navigation.component.spec.ts new file mode 100644 index 00000000..38577181 --- /dev/null +++ b/src/app/pages/voting/navigation/navigation.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { NavigationComponent } from './navigation.component'; + +describe('NavigationComponent', () => { + let component: NavigationComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ NavigationComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(NavigationComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/pages/voting/navigation/navigation.component.ts b/src/app/pages/voting/navigation/navigation.component.ts new file mode 100644 index 00000000..d61e2564 --- /dev/null +++ b/src/app/pages/voting/navigation/navigation.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'framadate-navigation', + templateUrl: './navigation.component.html', + styleUrls: ['./navigation.component.scss'] +}) +export class NavigationComponent implements OnInit { + + constructor() { } + + ngOnInit() { + } + +} diff --git a/src/app/pages/voting/voting-choice/voting-choice.component.scss b/src/app/pages/voting/voting-choice/voting-choice.component.scss index 45ab9402..4d79b14c 100644 --- a/src/app/pages/voting/voting-choice/voting-choice.component.scss +++ b/src/app/pages/voting/voting-choice/voting-choice.component.scss @@ -43,16 +43,6 @@ $breakpoint-responsive: 640px; // à définir font-weight: 700; background: #e9bdeb; } - - @media (min-width: $breakpoint-responsive) { - align-items: center; - justify-content: space-between; - min-height: auto; - } - - .title { - max-width: 25%; - } } .choicebox__subject { diff --git a/src/app/pages/voting/voting-navigation/voting-navigation.component.html b/src/app/pages/voting/voting-navigation/voting-navigation.component.html new file mode 100644 index 00000000..e8b48546 --- /dev/null +++ b/src/app/pages/voting/voting-navigation/voting-navigation.component.html @@ -0,0 +1,34 @@ + diff --git a/src/app/pages/voting/voting-navigation/voting-navigation.component.scss b/src/app/pages/voting/voting-navigation/voting-navigation.component.scss new file mode 100644 index 00000000..e69de29b diff --git a/src/app/pages/voting/voting-navigation/voting-navigation.component.spec.ts b/src/app/pages/voting/voting-navigation/voting-navigation.component.spec.ts new file mode 100644 index 00000000..1626cc28 --- /dev/null +++ b/src/app/pages/voting/voting-navigation/voting-navigation.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { VotingNavigationComponent } from './voting-navigation.component'; + +describe('VotingNavigationComponent', () => { + let component: VotingNavigationComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ VotingNavigationComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(VotingNavigationComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/pages/voting/voting-navigation/voting-navigation.component.ts b/src/app/pages/voting/voting-navigation/voting-navigation.component.ts new file mode 100644 index 00000000..5cd81980 --- /dev/null +++ b/src/app/pages/voting/voting-navigation/voting-navigation.component.ts @@ -0,0 +1,14 @@ +import {Component} from '@angular/core'; +import {ConfigService} from "../../../services/config.service"; + +@Component({ + selector: 'framadate-voting-navigation', + templateUrl: './voting-navigation.component.html', + styleUrls: ['./voting-navigation.component.scss'] +}) +export class VotingNavigationComponent { + + constructor(public config: ConfigService) { + } + +}