From 8ac8b696aad5bf0358fdd06cbcdc8a6fea718979 Mon Sep 17 00:00:00 2001 From: newick Date: Mon, 12 Aug 2019 21:54:21 +0200 Subject: [PATCH 01/56] added list of elements --- src/app/pages/kind/kind.component.html | 201 ++++++++++++++++++++++++- src/app/pages/kind/kind.component.scss | 22 +++ 2 files changed, 219 insertions(+), 4 deletions(-) diff --git a/src/app/pages/kind/kind.component.html b/src/app/pages/kind/kind.component.html index 70a5580e..826bacaa 100644 --- a/src/app/pages/kind/kind.component.html +++ b/src/app/pages/kind/kind.component.html @@ -1,4 +1,197 @@ -

page de démo

-

cette étape est en cours de développement.
S'inspirer de la page de FormContainer pour réaliser d'autres pages -

-C'est parfait! +

Atoms

+
+
+

Headings

+ +

Ceci est un h1

+

Ceci est un h2

+

Ceci est un h3

+
+ + + +
+

Buttons

+ +

+
+
+
+ +

+ +

+
+
+
+ +

+ +
+ +
+

Forms element

+ +

Labels

+ + + +

Input text

+
+ + +

Input email

+
+ + +

Input password

+
+ + +

Input date

+
+ + +

Select

+ + +

Textarea

+ +
+ +
+

Paragraphs

+ +

Lorem, ipsum dolor sit amet consectetur adipisicing elit. Magnam perspiciatis minus libero error dolores. + Corrupti repellat vero repellendus reiciendis assumenda minus. Nobis, quaerat ut nihil minima sed animi + delectus beatae!

+
+ +
+

Lists

+ +

Unordered list

+
    +
  • + plop +
    • +
  • + plop +
    • +
  • + plop +
    • +
+ +

Ordered list

+
    +
  1. + plop +
    2. +
  2. + plop +
    3. +
  3. + plop +
    4. +
+
+ +
+

Images

+ +
+
+ +
+

Molecules

+ +
+

Label + input text

+ + +
+ +
+

Label + select

+ + +
+ + + +
+

Commentaries

+
+
+ +
+

Components

+ +
+

Images list

+ that +
+ +
+

Calendar

+
+ +
+

Modale

+
+ +
+

Way to vote

+ that +
+ + + +
+

Graphics

