Merge branch 'develop' into uarray-intro

.github/CODEOWNERS

@@ -1,17 +1,21 @@
 # Gabriel as default owner
 *   @gabalafou
 
-# Noa as reviewer for Markdown examples
-/examples   @noatamir
+# Pavithra as reviewer for Markdown examples
+/examples   @pavithraes
 
-# Noa, Tania & Ralf as default reviewers for Labs blogs and assets
-/apps/labs/posts          @noatamir  @trallard  @rgommers
-/apps/labs/public/posts   @noatamir  @trallard  @rgommers
+# Pavithra, Tania & Ralf as default reviewers for Labs blogs and assets
+/apps/labs/posts          @pavithraes  @trallard  @rgommers
+/apps/labs/public/posts   @pavithraes  @trallard  @rgommers
 
-# Noa as default reviewer for changes to Labs Storyblok content
+# Pavithra as default reviewer for changes to Labs Storyblok content
 # Tania/Ralf/others to be manually added as appropriate
-/apps/labs/CHANGELOG.md   @noatamir 
+/apps/labs/CHANGELOG.md   @pavithraes
 
 # Brian as default reviewer for changes to LLC Storyblok content
 # Kate/others to be manually added as appropriate
 /apps/consulting/CHANGELOG.md   @bskinn
+
+# Brian as default reviewer for Consulting blogs and assets
+/apps/consulting/posts          @bskinn
+/apps/consulting/public/posts   @bskinn

apps/consulting/CHANGELOG.md

@@ -1,3 +1,88 @@
+May 31, 2023
+
+Via Storyblok:
+
+- Add open-source-services page
+  - Page itself
+  - Header nav
+  - Footer nav
+  - Link blok from /consulting
+  - Link blok from homepage
+- Adjust 'other service areas' heading text on
+  Data Engineering & MLOps services page
+- Alphabetize service areas in header nav and footer
+
+May 23, 2023
+
+Via Storyblok:
+
+- Add Camp Quansight video & adjacent content to Careers page
+
+April 27, 2023
+
+Via Storyblok:
+
+- Revise text copy on homepage
+  - Switch to Intertwined Article component
+  - Change to @marsbarlee's new illustrations
+
+April 11, 2023
+
+Via Storyblok:
+
+- Recreate the Board List Item for the 'Infrastructure,
+  Scaling & Acceleration' tile on `/consulting`, to fix
+  the incorrect rendered link as reported in #716
+- Revise Ashley's title to 'COO'
+- Revise header navigation to incorporate redesign and
+  inclusion of link to new Nebari Services page
+- Add 'Nebari Install & Support' link to site footer
+- Revise Jupyter Technologies services page, QHub->Nebari
+  - Rename 'QHub & JupyterHub' tile heading to 'Nebari & JupyterHub'
+    and update the icon to match
+  - Remove the QHub logo from the logo spread and update the
+    Nebari placeholder logo to the actual logo
+
+March 27, 2023
+
+Via Storyblok:
+
+- Change homepage hero to be green at all screen sizes
+
+March 24, 2023
+
+Via Storyblok:
+
+- Fix glitched asset reference for homepage hero on mobile
+
+March 19, 2023
+
+Via Storyblok:
+
+- Fixes to PyTorch 2022 blog post
+  - Add Andrew James as coauthor
+  - Remove Francisco Massa from acknowledgments
+
+March 17, 2023
+
+Via Storyblok:
+
+- Add PyTorch 2022 Contributions Consulting blog post
+
+February 22, 2023
+
+Via Storyblok:
+
+- Update 'About Us' page copy and illustrations, plus icons in the
+  Our Values section
+
+February 15, 2023
+
+Via Storyblok:
+
+- Add Teaser component to homepage with copy and link to Labs 2022
+  Annual Report
+
 January 2, 2023
 
 Via Storyblok:
@@ -31,7 +116,7 @@ November 8, 2022
 Via Storyblok:
 
 - Replaced hero for Visualization & Dashboards page
-  with a version without the white stripe at the right 
+  with a version without the white stripe at the right
   edge, and switch the 'hero background color' for that
   hero to black
 - Replaced mis-named profile picture of Adam Lewis

apps/consulting/api/queries/pageItems.graphql

@@ -6,6 +6,7 @@ query PageItems($relations: String, $prefix: String) {
         title
         description
         component
+        keywords
         body
         _editable
       }

apps/consulting/api/types/basic.ts

