@explorer-1/vue 0.2.27 → 0.2.28

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@explorer-1/vue",
-  "version": "0.2.27",
+  "version": "0.2.28",
   "private": false,
   "publishConfig": {
     "access": "public"
@@ -30,7 +30,7 @@
     "vue-bind-once": "^0.2.1",
     "vue-observe-visibility": "^1.0.0",
     "vue3-compare-image": "^1.2.5",
-    "@explorer-1/common": "1.1.7"
+    "@explorer-1/common": "1.1.8"
   },
   "devDependencies": {
     "@vitejs/plugin-vue": "^5.0.4",

package/src/components/AboutTheAuthor/AboutTheAuthor.stories.js

@@ -0,0 +1,50 @@
+import AboutTheAuthor from './AboutTheAuthor.vue'
+
+export default {
+  title: 'Components/Utilities/AboutTheAuthor',
+  component: AboutTheAuthor,
+  tags: ['!autodocs'],
+  excludeStories: /.*Data$/
+}
+
+export const AboutTheAuthorData = [
+  {
+    author: {
+      biography:
+        '<p data-block-key="8meb7">I&#x27;m someone that has a bio!  Test <a href="http://localhost:3000/edu/news">link</a>.</p>',
+      image: {
+        src: {
+          url: 'https://picsum.photos/512/512',
+          width: 512,
+          height: 512
+        },
+        alt: ''
+      },
+      jobTitle: 'Job title',
+      name: 'Author name',
+      organization: 'Organization'
+    }
+  },
+  {
+    author: {
+      biography:
+        '<p data-block-key="8meb7">I&#x27;m someone that has a bio!  Test <a href="http://localhost:3000/edu/news">link</a>. Lorem ipsum dolor sit amet long author bio here.</p><p>Lorem ipsum dolor site amet consectatur.</p>',
+      image: {
+        src: {
+          url: 'https://picsum.photos/512/512',
+          width: 512,
+          height: 512
+        },
+        alt: ''
+      },
+      jobTitle: 'Job title',
+      name: 'Another author',
+      organization: 'Organization'
+    }
+  }
+]
+// stories
+export const BaseStory = {
+  name: 'AboutTheAuthor',
+  args: { authors: AboutTheAuthorData }
+}

package/src/components/AboutTheAuthor/AboutTheAuthor.vue

@@ -0,0 +1,90 @@
+<script setup lang="ts">
+import { computed, reactive } from 'vue'
+import type { AuthorObject } from '../../interfaces'
+import BlockText from './../BlockText/BlockText.vue'
+import BaseImage from './../BaseImage/BaseImage.vue'
+import BaseImagePlaceholder from './../BaseImagePlaceholder/BaseImagePlaceholder.vue'
+
+interface AboutTheAuthorProps {
+  authors: {
+    author?: AuthorObject
+  }[]
+}
+
+// define props
+const props = withDefaults(defineProps<AboutTheAuthorProps>(), {
+  authors: undefined
+})
+
+const { authors } = reactive(props)
+
+const headingString = computed(() => {
+  let noun = 'Author'
+  if (authors?.length > 1) {
+    noun = 'Authors'
+  }
+  return `About the ${noun}`
+})
+</script>
+<template>
+  <div class="AboutTheAuthor">
+    <h3 class="text-h4 sm:ml-[130px] pl-10 mb-6">
+      {{ headingString }}
+    </h3>
+    <template
+      v-for="(author, index) in authors"
+      :key="index"
+    >
+      <div
+        v-if="author.author"
+        class="sm:flex flex-row"
+        :class="{ ' mb-10 sm:mb-12': index + 1 !== authors.length }"
+      >
+        <div class="sm:mr-10">
+          <BaseImagePlaceholder
+            aspect-ratio="1:1"
+            class="relative mb-6 sm:mb-0 overflow-hidden rounded-full w-[130px]"
+            transparent-mode
+            no-logo
+          >
+            <BaseImage
+              v-if="author.author.image?.src"
+              :src="author.author.image.src.url"
+              :width="author.author.image.src.width"
+              :height="author.author.image.src.height"
+              :alt="author.author.name"
+              object-fit-class="cover"
+              image-class="can-hover:group-hover:delay-200 can-hover:group-hover:scale-100 absolute top-0 left-0 w-full transition-all duration-200 ease-in transform scale-105"
+              loading="lazy"
+            />
+          </BaseImagePlaceholder>
+        </div>
+        <div>
+          <div class="mb-4">
+            <h3
+              v-if="author.author.name"
+              class="!font-medium !tracking-normal !text-lg mb-1"
+            >
+              {{ author.author.name }}
+            </h3>
+            <p
+              v-if="author.author.jobTitle || author.author.organization"
+              class="text-lg"
+            >
+              {{
+                (author.author.jobTitle ? author.author.jobTitle : '') +
+                (author.author.jobTitle && author.author.organization ? ', ' : '')
+              }}
+              {{ author.author.organization }}
+            </p>
+          </div>
+          <BlockText
+            v-if="author.author.biography"
+            :text="author.author.biography"
+            variant="small"
+          />
+        </div>
+      </div>
+    </template>
+  </div>
+</template>

package/src/components/BlockText/BlockText.vue

@@ -13,9 +13,9 @@ interface Variants {
 }
 
 export const variants: Variants = {
-  small: 'text-body-sm',
-  medium: 'text-body-md',
-  large: 'text-body-lg'
+  small: 'text-body-sm -small',
+  medium: 'text-body-md -medium',
+  large: 'text-body-lg -large'
 }
 
 export default defineComponent({

package/src/components/DetailHeadline/DetailHeadline.vue

@@ -140,7 +140,7 @@ export default defineComponent({
       default: undefined
     },
     author: {
-      type: Object as PropType<AuthorObject | AuthorObject[]>,
+      type: Object as PropType<AuthorObject | { author: AuthorObject }[]>,
       required: false,
       default: undefined
     },
@@ -208,11 +208,10 @@ export default defineComponent({
       const returnDate = new Date(this.publicationDate + ' ' + currentTime)
       return returnDate.toISOString()
     },
-    authors(): { name: string; organization: string }[] | undefined {
+    authors(): AuthorObject[] | undefined {
       let authors: AuthorObject[] | undefined = undefined
       if (this.author && this.author.constructor === Array) {
         authors = []
-        // @ts-expect-error we know it's an array at this point
         this.author.forEach((author: { author: AuthorObject }) => {
           // @ts-expect-error authors array is defined above
           authors.push(author.author)

package/src/interfaces.ts

@@ -183,7 +183,10 @@ export interface Attributes {
 
 export interface AuthorObject {
   name: string
-  organization: string
+  organization?: string
+  image?: ImageObject
+  jobTitle?: string
+  biography?: string
 }
 
 export interface Topic {
@@ -262,6 +265,7 @@ export interface EduResourceStandardItem {
 
 export interface PageEduResourcesObject extends PageObject {
   hero?: StreamfieldBlockData[]
+  authors?: { author: AuthorObject }[]
   primarySubject?: EduResourcesSubject
   additionalSubjects?: EduResourcesSubject[]
   gradeLevels?: EduResourcesGradeLevel[]

package/src/templates/edu/PageEduExplainerArticle/PageEduExplainerArticle.stories.js

@@ -4,10 +4,10 @@ import { BlockImageCarouselData } from './../../../components/BlockImageCarousel
 import { BlockImageComparisonData } from './../../../components/BlockImageComparison/BlockImageComparison.stories'
 import { BaseVideoData } from './../../../components/BaseVideo/BaseVideo.stories'
 import { BlockVideoEmbedData } from './../../../components/BlockVideoEmbed/BlockVideoEmbed.stories'
-
 import { BlockRelatedLinksData } from './../../../components/BlockRelatedLinks/BlockRelatedLinks.stories.js'
 import { BlockLinkCardCarouselData } from './../../../components/BlockLinkCarousel/BlockLinkCarousel.stories.js'
 import { BlockStreamfieldTruncatedData } from './../../../components/BlockStreamfield/BlockStreamfield.stories'
+import { AboutTheAuthorData } from './../../../components/AboutTheAuthor/AboutTheAuthor.stories'
 import PageEduExplainerArticle from './PageEduExplainerArticle.vue'
 
 export default {
@@ -41,6 +41,8 @@ export const BaseStory = {
       url: 'http://localhost:3000/edu/resources/test-resource',
       title: 'Test Resource',
       readTime: '6 min read',
+      lastPublishedAt: '2024-08-22T02:33:13.507206+00:00',
+      authors: AboutTheAuthorData,
       heroConstrain: true,
       heroPosition: 'full_bleed',
       hero: [

package/src/templates/edu/PageEduExplainerArticle/PageEduExplainerArticle.vue

@@ -10,10 +10,12 @@ import BlockStreamfield from './../../../components/BlockStreamfield/BlockStream
 import BlockRelatedLinks from '../../../components/BlockRelatedLinks/BlockRelatedLinks.vue'
 import NavJumpMenu from './../../../components/NavJumpMenu/NavJumpMenu.vue'
 import HeroInlineMedia from './../../../components/HeroInlineMedia/HeroInlineMedia.vue'
+import AboutTheAuthor from './../../../components/AboutTheAuthor/AboutTheAuthor.vue'
 
 export default defineComponent({
   name: 'PageEduExplainerArticle',
   components: {
+    AboutTheAuthor,
     HeroMedia,
     HeroInlineMedia,
     LayoutHelper,
@@ -170,5 +172,26 @@ export default defineComponent({
       :heading="data.relatedContentHeading"
       :items="data.relatedContent"
     />
+
+    <LayoutHelper
+      v-if="data.authors?.length"
+      indent="col-3"
+    >
+      <AboutTheAuthor :authors="data.authors" />
+    </LayoutHelper>
+
+    <LayoutHelper
+      v-if="data.lastPublishedAt"
+      indent="col-3"
+      class="lg:my-18 my-10"
+    >
+      <p class="border-t border-gray-light-mid pt-8">
+        <strong>Explainer Article Last Updated:</strong>
+        {{
+          // @ts-ignore
+          $filters.displayDate(data.lastPublishedAt)
+        }}
+      </p>
+    </LayoutHelper>
   </div>
 </template>

package/src/templates/edu/PageEduLesson/PageEduLesson.stories.js

@@ -13,6 +13,7 @@ import {
   BlockStreamfieldMinimalData
 } from './../../../components/BlockStreamfield/BlockStreamfield.stories'
 import PageEduLesson from './PageEduLesson.vue'
+import { AboutTheAuthorData } from './../../../components/AboutTheAuthor/AboutTheAuthor.stories'
 
 export default {
   title: 'Templates/EDU/PageEduLesson',
@@ -50,6 +51,7 @@ export const BaseStory = {
         original: 'http://127.0.0.1:9000/media/original_images/imagessirtfsirtf-090303-16.jpg',
         alt: ''
       },
+      authors: AboutTheAuthorData,
       hero: [
         {
           ...HeroMediaData,

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

@@ -19,6 +19,7 @@ import MetaPanel from '../../../components/MetaPanel/MetaPanel.vue'
 import PageEduLessonSection, { type PageEduLessonSectionProps } from './PageEduLessonSection.vue'
 import NavJumpMenu from './../../../components/NavJumpMenu/NavJumpMenu.vue'
 import HeroInlineMedia from './../../../components/HeroInlineMedia/HeroInlineMedia.vue'
+import AboutTheAuthor from './../../../components/AboutTheAuthor/AboutTheAuthor.vue'
 
 import { HeadingLevel } from '../../../components/BaseHeading/BaseHeading.vue'
 
@@ -364,10 +365,17 @@ const consolidatedSections = computed((): EduLessonSectionObject[] => {
     <BlockLinkCarousel
       item-type="cards"
       class="lg:my-24 my-12 print:px-4"
-      :heading="data.relatedContentHeading"
+      :heading="data.relatedContentHeading || 'Related Lessons & Projects'"
       :items="data.relatedContent"
     />
 
+    <LayoutHelper
+      v-if="data.authors?.length"
+      indent="col-3"
+    >
+      <AboutTheAuthor :authors="data.authors" />
+    </LayoutHelper>
+
     <LayoutHelper
       v-if="data.lastPublishedAt"
       indent="col-3"

package/src/templates/edu/PageEduNewsDetail/PageEduNewsDetail.stories.js

@@ -1,5 +1,7 @@
 import { HeroMediaData } from './../../../components/HeroMedia/HeroMedia.stories'
 import { BlockStreamfieldData } from './../../../components/BlockStreamfield/BlockStreamfield.stories'
+import { AboutTheAuthorData } from './../../../components/AboutTheAuthor/AboutTheAuthor.stories'
+
 import PageEduNewsDetail from './PageEduNewsDetail.vue'
 
 export default {
@@ -33,14 +35,7 @@ export const BaseStory = {
       title: "NASA's Ingenuity Mars Helicopter Recharges Its Batteries in Flight",
       publicationDate: '2024-06-20 20:36:49.657301+00:00',
       readTime: '5 min read',
-      authors: [
-        {
-          author: {
-            name: 'Author Name',
-            organization: 'Organization Name'
-          }
-        }
-      ],
+      authors: AboutTheAuthorData,
       getTopicsForDisplay: [
         {
           title: 'Mars',

package/src/templates/edu/PageEduNewsDetail/PageEduNewsDetail.vue

@@ -10,6 +10,7 @@ import BlockImageStandard from './../../../components/BlockImage/BlockImageStand
 import BlockText from './../../../components/BlockText/BlockText.vue'
 import BlockStreamfield from './../../../components/BlockStreamfield/BlockStreamfield.vue'
 import NavJumpMenu from './../../../components/NavJumpMenu/NavJumpMenu.vue'
+import AboutTheAuthor from './../../../components/AboutTheAuthor/AboutTheAuthor.vue'
 
 interface PageEduNewsDetailObject extends PageObject {
   readTime: string
@@ -18,7 +19,7 @@ interface PageEduNewsDetailObject extends PageObject {
   heroImageInline: ImageObject
   heroConstrain: boolean
   heroImageCaption: string
-  authors: AuthorObject[]
+  authors: { author: AuthorObject }[]
   showJumpMenu: boolean
 }
 
@@ -152,6 +153,14 @@ defineExpose({
       :data="data.body"
     />
 
+    <LayoutHelper
+      v-if="data.authors?.length"
+      indent="col-3"
+      class="mb-10 lg:mb-22"
+    >
+      <AboutTheAuthor :authors="data.authors" />
+    </LayoutHelper>
+
     <div class="bg-stars bg-primary-darker">
       <div class="py-10 text-center text-white">
         <strong>Related News goes here</strong>

package/src/templates/edu/PageEduTeachableMoment/PageEduTeachableMoment.stories.js

@@ -13,6 +13,7 @@ import {
   BlockStreamfieldMinimalData
 } from './../../../components/BlockStreamfield/BlockStreamfield.stories'
 import PageEduTeachableMoment from './PageEduTeachableMoment.vue'
+import { AboutTheAuthorData } from './../../../components/AboutTheAuthor/AboutTheAuthor.stories'
 
 export default {
   title: 'Templates/EDU/PageEduTeachableMoment',
@@ -47,6 +48,7 @@ export const BaseStory = {
         original: 'http://127.0.0.1:9000/media/original_images/imagessirtfsirtf-090303-16.jpg',
         alt: ''
       },
+      authors: AboutTheAuthorData,
       hero: [
         {
           ...HeroMediaData,

package/src/templates/edu/PageEduTeachableMoment/PageEduTeachableMoment.vue

@@ -11,6 +11,7 @@ import BlockStreamfield from './../../../components/BlockStreamfield/BlockStream
 import BlockRelatedLinks from '../../../components/BlockRelatedLinks/BlockRelatedLinks.vue'
 import NavJumpMenu from './../../../components/NavJumpMenu/NavJumpMenu.vue'
 import HeroInlineMedia from './../../../components/HeroInlineMedia/HeroInlineMedia.vue'
+import AboutTheAuthor from './../../../components/AboutTheAuthor/AboutTheAuthor.vue'
 
 interface PageEduTeachableMomentProps {
   data?: PageEduResourcesObject
@@ -142,14 +143,12 @@ const computedClass = computed((): string => {
       <BlockRelatedLinks :data="data.relatedLinks[0]" />
     </LayoutHelper>
 
-    <!-- related content -->
-    <BlockLinkCarousel
-      v-if="data.relatedContent?.length"
-      item-type="cards"
-      class="lg:my-24 my-12 print:px-4"
-      :heading="data.relatedContentHeading"
-      :items="data.relatedContent"
-    />
+    <LayoutHelper
+      v-if="data.authors?.length"
+      indent="col-3"
+    >
+      <AboutTheAuthor :authors="data.authors" />
+    </LayoutHelper>
 
     <LayoutHelper
       v-if="data.lastPublishedAt"