From 1bfe747e4cd256a42bd4c17f9b25fc1c3175131a Mon Sep 17 00:00:00 2001 From: Tykayn Date: Mon, 3 May 2021 10:06:10 +0200 Subject: [PATCH] home display stored polls --- .../core/components/home/home.component.html | 73 ++++++++++++++----- .../core/components/home/home.component.scss | 21 ++++++ .../core/components/home/home.component.ts | 6 +- src/app/core/services/storage.service.ts | 14 +++- .../feedback/feedback.component.scss | 2 +- src/environments/environment.ts | 2 +- src/styles/partials/_buttons.scss | 7 -- 7 files changed, 97 insertions(+), 28 deletions(-) diff --git a/src/app/core/components/home/home.component.html b/src/app/core/components/home/home.component.html index 248de299..2b49ed5f 100644 --- a/src/app/core/components/home/home.component.html +++ b/src/app/core/components/home/home.component.html @@ -2,10 +2,63 @@
+
+

+ {{ 'home.create_button' | translate }} +

+

+ {{ + 'SENTENCES.framadate-is-an-online-service-for-planning-an-appointment-or-making-a-decision-quickly-and-easily' + | translate + }} +

+ + +
+ +

{{ 'home.title' | translate }} - {{ env.appTitle }} + {{ environment.appTitle }}

{{ @@ -22,25 +75,11 @@ {{ 'home.subtitle' | translate }}
-
-

- {{ 'home.search_title' | translate }} -

-
+
diff --git a/src/app/core/components/home/home.component.scss b/src/app/core/components/home/home.component.scss index f50dfe0f..c31440bb 100644 --- a/src/app/core/components/home/home.component.scss +++ b/src/app/core/components/home/home.component.scss @@ -3,4 +3,25 @@ a .fa { margin-right: 1ch; } + .subtitle { + min-height: 4em; + } + .creation, + .search { + min-height: 20em; + max-width: 40em; + margin-bottom: 10em; + margin-left: auto; + margin-right: auto; + .title { + margin-bottom: 2em; + } + .button { + border: 0; + } + } + + .poll-list { + margin: 2em 0; + } } diff --git a/src/app/core/components/home/home.component.ts b/src/app/core/components/home/home.component.ts index 997226b9..697c6669 100644 --- a/src/app/core/components/home/home.component.ts +++ b/src/app/core/components/home/home.component.ts @@ -1,5 +1,6 @@ import { Component } from '@angular/core'; import { environment } from '../../../../environments/environment'; +import { StorageService } from '../../services/storage.service'; @Component({ selector: 'app-home', @@ -7,5 +8,8 @@ import { environment } from '../../../../environments/environment'; styleUrls: ['./home.component.scss'], }) export class HomeComponent { - public env = environment; + public environment = environment; + constructor(public storageService: StorageService) {} + + searchMyPolls() {} } diff --git a/src/app/core/services/storage.service.ts b/src/app/core/services/storage.service.ts index c37997db..58d76643 100644 --- a/src/app/core/services/storage.service.ts +++ b/src/app/core/services/storage.service.ts @@ -13,6 +13,8 @@ import { otherDefaultDates, TimeSlices, } from '../../../../mocks/old-stuff/config/defaultConfigs'; +import { Poll } from '../models/poll.model'; +import { Owner } from '../models/owner.model'; @Injectable({ providedIn: 'root', @@ -25,7 +27,7 @@ export class StorageService { public language: Language; @LocalStorage() - public userPollsIds: string[]; + public userPolls: Poll[] = []; @LocalStorage() public dateList: DateChoice[] = otherDefaultDates; @@ -36,6 +38,16 @@ export class StorageService { @LocalStorage() public vote_stack: Stack = new Stack(); + constructor() { + if (environment.autofill) { + this.userPolls.push(new Poll(new Owner(), 'Démo: Anniversaire de tonton Patrick', 'aujourdhui-ou-demain')); + this.userPolls.push(new Poll(new Owner(), 'Démo: Atelier cuisine du quartier', 'aujourdhui-ou-demain')); + this.userPolls.push( + new Poll(new Owner(), 'Démo: Réunion du département des chatons', 'aujourdhui-ou-demain') + ); + } + } + setChoicesForVoteStack(choices_list: Choice[]) { this.vote_stack.votes = []; diff --git a/src/app/shared/components/feedback/feedback.component.scss b/src/app/shared/components/feedback/feedback.component.scss index c7b6c2f5..e8396b91 100644 --- a/src/app/shared/components/feedback/feedback.component.scss +++ b/src/app/shared/components/feedback/feedback.component.scss @@ -1,7 +1,7 @@ :host { position: fixed; bottom: 4em; - right: 1em; + left: 1em; color: white; .feedback-choices { &.active { diff --git a/src/environments/environment.ts b/src/environments/environment.ts index d9854e85..dbb33ec1 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -21,7 +21,7 @@ export const environment = { frontDomain: 'http://tktest.lan', production: false, display_routes: true, - autofill: false, + autofill: true, showDemoWarning: true, autoSendNewPoll: false, appTitle: 'FramaDate Funky', diff --git a/src/styles/partials/_buttons.scss b/src/styles/partials/_buttons.scss index 2edeffdb..f2e53da8 100644 --- a/src/styles/partials/_buttons.scss +++ b/src/styles/partials/_buttons.scss @@ -24,10 +24,3 @@ button, .btn--danger { @extend .is-danger; } - -main { - [ng-reflect-router-link] { - min-width: 50%; - margin: 0.5em; - } -}