From aca7b2103d78002b59a45ea409feec6af68d1ebe Mon Sep 17 00:00:00 2001 From: Daniel Miranda Date: Thu, 23 Sep 2021 10:46:44 -0700 Subject: [PATCH 1/8] added migrations for mozilla researched --- .../0038_productpage_time_researched.py | 18 ++++++++++++++++++ .../wagtailpages/pagemodels/products.py | 14 ++++++++++++-- 2 files changed, 30 insertions(+), 2 deletions(-) create mode 100644 network-api/networkapi/wagtailpages/migrations/0038_productpage_time_researched.py diff --git a/network-api/networkapi/wagtailpages/migrations/0038_productpage_time_researched.py b/network-api/networkapi/wagtailpages/migrations/0038_productpage_time_researched.py new file mode 100644 index 00000000000..99818cc32cf --- /dev/null +++ b/network-api/networkapi/wagtailpages/migrations/0038_productpage_time_researched.py @@ -0,0 +1,18 @@ +# Generated by Django 3.1.11 on 2021-09-23 01:13 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('wagtailpages', '0037_productpage_mozilla_says'), + ] + + operations = [ + migrations.AddField( + model_name='productpage', + name='time_researched', + field=models.IntegerField(default=0, help_text='How many hours were spent researching this product?'), + ), + ] diff --git a/network-api/networkapi/wagtailpages/pagemodels/products.py b/network-api/networkapi/wagtailpages/pagemodels/products.py index 5f982553ea2..d074efe4fbb 100644 --- a/network-api/networkapi/wagtailpages/pagemodels/products.py +++ b/network-api/networkapi/wagtailpages/pagemodels/products.py @@ -425,6 +425,10 @@ class ProductPage(AirtableMixin, FoundationMetadataPageMixin, Page): help_text='Whether or not Mozilla would recommend this product. ' 'Will appear as a thumbs up/down/middle.', ) + time_researched = models.IntegerField( + help_text="How many hours were spent researching this product?", + default=0 + ) """ privacy_policy_links = Orderable, defined in ProductPagePrivacyPolicyLink @@ -560,6 +564,7 @@ def map_import_fields(cls): "Has privacy policy": "privacy_policy", "Privacy policy help text": "privacy_policy_helptext", "Mozilla Says": "mozilla_says", + "Time Researched ": "time_researched", } return mappings @@ -604,7 +609,9 @@ def get_export_fields(self): "Manages security help text": self.manage_vulnerabilities_helptext, "Has privacy policy": self.privacy_policy, "Privacy policy help text": self.privacy_policy_helptext, - "Mozilla Says": self.mozilla_says + "Mozilla Says": self.mozilla_says, + "Time Researched ": "time_researched", + } def get_status_for_airtable(self): @@ -655,7 +662,9 @@ def get_voting_json(self): FieldPanel('blurb'), ImageChooserPanel('image'), FieldPanel('worst_case'), - FieldPanel('mozilla_says') + FieldPanel('mozilla_says'), + FieldPanel('time_researched') + ], heading='General Product Details', classname='collapsible' @@ -781,6 +790,7 @@ def get_voting_json(self): SynchronizedField('privacy_policy'), TranslatableField('privacy_policy_helptext'), SynchronizedField('mozilla_says'), + SynchronizedField('time_researched'), ] @property From 3ef3bbefee3e487be5024471a3b889de2383fa6c Mon Sep 17 00:00:00 2001 From: Daniel Miranda Date: Fri, 24 Sep 2021 13:49:50 -0700 Subject: [PATCH 2/8] merge with q3 branch --- .../0038_productpage_time_researched.py | 18 ------------------ 1 file changed, 18 deletions(-) delete mode 100644 network-api/networkapi/wagtailpages/migrations/0038_productpage_time_researched.py diff --git a/network-api/networkapi/wagtailpages/migrations/0038_productpage_time_researched.py b/network-api/networkapi/wagtailpages/migrations/0038_productpage_time_researched.py deleted file mode 100644 index 99818cc32cf..00000000000 --- a/network-api/networkapi/wagtailpages/migrations/0038_productpage_time_researched.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 3.1.11 on 2021-09-23 01:13 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('wagtailpages', '0037_productpage_mozilla_says'), - ] - - operations = [ - migrations.AddField( - model_name='productpage', - name='time_researched', - field=models.IntegerField(default=0, help_text='How many hours were spent researching this product?'), - ), - ] From 2991121f9c9400e2cc98e457d83a05dfe737d0ae Mon Sep 17 00:00:00 2001 From: Daniel Miranda Date: Fri, 24 Sep 2021 14:06:53 -0700 Subject: [PATCH 3/8] merge with q3 branch --- .../0038_productpage_time_researched.py | 18 ++++++++++++++++++ .../wagtailpages/pagemodels/products.py | 2 +- 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 network-api/networkapi/wagtailpages/migrations/0038_productpage_time_researched.py diff --git a/network-api/networkapi/wagtailpages/migrations/0038_productpage_time_researched.py b/network-api/networkapi/wagtailpages/migrations/0038_productpage_time_researched.py new file mode 100644 index 00000000000..f5aa5de9949 --- /dev/null +++ b/network-api/networkapi/wagtailpages/migrations/0038_productpage_time_researched.py @@ -0,0 +1,18 @@ +# Generated by Django 3.1.11 on 2021-09-24 21:00 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('wagtailpages', '0037_productpage_mozilla_says'), + ] + + operations = [ + migrations.AddField( + model_name='productpage', + name='time_researched', + field=models.PositiveIntegerField(default=0, help_text='How many hours were spent researching this product?'), + ), + ] diff --git a/network-api/networkapi/wagtailpages/pagemodels/products.py b/network-api/networkapi/wagtailpages/pagemodels/products.py index d074efe4fbb..18e3eb7b763 100644 --- a/network-api/networkapi/wagtailpages/pagemodels/products.py +++ b/network-api/networkapi/wagtailpages/pagemodels/products.py @@ -425,7 +425,7 @@ class ProductPage(AirtableMixin, FoundationMetadataPageMixin, Page): help_text='Whether or not Mozilla would recommend this product. ' 'Will appear as a thumbs up/down/middle.', ) - time_researched = models.IntegerField( + time_researched = models.PositiveIntegerField( help_text="How many hours were spent researching this product?", default=0 ) From 496c371b1aa212fbd04cd4f6669cfe98363288a7 Mon Sep 17 00:00:00 2001 From: Daniel Miranda Date: Fri, 24 Sep 2021 14:17:01 -0700 Subject: [PATCH 4/8] updated migrations --- ...time_researched.py => 0039_productpage_time_researched.py} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename network-api/networkapi/wagtailpages/migrations/{0038_productpage_time_researched.py => 0039_productpage_time_researched.py} (77%) diff --git a/network-api/networkapi/wagtailpages/migrations/0038_productpage_time_researched.py b/network-api/networkapi/wagtailpages/migrations/0039_productpage_time_researched.py similarity index 77% rename from network-api/networkapi/wagtailpages/migrations/0038_productpage_time_researched.py rename to network-api/networkapi/wagtailpages/migrations/0039_productpage_time_researched.py index f5aa5de9949..0b6b5f2051e 100644 --- a/network-api/networkapi/wagtailpages/migrations/0038_productpage_time_researched.py +++ b/network-api/networkapi/wagtailpages/migrations/0039_productpage_time_researched.py @@ -1,4 +1,4 @@ -# Generated by Django 3.1.11 on 2021-09-24 21:00 +# Generated by Django 3.1.11 on 2021-09-24 21:07 from django.db import migrations, models @@ -6,7 +6,7 @@ class Migration(migrations.Migration): dependencies = [ - ('wagtailpages', '0037_productpage_mozilla_says'), + ('wagtailpages', '0038_auto_20210924_2002'), ] operations = [ From bdc9b819b9539def0ccf86e457a3d665df134421 Mon Sep 17 00:00:00 2001 From: Daniel Miranda Date: Sun, 26 Sep 2021 23:48:55 -0700 Subject: [PATCH 5/8] saving to ask design for what to do on the medium breakpoint for the mozilla says and researched section. --- .../templates/buyersguide/product_page.html | 27 +++++++++++++++++-- source/images/buyers-guide/info-circle.svg | 3 +++ source/sass/buyers-guide/views/product.scss | 13 +++++++++ 3 files changed, 41 insertions(+), 2 deletions(-) create mode 100644 source/images/buyers-guide/info-circle.svg diff --git a/network-api/networkapi/wagtailpages/templates/buyersguide/product_page.html b/network-api/networkapi/wagtailpages/templates/buyersguide/product_page.html index a5f2cbfe090..43bdd9e31f7 100644 --- a/network-api/networkapi/wagtailpages/templates/buyersguide/product_page.html +++ b/network-api/networkapi/wagtailpages/templates/buyersguide/product_page.html @@ -73,10 +73,33 @@

