Merge pull request #1592 from bcgov/feat/daniel-update-footer-1528

feat: Update Footer Links, Delete Contact Us
bcgov · Jan 3, 2025 · 85d8f1d · 85d8f1d
2 parents 412ae66 + 936e8e7
commit 85d8f1d
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 145 deletions.
diff --git a/frontend/src/App.jsx b/frontend/src/App.jsx
@@ -24,9 +24,7 @@ import { AddEditUser } from './views/Users'
 import { ApiDocs } from './components/ApiDocs'
 import { Login } from './components/Login'
 import { NotFound } from './components/NotFound'
-import ContactUs from './components/ContactUs'
 import PublicLayout from './layouts/PublicLayout'
-import { EditViewComplianceReport } from './views/ComplianceReports/EditViewComplianceReport'
 import { AddEditNotionalTransfers } from '@/views/NotionalTransfers'
 import { AddEditOtherUses } from './views/OtherUses/AddEditOtherUses'
 import { AddEditFinalSupplyEquipments } from './views/FinalSupplyEquipments/AddEditFinalSupplyEquipments'
@@ -35,7 +33,6 @@ import { AddEditFuelExports } from './views/FuelExports/AddEditFuelExports'
 import { AddEditAllocationAgreements } from './views/AllocationAgreements/AddEditAllocationAgreements'
 import { logout } from '@/utils/keycloak.js'
 import { CompareReports } from '@/views/CompareReports/CompareReports'
-import { ViewLegacyComplianceReport } from '@/views/ComplianceReports/ViewLegacyComplianceReport.jsx'
 import { ComplianceReportViewSelector } from '@/views/ComplianceReports/ComplianceReportViewSelector.jsx'
 
 const router = createBrowserRouter([
@@ -148,7 +145,7 @@ const router = createBrowserRouter([
       {
         path: ROUTES.ORGANIZATIONS,
         element: <Organizations />,
-        handle: { title: 'Organizations', crumb: () => `Organizations` }
+        handle: { title: 'Organizations', crumb: () => 'Organizations' }
       },
       {
         path: ROUTES.ORGANIZATIONS_ADD,
@@ -385,11 +382,6 @@ const router = createBrowserRouter([
     element: <ApiDocs />,
     handle: { crumb: () => 'API Docs' }
   },
-  {
-    path: ROUTES.CONTACT_US,
-    element: <ContactUs />,
-    handle: { crumb: () => 'Contact Us' }
-  },
   {
     path: ROUTES.LOG_OUT,
     loader: async () => {

diff --git a/frontend/src/components/BCFooter/BCFooter.stories.jsx b/frontend/src/components/BCFooter/BCFooter.stories.jsx
@@ -45,12 +45,6 @@ Default.args = {
       name: 'Copyright',
       id: 'footer-copyright',
       label: 'BC gov copyright information'
-    },
-    {
-      href: '/contact-us',
-      name: 'Contact Us',
-      id: 'footer-contact-us',
-      label: 'Contact Us information for LCFS application'
     }
   ],
   repoDetails: {

diff --git a/frontend/src/components/BCFooter/index.jsx b/frontend/src/components/BCFooter/index.jsx
@@ -1,15 +1,8 @@
 import PropTypes from 'prop-types'
-
-// @mui material components
 import { Link } from '@mui/material'
-
-// BCGov React components
 import BCBox from '@/components/BCBox'
 import BCTypography from '@/components/BCTypography'
-// Icons
 import GitHubIcon from '@mui/icons-material/GitHub'
-
-// BCGov React base styles
 import typography from '@/themes/base/typography'
 
 function Footer({

diff --git a/frontend/src/components/ContactUs.jsx b/frontend/src/components/ContactUs.jsx
diff --git a/frontend/src/components/Footer.jsx b/frontend/src/components/Footer.jsx
@@ -7,13 +7,13 @@ const Footer = (props) => {
   const links = useMemo(
     () => [
       {
-        href: '/',
+        href: 'https://gov.bc.ca/',
         name: 'Home',
         id: 'footer-home',
         label: 'Home page of LCFS'
       },
       {
-        href: 'https://www2.gov.bc.ca/gov/content/industry/electricity-alternative-energy/transportation-energies/renewable-low-carbon-fuels/transportation-fuels-reporting-system',
+        href: 'https://www.gov.bc.ca/aboutgov',
         name: 'About this site',
         id: 'footer-about-this-site',
         label: 'About this site'
@@ -43,7 +43,7 @@ const Footer = (props) => {
         label: 'BC gov copyright information'
       },
       {
-        href: '/contact-us',
+        href: 'https://gov.bc.ca/contactus',
         name: 'Contact Us',
         id: 'footer-contact-us',
         label: 'Contact Us information for LCFS application'

diff --git a/frontend/src/components/Login.jsx b/frontend/src/components/Login.jsx
@@ -23,7 +23,7 @@ import Grid from '@mui/material/Grid'
 import { useKeycloak } from '@react-keycloak/web'
 import { useMemo } from 'react'
 import { useTranslation } from 'react-i18next'
-import { Link, useLocation } from 'react-router-dom'
+import { useLocation } from 'react-router-dom'
 import Snowfall from 'react-snowfall'
 
 const currentDate = new Date()
@@ -245,22 +245,6 @@ export const Login = () => {
                       </BCTypography>
                     </BCButton>
                   </BCBox>
-                  <BCBox mt={3} mb={1} textAlign="center">
-                    <BCButton variant="contained" color="dark" size="small">
-                      {' '}
-                      <Link
-                        data-test="login-help-link"
-                        component="button"
-                        variant="button"
-                        to="/contact-us"
-                        fontWeight="medium"
-                      >
-                        <BCTypography variant="body2" color="light">
-                          {t('login.troubleMessage')}
-                        </BCTypography>
-                      </Link>
-                    </BCButton>
-                  </BCBox>
                 </BCBox>
               </BCBox>
             </Card>

diff --git a/frontend/src/constants/routes/routes.js b/frontend/src/constants/routes/routes.js
@@ -62,10 +62,7 @@ export const FUELCODES = '/fuel-codes'
 export const FUELCODES_ADD = `${FUELCODES}/add-fuel-code`
 export const FUELCODES_EDIT = `${FUELCODES}/:fuelCodeID`
 
-export const FSE = '/fse' // might not need
-
 export const FILESUBMISSION = '/file-submissions' // might not need
 
 export const APIDOCS = '/docs'
-export const CONTACT_US = '/contact-us'
 export const LOG_OUT = '/log-out'