fix: Tweaks from testing

clivewalkden · clivewalkden · commit 39cc22032ebf · 2023-11-23T15:46:34.000Z
diff --git a/Block/Display.php b/Block/Display.php
@@ -84,14 +84,7 @@ public function getSecret(): ?string
      */
     public function prepareConfig(): array
     {
-        $config = [
-            'custom' => [
-                'capturedBy' => 'Magento 2 Feedbucket Module: ' . $this->configProvider->getExtensionVersion(),
-                'magentoDeployMode' => $this->state->getMode()
-            ]
-        ];
-
-        return $this->jsConfig = $config;
+        return $this->jsConfig = [];
     }
 
     /**
diff --git a/etc/adminhtml/menu.xml b/etc/adminhtml/menu.xml
@@ -17,14 +17,22 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Backend:etc/menu.xsd">
     <menu>
+        <!-- SOZO Core Module Menu Additions -->
+        <!-- sortOrder 0605, F and E are letters 6 and 5 in the alphabet-->
         <add module="Sozo_Feedbucket"
              title="Feedbucket"
-             id="Sozo_Feedbucket::config"
+             translate="title"
+             id="Sozo_Feedbucket::core_feedbucket"
              resource="Sozo_Feedbucket::config"
-             parent="Magento_Backend::system_other_settings"
+             parent="Sozo_Core::sozo_menu"
+             sortOrder="0605"/>
+        <add module="Sozo_Feedbucket"
+             title="Configuration"
              translate="title"
+             id="Sozo_Feedbucket::core_feedbucket_config"
+             resource="Sozo_Feedbucket::config"
              action="admin/system_config/edit/section/sozo_feedbucket"
-             dependsOnModule="Sozo_Feedbucket"
-             sortOrder="40"/>
+             parent="Sozo_Feedbucket::core_feedbucket"
+             sortOrder="10"/>
     </menu>
 </config>
diff --git a/etc/csp_whitelist.xml b/etc/csp_whitelist.xml
@@ -20,31 +20,28 @@
     <policies>
         <policy id="script-src">
             <values>
-                <value id="sozo-feedbucket-widget" type="host">widget.usersnap.com</value>
-                <value id="sozo-feedbucket-resources" type="host">resources.usersnap.com</value>
+                <value id="sozo-feedbucket-widget" type="host">cdn.feedbucket.app</value>
             </values>
         </policy>
         <policy id="style-src">
             <values>
-                <!--GoogleFonts-->
-                <value id="sozo-feedbucket-googlefonts" type="host">https://fonts.googleapis.com</value>
+                <value id="sozo-feedbucket" type="host">https://cdn.feedbucket.app</value>
             </values>
         </policy>
-        <policy id="font-src">
+        <policy id="connect-src">
             <values>
-                <value id="cw-usersnao-googlefonts" type="host">https://fonts.gstatic.com</value>
+                <value id="sozo-feedbucket-dashboard" type="host">dashboard.feedbucket.app</value>
+                <value id="sozo-feedbucket-cdn" type="host">cdn.feedbucket.app</value>
             </values>
         </policy>
-        <policy id="connect-src">
+        <policy id="img-src">
             <values>
-                <value id="sozo-feedbucket-widget" type="host">widget.usersnap.com</value>
-
-                <value id="sozo-feedbucket-aws" type="host">*.amazonaws.com</value>
+                <value id="sozo-feedbucket" type="host">https://dashboard.feedbucket.app</value>
             </values>
         </policy>
-        <policy id="img-src">
+        <policy id="media-src">
             <values>
-                <value id="sozo-feedbucket-gravatar" type="host">www.gravatar.com</value>
+                <value id="sozo-feedbucket" type="host">blob:</value>
             </values>
         </policy>
     </policies>
diff --git a/view/adminhtml/layout/default.xml b/view/adminhtml/layout/default.xml
@@ -21,7 +21,7 @@
             <block class="Sozo\Feedbucket\Block\Backend"
                    name="feedbucket_js"
                    as="feedbucket_js"
-                   template="Sozo_Feedbucket::snap/widget.phtml"/>
+                   template="Sozo_Feedbucket::widget.phtml"/>
         </referenceContainer>
     </body>
 </page>
diff --git a/view/adminhtml/templates/widget.phtml b/view/adminhtml/templates/widget.phtml
@@ -21,9 +21,7 @@
 ?>
 <!-- BEGIN FEEDBUCKET CODE {literal} -->
 <script>
-    window.feedbucketConfig = {
-        <?= $block->getJsConfig()?>
-    }
+    window.feedbucketConfig = <?= $block->getJsConfig()?>
 </script>
 <script type="text/javascript">
     (function(k) {
diff --git a/view/adminhtml/web/css/source/_module.less b/view/adminhtml/web/css/source/_module.less
@@ -27,7 +27,4 @@
         float:left;
         padding-right: @indent__base;
     }
-    strong {
-        color: @feedbucket-primary;
-    }
 }
diff --git a/view/adminhtml/web/css/source/module/variables/_variables.less b/view/adminhtml/web/css/source/module/variables/_variables.less
@@ -14,5 +14,4 @@
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
-@cw-primary: #ea7601;
-@feedbucket-primary: #4438ca;
+
diff --git a/view/adminhtml/web/images/usersnap-logo-square-white.png b/view/adminhtml/web/images/usersnap-logo-square-white.png
diff --git a/view/frontend/templates/widget.phtml b/view/frontend/templates/widget.phtml
@@ -21,9 +21,7 @@
 ?>
 <!-- BEGIN FEEDBUCKET CODE {literal} -->
 <script>
-    window.feedbucketConfig = {
-        <?= $block->getJsConfig()?>
-    }
+    window.feedbucketConfig = <?= $block->getJsConfig()?>
 </script>
 <script type="text/javascript">
     (function(k) {

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,4 @@`
`27`	`27`	`float:left;`
`28`	`28`	`padding-right: @indent__base;`
`29`	`29`	`}`
`30`		`- strong {`
`31`		`- color: @feedbucket-primary;`
`32`		`- }`
`33`	`30`	`}`