@explorer-1/vue 0.2.18 → 0.2.20

package/src/templates/edu/PageEduLesson/PageEduLesson.vue

@@ -93,11 +93,13 @@ const stringAsHeadingBlockData = (
 }
 
 const heroEmpty = computed((): boolean => {
-  return !data?.hero?.length
+  return data?.hero?.length === 0
 })
 
 const heroInline = computed((): boolean => {
+  // heroes with interactive elements have special handling
   if (!heroEmpty.value && data?.hero) {
+    // excludes VideoBlock as this will autoplay
     if (data?.hero[0].blockType === 'VideoBlock') {
       return false
     } else if (
@@ -296,12 +298,13 @@ const consolidatedSections = computed((): EduLessonSectionObject[] => {
     <MetaPanel
       button="View Standards"
       theme="primary"
+      :class="{ 'mb-10 lg:mb-14': heroInline || data?.hero?.length === 0 }"
       :primary-subject="data.primarySubject"
       :additional-subjects="data.additionalSubjects"
       :time="data.time"
       :grade-levels="data.gradeLevels"
       :standards="data.standards"
-      negative-bottom
+      :negative-bottom="heroInline || data?.hero?.length !== 0"
     />
 
     <!-- hero media -->
@@ -366,45 +369,44 @@ const consolidatedSections = computed((): EduLessonSectionObject[] => {
       :blocks="consolidatedBlocks"
       :enabled="true"
     />
-    <div id="NavJumpMenuFrame">
-      <template
-        v-for="(value, _key) in consolidatedSections"
-        :key="_key"
-      >
-        <BlockStreamfield
-          v-if="value.type === 'streamfield'"
-          :data="value.blocks"
-        />
-        <PageEduLessonSection
-          v-else
-          :heading="value.heading"
-          :blocks="value.blocks"
-          :procedures="value.procedures"
-          :procedure-steps="value.procedureSteps"
-          :text="value.text"
-          :image="value.image"
-        />
-      </template>
 
-      <!-- streamfield blocks -->
-      <BlockStreamfield :data="data.body" />
+    <template
+      v-for="(value, _key) in consolidatedSections"
+      :key="_key"
+    >
+      <BlockStreamfield
+        v-if="value.type === 'streamfield'"
+        :data="value.blocks"
+      />
+      <PageEduLessonSection
+        v-else
+        :heading="value.heading"
+        :blocks="value.blocks"
+        :procedures="value.procedures"
+        :procedure-steps="value.procedureSteps"
+        :text="value.text"
+        :image="value.image"
+      />
+    </template>
 
-      <!-- related links -->
-      <LayoutHelper
-        v-if="data.relatedLinks && data.relatedLinks.length"
-        indent="col-3"
-        class="lg:my-18 my-10"
-      >
-        <BlockRelatedLinks :data="data.relatedLinks[0]" />
-      </LayoutHelper>
+    <!-- streamfield blocks -->
+    <BlockStreamfield :data="data.body" />
 
-      <!-- related content -->
-      <BlockLinkCarousel
-        item-type="cards"
-        class="lg:my-24 my-12 print:px-4"
-        :heading="data.relatedContentHeading"
-        :items="data.relatedContent"
-      />
-    </div>
+    <!-- related links -->
+    <LayoutHelper
+      v-if="data.relatedLinks && data.relatedLinks.length"
+      indent="col-3"
+      class="lg:my-18 my-10"
+    >
+      <BlockRelatedLinks :data="data.relatedLinks[0]" />
+    </LayoutHelper>
+
+    <!-- related content -->
+    <BlockLinkCarousel
+      item-type="cards"
+      class="lg:my-24 my-12 print:px-4"
+      :heading="data.relatedContentHeading"
+      :items="data.relatedContent"
+    />
   </div>
 </template>

package/src/utils/dayjs.js

@@ -8,6 +8,8 @@ import advancedFormat from 'dayjs/plugin/advancedFormat.js'
 // see https://github.com/iamkun/dayjs/tree/dev/src/locale
 import 'dayjs/locale/en-gb.js'
 
+dayjs.extend(timezone)
+dayjs.extend(advancedFormat)
 dayjs.extend(localizedFormat)
 dayjs.extend(updateLocale)
 dayjs.updateLocale('en', {
@@ -26,7 +28,5 @@ dayjs.updateLocale('en', {
     'Dec.'
   ]
 })
-dayjs.extend(timezone)
-dayjs.extend(advancedFormat)
 
 export default dayjs

package/src/utils/rangeifyGrades.ts

@@ -63,7 +63,7 @@ export const rangeifyGrades = (gradeLevels: GradeLevelsObject[]) => {
     const filteredGrades = rangeify(gradesArray.filter(Number.isFinite))
     let preparedGrades: string = ''
     if (filteredGrades?.length) {
-      const gradeString = filteredGrades.length > 1 ? 'Grades: ' : 'Grade: '
+      const gradeString = filteredGrades.length > 0 ? 'Grades: ' : 'Grade: '
       preparedGrades = filteredGrades
         .map((grade, index) => (index === 0 ? gradeString + grade : grade))
         .join(', ')