Merge remote-tracking branch 'origin/main' into validation

GSA-TTS · Feb 20, 2024 · c4b6250 · c4b6250
2 parents 2c25144 + 5057d00
commit c4b6250
Show file tree

Hide file tree

Showing 23 changed files with 640 additions and 156 deletions.
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -61,6 +61,6 @@ jobs:
         shell: bash
         run: pnpm test
 
-      - name: Vitest Coverage Report
-        if: always()
-        uses: davelosert/[email protected]
+      #- name: Vitest Coverage Report
+      #  if: always()
+      #  uses: davelosert/[email protected]
diff --git a/README.md b/README.md
@@ -36,7 +36,12 @@ pnpm vitest
 To start developing with hot reloading, use:
 
 ```bash
-pnpm dev --concurrency 12
+pnpm build
+```
+then run:
+
+```bash
+pnpm dev
 ```
 
 These local servers will be started:

diff --git a/apps/spotlight/src/components/Header.astro b/apps/spotlight/src/components/Header.astro
@@ -1,5 +1,6 @@
 ---
 import closeSvg from '@atj/design/static/uswds/img/usa-icons/close.svg';
+import logoSvg from '@atj/design/images/logo.svg';
 
 import * as routes from '../routes';
 
@@ -12,21 +13,21 @@ const getNavLinkClasses = (url: string) => {
 };
 ---
 
-<header class="usa-header usa-header--basic usa-header--megamenu"></header>
 <div class="usa-overlay"></div>
-<header class="usa-header usa-header--basic">
-  <div class="usa-nav-container">
-    <div class="usa-navbar">
-      <div class="usa-logo">
-        <em class="usa-logo__text">
-          <a href={routes.getHomeUrl()} title="10x Access to Justice">
-            10x Access to Justice
-          </a>
-        </em>
-      </div>
-      <button type="button" class="usa-menu-btn">Menu</button>
+<header class="usa-header usa-header--extended">
+  <div class="usa-navbar">
+    <div class="usa-logo">
+      <em class="usa-logo__text">
+        <a href={routes.getHomeUrl()} title="10x Access to Justice">
+          <img src={logoSvg.src} role="img" alt="10x Logo" />
+          <span>Access to Justice Form Builder</span>
+        </a>
+      </em>
     </div>
-    <nav aria-label="Primary navigation" class="usa-nav">
+    <button type="button" class="usa-menu-btn">Menu</button>
+  </div>
+  <nav aria-label="Primary navigation" class="usa-nav">
+    <div class="usa-nav__inner">
       <button type="button" class="usa-nav__close">
         <img src={closeSvg.src} role="img" alt="Close" />
       </button>
@@ -52,6 +53,6 @@ const getNavLinkClasses = (url: string) => {
           >
         </li>
       </ul>
-    </nav>
-  </div>
+    </div>
+  </nav>
 </header>
diff --git a/apps/spotlight/src/layouts/ContentLayout.astro b/apps/spotlight/src/layouts/ContentLayout.astro
@@ -8,19 +8,15 @@ const { title } = Astro.props;
 ---
 
 <Layout title={title}>
-  <main id="main-content">
-    <div class="bg-base-lightest">
-      <section class="grid-container usa-section">
-        <div class="grid-row flex-justify-center">
-          <div class="grid-col-12 tablet:grid-col-12 desktop:grid-col-12">
-            <div
-              class="bg-white padding-y-3 padding-x-5 border border-base-lighter"
-            >
-              <slot />
-            </div>
+  <main class="bg-base-lightest" id="main-content">
+    <section class="grid-container usa-section">
+      <div class="grid-row flex-justify-center">
+        <div class="grid-col-12 tablet:grid-col-12 desktop:grid-col-12">
+          <div class="bg-white padding-y-3 padding-x-3 border border-base-lighter">
+            <slot />
           </div>
         </div>
-      </section>
-    </div>
+      </div>
+    </section>
   </main>
 </Layout>
diff --git a/apps/spotlight/src/layouts/Layout.astro b/apps/spotlight/src/layouts/Layout.astro
@@ -45,13 +45,16 @@ const context = getAppContext();
     />
     <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">
     <script src="../lib/initialize.ts"></script>
     <title>{title}</title>
   </head>
   <body>
-    <UsaBanner />
-    <Header />
-    <slot />
-    <Footer github={context.github} />
+    <div class="usa-app usa-app__theme-1">
+      <UsaBanner />
+      <Header />
+      <slot />
+      <Footer github={context.github} />  
+    </div>
   </body>
 </html>
diff --git a/apps/spotlight/src/pages/index.astro b/apps/spotlight/src/pages/index.astro
@@ -5,7 +5,7 @@ import DebugTools from '../components/DebugTools';
 ---
 
 <ContentLayout title="10x Access to Justice Spotlight">
-  <h1>10x Access to Justice Spotlight</h1>
+  <h1>Create an interview from a PDF Form</h1>
   <AppAvailableFormList client:only />
   <DebugTools client:only />
 </ContentLayout>
diff --git a/apps/spotlight/src/styles.css b/apps/spotlight/src/styles.css
@@ -1,9 +1,4 @@
 @import '@atj/design/static/uswds/styles/styles.css';
 
-.usa-form--large {
-  max-width: 32rem;
-}
 
-.usa-legend {
-  max-width: 100%;
-}
+
diff --git a/package.json b/package.json
@@ -29,14 +29,14 @@
     "prettier": "^3.2.5",
     "ts-node": "^10.9.2",
     "tsup": "^8.0.1",
-    "turbo": "^1.12.2",
+    "turbo": "^1.12.3",
     "type-fest": "^4.10.2",
     "typescript": "^5.3.3",
     "vitest": "^0.34.6",
     "vitest-github-actions-reporter": "^0.11.1",
     "vitest-mock-extended": "^1.3.1"
   },
   "dependencies": {
-    "astro": "^4.3.3"
+    "astro": "^4.3.5"
   }
 }
diff --git a/packages/design/images/logo.svg b/packages/design/images/logo.svg