From 5dd82b9a8413f7b0bb76cbd1b5c8a3e2c643ff24 Mon Sep 17 00:00:00 2001
From: Laurie Reynolds <lauriesreynolds@gmail.com>
Date: Mon, 16 Dec 2024 13:45:45 -0800
Subject: [PATCH] chore(arpa): fix headings and color contrast issues

---
 .../client/src/arpa_reporter/components/DownloadButton.vue | 2 +-
 .../client/src/arpa_reporter/components/PageNavigation.vue | 4 ++--
 .../client/src/arpa_reporter/components/StandardForm.vue   | 2 +-
 packages/client/src/arpa_reporter/scss/index.scss          | 2 +-
 packages/client/src/arpa_reporter/views/AgenciesView.vue   | 2 +-
 packages/client/src/arpa_reporter/views/LoginView.vue      | 4 ++--
 .../client/src/arpa_reporter/views/NewTemplateView.vue     | 6 +++---
 packages/client/src/arpa_reporter/views/NewUploadView.vue  | 2 +-
 .../src/arpa_reporter/views/ReportingPeriodsView.vue       | 7 ++++---
 packages/client/src/arpa_reporter/views/UploadView.vue     | 6 +++---
 packages/client/src/arpa_reporter/views/UploadsView.vue    | 2 +-
 packages/client/src/arpa_reporter/views/UsersView.vue      | 2 +-
 packages/client/src/arpa_reporter/views/ValidationView.vue | 2 +-
 13 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/packages/client/src/arpa_reporter/components/DownloadButton.vue b/packages/client/src/arpa_reporter/components/DownloadButton.vue
index da1d69551..9e35e5fc3 100644
--- a/packages/client/src/arpa_reporter/components/DownloadButton.vue
+++ b/packages/client/src/arpa_reporter/components/DownloadButton.vue
@@ -2,7 +2,7 @@
   <a
     download
     :href="href"
-    class="btn btn-primary"
+    class="btn usdr-btn-primary"
     :class="computedClasses"
     @click="setLoadingState"
   >
