diff --git a/apps/civicsignalblog/contrib/dokku/Dockerfile b/apps/civicsignalblog/contrib/dokku/Dockerfile index e880e9b0a..9b020b544 100644 --- a/apps/civicsignalblog/contrib/dokku/Dockerfile +++ b/apps/civicsignalblog/contrib/dokku/Dockerfile @@ -1 +1 @@ -FROM codeforafrica/codeforafrica-ui:0.1.12 +FROM codeforafrica/codeforafrica-ui:0.1.13 diff --git a/apps/civicsignalblog/package.json b/apps/civicsignalblog/package.json index 7dd9de323..8bdf27e5f 100644 --- a/apps/civicsignalblog/package.json +++ b/apps/civicsignalblog/package.json @@ -1,6 +1,6 @@ { "name": "civicsignalblog", - "version": "0.1.12", + "version": "0.1.13", "private": true, "author": "Code for Africa ", "description": "This is the (temporary) CivicSignal blog", diff --git a/apps/civicsignalblog/src/lib/data/seo.js b/apps/civicsignalblog/src/lib/data/seo.js index c498e9524..fc2e00f4f 100644 --- a/apps/civicsignalblog/src/lib/data/seo.js +++ b/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 || diff --git a/apps/civicsignalblog/src/pages/_document.page.js b/apps/civicsignalblog/src/pages/_document.page.js index 12951988f..c696819af 100644 --- a/apps/civicsignalblog/src/pages/_document.page.js +++ b/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 { - + {this.props.emotionStyleTags} diff --git a/apps/roboshield/package.json b/apps/roboshield/package.json index 672ca9f7c..891264367 100644 --- a/apps/roboshield/package.json +++ b/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", diff --git a/apps/roboshield/public/android-chrome-192x192.png b/apps/roboshield/public/android-chrome-192x192.png new file mode 100644 index 000000000..b6b1c195a Binary files /dev/null and b/apps/roboshield/public/android-chrome-192x192.png differ diff --git a/apps/roboshield/public/android-chrome-512x512.png b/apps/roboshield/public/android-chrome-512x512.png new file mode 100644 index 000000000..994c5f68a Binary files /dev/null and b/apps/roboshield/public/android-chrome-512x512.png differ diff --git a/apps/roboshield/public/apple-touch-icon.png b/apps/roboshield/public/apple-touch-icon.png new file mode 100644 index 000000000..bc086d518 Binary files /dev/null and b/apps/roboshield/public/apple-touch-icon.png differ diff --git a/apps/roboshield/public/browserconfig.xml b/apps/roboshield/public/browserconfig.xml new file mode 100644 index 000000000..f9c2e67fe --- /dev/null +++ b/apps/roboshield/public/browserconfig.xml @@ -0,0 +1,9 @@ + + + + + + #2b5797 + + + diff --git a/apps/roboshield/public/favicon-16x16.png b/apps/roboshield/public/favicon-16x16.png new file mode 100644 index 000000000..aeecce01f Binary files /dev/null and b/apps/roboshield/public/favicon-16x16.png differ diff --git a/apps/roboshield/public/favicon-32x32.png b/apps/roboshield/public/favicon-32x32.png new file mode 100644 index 000000000..3dd2a39a8 Binary files /dev/null and b/apps/roboshield/public/favicon-32x32.png differ diff --git a/apps/roboshield/public/image.jpg b/apps/roboshield/public/image.jpg new file mode 100644 index 000000000..890f759aa Binary files /dev/null and b/apps/roboshield/public/image.jpg differ diff --git a/apps/roboshield/public/mstile-150x150.png b/apps/roboshield/public/mstile-150x150.png new file mode 100644 index 000000000..f47cd2c07 Binary files /dev/null and b/apps/roboshield/public/mstile-150x150.png differ diff --git a/apps/roboshield/public/safari-pinned-tab.svg b/apps/roboshield/public/safari-pinned-tab.svg new file mode 100644 index 000000000..dcae051b6 --- /dev/null +++ b/apps/roboshield/public/safari-pinned-tab.svg @@ -0,0 +1,46 @@ + + + + +Created by potrace 1.14, written by Peter Selinger 2001-2017 + + + + + + + + + diff --git a/apps/roboshield/public/site.webmanifest b/apps/roboshield/public/site.webmanifest new file mode 100644 index 000000000..edc29a197 --- /dev/null +++ b/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" +} diff --git a/apps/roboshield/src/lib/data/seo.ts b/apps/roboshield/src/lib/data/seo.ts index 211c9a4fe..a44a126b7 100644 --- a/apps/roboshield/src/lib/data/seo.ts +++ b/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 || diff --git a/apps/roboshield/src/pages/_document.tsx b/apps/roboshield/src/pages/_document.tsx index 6bb40277d..a30ef2f18 100644 --- a/apps/roboshield/src/pages/_document.tsx +++ b/apps/roboshield/src/pages/_document.tsx @@ -1,17 +1,18 @@ -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, @@ -19,6 +20,27 @@ export default function MyDocument( return ( + + + + + + +