Merge commit '6bf322db6418b422cb2d945dce9ce27749e6b701' into develop

IntersectMBO · May 17, 2024 · 812c0f6 · 812c0f6
2 parents 899edbe + 6bf322d
commit 812c0f6
Show file tree

Hide file tree

Showing 6 changed files with 82 additions and 9 deletions.
diff --git a/govtool/analytics-dashboard/public/assets/svgs/favicon.svg b/govtool/analytics-dashboard/public/assets/svgs/favicon.svg
diff --git a/govtool/analytics-dashboard/src/app/[locale]/layout.js b/govtool/analytics-dashboard/src/app/[locale]/layout.js
@@ -5,6 +5,7 @@ import { unstable_setRequestLocale } from "next-intl/server";
 import { notFound } from "next/navigation";
 import '@/styles/index.css';
 import ThemeProviderWrapper from "@/components/ThemeProviderWrapper";
+import Head from "next/head";
 
 
 export function generateStaticParams() {
@@ -14,8 +15,8 @@ export function generateStaticParams() {
 
 // Define common metadata for the application.
 export const metadata = {
-	title: "Web App Boilerplate",
-	description: "Web App Boilerplate",
+	title: "Participation dashboard",
+	description: "Participation dashboard",
 };
 
 async function RootLayout({ children, params: { locale } }) {
@@ -36,10 +37,10 @@ async function RootLayout({ children, params: { locale } }) {
 		<html lang={locale}>
 			<head>
 				<title>{metadata.title}</title>
-				<link rel="icon" href="/favicon.ico" sizes="any" />
+				<link rel="icon" type="image/svg+xml" href="assets/svgs/favicon.svg" />
 			</head>
 			{/* Apply font class and suppress hydration warning. */}
-			<body style={{ margin: 0 }} suppressHydrationWarning={true}>
+			<body style={{ margin: 0 }} >
 				{/* Provide internationalization context. */}
 				<NextIntlClientProvider locale={locale} messages={messages}>
 					{/* Wrap children in global state context */}

diff --git a/govtool/analytics-dashboard/src/app/[locale]/page.js b/govtool/analytics-dashboard/src/app/[locale]/page.js
@@ -5,6 +5,7 @@ import { PeopleAltOutlined, ArticleOutlined, AccountBalanceWalletOutlined, HowTo
 import { useTheme } from '@mui/material/styles';
 import getGoogleData from '@/lib/api';
 import { useEffect, useState } from 'react';
+import { Link } from '@/navigation';
 
 function Dashboard() {
 
@@ -57,7 +58,7 @@ function Dashboard() {
 						Participation Dashboard
 					</Typography>
 					<Typography variant="subtitle1" sx={{ color: (theme) => theme?.palette?.text?.gray }}>
-						This dashboard show the overall participation and usage of govtool from 1 of January 2024
+						This dashboard shows the overall participation and usage of SanchoNet Govtool from 1st of December 2023
 					</Typography>
 				</Box>
 
@@ -88,9 +89,11 @@ function Dashboard() {
 				<Typography variant="caption" display="block" gutterBottom>
 					© {new Date().getFullYear()} Intersect MBO
 				</Typography>
-				<Typography variant="caption" display="block" sx={{ color: (theme) => theme?.palette?.text?.primaryBlue }}>
-					Sancho Govtool
-				</Typography>
+				<Link href="https://sanchogov.tools/">
+					<Typography variant="caption" display="block" sx={{ color: (theme) => theme?.palette?.text?.primaryBlue }}>
+						Sancho Govtool
+					</Typography>
+				</Link>
 			</Box>
 
 		</Box >

diff --git a/govtool/analytics-dashboard/src/app/favicon.ico b/govtool/analytics-dashboard/src/app/favicon.ico
diff --git a/govtool/analytics-dashboard/src/app/favicon.svg b/govtool/analytics-dashboard/src/app/favicon.svg
diff --git a/govtool/analytics-dashboard/src/pages/api/analytics.js b/govtool/analytics-dashboard/src/pages/api/analytics.js
@@ -14,7 +14,7 @@ export default async function handler(req, res) {
         const [response] = await analyticsDataClient.runReport({
             property: `properties/${propertyId}`,
             dateRanges: [{
-                startDate: '2024-01-01',
+                startDate: '2023-12-01',
                 endDate: 'today',
             }],
             dimensions: [{ name: 'eventName' }],