{{product.title}}

{% endif %} -
+

{% blocktrans with date=product.review_date|date:"DATE_FORMAT" context "Date format (e.g. Nov. 19, 2020)" %}Review date: {{ date }}{% endblocktrans %}

- | + {% trans "Mozilla researched" context "This string is followed by a numerical value, to show the hours spent researching the product." %} {{ product.time_researched }} {% trans "hours" %}

{% trans "Mozilla says" context "This string is followed by a thumb up, thumb down, or thumb on the side icon to summarize Mozilla’s review of the product" %}

+ {% trans "People voted" context "This string is followed by the creepiness that most people voted, as well as the percentage of people that voted for that ranking" %} {{ product.time_researched }} % {% trans "super creepy" %} + + + + + + + +

{{product.blurb}}

diff --git a/source/images/buyers-guide/info-circle.svg b/source/images/buyers-guide/info-circle.svg new file mode 100644 index 00000000000..0713b2fe3fe --- /dev/null +++ b/source/images/buyers-guide/info-circle.svg @@ -0,0 +1,3 @@ + + + diff --git a/source/sass/buyers-guide/views/product.scss b/source/sass/buyers-guide/views/product.scss index 8b4dc53a06d..6da675fc2c5 100644 --- a/source/sass/buyers-guide/views/product.scss +++ b/source/sass/buyers-guide/views/product.scss @@ -209,6 +209,19 @@ } } + .mozilla-researched { + &::after { + content: " "; + display: inline-block; + width: 1.5em; + height: 1.5em; + margin-left: 4px; + position: relative; + vertical-align: middle; + background: url(../_images/buyers-guide/info-circle.svg) no-repeat; + } + } + .mozilla-says { &::after { content: " "; From 4ec3387018e2ee4fa34112e558b6662c83d6adfa Mon Sep 17 00:00:00 2001 From: Daniel Miranda Date: Wed, 29 Sep 2021 16:08:23 -0700 Subject: [PATCH 6/8] updated to use tailwind --- .../templates/buyersguide/product_page.html | 36 ++++++------------- 1 file changed, 11 insertions(+), 25 deletions(-) diff --git a/network-api/networkapi/wagtailpages/templates/buyersguide/product_page.html b/network-api/networkapi/wagtailpages/templates/buyersguide/product_page.html index 43bdd9e31f7..7dc130be36f 100644 --- a/network-api/networkapi/wagtailpages/templates/buyersguide/product_page.html +++ b/network-api/networkapi/wagtailpages/templates/buyersguide/product_page.html @@ -73,33 +73,19 @@

{{product.title}}

{% endif %} -
-

{% blocktrans with date=product.review_date|date:"DATE_FORMAT" context "Date format (e.g. Nov. 19, 2020)" %}Review date: {{ date }}{% endblocktrans %}

- {% trans "Mozilla researched" context "This string is followed by a numerical value, to show the hours spent researching the product." %} {{ product.time_researched }} {% trans "hours" %} -

{% trans "Mozilla says" context "This string is followed by a thumb up, thumb down, or thumb on the side icon to summarize Mozilla’s review of the product" %}

- {% trans "People voted" context "This string is followed by the creepiness that most people voted, as well as the percentage of people that voted for that ranking" %} {{ product.time_researched }} % {% trans "super creepy" %} - - - - - - - - +

{{product.blurb}}

From 8e29cf18280aa700ddc9a9aadbcf2e6edb560ae5 Mon Sep 17 00:00:00 2001 From: Daniel Miranda Date: Thu, 30 Sep 2021 17:28:53 -0700 Subject: [PATCH 7/8] added new template to house all of the research details --- .../templates/buyersguide/product_page.html | 15 +----------- .../templates/fragments/research_details.html | 23 +++++++++++++++++++ tailwind.config.js | 1 + 3 files changed, 25 insertions(+), 14 deletions(-) create mode 100644 network-api/networkapi/wagtailpages/templates/fragments/research_details.html diff --git a/network-api/networkapi/wagtailpages/templates/buyersguide/product_page.html b/network-api/networkapi/wagtailpages/templates/buyersguide/product_page.html index 7dc130be36f..c0c9a85fc17 100644 --- a/network-api/networkapi/wagtailpages/templates/buyersguide/product_page.html +++ b/network-api/networkapi/wagtailpages/templates/buyersguide/product_page.html @@ -73,20 +73,7 @@

{{product.title}}

{% endif %} -
-
- {% blocktrans with date=product.review_date|date:"DATE_FORMAT" context "Date format (e.g. Nov. 19, 2020)" %}Review date: {{ date }}{% endblocktrans %}

-
-
- {% trans "Mozilla researched" context "This string is followed by a numerical value, to show the hours spent researching the product." %} {{ product.time_researched }} {% trans "hours" %} -
-
- {% trans "Mozilla says" context "This string is followed by a thumb up, thumb down, or thumb on the side icon to summarize Mozilla’s review of the product" %} -
-
- {% trans "People voted" context "This string is followed by the creepiness that most people voted, as well as the percentage of people that voted for that ranking" %} {{ product.time_researched }} % {% trans "super creepy" %} -
-
+ {% include "fragments/research_details.html" with review_date=product.review_date time_researched=product.time_researched mozilla_says=product.mozilla_says %}

{{product.blurb}}

diff --git a/network-api/networkapi/wagtailpages/templates/fragments/research_details.html b/network-api/networkapi/wagtailpages/templates/fragments/research_details.html new file mode 100644 index 00000000000..f04489a0ae8 --- /dev/null +++ b/network-api/networkapi/wagtailpages/templates/fragments/research_details.html @@ -0,0 +1,23 @@ +{% load i18n localization %} + +{% comment %} + This is the section underneath the title of the products heading, where we display date and time spent researching, as well as creepiness level people have voted. +{% endcomment %} + +
+
+
+

{% blocktrans with date=review_date|date:"DATE_FORMAT" context "Date format (e.g. Nov. 19, 2020)" %}Review date: {{ date }}{% endblocktrans %}

+
+ | +
+ {% trans "Mozilla researched" context "This string is followed by a numerical value, to show the hours spent researching the product." %} {{ time_researched }} {% trans "hours" %} +
+
+ | +
+
+

{% trans "Mozilla says" context "This string is followed by a thumb up, thumb down, or thumb on the side icon to summarize Mozilla’s review of the product" %}

+
+
+
\ No newline at end of file diff --git a/tailwind.config.js b/tailwind.config.js index bdedf27930f..1b6039f995d 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -53,6 +53,7 @@ module.exports = { }, // Renaming breakpoints temporary until we remove bootstrap usage screens: { + xsmall: "380px", small: "576px", medium: "768px", large: "992px", From e56cd234b54484f3688a60f0df14a87552af59f6 Mon Sep 17 00:00:00 2001 From: Daniel Miranda Date: Thu, 30 Sep 2021 17:58:32 -0700 Subject: [PATCH 8/8] updated migrations --- ...time_researched.py => 0041_productpage_time_researched.py} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename network-api/networkapi/wagtailpages/migrations/{0039_productpage_time_researched.py => 0041_productpage_time_researched.py} (78%) diff --git a/network-api/networkapi/wagtailpages/migrations/0039_productpage_time_researched.py b/network-api/networkapi/wagtailpages/migrations/0041_productpage_time_researched.py similarity index 78% rename from network-api/networkapi/wagtailpages/migrations/0039_productpage_time_researched.py rename to network-api/networkapi/wagtailpages/migrations/0041_productpage_time_researched.py index 0b6b5f2051e..1df505e5f96 100644 --- a/network-api/networkapi/wagtailpages/migrations/0039_productpage_time_researched.py +++ b/network-api/networkapi/wagtailpages/migrations/0041_productpage_time_researched.py @@ -1,4 +1,4 @@ -# Generated by Django 3.1.11 on 2021-09-24 21:07 +# Generated by Django 3.1.11 on 2021-10-01 00:54 from django.db import migrations, models @@ -6,7 +6,7 @@ class Migration(migrations.Migration): dependencies = [ - ('wagtailpages', '0038_auto_20210924_2002'), + ('wagtailpages', '0040_auto_20210929_2116'), ] operations = [