Skip to content

Commit 5f57b80

Browse files
authored
Merge branch 'develop' into uarray-intro
2 parents f04ea51 + 3d1e583 commit 5f57b80

File tree

338 files changed

+14308
-967
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

338 files changed

+14308
-967
lines changed

.github/CODEOWNERS

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,21 @@
11
# Gabriel as default owner
22
* @gabalafou
33

4-
# Noa as reviewer for Markdown examples
5-
/examples @noatamir
4+
# Pavithra as reviewer for Markdown examples
5+
/examples @pavithraes
66

7-
# Noa, Tania & Ralf as default reviewers for Labs blogs and assets
8-
/apps/labs/posts @noatamir @trallard @rgommers
9-
/apps/labs/public/posts @noatamir @trallard @rgommers
7+
# Pavithra, Tania & Ralf as default reviewers for Labs blogs and assets
8+
/apps/labs/posts @pavithraes @trallard @rgommers
9+
/apps/labs/public/posts @pavithraes @trallard @rgommers
1010

11-
# Noa as default reviewer for changes to Labs Storyblok content
11+
# Pavithra as default reviewer for changes to Labs Storyblok content
1212
# Tania/Ralf/others to be manually added as appropriate
13-
/apps/labs/CHANGELOG.md @noatamir
13+
/apps/labs/CHANGELOG.md @pavithraes
1414

1515
# Brian as default reviewer for changes to LLC Storyblok content
1616
# Kate/others to be manually added as appropriate
1717
/apps/consulting/CHANGELOG.md @bskinn
18+
19+
# Brian as default reviewer for Consulting blogs and assets
20+
/apps/consulting/posts @bskinn
21+
/apps/consulting/public/posts @bskinn

README.md

Lines changed: 266 additions & 228 deletions
Large diffs are not rendered by default.

apps/consulting/CHANGELOG.md

Lines changed: 86 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,88 @@
1+
May 31, 2023
2+
3+
Via Storyblok:
4+
5+
- Add open-source-services page
6+
- Page itself
7+
- Header nav
8+
- Footer nav
9+
- Link blok from /consulting
10+
- Link blok from homepage
11+
- Adjust 'other service areas' heading text on
12+
Data Engineering & MLOps services page
13+
- Alphabetize service areas in header nav and footer
14+
15+
May 23, 2023
16+
17+
Via Storyblok:
18+
19+
- Add Camp Quansight video & adjacent content to Careers page
20+
21+
April 27, 2023
22+
23+
Via Storyblok:
24+
25+
- Revise text copy on homepage
26+
- Switch to Intertwined Article component
27+
- Change to @marsbarlee's new illustrations
28+
29+
April 11, 2023
30+
31+
Via Storyblok:
32+
33+
- Recreate the Board List Item for the 'Infrastructure,
34+
Scaling & Acceleration' tile on `/consulting`, to fix
35+
the incorrect rendered link as reported in #716
36+
- Revise Ashley's title to 'COO'
37+
- Revise header navigation to incorporate redesign and
38+
inclusion of link to new Nebari Services page
39+
- Add 'Nebari Install & Support' link to site footer
40+
- Revise Jupyter Technologies services page, QHub->Nebari
41+
- Rename 'QHub & JupyterHub' tile heading to 'Nebari & JupyterHub'
42+
and update the icon to match
43+
- Remove the QHub logo from the logo spread and update the
44+
Nebari placeholder logo to the actual logo
45+
46+
March 27, 2023
47+
48+
Via Storyblok:
49+
50+
- Change homepage hero to be green at all screen sizes
51+
52+
March 24, 2023
53+
54+
Via Storyblok:
55+
56+
- Fix glitched asset reference for homepage hero on mobile
57+
58+
March 19, 2023
59+
60+
Via Storyblok:
61+
62+
- Fixes to PyTorch 2022 blog post
63+
- Add Andrew James as coauthor
64+
- Remove Francisco Massa from acknowledgments
65+
66+
March 17, 2023
67+
68+
Via Storyblok:
69+
70+
- Add PyTorch 2022 Contributions Consulting blog post
71+
72+
February 22, 2023
73+
74+
Via Storyblok:
75+
76+
- Update 'About Us' page copy and illustrations, plus icons in the
77+
Our Values section
78+
79+
February 15, 2023
80+
81+
Via Storyblok:
82+
83+
- Add Teaser component to homepage with copy and link to Labs 2022
84+
Annual Report
85+
186
January 2, 2023
287

388
Via Storyblok:
@@ -31,7 +116,7 @@ November 8, 2022
31116
Via Storyblok:
32117

33118
- Replaced hero for Visualization & Dashboards page
34-
with a version without the white stripe at the right
119+
with a version without the white stripe at the right
35120
edge, and switch the 'hero background color' for that
36121
hero to black
37122
- Replaced mis-named profile picture of Adam Lewis

apps/consulting/api/queries/pageItems.graphql

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ query PageItems($relations: String, $prefix: String) {
66
title
77
description
88
component
9+
keywords
910
body
1011
_editable
1112
}

apps/consulting/api/types/basic.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ export type Scalars = {
1818
Int: number;
1919
Float: number;
2020
BlockScalar: any;
21-
/** An ISO 8601-encoded datetime */
2221
ISO8601DateTime: any;
2322
JsonScalar: any;
2423
};
@@ -318,10 +317,12 @@ export type PageComponent = {
318317
body: Maybe<Scalars['BlockScalar']>;
319318
component: Maybe<Scalars['String']>;
320319
description: Maybe<Scalars['String']>;
320+
keywords: Maybe<Scalars['String']>;
321321
title: Maybe<Scalars['String']>;
322322
};
323323

