Merge branch 'main' of https://github.com/CodeForAfrica/ui into ft/hu…

…rumap-choropleth-map

apps/civicsignalblog/contrib/dokku/Dockerfile

@@ -1 +1 @@
-FROM codeforafrica/codeforafrica-ui:0.1.12
+FROM codeforafrica/codeforafrica-ui:0.1.13

apps/civicsignalblog/package.json

@@ -1,6 +1,6 @@
 {
   "name": "civicsignalblog",
-  "version": "0.1.12",
+  "version": "0.1.13",
   "private": true,
   "author": "Code for Africa <tech@codeforafrica.org>",
   "description": "This is the (temporary) CivicSignal blog",

apps/civicsignalblog/src/lib/data/seo.js

@@ -39,8 +39,7 @@ export default function getPageSeoFromMeta(page, settings) {
   const defaultTitle = settings.meta?.title || settings.title || site.name;
   const title = page.meta?.title || page.title || defaultTitle;
   // Dont't use template on homepage
-  const titleTemplate =
-    page.slug !== "index" ? defaultTitle && `%s | ${defaultTitle}` : null;
+  const titleTemplate = page.slug === "index" ? "%s" : `%s | ${defaultTitle}`;
   const description =
     page.meta?.description ||
     settings.meta?.description ||

apps/civicsignalblog/src/pages/_document.page.js

@@ -2,6 +2,7 @@ import createEmotionServer from "@emotion/server/create-instance";
 import Document, { Html, Head, Main, NextScript } from "next/document";
 import React from "react";
 
+import theme from "@/civicsignalblog/theme";
 import createEmotionCache from "@/civicsignalblog/utils/createEmotionCache";
 
 class MyDocument extends Document {
@@ -44,7 +45,7 @@ class MyDocument extends Document {
           <link rel="manifest" href="/site.webmanifest" />
           <link rel="mask-icon" href="/safari-pinned-tab.svg" color="#1020e1" />
           <meta name="msapplication-TileColor" content="#2b5797" />
-          <meta name="theme-color" content="#ffffff" />
+          <meta name="theme-color" content={theme.palette.primary.main} />
           <meta name="emotion-insertion-point" content="" />
           {this.props.emotionStyleTags}
         </Head>

apps/roboshield/package.json

@@ -1,6 +1,6 @@
 {
   "name": "roboshield",
-  "version": "0.1.11",
+  "version": "0.1.13",
   "private": true,
   "scripts": {
     "build-server": "tsc --project tsconfig.server.json",

apps/roboshield/public/browserconfig.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<browserconfig>
+    <msapplication>
+        <tile>
+            <square150x150logo src="/mstile-150x150.png"/>
+            <TileColor>#2b5797</TileColor>
+        </tile>
+    </msapplication>
+</browserconfig>

apps/roboshield/public/site.webmanifest

@@ -0,0 +1,19 @@
+{
+  "name": "TrustLab's RoboShield",
+  "short_name": "RoboShield",
+  "icons": [
+    {
+      "src": "/android-chrome-192x192.png",
+      "sizes": "192x192",
+      "type": "image/png"
+    },
+    {
+      "src": "/android-chrome-512x512.png",
+      "sizes": "512x512",
+      "type": "image/png"
+    }
+  ],
+  "theme_color": "#1020E1",
+  "background_color": "#ffffff",
+  "display": "standalone"
+}

apps/roboshield/src/lib/data/seo.ts

@@ -66,8 +66,7 @@ export default function getPageSeoFromMeta(
   const defaultTitle = settings.meta?.title || settings.title || site.name;
   const title = page.meta?.title || page.title || defaultTitle;
   // Dont't use template on homepage
-  const titleTemplate =
-    page.slug !== "index" ? defaultTitle && `%s | ${defaultTitle}` : null;
+  const titleTemplate = page.slug === "index" ? "%s" : `%s | ${defaultTitle}`;
   const description =
     page.meta?.description ||
     settings.meta?.description ||

apps/roboshield/src/pages/_document.tsx

@@ -1,24 +1,46 @@
-import * as React from "react";
-import {
-  Html,
-  Head,
-  Main,
-  NextScript,
-  DocumentProps,
-  DocumentContext,
-} from "next/document";
 import {
   DocumentHeadTags,
   DocumentHeadTagsProps,
   documentGetInitialProps,
 } from "@mui/material-nextjs/v14-pagesRouter";
+import {
+  DocumentContext,
+  DocumentProps,
+  Head,
+  Html,
+  Main,
+  NextScript,
+} from "next/document";
+
+import theme from "@/roboshield/theme";
 
 export default function MyDocument(
   props: DocumentProps & DocumentHeadTagsProps,
 ) {
   return (
     <Html lang="en">
       <Head>
+        <link
+          rel="apple-touch-icon"
+          sizes="180x180"
+          href="/apple-touch-icon.png"
+        />
+        <link
+          rel="icon"
+          type="image/png"
+          sizes="32x32"
+          href="/favicon-32x32.png"
+        />
+        <link
+          rel="icon"
+          type="image/png"
+          sizes="16x16"
+          href="/favicon-16x16.png"
+        />
+        <link rel="manifest" href="/site.webmanifest" />
+        <link rel="mask-icon" href="/safari-pinned-tab.svg" color="#1020e1" />
+        <meta name="msapplication-TileColor" content="#2b5797" />
+        <meta name="theme-color" content={theme.palette.primary.main} />
         <link rel="shortcut icon" href="/favicon.ico" />
         <meta name="emotion-insertion-point" content="" />
         <DocumentHeadTags {...props} />