From 672cd0c1b9c6b4d53f83e88ed26af7139fa0abd9 Mon Sep 17 00:00:00 2001 From: regalijan Date: Thu, 19 Oct 2023 16:49:49 -0400 Subject: [PATCH] Root mobile detection and some theming fixes --- app/root.tsx | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/app/root.tsx b/app/root.tsx index dc1f541..6884389 100644 --- a/app/root.tsx +++ b/app/root.tsx @@ -22,6 +22,7 @@ import { } from "@remix-run/react"; import { type ErrorResponse } from "@remix-run/router"; import { LinksFunction } from "@remix-run/cloudflare"; +import MobileDetect from "mobile-detect"; import Login from "../components/Login.js"; import Navigation from "../components/Navigation.js"; @@ -117,6 +118,18 @@ export async function loader({ if (context.env.DSN) data.dsn = context.env.DSN; if (context.data.theme) data.theme = context.data.theme; + const isMobileCH = context.request.headers.get("sec-ch-ua-mobile"); + + if (isMobileCH) { + data.mobile = isMobileCH; + return data; + } + + const ua = context.request.headers.get("user-agent"); + + if (!ua) data.mobile = "?0"; + else data.mobile = `?${Number(new MobileDetect(ua).mobile())}`; + return data; } @@ -164,7 +177,13 @@ function getMarkup( ); return ( - + {serverStyleData?.map(({ key, ids, css }) => ( @@ -186,7 +205,13 @@ function getMarkup( /> - {body} + + {body} + ); }