@explorer-1/vue 0.2.66 → 0.2.69

package/src/components/BlockRichTable/BlockRichTable.stories.js

@@ -72,3 +72,97 @@ export const BaseStory = {
     table: BlockRichTableData
   }
 }
+export const MixedColumnWidths = {
+  args: {
+    table: {
+      blockType: 'RichTableBlock',
+      tableCaption:
+        'Ut dapibus cursus quam, non dapibus diam pellentesque ac. Maecenas ultrices porta dui eget placerat. Curabitur ornare congue interdum.',
+      tableContent: {
+        tableHead: [
+          [
+            {
+              text: 'Image'
+            },
+            {
+              text: 'Type'
+            },
+            {
+              text: 'Description'
+            }
+          ]
+        ],
+        tableBody: [
+          [
+            {
+              ...BlockImageData,
+              caption: '<p>Custom ImageCaption</p>',
+              displayCaption: true,
+              blockType: 'ImageBlock'
+            },
+            {
+              blockType: 'CharBlock',
+              value: 'Internal'
+            },
+            {
+              blockType: 'RichTextBlock',
+              value:
+                '<p>Lorem ipsum <a href="/missions/test-mission/">dolor</a> sit amet, consectetur adipiscing elit. Quisque vitae justo quis justo malesuada molestie. Cras sed tincidunt dui.</p>\n'
+            }
+          ],
+          [
+            {
+              ...BlockImageData,
+              caption: '<p>Custom ImageCaption</p>',
+              displayCaption: true,
+              blockType: 'ImageBlock'
+            },
+            {
+              blockType: 'CharBlock',
+              value: 'External'
+            },
+            {
+              blockType: 'RichTextBlock',
+              value:
+                '<p>Morbi pretium, massa non convallis facilisis, lectus eros vulputate turpis, et imperdiet eros metus eu enim. Cras consequat iaculis leo eget auctor. Sed bibendum, nulla vel ultricies aliquam, augue mauris sagittis massa, nec malesuada massa justo id sem. In hac habitasse platea dictumst. Sed ullamcorper bibendum libero vitae pellentesque.</p>\n'
+            }
+          ],
+          [
+            {
+              ...BlockImageData,
+              caption: '<p>Custom ImageCaption</p>',
+              displayCaption: false,
+              blockType: 'ImageBlock'
+            },
+            {
+              blockType: 'CharBlock',
+              value: 'N/A'
+            },
+            {
+              blockType: 'RichTextBlock',
+              value:
+                '<p>Maecenas vel dapibus ligula, pretium <a href="#">dictum est</a>. Proin venenatis massa vulputate <strong>est rhoncus</strong>, sed ornare ex sagittis. Donec iaculis magna in rhoncus malesuada.</p>\n'
+            }
+          ],
+          [
+            {
+              ...BlockImageData,
+              caption: '<p>Custom ImageCaption</p>',
+              displayCaption: true,
+              blockType: 'ImageBlock'
+            },
+            {
+              blockType: 'CharBlock',
+              value: 'Internal'
+            },
+            {
+              blockType: 'RichTextBlock',
+              value:
+                '<p>Lorem ipsum <a href="/missions/test-mission/">dolor</a> sit amet, consectetur adipiscing elit. Quisque vitae justo quis justo malesuada molestie. Cras sed tincidunt dui.</p>\n'
+            }
+          ]
+        ]
+      }
+    }
+  }
+}

package/src/components/BlockRichTable/BlockRichTable.vue

