Merge remote-tracking branch 'scorecard-gridsome-internal/dev' into dev

RTICWDT · Nov 7, 2022 · 83adfbf · 83adfbf
2 parents fee5d39 + d330488
commit 83adfbf
Show file tree

Hide file tree

Showing 9 changed files with 462 additions and 298 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -33,7 +33,6 @@
     "trim-newlines": "^3.0.1",
     "glob-parent": "^5.1.2",
     "moment": "^2.29.4",
-    "sharp": "^0.30.5",
     "terser": "^4.8.1"
   }
 }
diff --git a/src/components/CheckRange.vue b/src/components/CheckRange.vue
@@ -33,12 +33,15 @@
           :track-color="trackBackground"
           thumb-color="secondary"
           :aria-labelledby="generatedId"
+          :aria-label="generatedId"
           thumb-label
+          :title="id"
         >
           <template v-slot:append>
             <v-text-field
               v-model="sliderValue"
               :id="`${id}-field`"
+              :title="`${id}-field`"
               hide-details
               type="number"
               min="0"

diff --git a/src/components/NameAutocomplete.vue b/src/components/NameAutocomplete.vue
@@ -84,6 +84,7 @@ export default {
         }
 
         query["school.search"] = newVal ? newVal : ""
+        query[fields.OPEID + '__not'] = 'null';
         query = this.prepareParams(query)
 
         let request = apiGet("/schools", query)

diff --git a/src/components/SearchForm.vue b/src/components/SearchForm.vue
@@ -428,7 +428,7 @@
         WIOA Programs&nbsp;<tooltip definition="wioa-participants" />
       </p>
       <v-checkbox
-        id="search-form-dolflag"
+        id="search-form-dolflag-2"
         class="search-form-dolflag-cb my-0 py-0"
         v-model="input.dolflag"
         label="Only show schools that have Department of Labor WIOA programs"

diff --git a/src/components/Tooltip.vue b/src/components/Tooltip.vue
@@ -5,11 +5,12 @@
       icon
       small
       class="align-start ml-n2"
+      aria-label="More Information"
     >
       <v-icon x-small allow-overflow :color="color" dark
         >fas fa-info-circle</v-icon
       >
-      <span class="sr-only">info</span>
+      <span class="sr-only">More Information</span>
     </v-btn>
     <v-dialog max-width="500px" v-model="showDialog">
       <v-card>

diff --git a/src/data/glossary.json b/src/data/glossary.json
diff --git a/src/main.js b/src/main.js
@@ -151,6 +151,10 @@ export default function (Vue, { router, head, isClient, appOptions }) {
   })   
 
   //Twitter and OpenGraph
+  head.meta.push({
+    'http-equiv':'Content-Security-Policy',
+    content: "default-src 'unsafe-inline' 'unsafe-eval'; img-src 'self' data: *.cloud.gov *.googleapis.com; child-src 'none'; script-src-elem * 'unsafe-inline'; style-src-elem 'self' 'unsafe-inline'; prefetch-src 'self'; connect-src https://api.data.gov 'self'; font-src 'self'"
+  })
   head.meta.push({
     name: 'og:type',
     content: 'website'

diff --git a/src/pages/school/Index.vue b/src/pages/school/Index.vue
@@ -442,7 +442,6 @@
               <v-expansion-panel class="fos-profile-panel">
                 <v-expansion-panel-header
                   id="fields-of-study"
-                  aria-controls="fos-content"
                   @click="trackAccordion('Fields of Study')"
                 >
                   <span
@@ -976,7 +975,6 @@
               <v-expansion-panel class="institution-profile-panel">
                 <v-expansion-panel-header
                   id="cost"
-                  aria-controls="costs-content"
                   @click="trackAccordion('Costs')"
                   >Costs</v-expansion-panel-header
                 >
@@ -1246,7 +1244,6 @@
               <v-expansion-panel class="institution-profile-panel">
                 <v-expansion-panel-header
                   id="graduation"
-                  aria-controls="graduation-content"
                   @click="trackAccordion('Graduation &amp; Retention')"
                   >Graduation &amp; Retention</v-expansion-panel-header
                 >
@@ -1448,7 +1445,6 @@
               <v-expansion-panel class="institution-profile-panel">
                 <v-expansion-panel-header
                   id="aid"
-                  aria-controls="aid-content"
                   @click="trackAccordion('Financial Aid &amp; Debt')"
                   >Financial Aid &amp; Debt</v-expansion-panel-header
                 >
@@ -2081,7 +2077,6 @@
               <v-expansion-panel class="institution-profile-panel">
                 <v-expansion-panel-header
                   id="earnings"
-                  aria-controls="earnings-content"
                   @click="trackAccordion('Typical Earnings')"
                 >
                   Typical Earnings
@@ -2209,7 +2204,6 @@
               <v-expansion-panel class="institution-profile-panel">
                 <v-expansion-panel-header
                   id="demographics"
-                  aria-controls="demographics-content"
                   @click="trackAccordion('Student Body')"
                   >Student Body</v-expansion-panel-header
                 >
@@ -2318,8 +2312,7 @@
               <v-expansion-panel class="institution-profile-panel">
                 <v-expansion-panel-header
                   id="selectivity"
-                  aria-controls="selectivity-content"
-                  @click="trackAccordion('Test Scores and Acceptance')"
+                    @click="trackAccordion('Test Scores and Acceptance')"
                   >Test Scores &amp; Acceptance</v-expansion-panel-header
                 >
                 <v-expansion-panel-content