324324
export type PageFilterQuery = {
325+
keywords: InputMaybe<FilterQueryOperations>;
325326
title: InputMaybe<FilterQueryOperations>;
326327
};
327328

apps/consulting/api/types/hooks.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,7 @@ export const PageItemsDocument = gql`
173173
title
174174
description
175175
component
176+
keywords
176177
body
177178
_editable
178179
}
@@ -364,6 +365,7 @@ export const PageItemDocument = gql`
364365
component
365366
title
366367
description
368+
keywords
367369
}
368370
created_at
369371
default_full_slug
@@ -419,6 +421,9 @@ export const TeamDocument = gql`
419421
}
420422
projects
421423
githubNick
424+
githubLink {
425+
url
426+
}
422427
}
423428
}
424429
}

apps/consulting/api/types/operations.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -212,6 +212,7 @@ export type PageItemsQuery = {
212212
title: string | null;
213213
description: string | null;
214214
component: string | null;
215+
keywords: string | null;
215216
body: any | null;
216217
_editable: string | null;
217218
} | null;
@@ -417,6 +418,7 @@ export type PageItemQuery = {
417418
component: string | null;
418419
title: string | null;
419420
description: string | null;
421+
keywords: string | null;
420422
} | null;
421423
translated_slugs: Array<{
422424
__typename?: 'TranslatedSlug';
@@ -452,6 +454,7 @@ export type TeamQuery = {
452454
filename: string;
453455
alt: string | null;
454456
} | null;
457+
githubLink: { __typename?: 'Link'; url: string } | null;
455458
} | null;
456459
} | null> | null;
457460
} | null;

apps/consulting/components/BlogArticle/BlogArticle.tsx

Lines changed: 0 additions & 23 deletions
This file was deleted.

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

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,10 @@ export const BlogHeader: FC<TBlogHeaderProps> = ({
99
postTitle,
1010
publishedDate,
1111
author,
12-
}) => {
13-
return (
14-
<header className="mt-[5.8rem] mb-[7rem] sm:mt-[4.4rem] sm:mb-[4.1rem] xl:mt-[7.1rem]">
15-
<BlogHeaderLink />
16-
<BlogHeaderPostData postTitle={postTitle} publishedDate={publishedDate} />
17-
{author && <BlogHeaderAuthor {...author} />}
18-
</header>
19-
);
20-
};
12+
}) => (
13+
<header className="mt-[5.8rem] mb-[7rem] sm:mt-[4.4rem] sm:mb-[4.1rem] xl:mt-[7.1rem]">
14+
<BlogHeaderLink />
15+
<BlogHeaderPostData postTitle={postTitle} publishedDate={publishedDate} />
16+
<BlogHeaderAuthor {...author} />
17+
</header>
18+
);

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

Lines changed: 32 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -2,42 +2,36 @@ import { FC } from 'react';
22

33
import { Picture } from '@quansight/shared/ui-components';
44

5-
import { getAuthorName } from '../../../utils/getAuthorName/getAuthorName';
6-
import { TBlogHeaderAuthorProps } from '../types';
5+
import { TPostAuthor } from '../../../types/storyblok/bloks/blogPost';
76

8-
export const BlogHeaderAuthor: FC<TBlogHeaderAuthorProps> = ({
9-
firstName,
10-
lastName,
11-
githubNick,
12-
githubLink,
13-
authorImage,
14-
}) => {
15-
const authorsName = getAuthorName(firstName, lastName);
16-
17-
return (
18-
<section className="flex gap-[1.4rem] justify-start items-center">
19-
<div className="overflow-hidden relative w-[4.8rem] h-[4.8rem] rounded-full">
20-
<Picture
21-
imageSrc={authorImage.filename}
22-
imageAlt={authorImage.alt}
23-
layout="fill"
24-
objectFit="cover"
25-
objectPosition="center"
26-
/>
27-
</div>
28-
<div className="flex flex-col justify-between items-start">
29-
<a
30-
href={githubLink.url}
31-
target="_blank"
32-
rel="noreferrer"
33-
className="text-[1.4rem] font-normal leading-[2.7rem]"
34-
>
35-
{githubNick}
36-
</a>
37-
<p className="text-[1.9rem] font-extrabold leading-[2.7rem]">
38-
{authorsName}
39-
</p>
40-
</div>
41-
</section>
42-
);
43-
};
7+
export const BlogHeaderAuthor: FC<TPostAuthor> = ({
8+
avatarSrc,
9+
fullName,
10+
nickName,
11+
authorUrl,
12+
}) => (
13+
<section className="flex gap-[1.4rem] justify-start items-center">
14+
<div className="overflow-hidden relative w-[4.8rem] h-[4.8rem] rounded-full">
15+
<Picture
16+
imageSrc={avatarSrc}
17+
imageAlt={fullName}
18+
layout="fill"
19+
objectFit="cover"
20+
objectPosition="center"
21+
/>
22+
</div>
23+
<div className="flex flex-col justify-between items-start">
24+
<a
25+
href={authorUrl.url}
26+
target="_blank"
27+
rel="noreferrer"
28+
className="text-[1.4rem] font-normal leading-[2.7rem]"
29+
>
30+
{nickName}
31+
</a>
32+
<p className="text-[1.9rem] font-extrabold leading-[2.7rem]">
33+
{fullName}
34+
</p>
35+
</div>
36+
</section>
37+
);

0 commit comments

Comments
 (0)