Clean Up /contact-us Page, Fix "Contact us" Footer Link, and Update terms_of_use_path

CHANGELOG.md

@@ -14,6 +14,10 @@
 
  - Bump recaptcha from 5.16.0 to 5.18.0 [#964](https://github.com/portagenetwork/roadmap/pull/964)
 
+### Fixed
+
+ - Clean Up `/contact-us` Page, Fix "Contact us" Footer Link, and Update `terms_of_use_path` [#978](https://github.com/portagenetwork/roadmap/pull/978)
+
 ## [4.1.1+portage-4.2.3] - 2024-11-20
 
 ### Added

app/helpers/application_helper.rb

@@ -53,24 +53,8 @@ def current_locale_logo
     end
   end
 
-  def contact_us_path
-    if I18n.locale == :'fr-CA'
-      'https://portagenetwork.ca/fr/contactez-nous/'
-    else
-      # Handling :'en-CA' locale
-      'https://portagenetwork.ca/contact-us/'
-    end
-  end
-
-  # TODO: Replace function body with the commented-out code when French version of this path is made available.
   def terms_of_use_path
-    'https://dmp-pgd.ca/terms' # TEMPORARY FIX
-    # if I18n.locale == :'fr-CA'
-    #   'https://portagenetwork.ca/fr/outils-et-ressources/assistant-pgd/conditions-dutilisation-de-lassistant-pgd/'
-    # else
-    #   # Handling :'en-CA' locale
-    #   'https://assistant.portagenetwork.ca/terms'
-    # end
+    '/terms'
   end
 
   def how_to_manage_your_data_path

config/initializers/_dmproadmap.rb

@@ -36,26 +36,23 @@ class Application < Rails::Application
     # This email is used in email communications
     config.x.organisation.helpdesk_email = '[email protected]'
     # Your organisation's telephone number - used on the contact us page
-    config.x.organisation.telephone = '+1-123-123-1234'
+    config.x.organisation.telephone = nil
     # Your organisation's address - used on the contact us page
-    # rubocop:disable Naming/VariableNumber
     config.x.organisation.address = {
-      line_1: 'P.O. Box 48008',
-      line_2: 'Davisville Post Office',
-      line_3: 'Toronto, ON',
-      line_4: 'M4S 3C6',
+      line1: nil,
+      line2: nil,
+      line3: nil,
+      line4: nil,
       country: 'Canada'
     }
-    # rubocop:enable Naming/VariableNumber
-
     # The Google maps link to your organisation's location - used to display the
     # Google map on the contact us page.
     # To find your organisation's Google maps URL, open maps.google.com, search for
     # your orgnaisation and then click the menu link to the left of the search box,
     # once the menu opens, click the 'share or embed' link and the 'embed' tab on
     # the dialog window that opens. DO NOT place the entire <iframe> tag below, just
     # the address!
-    config.x.organisation.google_maps_link = 'https://www.google.com/maps/embed?pb=!1m18!1m12!1m3!1d29046286.09795864!2d-34.22768319424708!3d-63.61874004304689!2m3!1f0!2f0!3f0!3m2!1i1024!2i768!4f13.1!3m3!1m2!1s0x0%3A0xb57520cc078b16a9!2sPrincess%20Elisabeth%20Station!5e0!3m2!1sen!2sus!4v1587495708129!5m2!1sen!2sus'
+    config.x.organisation.google_maps_link = nil
 
     # Uncomment the following line if you want to redirect your users to an
     # organisational contact/help page instead of using the built-in contact_us form