Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[website] Url Path Updates #1902

Merged
merged 1 commit into from
Mar 12, 2024
Merged

[website] Url Path Updates #1902

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions website/frontend/App.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,10 @@ const MobileAppPage = React.lazy(() => import('src/pages/OurProducts/MobileAppPa
const APIPage = React.lazy(() => import('src/pages/OurProducts/ApiPage'));
const CalibrationPage = React.lazy(() => import('src/pages/OurProducts/CalibrationPage'));
const QRCodeRedirectPage = React.lazy(() => import('src/pages/ExploreData/Redirect'));
const CleanAirPage = React.lazy(() => import('src/pages/CleanAir'));
const CleanAirPage = React.lazy(() => import('src/pages/CleanAir/CleanAirAbout'));
const CleanAirMemberPage = React.lazy(() => import('src/pages/CleanAir/CleanAirPartners'));
const CleanAirEventsPage = React.lazy(() => import('src/pages/CleanAir/CleanAirEvents'));
const CleanAirResourcesPage = React.lazy(() => import('src/pages/CleanAir/CleanAirPublications'));
const CleanAirEventsDetailsPage = React.lazy(() => import('src/pages/CleanAir/EventDetails'));

import { loadAirQloudSummaryData } from 'reduxStore/AirQlouds/operations';
Expand Down Expand Up @@ -119,7 +122,10 @@ const App = () => {
<Route path="/products/api" element={<APIPage />} />
<Route path="/download-apps" element={<QRCodeRedirectPage />} />
<Route path="/products/calibrate" element={<CalibrationPage />} />
<Route path="/clean-air" element={<CleanAirPage />} />
<Route path="/clean-air/about" element={<CleanAirPage />} />
<Route path="/clean-air/membership" element={<CleanAirMemberPage />} />
<Route path="/clean-air/events" element={<CleanAirEventsPage />} />
<Route path="/clean-air/resources" element={<CleanAirResourcesPage />} />
<Route
path="/clean-air/event-details/:uniqueTitle"
element={<CleanAirEventsDetailsPage />}
Expand Down
41 changes: 20 additions & 21 deletions website/frontend/src/components/CleanAir/SecondaryNav/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import React, { useEffect, useState } from 'react';
import React, { useEffect } from 'react';
import { useSelector, useDispatch } from 'react-redux';
import { setActiveTab } from '../../../../reduxStore/CleanAirNetwork/CleanAir';
import PropTypes from 'prop-types';
import { useTranslation } from 'react-i18next';
import { Link, useLocation } from 'react-router-dom';

/**
* @description Secondary navigation component for the CleanAir site
Expand All @@ -18,34 +19,32 @@ const SecondaryNavComponent = ({ disabledTabs }) => {
t('cleanAirSite.subNav.resources')
];
const dispatch = useDispatch();
const activeTab = useSelector((state) => state.cleanAirData.activeTab);
const [selectedTab, setSelectedTab] = useState(tabs[0]);
const location = useLocation();

useEffect(() => {
setSelectedTab(activeTab);
}, []);

const handleTabClick = (tab) => {
if (!disabledTabs.includes(tab)) {
setSelectedTab(tab);
dispatch(setActiveTab(tab));
const currentTab = tabs.findIndex((tab) => location.pathname.includes(tab.toLowerCase()));
if (currentTab !== -1 && !disabledTabs.includes(currentTab)) {
dispatch(setActiveTab(tabs[currentTab]));
}
};
}, [location, dispatch, tabs, disabledTabs]);

return (
<div className="header-subnav">
<ul className="tabs">
{tabs.map((tab, index) => (
<li
key={index}
className={`${selectedTab === index ? 'active' : ''} ${
disabledTabs.includes(index) ? 'disabled' : ''
}`}
onClick={() => {
handleTabClick(index);
}}>
<span>{tab}</span>
</li>
<Link to={`/clean-air/${tab.toLowerCase()}`} key={index}>
<li
className={`${location.pathname.includes(tab.toLowerCase()) ? 'active' : ''} ${
disabledTabs.includes(index) ? 'disabled' : ''
}`}
onClick={() => {
if (!disabledTabs.includes(index)) {
dispatch(setActiveTab(tab));
}
}}>
<span>{tab}</span>
</li>
</Link>
))}
</ul>
</div>
Expand Down
2 changes: 1 addition & 1 deletion website/frontend/src/components/LanguageSwitcher.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ const LanguageSwitcher = () => {
<div className="clean-air-link">
<p className="desktop-view">
{t('topBanners.languageSwitcher.cleanAirText')}
<Link to="/clean-air">
<Link to="/clean-air/about">
<span>
{t('topBanners.languageSwitcher.linkText')}
<ArrowRightAltIcon
Expand Down
265 changes: 134 additions & 131 deletions website/frontend/src/pages/CleanAir/CleanAirAbout.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import Placeholder2 from 'assets/img/cleanAir/goal2.png';
import Placeholder3 from 'assets/img/cleanAir/goal3.png';
import SEO from 'utilities/seo';
import { useTranslation, Trans } from 'react-i18next';
import CleanAirPageContainer from './Page';

const CleanAirAbout = () => {
useInitScrollTop();
Expand Down Expand Up @@ -37,153 +38,155 @@ const CleanAirAbout = () => {
];

return (
<div className="page-wrapper about-page">
<SEO
title="About"
siteTitle="CLEAN-Air Network"
description="An African led, multi-region network bringing together a community of practice for air quality solutions and air quality management across Africa."
/>
<CleanAirPageContainer>
<div className="page-wrapper about-page">
<SEO
title="About"
siteTitle="CLEAN-Air Network"
description="An African led, multi-region network bringing together a community of practice for air quality solutions and air quality management across Africa."
/>

{/* section 1 */}
<div className="Hero">
<span className="image-container">
<img src={Section1} />
</span>
<div className="hero-content">
<div>
<p className="hero-title">
<Trans i18nKey="cleanAirSite.about.section1.title">
The CLEAN-Air <br /> Network
</Trans>
</p>
<p className="hero-sub">
<Trans i18nKey="cleanAirSite.about.section1.subText">
<span className="fact">An African-led, multi-regional network</span> <br />
bringing together a community of practice for air quality solutions and air quality
management across Africa.
</Trans>
</p>
<ButtonCTA
label={t('cleanAirSite.about.section1.cta')}
link="https://docs.google.com/forms/d/e/1FAIpQLScIPz7VrhfO2ifMI0dPWIQRiGQ9y30LoKUCT-DDyorS7sAKUA/viewform"
style={{
width: '200px'
}}
/>
{/* section 1 */}
<div className="Hero">
<span className="image-container">
<img src={Section1} />
</span>
<div className="hero-content">
<div>
<p className="hero-title">
<Trans i18nKey="cleanAirSite.about.section1.title">
The CLEAN-Air <br /> Network
</Trans>
</p>
<p className="hero-sub">
<Trans i18nKey="cleanAirSite.about.section1.subText">
<span className="fact">An African-led, multi-regional network</span> <br />
bringing together a community of practice for air quality solutions and air
quality management across Africa.
</Trans>
</p>
<ButtonCTA
label={t('cleanAirSite.about.section1.cta')}
link="https://docs.google.com/forms/d/e/1FAIpQLScIPz7VrhfO2ifMI0dPWIQRiGQ9y30LoKUCT-DDyorS7sAKUA/viewform"
style={{
width: '200px'
}}
/>
</div>
</div>
</div>
</div>

{/* section 2 */}
<div className="page-section">
<div className="acronym-section-container">
<div className="acronym-section">
<div className="content">
<div className="acronym-content-container">
<p>
<Trans i18nKey="cleanAirSite.about.section2.acronym">
<span className="highlight">CLEAN-Air</span>, is an acronym coined from
</Trans>
</p>
<h2 className="content-h">{t('cleanAirSite.about.section2.title')}</h2>
<p>{t('cleanAirSite.about.section2.subText')}</p>
<p className="join-now">
<Trans i18nKey="cleanAirSite.about.section2.cta">
Are you an organization or individual interested in air quality in Africa?
<a
href="https://docs.google.com/forms/d/e/1FAIpQLScIPz7VrhfO2ifMI0dPWIQRiGQ9y30LoKUCT-DDyorS7sAKUA/viewform"
target="_blank"
rel="noopener noreferrer">
Join the network
</a>
</Trans>
</p>
{/* section 2 */}
<div className="page-section">
<div className="acronym-section-container">
<div className="acronym-section">
<div className="content">
<div className="acronym-content-container">
<p>
<Trans i18nKey="cleanAirSite.about.section2.acronym">
<span className="highlight">CLEAN-Air</span>, is an acronym coined from
</Trans>
</p>
<h2 className="content-h">{t('cleanAirSite.about.section2.title')}</h2>
<p>{t('cleanAirSite.about.section2.subText')}</p>
<p className="join-now">
<Trans i18nKey="cleanAirSite.about.section2.cta">
Are you an organization or individual interested in air quality in Africa?
<a
href="https://docs.google.com/forms/d/e/1FAIpQLScIPz7VrhfO2ifMI0dPWIQRiGQ9y30LoKUCT-DDyorS7sAKUA/viewform"
target="_blank"
rel="noopener noreferrer">
Join the network
</a>
</Trans>
</p>
</div>
</div>
</div>
</div>
</div>
</div>

{/* section 3 */}
<div className="page-section">
<SplitSection
pillTitle={t('cleanAirSite.about.section3.pillTitle')}
title={t('cleanAirSite.about.section3.title')}
content={t('cleanAirSite.about.section3.subText')}
showButton={false}
link="#"
imageStyle={{
objectFit: 'cover',
maxHeight: '400px'
}}
imgURL={Section3}
pillBgColor="#ECF2FF"
pillTextColor="#135DFF"
reverse={false}
/>
</div>
{/* section 3 */}
<div className="page-section">
<SplitSection
pillTitle={t('cleanAirSite.about.section3.pillTitle')}
title={t('cleanAirSite.about.section3.title')}
content={t('cleanAirSite.about.section3.subText')}
showButton={false}
link="#"
imageStyle={{
objectFit: 'cover',
maxHeight: '400px'
}}
imgURL={Section3}
pillBgColor="#ECF2FF"
pillTextColor="#135DFF"
reverse={false}
/>
</div>

{/* section 4 */}
<div className="page-section">
<SplitSection
pillTitle={t('cleanAirSite.about.section4.pillTitle')}
title={t('cleanAirSite.about.section4.title')}
content={t('cleanAirSite.about.section4.subText')}
imgURL={Section4}
imageStyle={{
height: '420px',
objectFit: 'contain'
}}
pillBgColor="#ECF2FF"
pillTextColor="#135DFF"
showButton={false}
reverse={true}
/>
</div>
{/* section 4 */}
<div className="page-section">
<SplitSection
pillTitle={t('cleanAirSite.about.section4.pillTitle')}
title={t('cleanAirSite.about.section4.title')}
content={t('cleanAirSite.about.section4.subText')}
imgURL={Section4}
imageStyle={{
height: '420px',
objectFit: 'contain'
}}
pillBgColor="#ECF2FF"
pillTextColor="#135DFF"
showButton={false}
reverse={true}
/>
</div>

{/* section 5 */}
<div className="page-section">
<SingleSection
content={
<div className="goals-container">
<div
style={{
width: '100%',
display: 'flex',
flexDirection: 'column',
alignItems: 'flex-start'
}}>
<span id="first-pill" style={{ backgroundColor: '#FFF' }}>
<p style={{ color: '#135DFF' }}>{t('cleanAirSite.about.section5.pillTitle')}</p>
</span>
<h2 className="content-h">{t('cleanAirSite.about.section5.title')}</h2>
</div>
{/* section 5 */}
<div className="page-section">
<SingleSection
content={
<div className="goals-container">
<div
style={{
width: '100%',
display: 'flex',
flexDirection: 'column',
alignItems: 'flex-start'
}}>
<span id="first-pill" style={{ backgroundColor: '#FFF' }}>
<p style={{ color: '#135DFF' }}>{t('cleanAirSite.about.section5.pillTitle')}</p>
</span>
<h2 className="content-h">{t('cleanAirSite.about.section5.title')}</h2>
</div>

<div className="goals">
{goals.map((goal, index) => (
<div className={`goal ${index === 0 ? 'first' : ''}`} key={index}>
<div className="goal-image-container">
<img src={goal.imgURL} className="goal-image" />
<div className="goals">
{goals.map((goal, index) => (
<div className={`goal ${index === 0 ? 'first' : ''}`} key={index}>
<div className="goal-image-container">
<img src={goal.imgURL} className="goal-image" />
</div>
<div className="goal-content">
<h3 className="goal-title">{goal.title}</h3>
<p className="goal-p">{goal.content}</p>
</div>
</div>
<div className="goal-content">
<h3 className="goal-title">{goal.title}</h3>
<p className="goal-p">{goal.content}</p>
</div>
</div>
))}
))}
</div>
</div>
</div>
}
padding="5rem 0"
bgColor="#EDF3FF"
/>
</div>
}
padding="5rem 0"
bgColor="#EDF3FF"
/>
</div>

{/* section 6 */}
<div className="page-section">
<MainHighlight />
{/* section 6 */}
<div className="page-section">
<MainHighlight />
</div>
</div>
</div>
</CleanAirPageContainer>
);
};

Expand Down
Loading
Loading