From 942649656df42aa23f0117ed8757bb3e176129b8 Mon Sep 17 00:00:00 2001 From: Le Libre Au Quotidien Date: Mon, 18 Nov 2019 19:32:14 +0100 Subject: [PATCH 1/5] Une partie de html --- package-lock.json | 48 ++++++++++----------- src/app/app.module.ts | 2 + src/app/config/Routes.ts | 2 + src/app/pages/admin/admin.component.html | 37 ++++++++++++++++ src/app/pages/admin/admin.component.scss | 6 +++ src/app/pages/admin/admin.component.spec.ts | 25 +++++++++++ src/app/pages/admin/admin.component.ts | 16 +++++++ 7 files changed, 112 insertions(+), 24 deletions(-) create mode 100644 src/app/pages/admin/admin.component.html create mode 100644 src/app/pages/admin/admin.component.scss create mode 100644 src/app/pages/admin/admin.component.spec.ts create mode 100644 src/app/pages/admin/admin.component.ts diff --git a/package-lock.json b/package-lock.json index aa8a150c..61b24493 100644 --- a/package-lock.json +++ b/package-lock.json @@ -126,9 +126,9 @@ } }, "@angular/animations": { - "version": "8.2.13", - "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-8.2.13.tgz", - "integrity": "sha512-ZE4UZsQ6HDW1ZIj9tL45PVosCcG4Ke7ihV7eWCE1VgLZKDDxTOPbLf1UeEiszUYptMLGH3eGMNBKo85mOlkH8w==", + "version": "8.2.14", + "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-8.2.14.tgz", + "integrity": "sha512-3Vc9TnNpKdtvKIXcWDFINSsnwgEMiDmLzjceWg1iYKwpeZGQahUXPoesLwQazBMmxJzQiA4HOMj0TTXKZ+Jzkg==", "requires": { "tslib": "^1.9.0" } @@ -183,17 +183,17 @@ } }, "@angular/common": { - "version": "8.2.13", - "resolved": "https://registry.npmjs.org/@angular/common/-/common-8.2.13.tgz", - "integrity": "sha512-I9cTcjUi88L+Mb/a/ZzUrdDcn3YgFFK9LubxaPjAfr6+G7IZ//MY5HuvG8Y41yKprXVVvQCbQ1yQD+GGRSCkaA==", + "version": "8.2.14", + "resolved": "https://registry.npmjs.org/@angular/common/-/common-8.2.14.tgz", + "integrity": "sha512-Qmt+aX2quUW54kaNT7QH7WGXnFxr/cC2C6sf5SW5SdkZfDQSiz8IaItvieZfXVQUbBOQKFRJ7TlSkt0jI/yjvw==", "requires": { "tslib": "^1.9.0" } }, "@angular/compiler": { - "version": "8.2.13", - "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-8.2.13.tgz", - "integrity": "sha512-u2NWCvEn4SjbMvn2PG6sYcf+rR5u3aYMv3/mNQ9k+2UmCIu3yJrcuCzebjo5SdlDVqKD2vzbyMZnr8VB9OcceQ==", + "version": "8.2.14", + "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-8.2.14.tgz", + "integrity": "sha512-ABZO4E7eeFA1QyJ2trDezxeQM5ZFa1dXw1Mpl/+1vuXDKNjJgNyWYwKp/NwRkLmrsuV0yv4UDCDe4kJOGbPKnw==", "requires": { "tslib": "^1.9.0" } @@ -974,17 +974,17 @@ } }, "@angular/core": { - "version": "8.2.13", - "resolved": "https://registry.npmjs.org/@angular/core/-/core-8.2.13.tgz", - "integrity": "sha512-W8HN0lUQV4Sq85l17nhRIXeIfcw1ZdpgGm6to98pl0y9l/1srfzWfTnofuwCJC7gedt5AMrYJGUaNiDbByosFw==", + "version": "8.2.14", + "resolved": "https://registry.npmjs.org/@angular/core/-/core-8.2.14.tgz", + "integrity": "sha512-zeePkigi+hPh3rN7yoNENG/YUBUsIvUXdxx+AZq+QPaFeKEA2FBSrKn36ojHFrdJUjKzl0lPMEiGC2b6a6bo6g==", "requires": { "tslib": "^1.9.0" } }, "@angular/forms": { - "version": "8.2.13", - "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-8.2.13.tgz", - "integrity": "sha512-l7lHD4kbWK70KY0Xp4IpSa106ZzSgPMwRYMFKd9qhYaJ7v0Y7Shh7Z/ZDCOP730maj9WULnpy5X4eeozWXgvgg==", + "version": "8.2.14", + "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-8.2.14.tgz", + "integrity": "sha512-zhyKL3CFIqcyHJ/TQF/h1OZztK611a6rxuPHCrt/5Sn1SuBTJJQ1pPTkOYIDy6IrCrtyANc8qB6P17Mao71DNQ==", "requires": { "tslib": "^1.9.0" } @@ -996,25 +996,25 @@ "dev": true }, "@angular/platform-browser": { - "version": "8.2.13", - "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-8.2.13.tgz", - "integrity": "sha512-1lPbeLQIbbafjq9ul3IA8s2fMJ/EXeMJ74ouTolVXoPPur9ZPRLX9FqBAO1K4QzkAWhRlyf6qIC+mDZfJILwZw==", + "version": "8.2.14", + "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-8.2.14.tgz", + "integrity": "sha512-MtJptptyKzsE37JZ2VB/tI4cvMrdAH+cT9pMBYZd66YSZfKjIj5s+AZo7z8ncoskQSB1o3HMfDjSK7QXGx1mLQ==", "requires": { "tslib": "^1.9.0" } }, "@angular/platform-browser-dynamic": { - "version": "8.2.13", - "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-8.2.13.tgz", - "integrity": "sha512-KP5psUKujAO8jZKHi6LRC+N7hE/epiGOhYZxdher1sCi81sYoZmqrEWkVZ4VKhov/4aC409CocDXcF7nmHV8tg==", + "version": "8.2.14", + "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-8.2.14.tgz", + "integrity": "sha512-mO2JPR5kLU/A3AQngy9+R/Q5gaF9csMStBQjwsCRI0wNtlItOIGL6+wTYpiTuh/ux+WVN1F2sLcEYU4Zf1ud9A==", "requires": { "tslib": "^1.9.0" } }, "@angular/router": { - "version": "8.2.13", - "resolved": "https://registry.npmjs.org/@angular/router/-/router-8.2.13.tgz", - "integrity": "sha512-9CqnachtdASnEmRMtrG/R3c5nDCjjlCU4n0W/xt5+LlveyuUVvAT/CFUC38km4Df3lIvqap8mSpxzGaEzCL+wQ==", + "version": "8.2.14", + "resolved": "https://registry.npmjs.org/@angular/router/-/router-8.2.14.tgz", + "integrity": "sha512-DHA2BhODqV7F0g6ZKgFaZgbsqzHHWRcfWchCOrOVKu2rYiKUTwwHVLBgZAhrpNeinq2pWanVYSIhMr7wy+LfEA==", "requires": { "tslib": "^1.9.0" } diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 6c6e47fa..880016e4 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -38,6 +38,7 @@ import { TranslateService } from '@ngx-translate/core'; import {TranslateHttpLoader} from '@ngx-translate/http-loader'; +import { AdminComponent } from './pages/admin/admin.component'; export class MyMissingTranslationHandler implements MissingTranslationHandler { handle(params: MissingTranslationHandlerParams) { @@ -74,6 +75,7 @@ export function HttpLoaderFactory(http: HttpClient) { PasswordComponent, HomeComponent, VoteChoiceComponent, + AdminComponent, ], imports: [ diff --git a/src/app/config/Routes.ts b/src/app/config/Routes.ts index 72ef5a8c..1c64a672 100644 --- a/src/app/config/Routes.ts +++ b/src/app/config/Routes.ts @@ -5,6 +5,7 @@ import {ResumeComponent} from '../pages/resume/resume.component'; import {PicturesComponent} from '../pages/pictures/pictures.component'; import {EndConfirmationComponent} from '../pages/end-confirmation/end-confirmation.component'; import {AnswersComponent} from '../pages/answers/answers.component'; +import {AdminComponent} from '../pages/admin/admin.component'; import {CreateOrRetrieveComponent} from '../pages/create-or-retrieve/create-or-retrieve.component'; import {BaseComponent} from '../pages/base-page/base.component'; import {HomeComponent} from "../pages/home/home.component"; @@ -22,6 +23,7 @@ export const Routes = {path: 'step/date', component: DatesComponent}, {path: 'step/kind', component: KindComponent}, {path: 'step/answers', component: AnswersComponent}, + {path: 'step/admin', component: AdminComponent}, {path: 'step/pictures', component: PicturesComponent}, {path: 'step/visibility', component: VisibilityComponent}, {path: 'step/resume', component: ResumeComponent}, diff --git a/src/app/pages/admin/admin.component.html b/src/app/pages/admin/admin.component.html new file mode 100644 index 00000000..29c5ed63 --- /dev/null +++ b/src/app/pages/admin/admin.component.html @@ -0,0 +1,37 @@ +
+

Nom du sondage

+ +

Informations du sondage

+ + + + + + + +

Paramètres

+

Visibilité des réponses

+ + + +

Votes

+ + + + + + + + + + +
diff --git a/src/app/pages/admin/admin.component.scss b/src/app/pages/admin/admin.component.scss new file mode 100644 index 00000000..4a1f896b --- /dev/null +++ b/src/app/pages/admin/admin.component.scss @@ -0,0 +1,6 @@ +form{ + display:flex; + flex-direction: column; + width:340px; +margin:auto; +} diff --git a/src/app/pages/admin/admin.component.spec.ts b/src/app/pages/admin/admin.component.spec.ts new file mode 100644 index 00000000..72e742ff --- /dev/null +++ b/src/app/pages/admin/admin.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { AdminComponent } from './admin.component'; + +describe('AdminComponent', () => { + let component: AdminComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ AdminComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(AdminComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/pages/admin/admin.component.ts b/src/app/pages/admin/admin.component.ts new file mode 100644 index 00000000..13ec96e6 --- /dev/null +++ b/src/app/pages/admin/admin.component.ts @@ -0,0 +1,16 @@ +import { Component, OnInit } from '@angular/core'; +import {BaseComponent} from '../base-page/base.component'; +import {ConfigService} from '../../config.service'; +@Component({ + selector: 'framadate-admin', + templateUrl: './admin.component.html', + styleUrls: ['./admin.component.scss'] +}) +export class AdminComponent implements OnInit { + + constructor() { } + + ngOnInit() { + } + +} From 84b87486ed57d14549f6a5bc5c00df508cad7ed1 Mon Sep 17 00:00:00 2001 From: Le Libre Au Quotidien Date: Tue, 19 Nov 2019 18:37:03 +0100 Subject: [PATCH 2/5] =?UTF-8?q?Page=20cr=C3=A9e=20et=20bien=20compl=C3=A9t?= =?UTF-8?q?=C3=A9e=20(plus=20qu'a=20faire=20les=20alignements)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/pages/admin/admin.component.html | 36 +++++++++++++++++++++--- src/app/pages/admin/admin.component.scss | 3 ++ src/assets/scss/atoms/_buttons.scss | 6 +++- src/assets/scss/atoms/_forms.scss | 1 + src/assets/scss/variables.scss | 4 +-- 5 files changed, 43 insertions(+), 7 deletions(-) diff --git a/src/app/pages/admin/admin.component.html b/src/app/pages/admin/admin.component.html index 29c5ed63..a3d1fcdd 100644 --- a/src/app/pages/admin/admin.component.html +++ b/src/app/pages/admin/admin.component.html @@ -20,6 +20,7 @@

Votes

+
- - - - +
+ + +

Commentaires

+ + +

Archivage

+ + +

Accés au sondage

+ + + +

Tout supprimer

+ + +

Liens d'accès au sondage

+

Coté administrateur·ice

+ + + +

Côté sondé·es

+ + + +

Recevoir les liens par mail

+ + diff --git a/src/app/pages/admin/admin.component.scss b/src/app/pages/admin/admin.component.scss index 4a1f896b..3ef17de7 100644 --- a/src/app/pages/admin/admin.component.scss +++ b/src/app/pages/admin/admin.component.scss @@ -4,3 +4,6 @@ form{ width:340px; margin:auto; } +.row{ + flex-direction: row; +} diff --git a/src/assets/scss/atoms/_buttons.scss b/src/assets/scss/atoms/_buttons.scss index d03435f0..e84c9276 100644 --- a/src/assets/scss/atoms/_buttons.scss +++ b/src/assets/scss/atoms/_buttons.scss @@ -43,5 +43,9 @@ display: block; min-width: 100%; } + &--mini{ + background-color: $mini-button-color; -} \ No newline at end of file + } + +} diff --git a/src/assets/scss/atoms/_forms.scss b/src/assets/scss/atoms/_forms.scss index 53981723..6b8bdd1f 100644 --- a/src/assets/scss/atoms/_forms.scss +++ b/src/assets/scss/atoms/_forms.scss @@ -18,6 +18,7 @@ select { textarea { width: 100%; + border-left: 3px solid $primary_color; } select, diff --git a/src/assets/scss/variables.scss b/src/assets/scss/variables.scss index 9a9eaab7..8bdaa5c3 100644 --- a/src/assets/scss/variables.scss +++ b/src/assets/scss/variables.scss @@ -13,7 +13,7 @@ $red: #cd0000; $cool-grey: #aeafb1; $warm-grey:#807e7e; $wisteria:#bf83c2; - +$pale-purple:#d198d4; // interpretations in app $primary_color: $ugly-purple; $secondary_color: $lavender-pink; @@ -23,7 +23,7 @@ $logo_color_2: $camo; $choice_select_border_color: $cool-grey; $hover-color:$warm-grey; $clicked-color:$wisteria; - +$mini-button-color:$pale-purple; // FONT $default_font : "pt_sans"; $title_font: "proza_libre"; From 8f8a0d07d27a23f0871f1718ca5e0654bb1f38db Mon Sep 17 00:00:00 2001 From: Le Libre Au Quotidien Date: Tue, 19 Nov 2019 19:28:00 +0100 Subject: [PATCH 3/5] Presque fini --- src/app/pages/admin/admin.component.html | 9 ++++++++- src/app/pages/admin/admin.component.scss | 25 ++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 1 deletion(-) diff --git a/src/app/pages/admin/admin.component.html b/src/app/pages/admin/admin.component.html index a3d1fcdd..f24f32f1 100644 --- a/src/app/pages/admin/admin.component.html +++ b/src/app/pages/admin/admin.component.html @@ -11,15 +11,19 @@

Paramètres

Visibilité des réponses

+
+

Votes

+
+
+

Commentaires

@@ -41,15 +46,17 @@

Accés au sondage

+
+

Tout supprimer

- +

Liens d'accès au sondage

Coté administrateur·ice

diff --git a/src/app/pages/admin/admin.component.scss b/src/app/pages/admin/admin.component.scss index 3ef17de7..571a54af 100644 --- a/src/app/pages/admin/admin.component.scss +++ b/src/app/pages/admin/admin.component.scss @@ -6,4 +6,29 @@ margin:auto; } .row{ flex-direction: row; + flex-wrap: wrap; +} +textarea{ + height:115px; + margin-bottom: 50px; +} +label{ + padding-bottom: 10px; + flex-wrap: wrap; +} +h2,h1{ + margin-bottom: 40px; +} +h2{ + margin-top: 40px; + padding-left:16px; +} +.btn--alert{ + font-weight: 600; +} +h3{ + padding-left: 28px; +} +select,input[type=date]{ + max-width: 130px; } From 39d4213bded6915081dd42cd506c52ff20ac2659 Mon Sep 17 00:00:00 2001 From: Le Libre Au Quotidien Date: Wed, 20 Nov 2019 19:31:11 +0100 Subject: [PATCH 4/5] Dernier commit avant merge --- src/app/pages/admin/admin.component.html | 9 ++++++--- src/app/pages/admin/admin.component.scss | 5 +++++ src/assets/scss/atoms/_forms.scss | 6 +++++- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/src/app/pages/admin/admin.component.html b/src/app/pages/admin/admin.component.html index f24f32f1..f2ce8400 100644 --- a/src/app/pages/admin/admin.component.html +++ b/src/app/pages/admin/admin.component.html @@ -43,14 +43,16 @@

Archivage

+
+

Accés au sondage

@@ -67,6 +69,7 @@

Recevoir les liens par mail

- - + + + diff --git a/src/app/pages/admin/admin.component.scss b/src/app/pages/admin/admin.component.scss index 571a54af..0909d584 100644 --- a/src/app/pages/admin/admin.component.scss +++ b/src/app/pages/admin/admin.component.scss @@ -7,6 +7,7 @@ margin:auto; .row{ flex-direction: row; flex-wrap: wrap; + padding-bottom: 65px; } textarea{ height:115px; @@ -28,7 +29,11 @@ h2{ } h3{ padding-left: 28px; + padding-bottom:15px; } select,input[type=date]{ max-width: 130px; } +.btn--outline{ + margin-bottom: 70px; +} diff --git a/src/assets/scss/atoms/_forms.scss b/src/assets/scss/atoms/_forms.scss index 6b8bdd1f..cc0fde2f 100644 --- a/src/assets/scss/atoms/_forms.scss +++ b/src/assets/scss/atoms/_forms.scss @@ -1,5 +1,9 @@ @charset "UTF-8"; - +input[type="date"]::after{ + content:"au format JJ/MM/AAAA"; + display: inline-block; + position: relative; +} input, select, textarea { From 275a065d8ebde70d9556ad1c2e915daf6228578b Mon Sep 17 00:00:00 2001 From: Le Libre Au Quotidien Date: Fri, 22 Nov 2019 10:18:09 +0100 Subject: [PATCH 5/5] Resolve a part of merge conflicts --- src/app/app.module.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 880016e4..33f0f37a 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -38,6 +38,7 @@ import { TranslateService } from '@ngx-translate/core'; import {TranslateHttpLoader} from '@ngx-translate/http-loader'; + import { AdminComponent } from './pages/admin/admin.component'; export class MyMissingTranslationHandler implements MissingTranslationHandler {