Merge remote-tracking branch 'scorecard-gridsome-internal/dev-3.1.2' …

…into dev

src/components/FieldOfStudyResultCard.vue

@@ -59,7 +59,7 @@
       </h2>
 
       <p class="">{{ city }}, {{ state }} {{ zip }}</p>
-      <small-school-icons :school="school" :fields="fields" size="small" />
+      <small-school-icons :school="school" :fields="fields" size="small" fos />
       <p v-if="underInvestigation == 1">
         <v-card color="error" class="px-2 py-1" flat>
           <strong class="white--text">Under ED Monitoring</strong>
@@ -290,6 +290,7 @@ export default {
   mounted() {
     // flatten the school to work with the computed fields.
     this.school = _.merge(this.fos.institution, this.fos.institution.school)
+    //console.log(this.school)
   },
 }
 </script>

src/components/FieldOfStudySchoolResult.vue

@@ -78,7 +78,7 @@
     <p class="mb-1 font-weight-bold">{{ city }}, {{ state }} {{ zip }}</p>
     <v-row>
       <v-col cols="12">
-        <small-school-icons :school="school" :fields="fields" size="small" />
+        <small-school-icons :school="school" :fields="fields" size="small" fos />
       </v-col>
     </v-row>
   </v-col>

src/components/HorizontalBarRange.vue