diff --git a/packages/client/src/arpa_reporter/components/PageNavigation.vue b/packages/client/src/arpa_reporter/components/PageNavigation.vue
index 11ba3212b..1429325ac 100644
--- a/packages/client/src/arpa_reporter/components/PageNavigation.vue
+++ b/packages/client/src/arpa_reporter/components/PageNavigation.vue
@@ -220,9 +220,9 @@ export default {
     },
     navLinkClass(to) {
       if (this.$route.path === to) {
-        return 'nav-link usdr-tab-nav-link active';
+        return 'nav-link usdr-link active';
       }
-      return 'nav-link usdr-tab-nav-link';
+      return 'nav-link usdr-link';
     },
     dateFormat(d) {
       return moment(d)
diff --git a/packages/client/src/arpa_reporter/components/StandardForm.vue b/packages/client/src/arpa_reporter/components/StandardForm.vue
index b001f3adf..c407b3ba6 100644
--- a/packages/client/src/arpa_reporter/components/StandardForm.vue
+++ b/packages/client/src/arpa_reporter/components/StandardForm.vue
@@ -59,7 +59,7 @@
       <div class="col-sm-2" />
       <div class="col-sm-10">
         <button
-          class="btn btn-primary"
+          class="btn usdr-btn-primary"
           :disabled="disabled"
           @click="validateAndSave()"
         >
diff --git a/packages/client/src/arpa_reporter/scss/index.scss b/packages/client/src/arpa_reporter/scss/index.scss
index af1da43fb..27419ec8a 100644
--- a/packages/client/src/arpa_reporter/scss/index.scss
+++ b/packages/client/src/arpa_reporter/scss/index.scss
@@ -86,7 +86,7 @@ hr {
   color: $positive-default;
 }
 
-.usdr-tab-nav-link {
+.usdr-link {
   color: #305CE0;
 }
 
diff --git a/packages/client/src/arpa_reporter/views/AgenciesView.vue b/packages/client/src/arpa_reporter/views/AgenciesView.vue
index 690f65f8f..69dfbbf6e 100644
--- a/packages/client/src/arpa_reporter/views/AgenciesView.vue
+++ b/packages/client/src/arpa_reporter/views/AgenciesView.vue
@@ -5,7 +5,7 @@
     <div class="mb-4">
       <router-link
         to="/agencies/new"
-        class="btn btn-primary"
+        class="btn usdr-btn-primary"
       >
         Create New Agency
       </router-link>
diff --git a/packages/client/src/arpa_reporter/views/LoginView.vue b/packages/client/src/arpa_reporter/views/LoginView.vue
index 9307ad61f..f5536d37a 100644
--- a/packages/client/src/arpa_reporter/views/LoginView.vue
+++ b/packages/client/src/arpa_reporter/views/LoginView.vue
@@ -2,7 +2,7 @@
 <!-- eslint-disable vuejs-accessibility/no-autofocus -->
 <template>
   <div class="my-3">
-    <h2>ARPA Reporter Login</h2>
+    <h1>ARPA Reporter Login</h1>
     <form @submit="login">
       <div class="form-group">
         <input
@@ -16,7 +16,7 @@
       </div>
       <div class="form-group">
         <button
-          class="btn btn-primary"
+          class="btn usdr-btn-primary"
           type="Submit"
           @click="login"
         >
diff --git a/packages/client/src/arpa_reporter/views/NewTemplateView.vue b/packages/client/src/arpa_reporter/views/NewTemplateView.vue
index b61e100a1..fb6cad056 100644
--- a/packages/client/src/arpa_reporter/views/NewTemplateView.vue
+++ b/packages/client/src/arpa_reporter/views/NewTemplateView.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <h2>Upload Period Template</h2>
+    <h1>Upload Period Template</h1>
 
     <p>
       This upload will be used as the template for period <em>{{ reportingPeriod.name }}</em>
@@ -24,7 +24,7 @@
       </div>
       <div class="form-group">
         <button
-          class="btn btn-primary"
+          class="btn usdr-btn-primary"
           type="submit"
           :disabled="uploadDisabled"
           @click.prevent="uploadTemplate"
@@ -32,7 +32,7 @@
           {{ uploadButtonLabel }}
         </button>
         <a
-          class="ml-3"
+          class="ml-3 usdr-link"
           href="#"
           @click="cancelUpload"
         >Cancel</a>
diff --git a/packages/client/src/arpa_reporter/views/NewUploadView.vue b/packages/client/src/arpa_reporter/views/NewUploadView.vue
index bf80ba37e..c95fc9e21 100644
--- a/packages/client/src/arpa_reporter/views/NewUploadView.vue
+++ b/packages/client/src/arpa_reporter/views/NewUploadView.vue
@@ -79,7 +79,7 @@ export default {
               name: 'submit',
               type: 'submit',
               label: 'Submit',
-              inputClass: ['btn', 'btn-primary'],
+              inputClass: ['btn', 'usdr-btn-primary'],
             },
             {
               type: 'button',
diff --git a/packages/client/src/arpa_reporter/views/ReportingPeriodsView.vue b/packages/client/src/arpa_reporter/views/ReportingPeriodsView.vue
index b3bde1a17..6222eea18 100644
--- a/packages/client/src/arpa_reporter/views/ReportingPeriodsView.vue
+++ b/packages/client/src/arpa_reporter/views/ReportingPeriodsView.vue
@@ -5,7 +5,7 @@
     <div class="mb-4">
       <router-link
         to="/reporting_periods/new"
-        class="btn btn-primary"
+        class="btn usdr-btn-primary"
       >
         Create New Reporting Period
       </router-link>
@@ -36,6 +36,7 @@
             <router-link
               v-if="!p.certified_at"
               :to="`/new_template/${p.id}`"
+              class="usdr-link"
             >
               Upload Template
             </router-link>
@@ -43,7 +44,7 @@
           <td>
             <span v-if="isCurrentReportingPeriod(p)">
               <button
-                class="btn btn-primary"
+                class="btn usdr-btn-primary"
                 data-toggle="modal"
                 data-target="#certify-reporting-period"
                 :disabled="certifying"
@@ -97,7 +98,7 @@
           <div class="modal-footer">
             <button
               type="button"
-              class="btn btn-primary"
+              class="btn usdr-btn-primary"
               @click="handleCertify"
             >
               Certify
diff --git a/packages/client/src/arpa_reporter/views/UploadView.vue b/packages/client/src/arpa_reporter/views/UploadView.vue
index e11bc39c9..131c68d73 100644
--- a/packages/client/src/arpa_reporter/views/UploadView.vue
+++ b/packages/client/src/arpa_reporter/views/UploadView.vue
@@ -132,7 +132,7 @@
               class="float-right"
             >
               <button
-                class="btn btn-primary ml-2"
+                class="btn usdr-btn-primary ml-2"
                 :disabled="validating"
                 @click="validateUpload"
               >
@@ -178,7 +178,7 @@
                 Invalidate
               </button>
               <button
-                class="btn btn-primary ml-2"
+                class="btn usdr-btn-primary ml-2"
                 :disabled="validating"
                 @click="validateUpload"
               >
@@ -187,7 +187,7 @@
             </span>
 
             <!--
-            <button class="btn btn-primary ml-2" @click="validateUpload" :disabled="validating">
+            <button class="btn usdr-btn-primary ml-2" @click="validateUpload" :disabled="validating">
               <span v-if="validating">Validating...</span>
               <span v-else-if="upload.validated_at">Re-validate</span>
               <span v-else>Validate</span>
diff --git a/packages/client/src/arpa_reporter/views/UploadsView.vue b/packages/client/src/arpa_reporter/views/UploadsView.vue
index f6fe2a2d6..9ffd9df1a 100644
--- a/packages/client/src/arpa_reporter/views/UploadsView.vue
+++ b/packages/client/src/arpa_reporter/views/UploadsView.vue
@@ -8,7 +8,7 @@
 
         <router-link
           to="/new_upload"
-          class="btn btn-primary ml-2"
+          class="btn usdr-btn-primary ml-2"
         >
           Submit Workbook
         </router-link>
diff --git a/packages/client/src/arpa_reporter/views/UsersView.vue b/packages/client/src/arpa_reporter/views/UsersView.vue
index 30299283c..c2d5a6d20 100644
--- a/packages/client/src/arpa_reporter/views/UsersView.vue
+++ b/packages/client/src/arpa_reporter/views/UsersView.vue
@@ -4,7 +4,7 @@
     <div class="mb-4">
       <router-link
         to="/users/new"
-        class="btn btn-primary"
+        class="btn usdr-btn-primary"
       >
         Create New User
       </router-link>
diff --git a/packages/client/src/arpa_reporter/views/ValidationView.vue b/packages/client/src/arpa_reporter/views/ValidationView.vue
index 23bc7345f..04f549a2f 100644
--- a/packages/client/src/arpa_reporter/views/ValidationView.vue
+++ b/packages/client/src/arpa_reporter/views/ValidationView.vue
@@ -122,7 +122,7 @@ export default {
   computed: {
     revalidateBtnClass() {
       return {
-        'btn-primary': !this.commit,
+        'usdr-btn-primary': !this.commit,
         'btn-danger': this.commit,
       };
     },