From b355f84dd5bd7cf8779360db7b238b6b5185856c Mon Sep 17 00:00:00 2001
From: Ethan Gardner <ethangardner@users.noreply.github.com>
Date: Mon, 23 Dec 2024 11:38:05 -0500
Subject: [PATCH] update head tag order (#407)

* update head tag order

* update head tag order for ssr version
---
 apps/spotlight/src/layouts/Layout.astro  | 26 ++++++++++--------------
 packages/server/src/layouts/Layout.astro | 12 +++++------
 2 files changed, 16 insertions(+), 22 deletions(-)
diff --git a/apps/spotlight/src/layouts/Layout.astro b/apps/spotlight/src/layouts/Layout.astro
index e3f7d573..a690c188 100644
--- a/apps/spotlight/src/layouts/Layout.astro
+++ b/apps/spotlight/src/layouts/Layout.astro
@@ -16,42 +16,38 @@ const context = getAppContext();
 <html lang="en">
   <head>
     <meta charset="UTF-8" />
-    <meta
-      name="description"
-      content=`10x Access to Justice Spotlight - ${title}`
-    />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>{title}</title>
     <script
       async
-      type="text/javascript"
+      is:inline
       src="https://dap.digitalgov.gov/Universal-Federated-Analytics-Min.js?agency=GSA"
       id="_fed_an_ua_tag"></script>
+    <script is:inline src={`${context.uswdsRoot}js/uswds-init.min.js`}></script>
+    <script src="../lib/initialize.ts"></script>
     <link
-      href="/favicon/apple-touch-icon.png"
+      href={`${context.baseUrl}favicon/apple-touch-icon.png`}
       rel="apple-touch-icon"
       sizes="180x180"
     />
     <link
-      href="/favicon/favicon-32x32.png"
+      href={`${context.baseUrl}favicon/favicon-32x32.png`}
       rel="icon"
       sizes="32x32"
       type="image/png"
     />
     <link
-      href="/favicon/favicon-16x16.png"
+      href={`${context.baseUrl}favicon/favicon-16x16.png`}
       rel="icon"
       sizes="16x16"
       type="image/png"
     />
-    <link href="/favicon/favicon.ico" rel="shortcut icon" />
+    <link href={`${context.baseUrl}favicon/favicon.ico`} rel="shortcut icon" />
     <meta name="generator" content={Astro.generator} />
-    <link
-      href="https://fonts.googleapis.com/icon?family=Material+Icons"
-      rel="stylesheet"
+    <meta
+      name="description"
+      content=`10x Access to Justice Spotlight - ${title}`
     />
-    <script is:inline src={`${context.uswdsRoot}js/uswds-init.min.js`}></script>  
-    <script src="../lib/initialize.ts"></script>
-    <title>{title}</title>
   </head>
   <body id="top">
     <script is:inline defer src={`${context.uswdsRoot}js/uswds.min.js`}></script>
diff --git a/packages/server/src/layouts/Layout.astro b/packages/server/src/layouts/Layout.astro
index 172b3eff..43fc43cf 100644
--- a/packages/server/src/layouts/Layout.astro
+++ b/packages/server/src/layouts/Layout.astro
@@ -14,14 +14,14 @@ const { title } = Astro.props;
 <html lang="en">
   <head>
     <meta charset="UTF-8" />
-    <meta name="description" content=`10x Access to Justice - ${title}` />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>{title}</title>
     <script
       async
       is:inline
-      type="text/javascript"
       src="https://dap.digitalgov.gov/Universal-Federated-Analytics-Min.js?agency=GSA"
       id="_fed_an_ua_tag"></script>
+    <script src="../lib/initialize.ts"></script>
     <link
       href="/favicon/apple-touch-icon.png"
       rel="apple-touch-icon"
@@ -41,12 +41,10 @@ const { title } = Astro.props;
     />
     <link href="/favicon/favicon.ico" rel="shortcut icon" />
     <meta name="generator" content={Astro.generator} />
-    <link
-      href="https://fonts.googleapis.com/icon?family=Material+Icons"
-      rel="stylesheet"
+    <meta
+      name="description"
+      content=`10x Access to Justice Spotlight - ${title}`
     />
-    <script src="../lib/initialize.ts"></script>
-    <title>{title}</title>
   </head>
   <body id="top">
     <div class="usa-app usa-app__theme-1">