@@ -18,7 +18,6 @@ export type Scalars = {
   Int: number;
   Float: number;
   BlockScalar: any;
-  /** An ISO 8601-encoded datetime */
   ISO8601DateTime: any;
   JsonScalar: any;
 };
@@ -318,10 +317,12 @@ export type PageComponent = {
   body: Maybe<Scalars['BlockScalar']>;
   component: Maybe<Scalars['String']>;
   description: Maybe<Scalars['String']>;
+  keywords: Maybe<Scalars['String']>;
   title: Maybe<Scalars['String']>;
 };
 
 export type PageFilterQuery = {
+  keywords: InputMaybe<FilterQueryOperations>;
   title: InputMaybe<FilterQueryOperations>;
 };
 

apps/consulting/api/types/hooks.ts

@@ -173,6 +173,7 @@ export const PageItemsDocument = gql`
           title
           description
           component
+          keywords
           body
           _editable
         }
@@ -364,6 +365,7 @@ export const PageItemDocument = gql`
         component
         title
         description
+        keywords
       }
       created_at
       default_full_slug
@@ -419,6 +421,9 @@ export const TeamDocument = gql`
           }
           projects
           githubNick
+          githubLink {
+            url
+          }
         }
       }
     }

apps/consulting/api/types/operations.ts

@@ -212,6 +212,7 @@ export type PageItemsQuery = {
         title: string | null;
         description: string | null;
         component: string | null;
+        keywords: string | null;
         body: any | null;
         _editable: string | null;
       } | null;
@@ -417,6 +418,7 @@ export type PageItemQuery = {
       component: string | null;
       title: string | null;
       description: string | null;
+      keywords: string | null;
     } | null;
     translated_slugs: Array<{
       __typename?: 'TranslatedSlug';
@@ -452,6 +454,7 @@ export type TeamQuery = {
           filename: string;
           alt: string | null;
         } | null;
+        githubLink: { __typename?: 'Link'; url: string } | null;
       } | null;
     } | null> | null;
   } | null;

apps/consulting/components/BlogArticle/BlogHeader/BlogHeader.tsx

@@ -9,12 +9,10 @@ export const BlogHeader: FC<TBlogHeaderProps> = ({
   postTitle,
   publishedDate,
   author,
-}) => {
-  return (
-    <header className="mt-[5.8rem] mb-[7rem] sm:mt-[4.4rem] sm:mb-[4.1rem] xl:mt-[7.1rem]">
-      <BlogHeaderLink />
-      <BlogHeaderPostData postTitle={postTitle} publishedDate={publishedDate} />
-      {author && <BlogHeaderAuthor {...author} />}
-    </header>
-  );
-};
+}) => (
+  <header className="mt-[5.8rem] mb-[7rem] sm:mt-[4.4rem] sm:mb-[4.1rem] xl:mt-[7.1rem]">
+    <BlogHeaderLink />
+    <BlogHeaderPostData postTitle={postTitle} publishedDate={publishedDate} />
+    <BlogHeaderAuthor {...author} />
+  </header>
+);

apps/consulting/components/BlogArticle/BlogHeader/BlogHeaderAuthor.tsx

@@ -2,42 +2,36 @@ import { FC } from 'react';
 
 import { Picture } from '@quansight/shared/ui-components';
 
-import { getAuthorName } from '../../../utils/getAuthorName/getAuthorName';
-import { TBlogHeaderAuthorProps } from '../types';
+import { TPostAuthor } from '../../../types/storyblok/bloks/blogPost';
 
-export const BlogHeaderAuthor: FC<TBlogHeaderAuthorProps> = ({
-  firstName,
-  lastName,
-  githubNick,
-  githubLink,
-  authorImage,
-}) => {
-  const authorsName = getAuthorName(firstName, lastName);
-
-  return (
-    <section className="flex gap-[1.4rem] justify-start items-center">
-      <div className="overflow-hidden relative w-[4.8rem] h-[4.8rem] rounded-full">
-        <Picture
-          imageSrc={authorImage.filename}
-          imageAlt={authorImage.alt}
-          layout="fill"
-          objectFit="cover"
-          objectPosition="center"
-        />
-      </div>
-      <div className="flex flex-col justify-between items-start">
-        <a
-          href={githubLink.url}
-          target="_blank"
-          rel="noreferrer"
-          className="text-[1.4rem] font-normal leading-[2.7rem]"
-        >
-          {githubNick}
-        </a>
-        <p className="text-[1.9rem] font-extrabold leading-[2.7rem]">
-          {authorsName}
-        </p>
-      </div>
-    </section>
-  );
-};
+export const BlogHeaderAuthor: FC<TPostAuthor> = ({
+  avatarSrc,
+  fullName,
+  nickName,
+  authorUrl,
+}) => (
+  <section className="flex gap-[1.4rem] justify-start items-center">
+    <div className="overflow-hidden relative w-[4.8rem] h-[4.8rem] rounded-full">
+      <Picture
+        imageSrc={avatarSrc}
+        imageAlt={fullName}
+        layout="fill"
+        objectFit="cover"
+        objectPosition="center"
+      />
+    </div>
+    <div className="flex flex-col justify-between items-start">
+      <a
+        href={authorUrl.url}
+        target="_blank"
+        rel="noreferrer"
+        className="text-[1.4rem] font-normal leading-[2.7rem]"
+      >
+        {nickName}
+      </a>
+      <p className="text-[1.9rem] font-extrabold leading-[2.7rem]">
+        {fullName}
+      </p>
+    </div>
+  </section>
+);

apps/consulting/components/BlogArticle/BlogHeader/BlogHeaderLink.tsx

@@ -4,7 +4,7 @@ import Link from 'next/link';
 
 import { Picture } from '@quansight/shared/ui-components';
 
-import HeaderLinkIcon from '../assets/headerLinkIcon.svg';
+import HeaderLinkIcon from './assets/headerLinkIcon.svg';
 
 export const BlogHeaderLink: FC = () => (
   <Link href="/library">

apps/consulting/components/BlogArticle/BlogHeader/BlogHeaderPostData.tsx

@@ -1,24 +1,19 @@
 import { FC } from 'react';
 
-import { formatArticleDate } from '../../../utils/formatArticleDate/formatArticleDate';
 import { TBlogHeaderPostDataProps } from '../types';
 
 export const BlogHeaderPostData: FC<TBlogHeaderPostDataProps> = ({
   postTitle,
   publishedDate,
-}) => {
-  const articleDate = formatArticleDate(publishedDate);
-
-  return (
-    <section className="mb-[1.2rem] lg:mb-[3.7rem]">
-      <h2 className="text-[3rem] font-extrabold leading-[5.3rem] sm:mb-[5.1rem] sm:text-[4.8rem] font-heading text-violet">
-        {postTitle}
-      </h2>
-      {articleDate && (
-        <p className="text-[1.4rem] font-normal leading-[2.7rem]">
-          Published {articleDate}
-        </p>
-      )}
-    </section>
-  );
-};
+}) => (
+  <section className="mb-[1.2rem] lg:mb-[3.7rem]">
+    <h2 className="text-[3rem] font-extrabold leading-[5.3rem] sm:mb-[5.1rem] sm:text-[4.8rem] font-heading text-violet">
+      {postTitle}
+    </h2>
+    {publishedDate && (
+      <p className="text-[1.4rem] font-normal leading-[2.7rem]">
+        Published {publishedDate}
+      </p>
+    )}
+  </section>
+);

apps/consulting/components/BlogArticle/BlogMoreArticles/BlogMoreArticles.tsx

@@ -4,14 +4,16 @@ import { Tile } from '../../Tiles/Tile';
 import { TileVariant } from '../../Tiles/types';
 import { TBlogMoreArticlesProps } from '../types';
 
-export const BlogMoreArticles: FC<TBlogMoreArticlesProps> = ({ tiles }) => (
+export const BlogMoreArticles: FC<TBlogMoreArticlesProps> = ({
+  featuredPosts,
+}) => (
   <section className="px-[2rem] pt-[10rem] mx-auto mb-[2rem] border-t border-t-gray-100 sm:px-[6rem] sm:mb-[6rem] lg:px-[10rem] xl:px-[25rem] xl:mb-[18rem] max-w-layout">
     <h3 className="mb-[5rem] text-[1.9rem] font-bold leading-[2.7rem] text-center text-black">
       More articles from our Library
     </h3>
     <ul className="flex flex-col gap-[3.6rem] justify-between items-center sm:flex-row sm:gap-[2rem]">
-      {tiles.map((tile) => (
-        <Tile key={tile.uuid} {...tile} tileVariant={TileVariant.Blog} />
+      {featuredPosts.map((tile) => (
+        <Tile key={tile.key} {...tile} tileVariant={TileVariant.Blog} />
       ))}
     </ul>
   </section>