Skip to content

Commit

Permalink
Squashed 'govtool/analytics-dashboard/' changes from 9d116a9..a47b9c2
Browse files Browse the repository at this point in the history
a47b9c2 Merge pull request #2 from IntersectMBO/feat/icon-and-changes
8bb51a5 fix: favicon theme
56d39a9 Merge pull request #1 from IntersectMBO/feat/icon-and-changes
af210c9 fix favicon and text

git-subtree-dir: govtool/analytics-dashboard
git-subtree-split: a47b9c276dc0d196cf2d497981925a417113d1e2
  • Loading branch information
placek committed May 17, 2024
1 parent d908052 commit 6bf322d
Show file tree
Hide file tree
Showing 6 changed files with 82 additions and 9 deletions.
50 changes: 50 additions & 0 deletions public/assets/svgs/favicon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 5 additions & 4 deletions src/app/[locale]/layout.js
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand All @@ -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 } }) {
Expand All @@ -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 */}
Expand Down
11 changes: 7 additions & 4 deletions src/app/[locale]/page.js
Original file line number Diff line number Diff line change
Expand Up @@ -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() {

Expand Down Expand Up @@ -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>

Expand Down Expand Up @@ -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 >
Expand Down
Binary file modified src/app/favicon.ico
Binary file not shown.
19 changes: 19 additions & 0 deletions src/app/favicon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/pages/api/analytics.js
Original file line number Diff line number Diff line change
Expand Up @@ -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' }],
Expand Down

0 comments on commit 6bf322d

Please sign in to comment.