+ that +
+
\ No newline at end of file diff --git a/src/app/pages/kind/kind.component.scss b/src/app/pages/kind/kind.component.scss index e69de29b..76e12fed 100644 --- a/src/app/pages/kind/kind.component.scss +++ b/src/app/pages/kind/kind.component.scss @@ -0,0 +1,22 @@ +@charset "UTF-8"; + +section { + &:not(:last-of-type) { + border-bottom: 6px solid #000; + } + + & + & { + margin-top: 3rem; + } +} + +article { + padding: 2rem 0; + border-top: 3px solid #ffb92c; + + h3 { + &:not(:first-of-type) { + margin-top: 2rem; + } + } +} From 93b9908a407999324b50d85619cb185266fbebb0 Mon Sep 17 00:00:00 2001 From: newick Date: Mon, 12 Aug 2019 21:54:40 +0200 Subject: [PATCH 02/56] worked a bit on display --- src/assets/scss/atoms/_buttons.scss | 86 ++++++++++------------------- src/assets/scss/atoms/_fonts.scss | 6 +- src/assets/scss/atoms/_forms.scss | 40 ++++++++------ 3 files changed, 51 insertions(+), 81 deletions(-) diff --git a/src/assets/scss/atoms/_buttons.scss b/src/assets/scss/atoms/_buttons.scss index 76973c5d..02926f1a 100644 --- a/src/assets/scss/atoms/_buttons.scss +++ b/src/assets/scss/atoms/_buttons.scss @@ -1,68 +1,38 @@ @charset "UTF-8"; -a { - color: $black; +button, +input[type="submit"] { + padding-right: 1.5rem; + padding-left: 1.5rem; + font-size: 1.6rem; + line-height: 1; + border: 2px solid $primary_color; + border-radius: 0.3rem; - .icon { - font-size: 1.5em; - &.right{ - float: right; - display: inline-block; - margin: -0.3em 0.4em; + &.background-btn { + font-weight: 600; + background-color: $primary_color; + + &:hover { + background-color: $secondary_color; + border-color: $secondary_color; + } + + &.btn_delete { } - } -} - -// buttons -.btn { - display: inline-block; - padding: 1em; - border-radius: 0.25em; - background: $primary_color; - // color: $light; - border: 0; - margin: 1em; - min-height: 1.5rem; - cursor: pointer; - - &:hover { - background-color: $dusty-orange; } -} -.btn-block { - display: block; - font-weight: 600; - font-size: 1.25em; - text-align: center; -} + &.btn_border { + padding-top: 0.8rem; + padding-bottom: 0.8rem; -.btn-outline { - background: $white; - border: solid 1px $primary_color; -} + &:hover { + background-color: rgba($primary_color, .2); + } -.btn-next { - @extend .striked; - text-align: right; - width: 100%; - padding: 1em 2em; - - a { - display: block; + &.btn_delete { + + } } -} - -.striked { - &::after { - content: ""; - display: block; - width: 12ch; - height: 4px; - margin-top: -0.7em; - margin-right: 0; - margin-left: auto; - background-color: $primary_color; - } -} +} \ No newline at end of file diff --git a/src/assets/scss/atoms/_fonts.scss b/src/assets/scss/atoms/_fonts.scss index 838c4789..52a10675 100644 --- a/src/assets/scss/atoms/_fonts.scss +++ b/src/assets/scss/atoms/_fonts.scss @@ -60,8 +60,4 @@ h4, h5, h6 { font-family: $title_font, "Brie Light", "Arial", "DejaVu Sans Mono"; -} -p{ - font-family: $default_font; - font-size:14px; -} +} \ No newline at end of file diff --git a/src/assets/scss/atoms/_forms.scss b/src/assets/scss/atoms/_forms.scss index 4ffaa1f6..4d6bd10c 100644 --- a/src/assets/scss/atoms/_forms.scss +++ b/src/assets/scss/atoms/_forms.scss @@ -1,33 +1,37 @@ @charset "UTF-8"; -// form inputs -.funky-box { - //background: $white; - padding: 1em; - border-radius: 0.25em; +input, +select, +textarea { + padding: 1rem; + border-top: none; + border-right: none; border-bottom: 3px solid $primary_color; - + border-left: none; } input, -textarea, -select, - { - @extend .funky-box; - border:none; - border-bottom:2px solid $primary_color; - color:$black; +select { + display: inline-block; } -input[type="text"],input[type="email"],input[type="password"]{ -width: 219px; -height: 36px; -} textarea { - margin-top: 1em; + width: 100%; border-left: 3px solid $primary_color; } +select, +option { + // delete default display + -webkit-appearance : none; + -moz-appearance : none; + + background: none; + border-radius: 0; + + // TODO -> check what angular can do + find a way to add the arrow +} + label { &[for] { cursor: pointer; From 807b6bc66020c279c4e7296d718579d6837bd671 Mon Sep 17 00:00:00 2001 From: newick Date: Mon, 12 Aug 2019 21:54:57 +0200 Subject: [PATCH 03/56] worked on home --- .../create-or-retrieve.component.html | 53 +++++-------------- 1 file changed, 12 insertions(+), 41 deletions(-) diff --git a/src/app/pages/create-or-retrieve/create-or-retrieve.component.html b/src/app/pages/create-or-retrieve/create-or-retrieve.component.html index 33313934..de570769 100644 --- a/src/app/pages/create-or-retrieve/create-or-retrieve.component.html +++ b/src/app/pages/create-or-retrieve/create-or-retrieve.component.html @@ -2,55 +2,26 @@

Créer un sondage

-

+

Planifiez des rendez-vous avec vos amis ou votre famille ou créez un sondage avec du texte, des images ou des liens… un sondage quoi !

-
- - - C'est parti - - - > - - -
+ +

Où sont mes sondages ?

-
-
+ \ No newline at end of file From c64f6b9ebe17554c500224784417471fb0f93ce5 Mon Sep 17 00:00:00 2001 From: newick Date: Mon, 12 Aug 2019 22:20:53 +0200 Subject: [PATCH 04/56] added delete buttons --- src/assets/scss/atoms/_buttons.scss | 26 +++++++++++++++++++------- src/assets/scss/variables.scss | 1 + 2 files changed, 20 insertions(+), 7 deletions(-) diff --git a/src/assets/scss/atoms/_buttons.scss b/src/assets/scss/atoms/_buttons.scss index 02926f1a..7b522b79 100644 --- a/src/assets/scss/atoms/_buttons.scss +++ b/src/assets/scss/atoms/_buttons.scss @@ -6,10 +6,13 @@ input[type="submit"] { padding-left: 1.5rem; font-size: 1.6rem; line-height: 1; + background-color: #fff; border: 2px solid $primary_color; border-radius: 0.3rem; - &.background-btn { + &.btn_background { + padding-top: 1rem; + padding-bottom: 1rem; font-weight: 600; background-color: $primary_color; @@ -19,7 +22,13 @@ input[type="submit"] { } &.btn_delete { + color: #fff; + background-color: $red; + &:hover { + color: $red; + background-color: #fff; + } } } @@ -28,11 +37,14 @@ input[type="submit"] { padding-bottom: 0.8rem; &:hover { - background-color: rgba($primary_color, .2); - } - - &.btn_delete { - + background-color: rgba($primary_color, 0.2); } } -} \ No newline at end of file + + &.btn_delete { + &, + &:hover { + border-color: $red; + } + } +} diff --git a/src/assets/scss/variables.scss b/src/assets/scss/variables.scss index 13e08f02..a3d567dc 100644 --- a/src/assets/scss/variables.scss +++ b/src/assets/scss/variables.scss @@ -9,6 +9,7 @@ $dark-lavender: #7d6c99; $dusty-orange: #f18647; $mango: #ffb92c; $violet: #bd10e0; +$red: #cd0000; // interpretations in app $primary_color: $sun-yellow; From 58835864d32061c0d1e4c2da8cd00a98561f5b9f Mon Sep 17 00:00:00 2001 From: newick Date: Mon, 12 Aug 2019 22:21:12 +0200 Subject: [PATCH 05/56] added useful classes and comments --- src/app/pages/kind/kind.component.html | 20 +++++++++++++++++++- src/assets/scss/useful_classes.scss | 6 ++++++ src/styles.scss | 1 + 3 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 src/assets/scss/useful_classes.scss diff --git a/src/app/pages/kind/kind.component.html b/src/app/pages/kind/kind.component.html index 826bacaa..cc0b63e5 100644 --- a/src/app/pages/kind/kind.component.html +++ b/src/app/pages/kind/kind.component.html @@ -42,7 +42,12 @@

- + +

+ Warning, in the mockups, some buttons have different paddings.
+ Example: "Copier le lien" has smaller paddings, maybe a `btn_small` class could do the job, to check. +

+
@@ -132,6 +137,19 @@

Molecules

+ +

Label + input text

diff --git a/src/assets/scss/useful_classes.scss b/src/assets/scss/useful_classes.scss new file mode 100644 index 00000000..49725305 --- /dev/null +++ b/src/assets/scss/useful_classes.scss @@ -0,0 +1,6 @@ +@charset "UTF_8"; + +.align-right { + display: flex; + justify-content: flex-end; +} \ No newline at end of file diff --git a/src/styles.scss b/src/styles.scss index 2705b3d7..28ab950a 100644 --- a/src/styles.scss +++ b/src/styles.scss @@ -1,6 +1,7 @@ /* You can add global styles to this file, and also import other style files */ @import "assets/scss/variables"; @import "assets/scss/default"; +@import "assets/scss/useful_classes"; @import "assets/scss/atoms/main"; @import "assets/scss/atoms/section"; From fcc770f82de0b47a81c8c74cdbd029e82f58005c Mon Sep 17 00:00:00 2001 From: newick Date: Tue, 13 Aug 2019 11:19:34 +0200 Subject: [PATCH 06/56] corrected links background --- src/assets/scss/atoms/_links.scss | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/assets/scss/atoms/_links.scss b/src/assets/scss/atoms/_links.scss index 30d7b40c..5408ad19 100644 --- a/src/assets/scss/atoms/_links.scss +++ b/src/assets/scss/atoms/_links.scss @@ -21,10 +21,12 @@ a { &.next::before, &.prev::after { position: absolute; - bottom: 0.7rem; + top: 0; + bottom: 0; display: block; width: 100%; height: 0.6rem; + margin: auto; background-color: $primary_color; z-index: -1; } From 00e3f00c9adecf6f93d8c3259b7cf71db3fe347a Mon Sep 17 00:00:00 2001 From: Le Libre Au Quotidien Date: Tue, 13 Aug 2019 19:22:02 +0200 Subject: [PATCH 07/56] Add img --- src/assets/img/.gitkeep | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 src/assets/img/.gitkeep diff --git a/src/assets/img/.gitkeep b/src/assets/img/.gitkeep new file mode 100644 index 00000000..e69de29b From ccf37a85362d9f3a226d0a8e3721702a616ec2c0 Mon Sep 17 00:00:00 2001 From: Le Libre Au Quotidien Date: Wed, 14 Aug 2019 09:44:47 +0200 Subject: [PATCH 08/56] select modify --- package-lock.json | 48 +++++++++++++++--------------- src/assets/img/fleche_bas.png | Bin 0 -> 158 bytes src/assets/scss/atoms/_forms.scss | 1 + 3 files changed, 25 insertions(+), 24 deletions(-) create mode 100644 src/assets/img/fleche_bas.png diff --git a/package-lock.json b/package-lock.json index 061e13ed..55cdd94a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -126,9 +126,9 @@ } }, "@angular/animations": { - "version": "8.2.1", - "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-8.2.1.tgz", - "integrity": "sha512-+E2KWj798sgby1hnC2LmK380jCZ7JLcxs5X4pM+kwJzS4T8spPTBecHRqz19C2Ea4AOSou4S1Oxs/4CCmVnj2w==", + "version": "8.2.2", + "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-8.2.2.tgz", + "integrity": "sha512-vOfZGMDnP5/n4MIxZqT49nVc305EYpRK+bz68hJmZd2QkTxQA+8j84xr4jfIC6zUWdyQqZhwWEF5Lqqy7G155g==", "requires": { "tslib": "^1.9.0" } @@ -183,17 +183,17 @@ } }, "@angular/common": { - "version": "8.2.1", - "resolved": "https://registry.npmjs.org/@angular/common/-/common-8.2.1.tgz", - "integrity": "sha512-CVewkkFswELDQ1qx2G7m2pj0IqDbSIY6O6wZtNvYCDrLXRVDwSXcQsjNP1pSWuD37dHT/nifimchfLiVuisPyg==", + "version": "8.2.2", + "resolved": "https://registry.npmjs.org/@angular/common/-/common-8.2.2.tgz", + "integrity": "sha512-PLV2+gj4pSe4MC5fwpEpI0JyWSKkNVvA65CCZvG2XXJTp4eS+ppkCZpEvbXqf7IewpKMAeFkuLi16r92pLG5Vw==", "requires": { "tslib": "^1.9.0" } }, "@angular/compiler": { - "version": "8.2.1", - "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-8.2.1.tgz", - "integrity": "sha512-kOGNh0K4k7vEIMLlEyG1A+UxPOIMp2b3IT0vBq5isRjXxGzEnahyBYtXwGI7G6ox+OoNKy1OZOPaK473fcO8zg==", + "version": "8.2.2", + "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-8.2.2.tgz", + "integrity": "sha512-UMhOQehvi9u1r4u48Ymwm5JkdOKoH057ImCo26WqRqJBUgA44xwmUsKLFAmSg1JqzWCO5pBDyA3RaNBscD8ZzQ==", "requires": { "tslib": "^1.9.0" } @@ -974,17 +974,17 @@ } }, "@angular/core": { - "version": "8.2.1", - "resolved": "https://registry.npmjs.org/@angular/core/-/core-8.2.1.tgz", - "integrity": "sha512-BMyLo/iOZ/eRR25CggWT3cexzfOnoey13NPeqYRtsO5dQUeVQPT1RH/bIWZ6yIPFSlBm6zUi/QqE1rjDautK5A==", + "version": "8.2.2", + "resolved": "https://registry.npmjs.org/@angular/core/-/core-8.2.2.tgz", + "integrity": "sha512-glQLJ3aeRWHMsN9QeJYis5FVdCg0lBU2s9aFX9i6WvVLscYmGoBk+TKsgO+uJjLnUUgsCPLRLzde02IJEQzCGw==", "requires": { "tslib": "^1.9.0" } }, "@angular/forms": { - "version": "8.2.1", - "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-8.2.1.tgz", - "integrity": "sha512-KcB652QBup+VWKDZICtpznr0a+v82oG0BowWetfkMgZAQj655uEMkkEtCTnfWnft4MLYlRr9ZoxQXc575TcZmA==", + "version": "8.2.2", + "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-8.2.2.tgz", + "integrity": "sha512-2PTTKWP+GoHRLf3S3HKzn5QJtCMMRaMmcTrbR10hgUmDPdMeULGNZG3OacV8rRbRv4TDtXoqbKp0NRFQ7xsofQ==", "requires": { "tslib": "^1.9.0" } @@ -996,25 +996,25 @@ "dev": true }, "@angular/platform-browser": { - "version": "8.2.1", - "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-8.2.1.tgz", - "integrity": "sha512-mzaXsHNTN3lBu3+H02GrRRu8Zo5R4GQiAb+MKdqiQMJ8hjnAmKJTYIVEbEnk/dJYbMZWvhxRGLmRIcntpYF38g==", + "version": "8.2.2", + "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-8.2.2.tgz", + "integrity": "sha512-8PivPsi4Lrtl3vkC/a/s4QUSlv2nXjtea4h+t7zEpj6o9TeONA5iNe1LHSruG66IfOCW/U8l1THHJAsTj/8OAw==", "requires": { "tslib": "^1.9.0" } }, "@angular/platform-browser-dynamic": { - "version": "8.2.1", - "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-8.2.1.tgz", - "integrity": "sha512-9tdpvEXFCgbMUeyVvIklyDPyg39cRN6MOrQihObAoBKOkcko9MKJIxDPCv8o/5FBrlBcu0VhREPK56aVD0g6UQ==", + "version": "8.2.2", + "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-8.2.2.tgz", + "integrity": "sha512-c34GNNe9iDX6OUw7PJua4BbkUVTeX+SYmv5Iv5+pNENp9n6Y/kousbpoaDjLx37/8ujE8c9U378OeopZoasE4Q==", "requires": { "tslib": "^1.9.0" } }, "@angular/router": { - "version": "8.2.1", - "resolved": "https://registry.npmjs.org/@angular/router/-/router-8.2.1.tgz", - "integrity": "sha512-CIhwBmRoVaZmfvGjuUomiyWn7OdHqzKbHq0poI3jlNJZCmzuBicYFctjCeqG6L2BIN0eVuJUJNeQ0OrcicP52w==", + "version": "8.2.2", + "resolved": "https://registry.npmjs.org/@angular/router/-/router-8.2.2.tgz", + "integrity": "sha512-aoIuSiVYBFh53dS4a79ZK23YjQ363x+8hakorDdAdrC3WwGST9YYDpVuNoa/gahkWIWCWN4Q0nl16cjQ6XI6BA==", "requires": { "tslib": "^1.9.0" } diff --git a/src/assets/img/fleche_bas.png b/src/assets/img/fleche_bas.png new file mode 100644 index 0000000000000000000000000000000000000000..097b23024e3b4314ccbb6662a47ce08dce406bee GIT binary patch literal 158 zcmeAS@N?(olHy`uVBq!ia0vp^oIuRM!3HF?&tBaMq*&4&eH|GXHuiJ>Nn{1`Lp@y_ zLnI`V6A}_`Fdq5;F=2vDvzfsEg9|xS_$IM8OF9V6&QvJ05MbV9$7Hz4NkCquk4dY+ zCdF03j_m Date: Thu, 15 Aug 2019 13:49:44 +0200 Subject: [PATCH 09/56] minimal commit --- src/assets/scss/atoms/_forms.scss | 1 - 1 file changed, 1 deletion(-) diff --git a/src/assets/scss/atoms/_forms.scss b/src/assets/scss/atoms/_forms.scss index eef1ea97..4d6bd10c 100644 --- a/src/assets/scss/atoms/_forms.scss +++ b/src/assets/scss/atoms/_forms.scss @@ -15,7 +15,6 @@ select { display: inline-block; } - textarea { width: 100%; border-left: 3px solid $primary_color; From 2e1078c4e437372a8e5705709260cbb76e6264ac Mon Sep 17 00:00:00 2001 From: TitiAlone Date: Thu, 15 Aug 2019 20:44:42 +0200 Subject: [PATCH 10/56] Add dropdown arrow --- src/assets/scss/atoms/_forms.scss | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/assets/scss/atoms/_forms.scss b/src/assets/scss/atoms/_forms.scss index 4d6bd10c..087f45df 100644 --- a/src/assets/scss/atoms/_forms.scss +++ b/src/assets/scss/atoms/_forms.scss @@ -29,7 +29,14 @@ option { background: none; border-radius: 0; - // TODO -> check what angular can do + find a way to add the arrow + background-color: transparent; + background-image: url("./assets/img/fleche_bas.png"); + background-repeat: no-repeat; + background-size: 9px 8px; + background-position: right center; + background-clip: border-box; + + // TODO -> check what angular can do } label { From 9996d954dd5adafd3951e2357ae35fad6f99784e Mon Sep 17 00:00:00 2001 From: Le Libre Au Quotidien Date: Fri, 6 Sep 2019 10:34:12 +0200 Subject: [PATCH 11/56] Change colors --- package-lock.json | 48 +++++++++++++++---------------- src/assets/scss/atoms/_links.scss | 5 ++-- src/assets/scss/variables.scss | 10 +++---- 3 files changed, 32 insertions(+), 31 deletions(-) diff --git a/package-lock.json b/package-lock.json index 55cdd94a..3898eb0b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -126,9 +126,9 @@ } }, "@angular/animations": { - "version": "8.2.2", - "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-8.2.2.tgz", - "integrity": "sha512-vOfZGMDnP5/n4MIxZqT49nVc305EYpRK+bz68hJmZd2QkTxQA+8j84xr4jfIC6zUWdyQqZhwWEF5Lqqy7G155g==", + "version": "8.2.5", + "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-8.2.5.tgz", + "integrity": "sha512-t4TT11YIRGKSNYz5ngZ7trVPKZMtEql2LaPaVQnAZ6Cefrf+1s431mVh7ndPtGTLxRwr6RPTUe+Tc+5e2ROcmg==", "requires": { "tslib": "^1.9.0" } @@ -183,17 +183,17 @@ } }, "@angular/common": { - "version": "8.2.2", - "resolved": "https://registry.npmjs.org/@angular/common/-/common-8.2.2.tgz", - "integrity": "sha512-PLV2+gj4pSe4MC5fwpEpI0JyWSKkNVvA65CCZvG2XXJTp4eS+ppkCZpEvbXqf7IewpKMAeFkuLi16r92pLG5Vw==", + "version": "8.2.5", + "resolved": "https://registry.npmjs.org/@angular/common/-/common-8.2.5.tgz", + "integrity": "sha512-7iSDLVhS+jbVRkECpbTzU9+6IQPS3Wl0CF73EA0sdzPbTC2GKvGfM9WLnIZZIxewkii6Wn1Yb0x0qRdWMT2STA==", "requires": { "tslib": "^1.9.0" } }, "@angular/compiler": { - "version": "8.2.2", - "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-8.2.2.tgz", - "integrity": "sha512-UMhOQehvi9u1r4u48Ymwm5JkdOKoH057ImCo26WqRqJBUgA44xwmUsKLFAmSg1JqzWCO5pBDyA3RaNBscD8ZzQ==", + "version": "8.2.5", + "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-8.2.5.tgz", + "integrity": "sha512-u3OgSBTupn9DN1uDF+NmXqN7w9m6bbrIalJkwdw+kFXnXt8JpdIeJmeV2jN4wLuGp6A3sWS1ze+6u4kpFHMqTw==", "requires": { "tslib": "^1.9.0" } @@ -974,17 +974,17 @@ } }, "@angular/core": { - "version": "8.2.2", - "resolved": "https://registry.npmjs.org/@angular/core/-/core-8.2.2.tgz", - "integrity": "sha512-glQLJ3aeRWHMsN9QeJYis5FVdCg0lBU2s9aFX9i6WvVLscYmGoBk+TKsgO+uJjLnUUgsCPLRLzde02IJEQzCGw==", + "version": "8.2.5", + "resolved": "https://registry.npmjs.org/@angular/core/-/core-8.2.5.tgz", + "integrity": "sha512-cBEiHhLE8VFIdB53seR+nQYNQFlNloKgD7ro26eMazvRF94wBSzO9VrD3+/XmNWdIYibU7PBaXhDCOKTe+ZSHw==", "requires": { "tslib": "^1.9.0" } }, "@angular/forms": { - "version": "8.2.2", - "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-8.2.2.tgz", - "integrity": "sha512-2PTTKWP+GoHRLf3S3HKzn5QJtCMMRaMmcTrbR10hgUmDPdMeULGNZG3OacV8rRbRv4TDtXoqbKp0NRFQ7xsofQ==", + "version": "8.2.5", + "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-8.2.5.tgz", + "integrity": "sha512-USJdzopslLC7JVMu7v58SA/g0NWeQeAM16qcR4LHj+wdMbJ+5G64LdZQe9vEHRdgGpgrZU4c2ODAwDEa1MzIDA==", "requires": { "tslib": "^1.9.0" } @@ -996,25 +996,25 @@ "dev": true }, "@angular/platform-browser": { - "version": "8.2.2", - "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-8.2.2.tgz", - "integrity": "sha512-8PivPsi4Lrtl3vkC/a/s4QUSlv2nXjtea4h+t7zEpj6o9TeONA5iNe1LHSruG66IfOCW/U8l1THHJAsTj/8OAw==", + "version": "8.2.5", + "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-8.2.5.tgz", + "integrity": "sha512-JIm4uOcgQq0oX1oTzRbQpwxFYAEYKiLi/uAPUf2CZeU2lVxMkhScAW0b8+tVFLIJ7IaVx5d2QxZ6HK81r+QSVg==", "requires": { "tslib": "^1.9.0" } }, "@angular/platform-browser-dynamic": { - "version": "8.2.2", - "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-8.2.2.tgz", - "integrity": "sha512-c34GNNe9iDX6OUw7PJua4BbkUVTeX+SYmv5Iv5+pNENp9n6Y/kousbpoaDjLx37/8ujE8c9U378OeopZoasE4Q==", + "version": "8.2.5", + "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-8.2.5.tgz", + "integrity": "sha512-4Ewg8I3T0t6/ClLt5ZFZ6ncDTqvEyI84h0K1cnNTsyoup3QKrY/FnklFbZbNl4ONVioHS6fkEg3R+xt1WthhYQ==", "requires": { "tslib": "^1.9.0" } }, "@angular/router": { - "version": "8.2.2", - "resolved": "https://registry.npmjs.org/@angular/router/-/router-8.2.2.tgz", - "integrity": "sha512-aoIuSiVYBFh53dS4a79ZK23YjQ363x+8hakorDdAdrC3WwGST9YYDpVuNoa/gahkWIWCWN4Q0nl16cjQ6XI6BA==", + "version": "8.2.5", + "resolved": "https://registry.npmjs.org/@angular/router/-/router-8.2.5.tgz", + "integrity": "sha512-htkxrbB8rbOKIcfd0fV9KcxJGnVg8bAJ6atIMPETeI3dBORq6crzvML0B/yx6R+Ooy5e3Td3yXBsolexMxT0mg==", "requires": { "tslib": "^1.9.0" } diff --git a/src/assets/scss/atoms/_links.scss b/src/assets/scss/atoms/_links.scss index 5408ad19..561103c8 100644 --- a/src/assets/scss/atoms/_links.scss +++ b/src/assets/scss/atoms/_links.scss @@ -27,7 +27,7 @@ a { width: 100%; height: 0.6rem; margin: auto; - background-color: $primary_color; + background-color: $secondary_color; z-index: -1; } @@ -54,7 +54,8 @@ a { &:hover { &.next::before, &.prev::after { - background-color: $secondary_color; + background-color: rgba($primary_color,0.7); + } } diff --git a/src/assets/scss/variables.scss b/src/assets/scss/variables.scss index a3d567dc..9b1e2dfd 100644 --- a/src/assets/scss/variables.scss +++ b/src/assets/scss/variables.scss @@ -3,21 +3,21 @@ // colors from styleguide https://app.zeplin.io/project/5d4d83d68866d6522ff2ff10/styleguide/colors?cid=5d502bb032e23e3516af8154 $camo: #839546; $black: #000000; -$sun-yellow: #ffd52c; +$ugly-purple: #b24eb7; +$lavender-pink : #e9bdeb; $white: #ffffff; $dark-lavender: #7d6c99; $dusty-orange: #f18647; -$mango: #ffb92c; $violet: #bd10e0; $red: #cd0000; // interpretations in app -$primary_color: $sun-yellow; -$secondary_color: $mango; +$primary_color: $ugly-purple; +$secondary_color: $lavender-pink; $font_color: $black; $logo_color: $dark-lavender; $logo_color_2: $camo; // FONT $default_font : "pt_sans"; -$title_font: "proza_libre"; \ No newline at end of file +$title_font: "proza_libre"; From 1d6f1dc95580fb8432af93290b731c1e107ecea7 Mon Sep 17 00:00:00 2001 From: Le Libre Au Quotidien Date: Fri, 6 Sep 2019 10:41:48 +0200 Subject: [PATCH 12/56] Add input borders --- src/assets/scss/atoms/_forms.scss | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/assets/scss/atoms/_forms.scss b/src/assets/scss/atoms/_forms.scss index 087f45df..6676098d 100644 --- a/src/assets/scss/atoms/_forms.scss +++ b/src/assets/scss/atoms/_forms.scss @@ -4,10 +4,9 @@ input, select, textarea { padding: 1rem; - border-top: none; - border-right: none; + border: 1px solid $secondary_color; border-bottom: 3px solid $primary_color; - border-left: none; + } input, From b763252d765360da96f29c827258b76e100be567 Mon Sep 17 00:00:00 2001 From: Le Libre Au Quotidien Date: Fri, 6 Sep 2019 10:44:04 +0200 Subject: [PATCH 13/56] delete left border on textarea --- src/assets/scss/atoms/_forms.scss | 1 - 1 file changed, 1 deletion(-) diff --git a/src/assets/scss/atoms/_forms.scss b/src/assets/scss/atoms/_forms.scss index 6676098d..8a20db20 100644 --- a/src/assets/scss/atoms/_forms.scss +++ b/src/assets/scss/atoms/_forms.scss @@ -16,7 +16,6 @@ select { textarea { width: 100%; - border-left: 3px solid $primary_color; } select, From b091a190cf24785e78bce31086ce7f09aa527c64 Mon Sep 17 00:00:00 2001 From: Le Libre Au Quotidien Date: Fri, 6 Sep 2019 10:50:54 +0200 Subject: [PATCH 14/56] Change png to svg select image --- src/assets/img/fleche_bas.svg | 7 +++++++ src/assets/scss/atoms/_forms.scss | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 src/assets/img/fleche_bas.svg diff --git a/src/assets/img/fleche_bas.svg b/src/assets/img/fleche_bas.svg new file mode 100644 index 00000000..2801334c --- /dev/null +++ b/src/assets/img/fleche_bas.svg @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/src/assets/scss/atoms/_forms.scss b/src/assets/scss/atoms/_forms.scss index 8a20db20..8e21a042 100644 --- a/src/assets/scss/atoms/_forms.scss +++ b/src/assets/scss/atoms/_forms.scss @@ -28,7 +28,7 @@ option { border-radius: 0; background-color: transparent; - background-image: url("./assets/img/fleche_bas.png"); + background-image: url("./assets/img/fleche_bas.svg"); background-repeat: no-repeat; background-size: 9px 8px; background-position: right center; From bddc200cbdc44e0266eaa018c0d9f9a0dff5e8e0 Mon Sep 17 00:00:00 2001 From: Le Libre Au Quotidien Date: Fri, 6 Sep 2019 10:56:00 +0200 Subject: [PATCH 15/56] change select padding --- src/assets/scss/atoms/_forms.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/src/assets/scss/atoms/_forms.scss b/src/assets/scss/atoms/_forms.scss index 8e21a042..a6ff925d 100644 --- a/src/assets/scss/atoms/_forms.scss +++ b/src/assets/scss/atoms/_forms.scss @@ -29,6 +29,7 @@ option { background-color: transparent; background-image: url("./assets/img/fleche_bas.svg"); + padding-right:1.3rem; background-repeat: no-repeat; background-size: 9px 8px; background-position: right center; From e00dff4acb1a09f759779656af0a80e5d5e72718 Mon Sep 17 00:00:00 2001 From: Le Libre Au Quotidien Date: Fri, 6 Sep 2019 11:04:54 +0200 Subject: [PATCH 16/56] change select padding --- src/assets/scss/atoms/_forms.scss | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/assets/scss/atoms/_forms.scss b/src/assets/scss/atoms/_forms.scss index a6ff925d..18ef114a 100644 --- a/src/assets/scss/atoms/_forms.scss +++ b/src/assets/scss/atoms/_forms.scss @@ -29,10 +29,12 @@ option { background-color: transparent; background-image: url("./assets/img/fleche_bas.svg"); - padding-right:1.3rem; + padding-right:1.5rem; + background-repeat: no-repeat; background-size: 9px 8px; - background-position: right center; + background-position: right 1rem center; + background-clip: border-box; // TODO -> check what angular can do From ba4fad8a31660e5c0a761e7507d9ff7a6f858a0b Mon Sep 17 00:00:00 2001 From: Le Libre Au Quotidien Date: Fri, 6 Sep 2019 11:32:45 +0200 Subject: [PATCH 17/56] remove placeholder --- src/app/form-container/form-container.component.html | 3 --- src/assets/scss/atoms/_forms.scss | 2 ++ 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/app/form-container/form-container.component.html b/src/app/form-container/form-container.component.html index 3dfdb9c1..2705ca1a 100644 --- a/src/app/form-container/form-container.component.html +++ b/src/app/form-container/form-container.component.html @@ -38,7 +38,6 @@ type="text" id="poll_title" name="poll_title" - placeholder="titre" [(ngModel)]="config.title" > @@ -51,7 +50,6 @@ type="text" name="my_name" id="my_name" - placeholder="mon nom" [(ngModel)]="config.myName" > @@ -68,7 +66,6 @@ id="poll_description" name="poll_description" [(ngModel)]="config.description" - placeholder="description" cols="50" lines="5" > diff --git a/src/assets/scss/atoms/_forms.scss b/src/assets/scss/atoms/_forms.scss index 18ef114a..53981723 100644 --- a/src/assets/scss/atoms/_forms.scss +++ b/src/assets/scss/atoms/_forms.scss @@ -12,6 +12,8 @@ textarea { input, select { display: inline-block; + margin-bottom:10px; + margin-left:5px; } textarea { From 48e77024d54edfa950ed1cc89eab4110c830b8ff Mon Sep 17 00:00:00 2001 From: Le Libre Au Quotidien Date: Fri, 6 Sep 2019 11:37:47 +0200 Subject: [PATCH 18/56] change home order text --- .../form-container.component.html | 26 ++++++++++--------- 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/src/app/form-container/form-container.component.html b/src/app/form-container/form-container.component.html index 2705ca1a..543ef980 100644 --- a/src/app/form-container/form-container.component.html +++ b/src/app/form-container/form-container.component.html @@ -25,6 +25,7 @@ +
-
- - -
+
- +
+ + +
Date: Fri, 6 Sep 2019 11:44:52 +0200 Subject: [PATCH 19/56] added flex-line --- .../form-container.component.html | 84 +++++-------------- src/assets/scss/molecules/_flex-line.scss | 11 +++ src/styles.scss | 1 + 3 files changed, 35 insertions(+), 61 deletions(-) create mode 100644 src/assets/scss/molecules/_flex-line.scss diff --git a/src/app/form-container/form-container.component.html b/src/app/form-container/form-container.component.html index 543ef980..c90e354b 100644 --- a/src/app/form-container/form-container.component.html +++ b/src/app/form-container/form-container.component.html @@ -4,82 +4,44 @@

Pour commencer

- - Je veux créer un sondage - - - - - \ No newline at end of file diff --git a/src/assets/scss/molecules/_flex-line.scss b/src/assets/scss/molecules/_flex-line.scss new file mode 100644 index 00000000..296d6b1b --- /dev/null +++ b/src/assets/scss/molecules/_flex-line.scss @@ -0,0 +1,11 @@ +@charset "UTF-8"; + +.flex-line { + display: flex; + align-items: center; + + & > input, + & > select { + flex-grow: 1; + } +} \ No newline at end of file diff --git a/src/styles.scss b/src/styles.scss index 28ab950a..8008fc10 100644 --- a/src/styles.scss +++ b/src/styles.scss @@ -15,3 +15,4 @@ @import "assets/scss/molecules/logo"; @import "assets/scss/molecules/debug"; +@import "assets/scss/molecules/flex-line"; From ef9a0fe7704a18da5c5b4e75ee0839b53e6e70c3 Mon Sep 17 00:00:00 2001 From: newick Date: Fri, 6 Sep 2019 11:47:54 +0200 Subject: [PATCH 20/56] added wrap to flex-line --- .../form-container.component.html | 81 +++++++++---------- src/assets/scss/molecules/_flex-line.scss | 1 + 2 files changed, 40 insertions(+), 42 deletions(-) diff --git a/src/app/form-container/form-container.component.html b/src/app/form-container/form-container.component.html index c90e354b..908695d9 100644 --- a/src/app/form-container/form-container.component.html +++ b/src/app/form-container/form-container.component.html @@ -1,47 +1,44 @@ -
+ +

+ Pour commencer +

- -

- Pour commencer -

+
+ + Je veux créer un sondage + + +
-
- - Je veux créer un sondage - - -
+
+ + -
- - +
-
+
+ + -
- - - -
-
- - -
- - Continuer - -
\ No newline at end of file +
+
+ + +
+ + Continuer + \ No newline at end of file diff --git a/src/assets/scss/molecules/_flex-line.scss b/src/assets/scss/molecules/_flex-line.scss index 296d6b1b..0bd372f1 100644 --- a/src/assets/scss/molecules/_flex-line.scss +++ b/src/assets/scss/molecules/_flex-line.scss @@ -3,6 +3,7 @@ .flex-line { display: flex; align-items: center; + flex-wrap: wrap; & > input, & > select { From 53a550bdc1ce33f691bffa0cd40a579142dcea05 Mon Sep 17 00:00:00 2001 From: newick Date: Fri, 6 Sep 2019 12:01:59 +0200 Subject: [PATCH 21/56] changed content width --- src/assets/scss/atoms/_main.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/assets/scss/atoms/_main.scss b/src/assets/scss/atoms/_main.scss index cb902305..527ff8df 100644 --- a/src/assets/scss/atoms/_main.scss +++ b/src/assets/scss/atoms/_main.scss @@ -1,9 +1,9 @@ @charset "UTF-8"; main { - max-width: 500px; // to look like the styleguide, to remove when we will have full width views + max-width: 320px; // to look like the styleguide, to remove when we will have full width views width: 100%; display: block; margin: 0 auto; - padding: 0 1.2rem; + padding: 0 2rem; } From 3be3bb44f1886e72a828662d267c090a477a0627 Mon Sep 17 00:00:00 2001 From: Le Libre Au Quotidien Date: Fri, 6 Sep 2019 18:28:57 +0200 Subject: [PATCH 22/56] Change button style on home --- src/app/form-container/form-container.component.html | 4 ++-- src/app/pages/kind/kind.component.html | 4 +++- src/assets/scss/atoms/_buttons.scss | 3 +++ 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/app/form-container/form-container.component.html b/src/app/form-container/form-container.component.html index 908695d9..eef1760a 100644 --- a/src/app/form-container/form-container.component.html +++ b/src/app/form-container/form-container.component.html @@ -39,6 +39,6 @@ - + diff --git a/src/app/pages/kind/kind.component.html b/src/app/pages/kind/kind.component.html index cc0b63e5..ec02d1a0 100644 --- a/src/app/pages/kind/kind.component.html +++ b/src/app/pages/kind/kind.component.html @@ -34,6 +34,7 @@

+

@@ -41,6 +42,7 @@

+

@@ -212,4 +214,4 @@

Graphics

that
-
\ No newline at end of file + diff --git a/src/assets/scss/atoms/_buttons.scss b/src/assets/scss/atoms/_buttons.scss index 7b522b79..9e27d45f 100644 --- a/src/assets/scss/atoms/_buttons.scss +++ b/src/assets/scss/atoms/_buttons.scss @@ -30,6 +30,9 @@ input[type="submit"] { background-color: #fff; } } + &.btn_white_text{ + color:$white; + } } &.btn_border { From e0898ba3945b8617609bc1a1a24646e27d1713ee Mon Sep 17 00:00:00 2001 From: Le Libre Au Quotidien Date: Fri, 6 Sep 2019 18:46:12 +0200 Subject: [PATCH 23/56] style answers page --- src/app/pages/answers/answers.component.html | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/src/app/pages/answers/answers.component.html b/src/app/pages/answers/answers.component.html index 9cbaff0c..34633eee 100644 --- a/src/app/pages/answers/answers.component.html +++ b/src/app/pages/answers/answers.component.html @@ -4,7 +4,7 @@

- vous pouvez utiliser la syntaxe markdown + Vous pouvez utiliser la syntaxe markdown

    @@ -14,17 +14,15 @@ type="text" class="answer" [(ngModel)]="answer.text" - placeholder="réponse" - > - + >
- - Voyons ce que ça donne +
+ From 132a7fabd3c089b84dd237d37c9902996d1f2427 Mon Sep 17 00:00:00 2001 From: Le Libre Au Quotidien Date: Fri, 6 Sep 2019 18:58:48 +0200 Subject: [PATCH 24/56] add button --- src/app/pages/answers/answers.component.html | 1 + src/app/pages/resume/resume.component.html | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/app/pages/answers/answers.component.html b/src/app/pages/answers/answers.component.html index 34633eee..b0e135fa 100644 --- a/src/app/pages/answers/answers.component.html +++ b/src/app/pages/answers/answers.component.html @@ -25,4 +25,5 @@
+ Retour diff --git a/src/app/pages/resume/resume.component.html b/src/app/pages/resume/resume.component.html index adf36993..0ec05d41 100644 --- a/src/app/pages/resume/resume.component.html +++ b/src/app/pages/resume/resume.component.html @@ -7,4 +7,4 @@ {{config |json}} -C'est parfait! + From df859e02818f2ffe2b2e9340eae725d540fa0e23 Mon Sep 17 00:00:00 2001 From: Le Libre Au Quotidien Date: Sun, 8 Sep 2019 18:53:10 +0200 Subject: [PATCH 25/56] Testing --- src/app/pages/end-confirmation/end-confirmation.component.html | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/app/pages/end-confirmation/end-confirmation.component.html b/src/app/pages/end-confirmation/end-confirmation.component.html index 108fbddb..bc59331c 100644 --- a/src/app/pages/end-confirmation/end-confirmation.component.html +++ b/src/app/pages/end-confirmation/end-confirmation.component.html @@ -1,6 +1,9 @@

Et c'est tout pour nous!

+

Votre sondage {{config | json : 4}} a bien été crée
+ Voici les liens d'accès au sondage,conservez les soigneusement +

Coté administrateur-ice-eux

Coté sondés

recevoir les liens par e-mail

From 326f2731ff9caf811cab32062998cc62a6c116b6 Mon Sep 17 00:00:00 2001 From: Le Libre Au Quotidien Date: Mon, 9 Sep 2019 11:20:19 +0200 Subject: [PATCH 26/56] change link --- src/app/pages/answers/answers.component.html | 2 +- src/app/pages/end-confirmation/end-confirmation.component.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/pages/answers/answers.component.html b/src/app/pages/answers/answers.component.html index b0e135fa..71d2f47a 100644 --- a/src/app/pages/answers/answers.component.html +++ b/src/app/pages/answers/answers.component.html @@ -25,5 +25,5 @@
- Retour + diff --git a/src/app/pages/end-confirmation/end-confirmation.component.html b/src/app/pages/end-confirmation/end-confirmation.component.html index bc59331c..f98c8878 100644 --- a/src/app/pages/end-confirmation/end-confirmation.component.html +++ b/src/app/pages/end-confirmation/end-confirmation.component.html @@ -1,7 +1,7 @@

Et c'est tout pour nous!

-

Votre sondage {{config | json : 4}} a bien été crée
+

Votre sondage "Nom du sondage" a bien été crée
Voici les liens d'accès au sondage,conservez les soigneusement

Coté administrateur-ice-eux

From aab6ea801b81ee0aa8368483a2f15070ea574cf9 Mon Sep 17 00:00:00 2001 From: Le Libre Au Quotidien Date: Tue, 10 Sep 2019 11:03:26 +0200 Subject: [PATCH 27/56] Remove placeholder --- .../create-or-retrieve/create-or-retrieve.component.html | 4 +--- .../pages/end-confirmation/end-confirmation.component.html | 2 +- src/app/pages/home/home.component.html | 3 --- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/src/app/pages/create-or-retrieve/create-or-retrieve.component.html b/src/app/pages/create-or-retrieve/create-or-retrieve.component.html index 709cb22c..b05c4d93 100644 --- a/src/app/pages/create-or-retrieve/create-or-retrieve.component.html +++ b/src/app/pages/create-or-retrieve/create-or-retrieve.component.html @@ -20,9 +20,7 @@ > C'est parti - - > - + diff --git a/src/app/pages/end-confirmation/end-confirmation.component.html b/src/app/pages/end-confirmation/end-confirmation.component.html index d6aaf4ee..d354ec5c 100644 --- a/src/app/pages/end-confirmation/end-confirmation.component.html +++ b/src/app/pages/end-confirmation/end-confirmation.component.html @@ -1,7 +1,7 @@

Et c'est tout pour nous!

-

Votre sondage "Nom du sondage" a bien été crée
+

Votre sondage "{{ config.title }}" a bien été crée
Voici les liens d'accès au sondage,conservez les soigneusement

Coté administrateur-ice-eux

diff --git a/src/app/pages/home/home.component.html b/src/app/pages/home/home.component.html index a3b58fc5..82dac2f5 100644 --- a/src/app/pages/home/home.component.html +++ b/src/app/pages/home/home.component.html @@ -38,7 +38,6 @@ type="text" id="poll_title" name="poll_title" - placeholder="titre" [(ngModel)]="config.title" > @@ -51,7 +50,6 @@ type="text" name="my_name" id="my_name" - placeholder="mon nom" [(ngModel)]="config.myName" > @@ -68,7 +66,6 @@ id="poll_description" name="poll_description" [(ngModel)]="config.description" - placeholder="description" cols="50" lines="5" > From 0c0dd7063dd7a47e1440366dd7b976e3e75e169d Mon Sep 17 00:00:00 2001 From: Le Libre Au Quotidien Date: Mon, 30 Sep 2019 18:48:26 +0200 Subject: [PATCH 28/56] modify create or retrive page --- .../create-or-retrieve.component.html | 10 +++++----- src/assets/scss/atoms/_buttons.scss | 2 ++ src/assets/scss/atoms/_headings.scss | 6 +++++- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/app/pages/create-or-retrieve/create-or-retrieve.component.html b/src/app/pages/create-or-retrieve/create-or-retrieve.component.html index b05c4d93..319bab73 100644 --- a/src/app/pages/create-or-retrieve/create-or-retrieve.component.html +++ b/src/app/pages/create-or-retrieve/create-or-retrieve.component.html @@ -10,8 +10,8 @@ liens… un sondage quoi !

- + +

- Où sont mes sondages ? + Mes sondages

Date: Mon, 30 Sep 2019 19:07:00 +0200 Subject: [PATCH 29/56] stylise button --- src/app/pages/home/home.component.html | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/app/pages/home/home.component.html b/src/app/pages/home/home.component.html index 82dac2f5..f9f27499 100644 --- a/src/app/pages/home/home.component.html +++ b/src/app/pages/home/home.component.html @@ -72,12 +72,18 @@ - Continuer + + -
From 6cc09aebb5f175d09862228799735aeed1ac1c85 Mon Sep 17 00:00:00 2001 From: Le Libre Au Quotidien Date: Tue, 1 Oct 2019 18:32:24 +0200 Subject: [PATCH 30/56] Add html code for voting --- src/app/app.module.ts | 2 ++ src/app/pages/kind/kind.component.html | 2 +- .../vote-choice/vote-choice.component.html | 15 +++++++++++ .../vote-choice/vote-choice.component.scss | 5 ++++ .../vote-choice/vote-choice.component.spec.ts | 25 +++++++++++++++++++ src/app/vote-choice/vote-choice.component.ts | 15 +++++++++++ src/assets/img/check-2.svg | 6 +++++ src/assets/img/check.svg | 3 +++ src/assets/img/croix.svg | 3 +++ src/assets/img/votant-pas-sur.svg | 10 ++++++++ src/assets/img/votant-sur.svg | 9 +++++++ src/assets/scss/variables.scss | 2 ++ 12 files changed, 96 insertions(+), 1 deletion(-) create mode 100644 src/app/vote-choice/vote-choice.component.html create mode 100644 src/app/vote-choice/vote-choice.component.scss create mode 100644 src/app/vote-choice/vote-choice.component.spec.ts create mode 100644 src/app/vote-choice/vote-choice.component.ts create mode 100644 src/assets/img/check-2.svg create mode 100644 src/assets/img/check.svg create mode 100644 src/assets/img/croix.svg create mode 100644 src/assets/img/votant-pas-sur.svg create mode 100644 src/assets/img/votant-sur.svg diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 2f51ec2e..50301b68 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -28,6 +28,7 @@ import { VotingGraphComponent } from './pages/voting-graph/voting-graph.componen import { VotingChoiceComponent } from './pages/voting-choice/voting-choice.component'; import { PasswordComponent } from './pages/password/password.component'; import { HomeComponent } from './pages/home/home.component'; +import { VoteChoiceComponent } from './vote-choice/vote-choice.component'; registerLocaleData(localeFr, 'fr'); @@ -52,6 +53,7 @@ registerLocaleData(localeFr, 'fr'); VotingChoiceComponent, PasswordComponent, HomeComponent, + VoteChoiceComponent, ], imports: [ diff --git a/src/app/pages/kind/kind.component.html b/src/app/pages/kind/kind.component.html index 3fa54208..a826fdb7 100644 --- a/src/app/pages/kind/kind.component.html +++ b/src/app/pages/kind/kind.component.html @@ -142,7 +142,7 @@

Molecules

- +

Useful classes

diff --git a/src/app/vote-choice/vote-choice.component.html b/src/app/vote-choice/vote-choice.component.html new file mode 100644 index 00000000..455badb7 --- /dev/null +++ b/src/app/vote-choice/vote-choice.component.html @@ -0,0 +1,15 @@ +
+
+

Jeudi 17 aout

+

08:00

+
+
+

14

+

76

+
+
+ + + +
+
diff --git a/src/app/vote-choice/vote-choice.component.scss b/src/app/vote-choice/vote-choice.component.scss new file mode 100644 index 00000000..e66ca3a5 --- /dev/null +++ b/src/app/vote-choice/vote-choice.component.scss @@ -0,0 +1,5 @@ +.choice_container{ + width:320px; + height:172px; + box-shadow: 0 3px 6px 0 rgba(black, 0.2); +} diff --git a/src/app/vote-choice/vote-choice.component.spec.ts b/src/app/vote-choice/vote-choice.component.spec.ts new file mode 100644 index 00000000..f24b9070 --- /dev/null +++ b/src/app/vote-choice/vote-choice.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { VoteChoiceComponent } from './vote-choice.component'; + +describe('VoteChoiceComponent', () => { + let component: VoteChoiceComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ VoteChoiceComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(VoteChoiceComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/vote-choice/vote-choice.component.ts b/src/app/vote-choice/vote-choice.component.ts new file mode 100644 index 00000000..32b684dc --- /dev/null +++ b/src/app/vote-choice/vote-choice.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'framadate-vote-choice', + templateUrl: './vote-choice.component.html', + styleUrls: ['./vote-choice.component.scss'] +}) +export class VoteChoiceComponent implements OnInit { + + constructor() { } + + ngOnInit() { + } + +} diff --git a/src/assets/img/check-2.svg b/src/assets/img/check-2.svg new file mode 100644 index 00000000..2fd97ed2 --- /dev/null +++ b/src/assets/img/check-2.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/assets/img/check.svg b/src/assets/img/check.svg new file mode 100644 index 00000000..52234938 --- /dev/null +++ b/src/assets/img/check.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/assets/img/croix.svg b/src/assets/img/croix.svg new file mode 100644 index 00000000..1c398859 --- /dev/null +++ b/src/assets/img/croix.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/assets/img/votant-pas-sur.svg b/src/assets/img/votant-pas-sur.svg new file mode 100644 index 00000000..f8d8ade1 --- /dev/null +++ b/src/assets/img/votant-pas-sur.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/src/assets/img/votant-sur.svg b/src/assets/img/votant-sur.svg new file mode 100644 index 00000000..3d97906e --- /dev/null +++ b/src/assets/img/votant-sur.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/src/assets/scss/variables.scss b/src/assets/scss/variables.scss index 9b1e2dfd..ae263ce9 100644 --- a/src/assets/scss/variables.scss +++ b/src/assets/scss/variables.scss @@ -10,6 +10,7 @@ $dark-lavender: #7d6c99; $dusty-orange: #f18647; $violet: #bd10e0; $red: #cd0000; +$cool-grey: #aeafb1; // interpretations in app $primary_color: $ugly-purple; @@ -17,6 +18,7 @@ $secondary_color: $lavender-pink; $font_color: $black; $logo_color: $dark-lavender; $logo_color_2: $camo; +$choice_select_border_color: $cool-grey; // FONT $default_font : "pt_sans"; From e059d45f73b5ee16925260139bdf066a3ac1b4d0 Mon Sep 17 00:00:00 2001 From: Le Libre Au Quotidien Date: Tue, 1 Oct 2019 18:59:14 +0200 Subject: [PATCH 31/56] Add css on vote component : No works --- .../vote-choice/vote-choice.component.html | 14 ++++++------- .../vote-choice/vote-choice.component.scss | 21 +++++++++++++++++++ 2 files changed, 28 insertions(+), 7 deletions(-) diff --git a/src/app/vote-choice/vote-choice.component.html b/src/app/vote-choice/vote-choice.component.html index 455badb7..63f167a4 100644 --- a/src/app/vote-choice/vote-choice.component.html +++ b/src/app/vote-choice/vote-choice.component.html @@ -1,15 +1,15 @@
-

Jeudi 17 aout

-

08:00

+

Jeudi 17 aout

+

08:00

-

14

-

76

+

14

+

76

- - - + + +
diff --git a/src/app/vote-choice/vote-choice.component.scss b/src/app/vote-choice/vote-choice.component.scss index e66ca3a5..5695896c 100644 --- a/src/app/vote-choice/vote-choice.component.scss +++ b/src/app/vote-choice/vote-choice.component.scss @@ -2,4 +2,25 @@ width:320px; height:172px; box-shadow: 0 3px 6px 0 rgba(black, 0.2); + overflow: auto; + display:flex; +} +#vote img{ +border: 1px solid #aeafb1; +border-radius: 48px; +} +h2,h3{ + font-weight: normal; +} +span{ + font-weight: bold; + font-size:24px; +} +#nombre_vote{ + vertical-align: middle; + float:left; + +} +#nombre_vote p{ + line-height: 20px; } From 9c4fabb176e78f28b72439d6e4f5ee138f404069 Mon Sep 17 00:00:00 2001 From: Le Libre Au Quotidien Date: Wed, 2 Oct 2019 14:10:29 +0200 Subject: [PATCH 32/56] Minimal commit --- src/app/vote-choice/vote-choice.component.html | 8 ++++++++ src/app/vote-choice/vote-choice.component.scss | 3 +++ 2 files changed, 11 insertions(+) diff --git a/src/app/vote-choice/vote-choice.component.html b/src/app/vote-choice/vote-choice.component.html index 63f167a4..ca96beee 100644 --- a/src/app/vote-choice/vote-choice.component.html +++ b/src/app/vote-choice/vote-choice.component.html @@ -8,8 +8,16 @@

76

+ + + + + + + +
diff --git a/src/app/vote-choice/vote-choice.component.scss b/src/app/vote-choice/vote-choice.component.scss index 5695896c..0a60cc1b 100644 --- a/src/app/vote-choice/vote-choice.component.scss +++ b/src/app/vote-choice/vote-choice.component.scss @@ -6,9 +6,12 @@ display:flex; } #vote img{ + /* border: 1px solid #aeafb1; border-radius: 48px; +*/ } + h2,h3{ font-weight: normal; } From f48d05b5188df06e3e4494510cb6f780d6b8c982 Mon Sep 17 00:00:00 2001 From: Baptiste Lemoine Date: Wed, 2 Oct 2019 14:45:50 +0200 Subject: [PATCH 33/56] :zap: choice component JS logic and type constraints. demo for dev environment --- .../vote-choice/vote-choice.component.html | 59 ++++++++++++++----- .../vote-choice/vote-choice.component.scss | 44 ++++++++------ src/app/vote-choice/vote-choice.component.ts | 56 +++++++++++++++--- 3 files changed, 118 insertions(+), 41 deletions(-) diff --git a/src/app/vote-choice/vote-choice.component.html b/src/app/vote-choice/vote-choice.component.html index 63f167a4..ef5aae72 100644 --- a/src/app/vote-choice/vote-choice.component.html +++ b/src/app/vote-choice/vote-choice.component.html @@ -1,15 +1,46 @@
-
-

Jeudi 17 aout

-

08:00

-
-
-

14

-

76

-
-
- - - -
-
+
+
+
+ {{choice.date | date:'Y-m-d'}} +
+
+ {{choice.date | date:'H:i:s'}} +
+ +
+ {{choice.text}} +
+

Jeudi 17 aout

+

08:00

+
+
+ +

{{choice.votesCount.yes}}

+ + +

{{choice.votesCount.maybe}}

+ + +

{{choice.votesCount.no}}

+ + +

{{choice.votesCount.notAnswered}}

+ +
+
+ + + + +
+
+ diff --git a/src/app/vote-choice/vote-choice.component.scss b/src/app/vote-choice/vote-choice.component.scss index 5695896c..f33bae66 100644 --- a/src/app/vote-choice/vote-choice.component.scss +++ b/src/app/vote-choice/vote-choice.component.scss @@ -1,26 +1,32 @@ -.choice_container{ - width:320px; - height:172px; - box-shadow: 0 3px 6px 0 rgba(black, 0.2); - overflow: auto; - display:flex; +.choice_container { + width: 320px; + height: 172px; + box-shadow: 0 3px 6px 0 rgba(black, 0.2); + overflow: auto; + display: flex; } -#vote img{ -border: 1px solid #aeafb1; -border-radius: 48px; + +#vote img { + border: 1px solid #aeafb1; + border-radius: 48px; } -h2,h3{ - font-weight: normal; + +h2, h3 { + font-weight: normal; } -span{ - font-weight: bold; - font-size:24px; + +span { + font-weight: bold; + font-size: 24px; } -#nombre_vote{ - vertical-align: middle; - float:left; + +#nombre_vote { + vertical-align: middle; + float: left; } -#nombre_vote p{ - line-height: 20px; + +// TODO intricate selectors +#nombre_vote p { + line-height: 20px; } diff --git a/src/app/vote-choice/vote-choice.component.ts b/src/app/vote-choice/vote-choice.component.ts index 32b684dc..95097f32 100644 --- a/src/app/vote-choice/vote-choice.component.ts +++ b/src/app/vote-choice/vote-choice.component.ts @@ -1,15 +1,55 @@ -import { Component, OnInit } from '@angular/core'; +import {Component, Input} from '@angular/core'; +import {environment} from "../../environments/environment"; +interface VoteChoice { + votesCount: { + yes: number + no: number + maybe: number + notAnswered: number + }; + text: string; + date: Date; + answer: 'yes' | 'no' | 'maybe' | null; + simpleAnswer: boolean; // enable if we display only a togglable "yes" +} + +/** + * each vote choice takes a configuration from the container of all choices. + * this component is used to select a date choice, or a text answer + */ @Component({ - selector: 'framadate-vote-choice', - templateUrl: './vote-choice.component.html', - styleUrls: ['./vote-choice.component.scss'] + selector: 'framadate-vote-choice', + templateUrl: './vote-choice.component.html', + styleUrls: ['./vote-choice.component.scss'] }) -export class VoteChoiceComponent implements OnInit { +export class VoteChoiceComponent { - constructor() { } + @Input() choice: VoteChoice; - ngOnInit() { - } + constructor() { + if (!environment.production) { + // demo content for dev env + this.choice = { + date: new Date(), + text: 'description ', + simpleAnswer: false + } + } + } + + setAnswserTo(newAnswer: 'yes' | 'no' | 'maybe' | null) { + if (this.choice.simpleAnswer) { + // only toggle yes to no + if (this.choice.answer && this.choice.answer === 'yes') { + this.choice.answer = 'no'; + } else { + this.choice.answer = 'yes'; + } + + } else { + this.choice.answer = newAnswer; + } + } } From 1074d219dd9dc5c267976806270dd6a2c51ed4ea Mon Sep 17 00:00:00 2001 From: Baptiste Lemoine Date: Thu, 3 Oct 2019 11:27:25 +0200 Subject: [PATCH 34/56] :bug: fix undefined choice --- src/app/vote-choice/vote-choice.component.ts | 27 +++++++++++--------- 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/src/app/vote-choice/vote-choice.component.ts b/src/app/vote-choice/vote-choice.component.ts index 95097f32..ab31a590 100644 --- a/src/app/vote-choice/vote-choice.component.ts +++ b/src/app/vote-choice/vote-choice.component.ts @@ -1,5 +1,4 @@ import {Component, Input} from '@angular/core'; -import {environment} from "../../environments/environment"; interface VoteChoice { votesCount: { @@ -8,8 +7,8 @@ interface VoteChoice { maybe: number notAnswered: number }; - text: string; - date: Date; + text?: string; + date?: Date; answer: 'yes' | 'no' | 'maybe' | null; simpleAnswer: boolean; // enable if we display only a togglable "yes" } @@ -25,17 +24,21 @@ interface VoteChoice { }) export class VoteChoiceComponent { - @Input() choice: VoteChoice; + @Input() choice: VoteChoice = { + date: new Date(), + text: 'description ', + votesCount: { + yes: 0, + no: 0, + maybe: 0, + notAnswered: 0 + }, + simpleAnswer: false, + answer: null + }; constructor() { - if (!environment.production) { - // demo content for dev env - this.choice = { - date: new Date(), - text: 'description ', - simpleAnswer: false - } - } + } setAnswserTo(newAnswer: 'yes' | 'no' | 'maybe' | null) { From 2d060f99055acb3d5251b1afde70abc786768f51 Mon Sep 17 00:00:00 2001 From: Baptiste Lemoine Date: Thu, 3 Oct 2019 11:48:13 +0200 Subject: [PATCH 35/56] =?UTF-8?q?:zap:=20date=20en=20fran=C3=A7ais=20dans?= =?UTF-8?q?=20le=20choix=20de=20vote?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/app.module.ts | 98 +++++++++---------- src/app/config/Routes.ts | 2 + .../vote-choice/vote-choice.component.html | 11 ++- 3 files changed, 58 insertions(+), 53 deletions(-) diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 50301b68..8da4e668 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -1,5 +1,5 @@ import {BrowserModule} from '@angular/platform-browser'; -import {NgModule} from '@angular/core'; +import {LOCALE_ID, NgModule} from '@angular/core'; import {AppRoutingModule} from './app-routing.module'; import {AppComponent} from './app.component'; @@ -10,61 +10,59 @@ import {FormsModule} from '@angular/forms'; import {NavigationComponent} from './ui/navigation/navigation.component'; import {RouterModule} from '@angular/router'; import {Routes} from './config/Routes'; -import {CommonModule} from '@angular/common'; -import { DatesComponent } from './pages/dates/dates.component'; -import { DebuggerComponent } from './debugger/debugger.component'; -import { VisibilityComponent } from './pages/visibility/visibility.component'; -import { ResumeComponent } from './pages/resume/resume.component'; -import { PicturesComponent } from './pages/pictures/pictures.component'; -import { AnswersComponent } from './pages/answers/answers.component'; -import { EndConfirmationComponent } from './pages/end-confirmation/end-confirmation.component'; -import { CreateOrRetrieveComponent } from './pages/create-or-retrieve/create-or-retrieve.component'; -import { CalendarComponent } from './calendar/calendar.component'; - -import { registerLocaleData } from '@angular/common'; +import {CommonModule, registerLocaleData} from '@angular/common'; +import {DatesComponent} from './pages/dates/dates.component'; +import {DebuggerComponent} from './debugger/debugger.component'; +import {VisibilityComponent} from './pages/visibility/visibility.component'; +import {ResumeComponent} from './pages/resume/resume.component'; +import {PicturesComponent} from './pages/pictures/pictures.component'; +import {AnswersComponent} from './pages/answers/answers.component'; +import {EndConfirmationComponent} from './pages/end-confirmation/end-confirmation.component'; +import {CreateOrRetrieveComponent} from './pages/create-or-retrieve/create-or-retrieve.component'; +import {CalendarComponent} from './calendar/calendar.component'; import localeFr from '@angular/common/locales/fr'; -import { VotingSummaryComponent } from './pages/voting-summary/voting-summary.component'; -import { VotingGraphComponent } from './pages/voting-graph/voting-graph.component'; -import { VotingChoiceComponent } from './pages/voting-choice/voting-choice.component'; -import { PasswordComponent } from './pages/password/password.component'; -import { HomeComponent } from './pages/home/home.component'; -import { VoteChoiceComponent } from './vote-choice/vote-choice.component'; +import {VotingSummaryComponent} from './pages/voting-summary/voting-summary.component'; +import {VotingGraphComponent} from './pages/voting-graph/voting-graph.component'; +import {VotingChoiceComponent} from './pages/voting-choice/voting-choice.component'; +import {PasswordComponent} from './pages/password/password.component'; +import {HomeComponent} from './pages/home/home.component'; +import {VoteChoiceComponent} from './vote-choice/vote-choice.component'; registerLocaleData(localeFr, 'fr'); @NgModule({ - declarations: [ - AppComponent, - BaseComponent, - KindComponent, - HeaderComponent, - NavigationComponent, - DatesComponent, - DebuggerComponent, - VisibilityComponent, - ResumeComponent, - PicturesComponent, - AnswersComponent, - EndConfirmationComponent, - CreateOrRetrieveComponent, - CalendarComponent, - VotingSummaryComponent, - VotingGraphComponent, - VotingChoiceComponent, - PasswordComponent, - HomeComponent, - VoteChoiceComponent, + declarations: [ + AppComponent, + BaseComponent, + KindComponent, + HeaderComponent, + NavigationComponent, + DatesComponent, + DebuggerComponent, + VisibilityComponent, + ResumeComponent, + PicturesComponent, + AnswersComponent, + EndConfirmationComponent, + CreateOrRetrieveComponent, + CalendarComponent, + VotingSummaryComponent, + VotingGraphComponent, + VotingChoiceComponent, + PasswordComponent, + HomeComponent, + VoteChoiceComponent, - ], - imports: [ - CommonModule, - BrowserModule, - AppRoutingModule, - FormsModule, - RouterModule.forRoot(Routes) - ], - providers: [], - bootstrap: [AppComponent] + ], + imports: [ + CommonModule, + BrowserModule, + AppRoutingModule, + FormsModule, + RouterModule.forRoot(Routes) + ], + providers: [{provide: LOCALE_ID, useValue: "fr-FR"}], + bootstrap: [AppComponent] }) export class AppModule { } diff --git a/src/app/config/Routes.ts b/src/app/config/Routes.ts index 90a969ce..72ef5a8c 100644 --- a/src/app/config/Routes.ts +++ b/src/app/config/Routes.ts @@ -8,6 +8,7 @@ import {AnswersComponent} from '../pages/answers/answers.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"; +import {VoteChoiceComponent} from "../vote-choice/vote-choice.component"; /** * each step in the form is a component @@ -25,5 +26,6 @@ export const Routes = {path: 'step/visibility', component: VisibilityComponent}, {path: 'step/resume', component: ResumeComponent}, {path: 'step/end', component: EndConfirmationComponent}, + {path: 'votechoice', component: VoteChoiceComponent}, ] ; diff --git a/src/app/vote-choice/vote-choice.component.html b/src/app/vote-choice/vote-choice.component.html index ef5aae72..09332c47 100644 --- a/src/app/vote-choice/vote-choice.component.html +++ b/src/app/vote-choice/vote-choice.component.html @@ -2,12 +2,17 @@
- {{choice.date | date:'Y-m-d'}} + {{choice.date | date:'EEEE'}} +
+
+ {{choice.date | date:'dd'}} +
+
+ {{choice.date | date:'LLLL'}}
- {{choice.date | date:'H:i:s'}} + {{choice.date | date:'H:m'}}
-
{{choice.text}}
From 1b9c669ae3d16d8fcaaa6977d558e420e7bdfc03 Mon Sep 17 00:00:00 2001 From: Le Libre Au Quotidien Date: Thu, 3 Oct 2019 11:52:26 +0200 Subject: [PATCH 36/56] Add round to buttons on vote-choice --- .../vote-choice/vote-choice.component.html | 11 ++++++++--- .../vote-choice/vote-choice.component.scss | 19 ++++++++++++------- 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/src/app/vote-choice/vote-choice.component.html b/src/app/vote-choice/vote-choice.component.html index ef5aae72..8ba6808b 100644 --- a/src/app/vote-choice/vote-choice.component.html +++ b/src/app/vote-choice/vote-choice.component.html @@ -21,26 +21,31 @@

{{choice.votesCount.maybe}}

 - -

{{choice.votesCount.no}}

- +

{{choice.votesCount.notAnswered}}
+ + +
+
diff --git a/src/app/vote-choice/vote-choice.component.scss b/src/app/vote-choice/vote-choice.component.scss index 5a54c4bd..a90fe213 100644 --- a/src/app/vote-choice/vote-choice.component.scss +++ b/src/app/vote-choice/vote-choice.component.scss @@ -5,11 +5,10 @@ overflow: auto; display: flex; } -#vote img{ - /* -border: 1px solid #aeafb1; -border-radius: 48px; -*/ +.vote img{ + vertical-align: middle; + text-align: center; + } h2, h3 { @@ -21,13 +20,19 @@ span { font-size: 24px; } -#nombre_vote { +.nombre_vote { vertical-align: middle; float: left; } // TODO intricate selectors -#nombre_vote p { +.nombre_vote p { line-height: 20px; } +.vote button{ +border: 1px solid #aeafb1;; +border-radius: 50%; +width:48px; +height: 48px; +} From 36192647c01c47f1d6782da6c69297449c1f2d8b Mon Sep 17 00:00:00 2001 From: Le Libre Au Quotidien Date: Thu, 3 Oct 2019 11:57:39 +0200 Subject: [PATCH 37/56] Corrige center alignement --- src/app/vote-choice/vote-choice.component.scss | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/app/vote-choice/vote-choice.component.scss b/src/app/vote-choice/vote-choice.component.scss index a90fe213..cd61dd4c 100644 --- a/src/app/vote-choice/vote-choice.component.scss +++ b/src/app/vote-choice/vote-choice.component.scss @@ -7,7 +7,9 @@ } .vote img{ vertical-align: middle; - text-align: center; + display: block; + margin-left: auto; + margin-right: auto; } From 8215dfab78f101bd15fcfaa0752afedc0b56842d Mon Sep 17 00:00:00 2001 From: Le Libre Au Quotidien Date: Thu, 3 Oct 2019 12:00:34 +0200 Subject: [PATCH 38/56] stylize the date --- src/app/vote-choice/vote-choice.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/vote-choice/vote-choice.component.html b/src/app/vote-choice/vote-choice.component.html index 06552c55..7db79e4b 100644 --- a/src/app/vote-choice/vote-choice.component.html +++ b/src/app/vote-choice/vote-choice.component.html @@ -16,7 +16,7 @@
{{choice.text}}
-

Jeudi 17 aout

+

{{choice.date | date:'EEEE'}} {{choice.date | date:'dd'}}{{choice.date | date:'LLLL'}}

08:00

From 280783c56b699f72e736f31125cf4ab22c9d8c70 Mon Sep 17 00:00:00 2001 From: Le Libre Au Quotidien Date: Thu, 3 Oct 2019 18:36:06 +0200 Subject: [PATCH 39/56] Modify vote component --- src/app/vote-choice/vote-choice.component.html | 2 +- src/app/vote-choice/vote-choice.component.scss | 12 ++++++++++++ src/assets/scss/variables.scss | 2 ++ 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/src/app/vote-choice/vote-choice.component.html b/src/app/vote-choice/vote-choice.component.html index 7db79e4b..250abae7 100644 --- a/src/app/vote-choice/vote-choice.component.html +++ b/src/app/vote-choice/vote-choice.component.html @@ -16,7 +16,7 @@
{{choice.text}}
-

{{choice.date | date:'EEEE'}} {{choice.date | date:'dd'}}{{choice.date | date:'LLLL'}}

+

{{choice.date | date:'EEEE'}} {{choice.date | date:'dd'}} {{choice.date | date:'LLLL'}}

08:00

diff --git a/src/app/vote-choice/vote-choice.component.scss b/src/app/vote-choice/vote-choice.component.scss index cd61dd4c..2fe9a5d5 100644 --- a/src/app/vote-choice/vote-choice.component.scss +++ b/src/app/vote-choice/vote-choice.component.scss @@ -38,3 +38,15 @@ border-radius: 50%; width:48px; height: 48px; } +.vote button:hover{ + border-color: #807e7e; + transition:0,5s; +} +.vote button:focus{ + border:3px solid #bf83c2; + outline:0; +} +.nombre_vote img{ + vertical-align: middle; + display:inline; +} diff --git a/src/assets/scss/variables.scss b/src/assets/scss/variables.scss index ae263ce9..bb56d215 100644 --- a/src/assets/scss/variables.scss +++ b/src/assets/scss/variables.scss @@ -11,6 +11,7 @@ $dusty-orange: #f18647; $violet: #bd10e0; $red: #cd0000; $cool-grey: #aeafb1; +$warm-grey:#807e7e; // interpretations in app $primary_color: $ugly-purple; @@ -19,6 +20,7 @@ $font_color: $black; $logo_color: $dark-lavender; $logo_color_2: $camo; $choice_select_border_color: $cool-grey; +$hover-color:$warm-grey; // FONT $default_font : "pt_sans"; From c671a8bdea289d1623502d5672069897556af3ab Mon Sep 17 00:00:00 2001 From: Le Libre Au Quotidien Date: Mon, 7 Oct 2019 19:17:51 +0200 Subject: [PATCH 40/56] Minimal commit --- src/app/vote-choice/vote-choice.component.scss | 16 +++++++++++++--- src/assets/scss/variables.scss | 2 ++ 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/src/app/vote-choice/vote-choice.component.scss b/src/app/vote-choice/vote-choice.component.scss index 2fe9a5d5..6be8b710 100644 --- a/src/app/vote-choice/vote-choice.component.scss +++ b/src/app/vote-choice/vote-choice.component.scss @@ -4,6 +4,7 @@ box-shadow: 0 3px 6px 0 rgba(black, 0.2); overflow: auto; display: flex; +align-items: center; } .vote img{ vertical-align: middle; @@ -27,7 +28,10 @@ span { float: left; } - +.nombre_vote span{ + display: flex; + align-items: center; +} // TODO intricate selectors .nombre_vote p { line-height: 20px; @@ -37,6 +41,8 @@ border: 1px solid #aeafb1;; border-radius: 50%; width:48px; height: 48px; +display: flex; +align-items: center; } .vote button:hover{ border-color: #807e7e; @@ -47,6 +53,10 @@ height: 48px; outline:0; } .nombre_vote img{ - vertical-align: middle; - display:inline; +/* vertical-align: middle; + display:inline;*/ + display: block; +width: 20px; +height: 20px; +background-color: #000 } diff --git a/src/assets/scss/variables.scss b/src/assets/scss/variables.scss index bb56d215..9a9eaab7 100644 --- a/src/assets/scss/variables.scss +++ b/src/assets/scss/variables.scss @@ -12,6 +12,7 @@ $violet: #bd10e0; $red: #cd0000; $cool-grey: #aeafb1; $warm-grey:#807e7e; +$wisteria:#bf83c2; // interpretations in app $primary_color: $ugly-purple; @@ -21,6 +22,7 @@ $logo_color: $dark-lavender; $logo_color_2: $camo; $choice_select_border_color: $cool-grey; $hover-color:$warm-grey; +$clicked-color:$wisteria; // FONT $default_font : "pt_sans"; From 69802a99ffa5e5a23e94f6b1f1d6931c9bfc62aa Mon Sep 17 00:00:00 2001 From: Le Libre Au Quotidien Date: Thu, 10 Oct 2019 19:04:19 +0200 Subject: [PATCH 41/56] Align elements --- src/app/vote-choice/vote-choice.component.html | 6 +----- src/app/vote-choice/vote-choice.component.scss | 9 +++++++-- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/app/vote-choice/vote-choice.component.html b/src/app/vote-choice/vote-choice.component.html index 250abae7..e4a30afd 100644 --- a/src/app/vote-choice/vote-choice.component.html +++ b/src/app/vote-choice/vote-choice.component.html @@ -19,17 +19,13 @@

{{choice.date | date:'EEEE'}} {{choice.date | date:'dd'}} {{choice.date | date:'LLLL'}}

08:00

-
+

{{choice.votesCount.yes}}

{{choice.votesCount.maybe}}

 - - -

{{choice.votesCount.notAnswered}}

-
diff --git a/src/app/vote-choice/vote-choice.component.scss b/src/app/vote-choice/vote-choice.component.scss index 6be8b710..a1303168 100644 --- a/src/app/vote-choice/vote-choice.component.scss +++ b/src/app/vote-choice/vote-choice.component.scss @@ -5,6 +5,7 @@ overflow: auto; display: flex; align-items: center; +flex-direction: row; } .vote img{ vertical-align: middle; @@ -34,7 +35,12 @@ span { } // TODO intricate selectors .nombre_vote p { - line-height: 20px; + font-weight: normal; + font-size: 16px; +} +.vote{ + justify-content: flex-end; + align-items: flex-end; } .vote button{ border: 1px solid #aeafb1;; @@ -58,5 +64,4 @@ align-items: center; display: block; width: 20px; height: 20px; -background-color: #000 } From 802f54b930125db6c8994f53c1389d3892e0b91a Mon Sep 17 00:00:00 2001 From: 22px <22px@tuta.io> Date: Wed, 16 Oct 2019 21:33:49 +0200 Subject: [PATCH 42/56] [front] global : update button styles --- src/app/debugger/debugger.component.html | 6 +- src/app/pages/answers/answers.component.html | 4 +- src/app/pages/base-page/base.component.html | 2 +- .../create-or-retrieve.component.html | 4 +- src/app/pages/dates/dates.component.html | 4 +- src/app/pages/home/home.component.html | 2 +- src/app/pages/kind/kind.component.html | 79 ++++++++++++---- .../pages/pictures/pictures.component.html | 2 +- src/app/pages/resume/resume.component.html | 2 +- .../visibility/visibility.component.html | 2 +- src/assets/scss/atoms/_buttons.scss | 92 +++++++++---------- 11 files changed, 116 insertions(+), 83 deletions(-) diff --git a/src/app/debugger/debugger.component.html b/src/app/debugger/debugger.component.html index 5b504209..ba8cddca 100644 --- a/src/app/debugger/debugger.component.html +++ b/src/app/debugger/debugger.component.html @@ -32,7 +32,7 @@ (click)="config.set('pollType' , 'classic')" [class.active]="config.pollType == 'classic'" [disabled]="!formIsValid" - class="btn btn-primary next" + class="btn btn--primary next" > sondage classique @@ -46,7 +46,7 @@ (click)="selectOption('pollType' ,'dates')" [class.active]="config.pollType == 'dates'" [disabled]="!formIsValid" - class="btn btn-primary next" + class="btn btn--primary next" > sondage spécial date @@ -58,7 +58,7 @@
-

-
-
-
- - -

+
-

- Warning, in the mockups, some buttons have different paddings.
- Example: "Copier le lien" has smaller paddings, maybe a `btn_small` class could do the job, to check. -

+ + +
+ + + primary - outline - default + + +
+ + + +
+ + + +
+ + + +
+ + + +
+ + + +

+ + + + + + + +
diff --git a/src/app/pages/pictures/pictures.component.html b/src/app/pages/pictures/pictures.component.html index ab6dd725..ddd7b9f9 100644 --- a/src/app/pages/pictures/pictures.component.html +++ b/src/app/pages/pictures/pictures.component.html @@ -2,5 +2,5 @@

Images

-ok +ok diff --git a/src/app/pages/resume/resume.component.html b/src/app/pages/resume/resume.component.html index 608a4299..1cc9fdc1 100644 --- a/src/app/pages/resume/resume.component.html +++ b/src/app/pages/resume/resume.component.html @@ -7,4 +7,4 @@ {{config |json}} - + diff --git a/src/app/pages/visibility/visibility.component.html b/src/app/pages/visibility/visibility.component.html index 43317d13..ec5df6f9 100644 --- a/src/app/pages/visibility/visibility.component.html +++ b/src/app/pages/visibility/visibility.component.html @@ -11,4 +11,4 @@

Accès au sondage

-C'est parfait! +C'est parfait! diff --git a/src/assets/scss/atoms/_buttons.scss b/src/assets/scss/atoms/_buttons.scss index 4c629dbe..d03435f0 100644 --- a/src/assets/scss/atoms/_buttons.scss +++ b/src/assets/scss/atoms/_buttons.scss @@ -1,55 +1,47 @@ @charset "UTF-8"; -button, -input[type="submit"] { - padding-right: 1.5rem; - padding-left: 1.5rem; - font-size: 1.6rem; - line-height: 1; - background-color: #fff; - border: 2px solid $primary_color; - border-radius: 0.3rem; -font-family: $default_font; - font-weight: 600; - - &.btn_background { - padding-top: 1rem; - padding-bottom: 1rem; - font-weight: 600; - background-color: $primary_color; - - &:hover { - background-color: $secondary_color; - border-color: $secondary_color; +@mixin btnTheme ($color) { + background-color: $color; + color: $white; + &.btn--outline { + background-color: transparent; + border-color: $color; + color: $font-color; } - - &.btn_delete { - color: #fff; - background-color: $red; - - &:hover { - color: $red; - background-color: #fff; - } + &:focus, + &:hover, + &:active { + background-color: rgba($color, .8); + &.btn--outline { + background-color: rgba($color, .2); + } } - &.btn_white_text{ - color:$white; - } - } - - &.btn_border { - padding-top: 0.8rem; - padding-bottom: 0.8rem; - - &:hover { - background-color: rgba($primary_color, 0.2); - } - } - - &.btn_delete { - &, - &:hover { - border-color: $red; - } - } } + +.btn { + margin: .5rem 0; + padding: 1rem 1.5rem; + font-size: 1.6rem; + line-height: normal; + border: .2rem solid transparent; + border-radius: .3rem; + font-weight: normal; + + &--primary { + @include btnTheme($primary_color); + } + + &--alert { + @include btnTheme($red); + } + + &--small { + padding: .75rem 1.25rem; + } + + &--full { + display: block; + min-width: 100%; + } + +} \ No newline at end of file From a176405dd492ca9941d5b02011436db0e3f2076e Mon Sep 17 00:00:00 2001 From: 22px <22px@tuta.io> Date: Thu, 17 Oct 2019 21:56:22 +0200 Subject: [PATCH 43/56] [front] global : increase main wrap size --- src/assets/scss/atoms/_main.scss | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/assets/scss/atoms/_main.scss b/src/assets/scss/atoms/_main.scss index 527ff8df..b6b3032e 100644 --- a/src/assets/scss/atoms/_main.scss +++ b/src/assets/scss/atoms/_main.scss @@ -1,9 +1,11 @@ @charset "UTF-8"; main { - max-width: 320px; // to look like the styleguide, to remove when we will have full width views - width: 100%; - display: block; - margin: 0 auto; - padding: 0 2rem; + display: block; + width: 100%; + //max-width: 320px; // to look like the styleguide, to remove when we will have full width views + max-width: 800px; + margin: 0 auto; + padding: 0 2rem; } + From 3e29117ea62ee3025ed1e3ae8b328aa51197dc3e Mon Sep 17 00:00:00 2001 From: 22px <22px@tuta.io> Date: Thu, 17 Oct 2019 21:56:59 +0200 Subject: [PATCH 44/56] [front] component : vote choice --- .../vote-choice/vote-choice.component.html | 88 ++++---- .../vote-choice/vote-choice.component.scss | 211 +++++++++++++----- 2 files changed, 193 insertions(+), 106 deletions(-) diff --git a/src/app/vote-choice/vote-choice.component.html b/src/app/vote-choice/vote-choice.component.html index e4a30afd..aee7a1b8 100644 --- a/src/app/vote-choice/vote-choice.component.html +++ b/src/app/vote-choice/vote-choice.component.html @@ -1,52 +1,42 @@ -
-
-
-
- {{choice.date | date:'EEEE'}} -
-
- {{choice.date | date:'dd'}} -
-
- {{choice.date | date:'LLLL'}} -
-
- {{choice.date | date:'H:m'}} -
-
- {{choice.text}} -
-

{{choice.date | date:'EEEE'}} {{choice.date | date:'dd'}} {{choice.date | date:'LLLL'}}

-

08:00

-
-
- -

{{choice.votesCount.yes}}

- - -

{{choice.votesCount.maybe}}

- -
-
- - - - -
+
+
+
+ {{choice.date | date:'EEE'}} {{choice.date | date:'dd'}} {{choice.date | date:'LLL'}} +
+
+ 08:00 +
+
+ + + + +
+
+
+
+ {{choice.votesCount.yes}} + +
+
+ {{choice.votesCount.maybe}} + +
+
+
+ Choix ayant reçu le plus de votes +
+
+ +
+ +
\ No newline at end of file diff --git a/src/app/vote-choice/vote-choice.component.scss b/src/app/vote-choice/vote-choice.component.scss index a1303168..b28c4636 100644 --- a/src/app/vote-choice/vote-choice.component.scss +++ b/src/app/vote-choice/vote-choice.component.scss @@ -1,67 +1,164 @@ -.choice_container { - width: 320px; - height: 172px; - box-shadow: 0 3px 6px 0 rgba(black, 0.2); - overflow: auto; - display: flex; -align-items: center; -flex-direction: row; -} -.vote img{ - vertical-align: middle; - display: block; - margin-left: auto; - margin-right: auto; +// --------------------------------------------------------- +// -- VOTE CHOICE COMPONENT +// --------------------------------------------------------- + +// -- IMPORTS +// ---------------------------- + +@import "../../assets/scss/variables"; + + + +// -- VARIABLES +// ---------------------------- + +$box-padding: 2rem; +$box-border-width: .6rem; +$btn-size: 5rem; +$btn-margin-x: 1rem; +$btn-margin-y: 1.5rem; +$btn-wrap-size: calc(2 * #{$btn-size} + 4 * #{$btn-margin-x}); +$breakpoint-responsive: 640px; // à définir + + + +// -- GLOBAL +// ---------------------------- + +.choicebox { + position: relative; + min-width: 32rem; + padding: $box-padding $box-padding $box-padding calc(#{$box-padding} - #{$box-border-width}); + border-left: $box-border-width solid transparent; + background-color: $white; + box-shadow: 0 .3rem .6rem 0 rgba($black, .2); + &--active { + padding-left: $box-padding; + border-left-color: $primary_color; + } + + @media (min-width: $breakpoint-responsive) { + display: flex; + align-items: center; + justify-content: space-between; + } } -h2, h3 { - font-weight: normal; + + +// -- DATE +// ---------------------------- + +.choicebox__time { + margin-bottom: 3rem; + padding-right: $btn-wrap-size; + font-size: 1.8rem; + + @media (min-width: $breakpoint-responsive) { + margin-bottom: 0; + padding-right: 0; + } } -span { +.choicebox__date { + margin-bottom: .5rem; + white-space: nowrap; + text-transform: capitalize; + + @media (min-width: $breakpoint-responsive) { + margin-bottom: 0; + } +} + +.choicebox__day { + font-size: 2.4rem; font-weight: bold; - font-size: 24px; } -.nombre_vote { + + +// -- VOTE BTNS +// ---------------------------- + +.choicebox__actions { + position: absolute; + display: flex; + max-width: $btn-wrap-size; + top: 50%; + right: $box-padding; + flex-flow: row-reverse wrap; + transform: translateY(-50%); + + @media (min-width: $breakpoint-responsive) { + position: static; + max-width: none; + flex-flow: row nowrap; + transform: none; + } +} + +.choicebox__btn { + display: flex; + width: $btn-size; + height: $btn-size; + align-items: center; + justify-content: center; + margin: $btn-margin-y $btn-margin-x; + border: .1rem solid $primary_color; + border-radius: 50%; + + @media (min-width: $breakpoint-responsive) { + margin-top: 0; + margin-bottom: 0; + } + + &:focus, + &:hover, + &:active { + border-color: #ccc9c9; + background-color: #f7f7f7; + } + + &--maybe { + position: relative; + top: calc( (#{$btn-size} + 2 * #{$btn-margin-y}) / 2 ); + @media (min-width: $breakpoint-responsive) { + top: auto; + left: auto; + } + } + + &--active { + border-width: .3rem; + border-color: #bf83c2; + } +} + + + +// -- VOTE COUNT +// ---------------------------- + +.choicebox__count { + padding-right: $btn-wrap-size; + + @media (min-width: $breakpoint-responsive) { + padding-right: 0; + } +} + +.choicebox__vote { + display: inline-block; vertical-align: middle; - float: left; + margin-right: 3rem; +} -} -.nombre_vote span{ - display: flex; - align-items: center; -} -// TODO intricate selectors -.nombre_vote p { - font-weight: normal; - font-size: 16px; -} -.vote{ - justify-content: flex-end; - align-items: flex-end; -} -.vote button{ -border: 1px solid #aeafb1;; -border-radius: 50%; -width:48px; -height: 48px; -display: flex; -align-items: center; -} -.vote button:hover{ - border-color: #807e7e; - transition:0,5s; -} -.vote button:focus{ - border:3px solid #bf83c2; - outline:0; -} -.nombre_vote img{ -/* vertical-align: middle; - display:inline;*/ - display: block; -width: 20px; -height: 20px; -} +.choicebox__countxt { + display: none; + margin-top: .5rem; + color: $primary_color; + .choicebox--active & { + display: block; + } +} \ No newline at end of file From be96384a8e5f42211303b5f9215512787e9bb7cd Mon Sep 17 00:00:00 2001 From: MarguoNana Date: Wed, 23 Oct 2019 16:04:59 +0200 Subject: [PATCH 45/56] Issue-30: Markdown support --- angular.json | 6 +- package-lock.json | 172 ++++++++++++--------- package.json | 1 + src/app/app.module.ts | 2 + src/app/pages/home/home.component.html | 1 - src/app/pages/resume/resume.component.html | 8 +- 6 files changed, 114 insertions(+), 76 deletions(-) diff --git a/angular.json b/angular.json index ef8d1169..df9c8dac 100644 --- a/angular.json +++ b/angular.json @@ -30,7 +30,11 @@ "styles": [ "src/styles.scss" ], - "scripts": [] + "scripts": [ + "node_modules/marked/lib/marked.js", + "node_modules/prismjs/prism.js", + "node_modules/prismjs/components/prism-css.min.js" + ] }, "configurations": { "production": { diff --git a/package-lock.json b/package-lock.json index f8c49d2e..ae0f559d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -328,8 +328,7 @@ "ansi-regex": { "version": "2.1.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "aproba": { "version": "1.2.0", @@ -350,14 +349,12 @@ "balanced-match": { "version": "1.0.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, "dev": true, - "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -372,20 +369,17 @@ "code-point-at": { "version": "1.1.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "concat-map": { "version": "0.0.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "console-control-strings": { "version": "1.1.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "core-util-is": { "version": "1.0.2", @@ -502,8 +496,7 @@ "inherits": { "version": "2.0.3", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "ini": { "version": "1.3.5", @@ -515,7 +508,6 @@ "version": "1.0.0", "bundled": true, "dev": true, - "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -530,7 +522,6 @@ "version": "3.0.4", "bundled": true, "dev": true, - "optional": true, "requires": { "brace-expansion": "^1.1.7" } @@ -538,14 +529,12 @@ "minimist": { "version": "0.0.8", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "minipass": { "version": "2.3.5", "bundled": true, "dev": true, - "optional": true, "requires": { "safe-buffer": "^5.1.2", "yallist": "^3.0.0" @@ -564,7 +553,6 @@ "version": "0.5.1", "bundled": true, "dev": true, - "optional": true, "requires": { "minimist": "0.0.8" } @@ -645,8 +633,7 @@ "number-is-nan": { "version": "1.0.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "object-assign": { "version": "4.1.1", @@ -658,7 +645,6 @@ "version": "1.4.0", "bundled": true, "dev": true, - "optional": true, "requires": { "wrappy": "1" } @@ -744,8 +730,7 @@ "safe-buffer": { "version": "5.1.2", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "safer-buffer": { "version": "2.1.2", @@ -781,7 +766,6 @@ "version": "1.0.2", "bundled": true, "dev": true, - "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -801,7 +785,6 @@ "version": "3.0.1", "bundled": true, "dev": true, - "optional": true, "requires": { "ansi-regex": "^2.0.0" } @@ -845,14 +828,12 @@ "wrappy": { "version": "1.0.2", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "yallist": { "version": "3.0.3", "bundled": true, - "dev": true, - "optional": true + "dev": true } } }, @@ -1266,6 +1247,11 @@ "@types/jasmine": "*" } }, + "@types/marked": { + "version": "0.6.5", + "resolved": "https://registry.npmjs.org/@types/marked/-/marked-0.6.5.tgz", + "integrity": "sha512-6kBKf64aVfx93UJrcyEZ+OBM5nGv4RLsI6sR1Ar34bpgvGVRoyTgpxn4ZmtxOM5aDTAaaznYuYUH8bUX3Nk3YA==" + }, "@types/minimatch": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz", @@ -2620,6 +2606,17 @@ "integrity": "sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=", "dev": true }, + "clipboard": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/clipboard/-/clipboard-2.0.4.tgz", + "integrity": "sha512-Vw26VSLRpJfBofiVaFb/I8PVfdI1OxKcYShe6fm0sP/DtmiWQNCjhM/okTvdCo0G+lMMm1rMYbk4IK4x1X+kgQ==", + "optional": true, + "requires": { + "good-listener": "^1.2.2", + "select": "^1.1.2", + "tiny-emitter": "^2.0.0" + } + }, "cliui": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz", @@ -2752,8 +2749,7 @@ "commander": { "version": "2.20.0", "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.0.tgz", - "integrity": "sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ==", - "dev": true + "integrity": "sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ==" }, "commondir": { "version": "1.0.1", @@ -3254,6 +3250,12 @@ "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=", "dev": true }, + "delegate": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/delegate/-/delegate-3.2.0.tgz", + "integrity": "sha512-IofjkYBZaZivn0V8nnsMJGBr4jVLxHDheKSW88PyxS5QC4Vo9ZbZVvhzlSxY87fVq3STR6r+4cGepyHkcWOQSw==", + "optional": true + }, "depd": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz", @@ -4313,6 +4315,15 @@ } } }, + "good-listener": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/good-listener/-/good-listener-1.2.2.tgz", + "integrity": "sha1-1TswzfkxPf+33JoNR3CWqm0UXFA=", + "optional": true, + "requires": { + "delegate": "^3.1.2" + } + }, "graceful-fs": { "version": "4.2.1", "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.1.tgz", @@ -5685,8 +5696,7 @@ "console-control-strings": { "version": "1.1.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "core-util-is": { "version": "1.0.2", @@ -5803,8 +5813,7 @@ "inherits": { "version": "2.0.3", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "ini": { "version": "1.3.5", @@ -5846,7 +5855,6 @@ "version": "2.3.5", "bundled": true, "dev": true, - "optional": true, "requires": { "safe-buffer": "^5.1.2", "yallist": "^3.0.0" @@ -5865,7 +5873,6 @@ "version": "0.5.1", "bundled": true, "dev": true, - "optional": true, "requires": { "minimist": "0.0.8" } @@ -5959,7 +5966,6 @@ "version": "1.4.0", "bundled": true, "dev": true, - "optional": true, "requires": { "wrappy": "1" } @@ -6045,8 +6051,7 @@ "safe-buffer": { "version": "5.1.2", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "safer-buffer": { "version": "2.1.2", @@ -6082,7 +6087,6 @@ "version": "1.0.2", "bundled": true, "dev": true, - "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -6146,14 +6150,12 @@ "wrappy": { "version": "1.0.2", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "yallist": { "version": "3.0.3", "bundled": true, - "dev": true, - "optional": true + "dev": true } } }, @@ -6263,6 +6265,14 @@ "source-map-support": "^0.5.5" } }, + "katex": { + "version": "0.11.1", + "resolved": "https://registry.npmjs.org/katex/-/katex-0.11.1.tgz", + "integrity": "sha512-5oANDICCTX0NqYIyAiFCCwjQ7ERu3DQG2JFHLbYOf+fXaMoH8eg/zOq5WSYJsKMi/QebW+Eh3gSM+oss1H/bww==", + "requires": { + "commander": "^2.19.0" + } + }, "killable": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/killable/-/killable-1.0.1.tgz", @@ -6546,6 +6556,11 @@ "object-visit": "^1.0.0" } }, + "marked": { + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/marked/-/marked-0.7.0.tgz", + "integrity": "sha512-c+yYdCZJQrsRjTPhUx7VKkApw9bwDkNbHUKo1ovgcfDjb2kc8rLuRbIFyXL5WOEUwzSSKo3IXpph2K6DqB/KZg==" + }, "md5.js": { "version": "1.3.5", "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz", @@ -6950,6 +6965,18 @@ "integrity": "sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw==", "dev": true }, + "ngx-markdown": { + "version": "8.2.1", + "resolved": "https://registry.npmjs.org/ngx-markdown/-/ngx-markdown-8.2.1.tgz", + "integrity": "sha512-59LG8rEoOwDsZyyJckp+QDnW/c5wMaRpNkb6TWktlBVTfQKyAYHr6BuSskVbZ4y8nsj54UQg0CDFLBOfUiqOwA==", + "requires": { + "@types/marked": "^0.6.5", + "katex": "^0.11.1", + "marked": "^0.7.0", + "prismjs": "^1.16.0", + "tslib": "^1.9.0" + } + }, "nice-try": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz", @@ -7810,6 +7837,14 @@ "integrity": "sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=", "dev": true }, + "prismjs": { + "version": "1.17.1", + "resolved": "https://registry.npmjs.org/prismjs/-/prismjs-1.17.1.tgz", + "integrity": "sha512-PrEDJAFdUGbOP6xK/UsfkC5ghJsPJviKgnQOoxaDbBjwc8op68Quupwt1DeAFoG8GImPhiKXAvvsH7wDSLsu1Q==", + "requires": { + "clipboard": "^2.0.0" + } + }, "process": { "version": "0.11.10", "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz", @@ -8595,6 +8630,12 @@ "ajv-keywords": "^3.1.0" } }, + "select": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/select/-/select-1.1.2.tgz", + "integrity": "sha1-DnNQrN7ICxEIUoeG7B1EGNEbOW0=", + "optional": true + }, "select-hose": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz", @@ -9727,6 +9768,12 @@ "setimmediate": "^1.0.4" } }, + "tiny-emitter": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/tiny-emitter/-/tiny-emitter-2.1.0.tgz", + "integrity": "sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q==", + "optional": true + }, "tmp": { "version": "0.0.33", "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz", @@ -11190,8 +11237,7 @@ "ansi-regex": { "version": "2.1.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "aproba": { "version": "1.2.0", @@ -11234,8 +11280,7 @@ "code-point-at": { "version": "1.1.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "concat-map": { "version": "0.0.1", @@ -11246,8 +11291,7 @@ "console-control-strings": { "version": "1.1.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "core-util-is": { "version": "1.0.2", @@ -11364,8 +11408,7 @@ "inherits": { "version": "2.0.3", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "ini": { "version": "1.3.5", @@ -11377,7 +11420,6 @@ "version": "1.0.0", "bundled": true, "dev": true, - "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -11400,14 +11442,12 @@ "minimist": { "version": "0.0.8", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "minipass": { "version": "2.3.5", "bundled": true, "dev": true, - "optional": true, "requires": { "safe-buffer": "^5.1.2", "yallist": "^3.0.0" @@ -11426,7 +11466,6 @@ "version": "0.5.1", "bundled": true, "dev": true, - "optional": true, "requires": { "minimist": "0.0.8" } @@ -11507,8 +11546,7 @@ "number-is-nan": { "version": "1.0.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "object-assign": { "version": "4.1.1", @@ -11520,7 +11558,6 @@ "version": "1.4.0", "bundled": true, "dev": true, - "optional": true, "requires": { "wrappy": "1" } @@ -11606,8 +11643,7 @@ "safe-buffer": { "version": "5.1.2", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "safer-buffer": { "version": "2.1.2", @@ -11643,7 +11679,6 @@ "version": "1.0.2", "bundled": true, "dev": true, - "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -11663,7 +11698,6 @@ "version": "3.0.1", "bundled": true, "dev": true, - "optional": true, "requires": { "ansi-regex": "^2.0.0" } @@ -11707,14 +11741,12 @@ "wrappy": { "version": "1.0.2", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "yallist": { "version": "3.0.3", "bundled": true, - "dev": true, - "optional": true + "dev": true } } }, diff --git a/package.json b/package.json index c11a46c6..19a49403 100644 --- a/package.json +++ b/package.json @@ -22,6 +22,7 @@ "@angular/router": "~8.2.0", "@ngx-translate/core": "^11.0.1", "@ngx-translate/http-loader": "^4.0.0", + "ngx-markdown": "^8.2.1", "rxjs": "~6.4.0", "tslib": "^1.10.0", "zone.js": "~0.9.1" diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 6f6a2080..d2a78ad2 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -28,6 +28,7 @@ import {VotingChoiceComponent} from './pages/voting-choice/voting-choice.compone import {PasswordComponent} from './pages/password/password.component'; import {HomeComponent} from './pages/home/home.component'; import {HttpClient, HttpClientModule} from '@angular/common/http'; +import { MarkdownModule } from 'ngx-markdown'; import { MissingTranslationHandler, MissingTranslationHandlerParams, @@ -77,6 +78,7 @@ export function HttpLoaderFactory(http: HttpClient) { CommonModule, BrowserModule, AppRoutingModule, + MarkdownModule.forRoot(), TranslateModule.forRoot({ missingTranslationHandler: { provide: MissingTranslationHandler, diff --git a/src/app/pages/home/home.component.html b/src/app/pages/home/home.component.html index 620f21cf..c0bdf141 100644 --- a/src/app/pages/home/home.component.html +++ b/src/app/pages/home/home.component.html @@ -56,7 +56,6 @@ >
-