@@ -346,8 +346,8 @@ export default {
 
       if (right < 80 && this.addExtraPadding) {
         //this.extraPad["padding-right"] = "60px"
-        var s = this._upper.styles.left.replace(/[0-9]+%\s?/g, "")
-        this._upper.styles.left = s - 10 + "%"
+        //var s = this._upper.styles.left.replace(/[0-9]+%\s?/g, "")
+        //this._upper.styles.left = s - 10 + "%"
       }
     },
     scale(v) {

src/components/Range.vue

@@ -298,7 +298,7 @@ export default {
       this.bar_styles.right = right + "%"
 
       if (right < 20 && this.addExtraPadding) {
-        this.extraPad["padding-right"] = "60px"
+        //this.extraPad["padding-right"] = "60px"
       }
     },
     scale(v) {

src/components/ScorecardHeader.vue

@@ -127,7 +127,7 @@ header {
         >
           <div class="show-on-focus-container">
             <div class="show-on-focus">
-              <a @click="skipNav()" href="#" class="d-sr-only-focusable"
+              <a tabindex="1" @click="skipNav()" href="#" class="d-sr-only-focusable"
                 >Skip to main content</a
               >
             </div>
@@ -200,7 +200,7 @@ header {
                       @click="handleCompareIconClick"
                       aria-label="Show Compare Drawer"
                     >
-                      <v-icon color="#122E51">
+                      <v-icon color="black">
                         fas fa-university
                       </v-icon>
                     </v-btn>

src/components/SearchFieldsOfStudyForm.vue

@@ -153,8 +153,8 @@
         label="Only show schools that have Department of Labor WIOA programs"
         color="secondary"
         hide-details
-        true-value="true"
-        false-value="false"
+        value="true"
+
       ></v-checkbox>
     </div>
 
@@ -214,7 +214,6 @@ export default {
         formDefault: {
           fos_salary: [0, 150],
           fos_debt: [0, 50],
-          dolflag: null,
           state: null,
           zip: null,
           distance: 50,
@@ -264,7 +263,7 @@ export default {
         groomedInput.distance = this.input.distance
       } else {
         _.unset(groomedInput, "distance")
-      }
+      }   
 
       // Format Sliders - Happens here to ensure if shows up in url in desired format
       if (groomedInput.fos_salary) {
@@ -351,7 +350,7 @@ export default {
                 return Number(value / 1000)
               }
             })
-            break
+            break         
           default:
             if (_.isArray(objVal) && _.isString(newObjValue)) {
               return [newObjValue]

src/components/SmallSchoolIcons.vue

@@ -7,7 +7,7 @@
         <template v-slot:activator="{ on }">
           <li
             :class="years | yearsClass"
-            v-if="!sizeOnly"
+            v-if="!sizeOnly && yearIcon != 'none'"
             v-on="on"
             :style="{ 'background-image': 'url(' + $url(yearIcon) + ')' }"
           >
@@ -18,28 +18,28 @@
       </v-tooltip>
       <li
         :class="_.get(school, fields['OWNERSHIP'], '-1') | controlClass"
-        v-if="!sizeOnly"
+        v-if="!sizeOnly && ownershipIcon != 'none'"
         :style="{ 'background-image': 'url(' + $url(ownershipIcon) + ')' }"
       >
         <span>{{ _.get(school, fields["OWNERSHIP"], "-1") | control }}</span>
       </li>
       <li
         :class="_.get(school, fields['LOCALE'], '-1') | localeClass"
-        v-if="!sizeOnly"
+        v-if="!sizeOnly && localeIcon != 'none'"
         :style="{ 'background-image': 'url(' + $url(localeIcon) + ')' }"
       >
         <span>{{ _.get(school, fields["LOCALE"], "-1") | locale }}</span>
       </li>
 
       <v-tooltip bottom>
         <template v-slot:activator="{ on }">
-          <li
-            :class="_.get(school, fields['SIZE'], '-1') | sizeCategoryClass"
+          <li v-if="sizeIcon != 'none'"
+            :class="_.get(school, sizeField, '-1') | sizeCategoryClass"
             v-on="on"
             :style="{ 'background-image': 'url(' + $url(sizeIcon) + ')' }"
           >
             <span>{{
-              _.get(school, fields["SIZE"], "-1") | sizeCategory
+              _.get(school, sizeField, "-1") | sizeCategory
             }}</span>
           </li>
         </template>
@@ -130,12 +130,16 @@ export default {
       default: false,
       type: Boolean,
     },
+    fos: Boolean
   },
   created() {},
   computed: {
     years() {
       return _.get(this.school, this.fields["PREDOMINANT_DEGREE"])
     },
+    sizeField() {
+      return this.fos ? this.fields['FOS_SIZE'] : this.fields['SIZE']
+    },
     tip() {
       switch (this.years) {
         case 1:
@@ -193,16 +197,16 @@ export default {
       let icon = this.$options.filters.localeClass(
         _.get(this.school, this.fields["LOCALE"], "-1")
       )
-      if (icon) {
+      if (icon && icon != "unknown") {
         return "/img/school-icons/" + icon.substr(5) + ".svg"
       } else {
         return "none"
       }
     },
     sizeIcon() {
       let icon = this.$options.filters.sizeCategoryClass(
-        _.get(this.school, this.fields["SIZE"])
-      )
+        _.get(this.school, this.sizeField)
+      ) 
       if (icon) {
         return "/img/school-icons/" + icon.substr(5) + ".svg"
       } else {

src/components/USABanner.vue

@@ -1,5 +1,5 @@
 <template>
-  <header data-v-5c1ad70f="" data-v-7a69384f="" aria-label="Official government website" class="usx-component usx-banner banner bg-dark">
+  <div data-v-5c1ad70f="" data-v-7a69384f="" aria-label="Official government website" class="usx-component usx-banner banner bg-dark">
 
     <div size="lg" class="usx-component container-lg"><p class="usx-banner-text"><svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="16px" height="11px" viewBox="0 0 16 11" enable-background="new 0 0 16 11" xml:space="preserve" class="usx-flag"><image id="image0" width="16" height="11" x="0" y="0" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAALBAMAAACEzBAKAAAABGdBTUEAALGPC/xhBQAAACBjSFJN
 AAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAG1BMVEUdM7EeNLIeM7HgQCDa
@@ -9,16 +9,16 @@ oRwKGFw8Ulzc3IC64CIhKa1hES4uLQCkqxtECUS6FgAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAyMC0w
 OC0xM1QwMzo0MToxNCswMzowMGPS+9cAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMjAtMDgtMTNUMDM6
 NDE6MTQrMDM6MDASj0NrAAAAAElFTkSuQmCC"></image></svg> 
 
-<span v-if="$vuetify.breakpoint.mdAndUp">An official website of the United States government <span class="usx-banner-toggle" @click="toggleInfo"> Here’s how you know <i class="fas " :class="showInfo ? 'fa-chevron-up' : 'fa-chevron-down'"></i></span></span>
+<span v-if="$vuetify.breakpoint.mdAndUp"> An official website of the United States government <button @click="toggleInfo"><span tabindex="2" class="usx-banner-toggle"> Here’s how you know <i class="fas " :class="showInfo ? 'fa-chevron-up' : 'fa-chevron-down'"></i></span></button></span>
 
-<span v-if="$vuetify.breakpoint.smAndDown"><span class="" @click="toggleInfo">An official website of the United States government <i class="fas " :class="showInfo ? 'fa-chevron-up' : 'fa-chevron-down'"></i></span></span>
+<button @click="toggleInfo"><span v-if="$vuetify.breakpoint.smAndDown"><span tabindex="2" class=""> An official website of the United States government <i class="fas " :class="showInfo ? 'fa-chevron-up' : 'fa-chevron-down'"></i></span></span></button>
 
 </p>
 
 <div class="mt-2" v-show="showInfo"><div class="usx-banner-info-container usx-component row" fluid=""><div class="usx-component col"><svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" class="usx-banner-icon"><title>icon-dot-gov</title><path fill="#2378C3" fill-rule="evenodd" d="M32 0c17.673 0 32 14.327 32 32 0 17.673-14.327 32-32 32C14.327 64 0 49.673 0 32 0 14.327 14.327 0 32 0zm0 1.208C14.994 1.208 1.208 14.994 1.208 32S14.994 62.792 32 62.792 62.792 49.006 62.792 32 49.006 1.208 32 1.208zm10.59 38.858a.857.857 0 0 1 .882.822v1.642H18.886v-1.642a.857.857 0 0 1 .882-.822H42.59zM25.443 27.774v9.829h1.642v-9.83h3.273v9.83H32v-9.83h3.272v9.83h1.643v-9.83h3.272v9.83h.76a.857.857 0 0 1 .882.821v.821h-21.3v-.809a.857.857 0 0 1 .88-.82h.762v-9.842h3.272zm5.736-8.188l12.293 4.915v1.642h-1.63a.857.857 0 0 1-.882.822H21.41a.857.857 0 0 1-.882-.822h-1.642v-1.642l12.293-4.915z"></path></svg><p class="usx-banner-info-text"><strong>Official websites use .gov</strong><br> A <strong>.gov</strong> website belongs to an official government organization in the United States. </p></div><div class="usx-component col"><svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" class="usx-banner-icon"><title>icon-https</title><path fill="#719F2A" fill-rule="evenodd" d="M32 0c17.673 0 32 14.327 32 32 0 17.673-14.327 32-32 32C14.327 64 0 49.673 0 32 0 14.327 14.327 0 32 0zm0 1.208C14.994 1.208 1.208 14.994 1.208 32S14.994 62.792 32 62.792 62.792 49.006 62.792 32 49.006 1.208 32 1.208zm0 18.886a7.245 7.245 0 0 1 7.245 7.245v3.103h.52c.86 0 1.557.698 1.557 1.558v9.322c0 .86-.697 1.558-1.557 1.558h-15.53c-.86 0-1.557-.697-1.557-1.558V32c0-.86.697-1.558 1.557-1.558h.52V27.34A7.245 7.245 0 0 1 32 20.094zm0 3.103a4.142 4.142 0 0 0-4.142 4.142v3.103h8.284V27.34A4.142 4.142 0 0 0 32 23.197z"></path></svg><p class="usx-banner-info-text"><strong>Secure .gov websites use HTTPS</strong><br> A <strong>lock</strong> (<i class="fas fa-lock"></i>) or <strong>https://</strong> means you’ve safely connected to the .gov website. Share sensitive information only on official, secure websites. </p></div></div></div></div>
 
 
-</header>
+</div>
 </template>
 
 <style lang="scss" scoped>

src/js/constants.js

@@ -21,6 +21,7 @@ export const fields = {
   OPERATING:            'school.operating',
 
   SIZE:                 'latest.student.size',
+  FOS_SIZE:             'student.size',
   ONLINE_ONLY:          'school.online_only',
   MAIN:                 'school.main_campus',
   BRANCHES:             'school.branches',

src/main.js

@@ -164,13 +164,13 @@ export default function (Vue, { router, head, isClient, appOptions }) {
   })   
 
   //Twitter and OpenGraph
-
+    /*
   head.meta.push({
     'http-equiv':'Content-Security-Policy',
     content: "default-src 'self' https://www.gstatic.com https//*.typekit.net https://dap.digitalgov.gov https://static.hotjar.com https://www.google-analytics.com https://www.gstatic.com https://www.googletagmanager.com https://script.hotjar.com; img-src 'self' *.googletagmanager.com data: https://*.basemaps.cartocdn.com/ *.cloud.gov *.googleapis.com *.google-analytics.com; child-src 'none'; script-src-elem * 'unsafe-hashes' 'sha256-6egcWvmQP5hRCmW3iDq1X7sXo3/AY4zjQJNgqpm0rAg=' 'sha256-1e5RR2OpHhuX2h0Bat19DsNTmqbo4M3T1pqfeTXCHaA=' https://www.gstatic.com https://*.typekit.net/ https://fonts.googleapis.com 'self'; connect-src  https://api.data.gov https://www.google-analytics.com *.hotjar.com https://dap.digitalgov.gov https://stats.g.doubleclick.net *.hotjar.io 'self' ws:; font-src https://fonts.gstatic.com https://use.typekit.net 'self'; style-src 'unsafe-hashes' 'sha256-IQtfqzo2VPwYVfG45njd1UW4FZvVifJwM9V5cBNhx04=' 'sha256-yQomDylAVvpeRdlKgfqevQZtrtkp244GCzedeISNu5s=' 'sha256-vil6rwz9/3551namkTsVzfkGNkmRnO56lPD53U/pJbE=' 'sha256-cgjVz+andACCIsfeXoiI1/ChFQDlCC4y99sX5rrYseM=' 'sha256-TbrjG17MSiO8IKSlX/5IHYPweVR4+mHPUuUwZ7a5a2Y=' 'sha256-plI3P8SbP3ivQ+UUtO9JmesuN+PeYliWE+cQeiYVmiI=' 'sha256-uaE1UV3pZxXpavOfm/lrrxDNgEh6v+6g5hNCCp9X1bM=' 'sha256-lNOe1Kn+4LzGOr+ToMkETF58zM5uGP6/a0dq4hZYPYw=' 'sha256-xC8juOyOcGVG0BdxV2vy4LlzWOZfFlsV82FV45f1hTY=' 'sha256-hEgUMy467OqNfeKl/LTfR4/dPK2As3gne31r1nSBOEM=' 'sha256-jc9UupO4BKq2JkHD2Z57pylYRnr6PtjiI4FCyFavP+Q=' 'sha256-kwpt3lQZ21rs4cld7/uEm9qI5yAbjYzx+9FGm/XmwNU=' 'sha256-EjeKg7oj5a8SODh/FWP9+TlJK7I4FTcPMbwoz64kK2A=' 'sha256-uKAvZ8WKcIoeRdQwRKBztHzKuBMA3Z138XKPaddC+7w=' 'sha256-0EZqoz+oBhx7gF4nvY2bSqoGyy4zLjNF+SDQXGp/ZrY=' 'sha256-Q+nAeb6+lO7Hw/QTTOowxLK49HpHGB7ZfnCD6jX0qa4=' 'sha256-nr9cKw4ONTUDSB2DE0zh2RD8sdBaUN6T1YZ/cCE2H4M=' 'sha256-dkBZru08USynRApV+V+jfqq9MJtvAq+jnaGQA7L9XxU=' 'sha256-QdHgpwEEnPxZV6ByLX5uZCPOGKmc+SzQikh79cDYreg=' 'sha256-As+VZ5inwpJRs+3gKDhNonRoXR+TkIipyQpjbvYBHrU=' 'sha256-SaalYbFZ07L4qDYZ96HObgI4Re7qfskD24gbLnk5sMs=' 'sha256-jJoo4DNMwMVg4I4IDlg1ChLFJH7BV/MvNBPv6+rWzTc=' 'sha256-ANvVUHrEavvwj4x+omctWvh0ZmreLn18DtrkbfDSiLU=' 'sha256-47DEQpj8HBSa+/TImW+5JCeuQeRkm5NMpJWZG3hSuFU=' 'sha256-OwlOqbP3VnAzYedGO5K7BbLR2YOoHw96wRy+VxYn414=' 'sha256-SpI+QgQY6BCOYLFeTgU/Z7MZ/KACrNlP5nvudg2afjE=' 'sha256-5V9YVuxHIjG6QvEev93hYF1xNxaSY04UZuv2unPU6kI=' 'sha256-3N6czMg79KEwU27zoGyFZ+9tN6u4DjdWchvldaQGfJg=' 'sha256-mJdZhsxUcmqovcijgBWHajUhLFcxaAMgcl8+L3OoSBc=' 'sha256-UqwRKPEI+M9fzyKB+sUpqCjV2m04VhNFznxxOdPnNT0=' 'sha256-Qg5cxQYRx6S39U3W73DTaX6sJi/EsyRIdLpsrCGLU+Y=' 'sha256-45sUMOo34Q00977ekWUyBSJgpDN5q6k0Zj7t5hj2wSU=' 'sha256-712poVmdpVhla4ux+2hRbDwP5Pe8WghkleNxUA/pOOI=' 'sha256-GmQ3CN0FgcQUhYDj7WflBm5F5bTOZ+ULCAWm4lzmk/0=' 'sha256-pntav9oY700kXoHF80b4HDlnZ5BpaA2uhAVk4sV0gKc=' 'sha256-mJdZhsxUcmqovcijgBWHajUhLFcxaAMgcl8+L3OoSBc=' 'sha256-3N6czMg79KEwU27zoGyFZ+9tN6u4DjdWchvldaQGfJg=' 'sha256-UqwRKPEI+M9fzyKB+sUpqCjV2m04VhNFznxxOdPnNT0=' 'sha256-t24ZWXIZFGl0/9Pe+IsJCrOrxTlInar7Shy6lp8vK/A=' 'sha256-45sUMOo34Q00977ekWUyBSJgpDN5q6k0Zj7t5hj2wSU=' 'sha256-d5ZKJjeIRcwBXYLpyLytbE9ZOCaAXeS9GhHav4SwUaU=' 'sha256-EIQncaP5/cVFiCS/xPbpuNkEJ/oPQTms5c7x5rcHMw0=' 'sha256-JjdrXkXswLCxrOYd0x4YdkxIuxCSPyGd9r5+DkA8vjc=' 'sha256-nMxMqdZhkHxz5vAuW/PAoLvECzzsmeAxD/BNwG15HuA=' 'sha256-QMltachGXHWCMp4EqKjbNSh/DzUnnPauieGP1P/ICT8=' 'sha256-o8w/COZUxxk1YqNUesAyJl/MqdlJowzATI/JvM+1xFk=' 'sha256-TiLJM9i1j8TxGJWqhQ/W4PgcKojXXPTDyXe6cvzQeOM=' 'sha256-Cr/3tmZj9QqHn7Cas7RcSIajNiixeOsU+YyOXkNEsN8=' 'sha256-BG0pkMG9Kpet9txBspjL8nYPdJ1wuUo2pO5rkvKWg7A=' 'sha256-0NPSZcnPqpUsOZ1b5gOxuNJNbwzkNo5EoXYbyDVXJ4k=' 'sha256-5CuYvLl5DHQZ7RV1xUDWvP7bDc31+XoHROQ+GZkkyS4=' 'sha256-zFt+GYCSqXznoLwaqrFWKiM2IGeNifFvtoWhDH2+liU=' https://fonts.googleapis.com https://www.gstatic.com https://p.typekit.net https://use.typekit.net 'self'; frame-src https://vars.hotjar.com https://www.google.com"
   })
  
-/*
+
   head.meta.push({
     'http-equiv':'Content-Security-Policy',
     content: "default-src 'self' https://www.gstatic.com https//*.typekit.net https://dap.digitalgov.gov https://static.hotjar.com https://www.google-analytics.com https://www.gstatic.com https://www.googletagmanager.com https://script.hotjar.com; img-src 'self' *.googletagmanager.com data: https://*.basemaps.cartocdn.com/ *.cloud.gov *.googleapis.com *.google-analytics.com; child-src 'none'; script-src-elem * 'unsafe-inline'; style-src-elem  https://www.gstatic.com https://*.typekit.net/ https://fonts.googleapis.com 'self' 'unsafe-inline'; connect-src  https://api.data.gov https://www.google-analytics.com *.hotjar.com https://dap.digitalgov.gov https://stats.g.doubleclick.net *.hotjar.io 'self'; font-src https://fonts.gstatic.com https://use.typekit.net 'self'; style-src https://www.gstatic.com https://use.typekit.net 'self' 'unsafe-inline'; frame-src https://vars.hotjar.com https://www.google.com"

src/pages/search/Fos.vue

@@ -582,13 +582,16 @@ export default {
       ? this.urlParsedParams.sort
       : this.defaultSort
 
+      this.input.page = this.urlParsedParams.page
+      ? parseInt(this.urlParsedParams.page)
+      : 0
+
     this.input.cip4 = this.urlParsedParams.cip4
     this.input.cip4_degree = this.urlParsedParams.cip4_degree
 
     if (!this.input.cip4 || !this.input.cip4_degree) {
       this.$router.push("/search/fos-landing")
     }
-    this.searchAPI()
 
     // Create Debounce function for this page.
     this.debounceSearchUpdate = _.debounce(function() {
@@ -715,8 +718,9 @@ export default {
       this.input = Object.fromEntries(
         Object.entries(this.input).filter(([_, v]) => v != null)
       )
+      if (!this.input.page)
+        this.input.page = 0
 
-      this.input.page = 0
       this.searchAPI()
     },
     handlePaginationInput() {
@@ -731,9 +735,8 @@ export default {
     clearSearchForm() {
       this.input = {
         page: 1,
-        sort: this.defaultSort,
         cip4: this.urlParsedParams.cip4,
-        cip4_degree: this.urlParsedParams.cip4_degree,
+        cip4_degree: this.urlParsedParams.cip4_degree
       }
 
       this.$root.$emit("search-form-reset")