Merge pull request #630 from citizensadvice/fundraising-regulator-logo

CP-606: add Fundraing Regulator logo to the footer

Author: cnorthwood

Gemfile

@@ -38,7 +38,7 @@ gem "bootsnap", require: false
 # Pinned version, should match @citizensadvice/design-system in package.json
 gem "citizens_advice_components",
     github: "citizensadvice/design-system",
-    tag: "v8.1.0",
+    tag: "v8.3.0",
     glob: "engine/*.gemspec"
 
 gem "citizens_advice_cookie_preferences",

Gemfile.lock

@@ -31,11 +31,11 @@ GIT
 
 GIT
   remote: https://github.com/citizensadvice/design-system.git
-  revision: c3cb623bf7eeac13c5573d7594032bc10f611021
-  tag: v8.1.0
+  revision: deed9ed919cc1452c8e440e6cf45c1f3a1469bd8
+  tag: v8.3.0
   glob: engine/*.gemspec
   specs:
-    citizens_advice_components (8.1.0)
+    citizens_advice_components (8.3.0)
       actionpack (>= 7.1.0, < 9.0)
       actionview (>= 7.1.0, < 9.0)
       activemodel (>= 7.1.0, < 9.0)

app/components/footer_component.rb

@@ -17,6 +17,7 @@ def call
                            title: @feedback_title,
                            new_tab: true)
       c.with_columns(@columns)
+      c.with_additional_logo { fundraising_regulator_logo }
     end
   end
 
@@ -27,4 +28,12 @@ def research_uri
 
     URI::HTTPS.build(host: "www.research.net", path: "/r/#{@feedback_survey_id}", query: hash.to_query)
   end
+
+  def fundraising_regulator_logo
+    image_tag fundraising_regulator_logo_url, alt: "Fundraising Regulator registered"
+  end
+
+  def fundraising_regulator_logo_url
+    "https://www.fundraisingregulator.org.uk/fr-badge/6d8352f2-d995-4eea-bb60-a28c2dc8d842/en/black"
+  end
 end

config/initializers/content_security_policy.rb

@@ -68,6 +68,9 @@
 
     # DataDog JS error logging
     merge_into[:connect_src, "https://browser-intake-datadoghq.eu"]
+
+    # Fundraising Regulator logo (we have to use the third party hosted one to demonstrate the validation)
+    merge_into[:img_src, "https://www.fundraisingregulator.org.uk"]
   end
   # rubocop:enable Metrics/BlockLength
 

docs/getting-started.md

@@ -56,4 +56,4 @@ You can run the application along with asset compilation using the following dev
 ./bin/dev
 ```
 
-If all is working you should be able to access the application at `http://localhost:3000/`
+If all is working you should be able to access the application at `http://localhost:3300/`

package.json

@@ -2,7 +2,7 @@
   "name": "app",
   "private": "true",
   "dependencies": {
-    "@citizensadvice/design-system": "^8.1.0",
+    "@citizensadvice/design-system": "8.3.0",
     "@datadog/browser-logs": "^6.18.1",
     "esbuild": "^0.25.9",
     "eslint-plugin-import": "^2.32.0",

spec/components/footer_component_spec.rb

@@ -41,4 +41,8 @@
   describe "footer columns" do
     it { is_expected.to have_css "nav ul", count: 2 }
   end
+
+  describe "Fundraising Regulator logo" do
+    it { is_expected.to have_css 'img[src^="https://www.fundraisingregulator.org.uk"]' }
+  end
 end

yarn.lock

@@ -28,10 +28,10 @@
     chalk "^2.0.0"
     js-tokens "^4.0.0"
 
-"@citizensadvice/design-system@^8.1.0":
-  version "8.1.0"
-  resolved "https://registry.yarnpkg.com/@citizensadvice/design-system/-/design-system-8.1.0.tgz#32ae00c163da914f656e955cc87e6ec96cb90135"
-  integrity sha512-DUJulHNdhSbOHdso6fSg6vjROcKuXf7OC0QSm/kZnC1dMA+cOkFszi6YIVbYlK8zFl4ufOQb/GA+EU2hrBJXmA==
+"@citizensadvice/design-system@8.3.0":
+  version "8.3.0"
+  resolved "https://registry.yarnpkg.com/@citizensadvice/design-system/-/design-system-8.3.0.tgz#6203d39db9bf784da7dd1ea6691c0aa014cd48f5"
+  integrity sha512-1BMF+5yNKFo8e9Mag6SfVRwHboFv/RJBH0Ry6rhXHSabxL9CiG+ePdZ/aE2eU08MhOB7vZQBYmT7hJ9IVBhPnA==
 
 "@csstools/css-parser-algorithms@^3.0.5":
   version "3.0.5"