Merge pull request #2427 from airqo-platform/website-update-codebase

Website: Added Error handling and UI adjustments
airqo-platform · Jan 29, 2025 · c0b3e49 · c0b3e49
2 parents ae7c3bc + cb58d96
commit c0b3e49
Show file tree

Hide file tree

Showing 22 changed files with 737 additions and 899 deletions.
diff --git a/website2/src/app/clean-air-forum/layout.tsx b/website2/src/app/clean-air-forum/layout.tsx
@@ -17,7 +17,7 @@ type CleanAirLayoutProps = {
 
 const CleanAirLayout: React.FC<CleanAirLayoutProps> = ({ children }) => {
   // Using the `useForumEvents` hook
-  const { forumEvents, isLoading } = useForumEvents();
+  const { data: forumEvents, isLoading } = useForumEvents();
 
   // Extract the first event (if available)
   const eventData = forumEvents?.[0] || null;

diff --git a/website2/src/app/partners/[id]/page.tsx b/website2/src/app/partners/[id]/page.tsx
@@ -10,7 +10,7 @@ const PartnerDetailsPage: React.FC = () => {
   const router = useRouter();
   const params = useParams();
   const { id } = params as { id: string };
-  const { partnerDetails: partner, isLoading, isError } = usePartnerDetails(id);
+  const { data: partner, isLoading, isError } = usePartnerDetails(id);
 
   // Skeleton loader component
   const SkeletonLoader = () => (

diff --git a/website2/src/components/layouts/Navbar.tsx b/website2/src/components/layouts/Navbar.tsx
@@ -190,7 +190,11 @@ const Navbar: React.FC = () => {
           className={`flex items-center justify-between ${mainConfig.containerClass}`}
         >
           {/* Logo Section */}
-          <Link href="/" passHref className="flex items-center">
+          <Link
+            href={`${mainConfig.homePageUrl}`}
+            passHref
+            className="flex items-center"
+          >
             <Image
               src="https://res.cloudinary.com/dbibjvyhm/image/upload/v1728138368/website/Logos/logo_rus4my.png"
               alt="AirQo"