@@ -33,7 +33,7 @@ export default defineComponent({
               v-for="(headCell, headIndex) in table.tableContent.tableHead[0]"
               :key="headIndex"
               scope="col"
-              class="min-w-[12rem] bg-jpl-blue-darker edu:bg-jpl-teal-dark text-subtitle text-white border-gray-light-mid lg:p-5 p-3 border-b"
+              class="min-w-[6rem] bg-jpl-blue-darker edu:bg-jpl-violet-darker text-subtitle text-white border-gray-light-mid lg:p-5 p-3 border-b"
             >
               {{ headCell.text }}
             </th>
@@ -47,7 +47,7 @@ export default defineComponent({
             <td
               v-for="(cell, cellIndex) in row"
               :key="cellIndex"
-              class="min-w-[12rem] bg-white text-gray-dark border-gray-light-mid"
+              class="min-w-[6rem] bg-white text-gray-dark border-gray-light-mid"
             >
               <template v-if="cell.blockType === 'CharBlock'">
                 <p class="">

package/src/components/MetadataEduResource/MetadataEduResource.vue

@@ -11,7 +11,7 @@ interface MetadataEduResourceProps {
   resource: EduResourceCardObject
   compact?: boolean
   variant?: string
-  showTime: boolean
+  showTime?: boolean
 }
 
 // define props

package/src/components/NavDesktopEdu/NavDesktopEdu.vue

@@ -36,7 +36,7 @@
         <div class="ml-2 pl-3 xl:ml-3 xl:pl-5 border-l border-white border-opacity-30 z-20">
           <BaseLink
             class="text-white font-bold text-2xl xl:text-3xl"
-            to="/edu/"
+            to="/edubeta/"
             link-class="py-2"
             variant="none"
           >

package/src/components/NavSearchForm/NavSearchForm.vue

@@ -23,7 +23,7 @@ const clearSearch = () => {
 const submitSearch = () => {
   emit('submitForm')
   router.push({
-    path: themeStore.isEdu ? '/edu/search/' : '/search',
+    path: themeStore.isEdu ? '/edubeta/search/' : '/search',
     query: { query: searchQuery.value }
   })
 }

package/src/components/SearchResultCard/SearchResultCard.vue

@@ -29,6 +29,7 @@
         }
       }"
       show-calendar-chip
+      use-featured-styles
     />
     <EventCard
       v-else-if="isEvents"

package/src/components/SearchResultGridItem/SearchResultGridItem.vue

@@ -28,6 +28,7 @@
       :heading-level="headingLevel"
       size="sm"
       show-calendar-chip
+      use-featured-styles
     />
     <BlockLinkCard
       v-else-if="typename === 'News'"

package/src/constants.ts

@@ -1,6 +1,12 @@
 import type { PillDictionaryInterface } from './interfaces'
 
 export const eduMetadataDictionary: PillDictionaryInterface = {
+  EDUNewsPage: {
+    label: 'News',
+    variant: 'primary',
+    icons: 'primary',
+    type: undefined
+  },
   EDUEventPage: {
     label: 'Event',
     variant: 'primary',

package/src/templates/edu/PageEduHome/PageEduHome.vue

@@ -33,7 +33,7 @@ const image = computed(() => {
 })
 
 const submitSearch = () => {
-  router.push({ path: '/edu/resources/', query: { query: searchQuery.value } })
+  router.push({ path: '/edubeta/resources/', query: { query: searchQuery.value } })
 }
 </script>
 <template>
@@ -101,7 +101,7 @@ const submitSearch = () => {
                   >
                     <BaseLink
                       variant="none"
-                      :to="`/edu/resources?query=${topic.page?.title}`"
+                      :to="`/edubeta/resources?query=${topic.page?.title}`"
                       link-class="text-gray-dark whitespace-nowrap text-sm bg-[#99D1DF] font-extrabold rounded-full inline-block px-3 py-1 text-contrast-none hover:bg-action hover:text-white"
                     >
                       {{ topic.page?.title }}

package/src/utils/mixins.ts

@@ -157,9 +157,9 @@ export const mixinIsActivePath = (itemPath: string): Boolean => {
     if (currentPath && path && ancestorPath) {
       if (currentPath === path) {
         return true
-      } else if (currentPath.startsWith('/edu/events')) {
+      } else if (currentPath.startsWith('/edubeta/events')) {
         // special treatment since EDU combines News & Events in the main nav
-        return path.startsWith('/edu/news')
+        return path.startsWith('/edubeta/news')
       } else {
         return currentPath.startsWith(ancestorPath)
       }