From d5dc6876dbb2cc1912d899607ee847d70b993b92 Mon Sep 17 00:00:00 2001
From: Petr Jasek <jasekpetr@gmail.com>
Date: Tue, 26 Mar 2024 14:37:03 +0100
Subject: [PATCH] integrate feedback form via product fruits

CPCN-194
---
 client/package-lock.json | 22 +++++++++++-----------
 server/settings.py       |  2 ++
 server/theme/layout.html | 15 ++++++++++++++-
 server/theme/theme.css   |  4 ++++
 4 files changed, 31 insertions(+), 12 deletions(-)

diff --git a/client/package-lock.json b/client/package-lock.json
index 504257c..efebaef 100644
--- a/client/package-lock.json
+++ b/client/package-lock.json
@@ -1187,12 +1187,12 @@
       },
       "dependencies": {
         "@types/react": {
-          "version": "16.14.59",
-          "resolved": "https://registry.npmjs.org/@types/react/-/react-16.14.59.tgz",
-          "integrity": "sha512-tOV7Za9TpBGi0jyi/fjsUmuFM1svfInVsBCkpQcwNDkVL8MEN1aV3FxjI4wYaASMlVE6NZXXx06zaN4rtRPwyQ==",
+          "version": "16.14.60",
+          "resolved": "https://registry.npmjs.org/@types/react/-/react-16.14.60.tgz",
+          "integrity": "sha512-wIFmnczGsTcgwCBeIYOuy2mdXEiKZ5znU/jNOnMZPQyCcIxauMGWlX0TNG4lZ7NxRKj7YUIZRneJQSSdB2jKgg==",
           "requires": {
             "@types/prop-types": "*",
-            "@types/scheduler": "*",
+            "@types/scheduler": "^0.16",
             "csstype": "^3.0.2"
           }
         }
@@ -1267,12 +1267,12 @@
       "integrity": "sha512-5zvhXYtRNRluoE/jAp4GVsSduVUzNWKkOZrCDBWYtE7biZywwdC2AcEzg+cSMLFRfVgeAFqpfNabiPjxFddV1Q=="
     },
     "@types/react": {
-      "version": "17.0.79",
-      "resolved": "https://registry.npmjs.org/@types/react/-/react-17.0.79.tgz",
-      "integrity": "sha512-gavKA8AwJAML9zWHuiQRASjrrPJHbT/zrUDHiUGUf+l5a3pkEd6atvjjq+8y2vfRHBJLQJjFpxSa9I8qe9zHAw==",
+      "version": "17.0.80",
+      "resolved": "https://registry.npmjs.org/@types/react/-/react-17.0.80.tgz",
+      "integrity": "sha512-LrgHIu2lEtIo8M7d1FcI3BdwXWoRQwMoXOZ7+dPTW0lYREjmlHl3P0U1VD0i/9tppOuv8/sam7sOjx34TxSFbA==",
       "requires": {
         "@types/prop-types": "*",
-        "@types/scheduler": "*",
+        "@types/scheduler": "^0.16",
         "csstype": "^3.0.2"
       }
     },
@@ -4317,9 +4317,9 @@
       "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow=="
     },
     "electron-to-chromium": {
-      "version": "1.4.715",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.715.tgz",
-      "integrity": "sha512-XzWNH4ZSa9BwVUQSDorPWAUQ5WGuYz7zJUNpNif40zFCiCl20t8zgylmreNmn26h5kiyw2lg7RfTmeMBsDklqg=="
+      "version": "1.4.717",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.717.tgz",
+      "integrity": "sha512-6Fmg8QkkumNOwuZ/5mIbMU9WI3H2fmn5ajcVya64I5Yr5CcNmO7vcLt0Y7c96DCiMO5/9G+4sI2r6eEvdg1F7A=="
     },
     "elliptic": {
       "version": "6.5.5",
diff --git a/server/settings.py b/server/settings.py
index 62eb085..cb46621 100644
--- a/server/settings.py
+++ b/server/settings.py
@@ -370,3 +370,5 @@
     "en": "CP NewsPro",
     "fr_ca": "PC NouvellesPro",
 }
+
+PRODUCTFRUITS_WORKSPACE_CODE = os.environ.get("PRODUCTFRUITS_WORKSPACE_CODE")
diff --git a/server/theme/layout.html b/server/theme/layout.html
index 1b98aea..2099fcd 100644
--- a/server/theme/layout.html
+++ b/server/theme/layout.html
@@ -9,11 +9,24 @@
     {% if get_locale() == "fr_CA" %}
     <title>PC NouvellesPro pour RP</title>
     {% else %}
-    <title>CP NewsPro for PR</title>
+    <title>CP NewsPro for PR v2</title>
     {% endif %}
 {% endblock %}
 
 {% block logo %}
 {% include 'logo.html' %}
 {% include 'logo-additional.html' %}
+{% endblock %}
+
+{% block layout_script %}
+{% if config.PRODUCTFRUITS_WORKSPACE_CODE and auth_user %}
+<script type="text/javascript">
+    (function(w,d,u){
+        w.$productFruits=w.$productFruits||[];
+        w.productFruits=w.productFruits||{};w.productFruits.scrV='2';
+        let a=d.getElementsByTagName('head')[0];let r=d.createElement('script');r.async=1;r.src=u;a.appendChild(r);
+    })(window,document,'https://app.productfruits.com/static/script.js');
+	$productFruits.push(['init', '{{ config.PRODUCTFRUITS_WORKSPACE_CODE }}', '{{ get_locale()[:2] }}', { username: '{{ hash(auth_user._id) }}' }]);
+</script>
+{% endif %}
 {% endblock %}
\ No newline at end of file
diff --git a/server/theme/theme.css b/server/theme/theme.css
index 3b22a5d..9243cff 100644
--- a/server/theme/theme.css
+++ b/server/theme/theme.css
@@ -104,4 +104,8 @@
         margin-block-start: 0;
         max-width: 160px;
     }
+}
+
+.productfruits--feedback-button {
+    z-index: 500;
 }
\ No newline at end of file