From b1f8d1839b68363f5a0835083bc1ec913920d5ad Mon Sep 17 00:00:00 2001 From: rijkvanzanten Date: Tue, 5 Sep 2023 13:48:51 -0400 Subject: [PATCH 01/51] Add responsive styling for base form --- components/Base/HsForm.vue | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/components/Base/HsForm.vue b/components/Base/HsForm.vue index 75d98480..202e0221 100644 --- a/components/Base/HsForm.vue +++ b/components/Base/HsForm.vue @@ -222,12 +222,16 @@ watch(formId, renderHsForm); } input:not([type='submit']) { - min-inline-size: var(--space-80); + min-inline-size: var(--space-64); } input[type='submit'] { height: 100%; } + + .hs-form-field { + flex-grow: 1; + } } &.inline.align-center :deep(form) { From f4549061ec5fa8b34c46da805368af3fbc4144d7 Mon Sep 17 00:00:00 2001 From: rijkvanzanten Date: Tue, 5 Sep 2023 13:54:28 -0400 Subject: [PATCH 02/51] Fix height of art lines --- components/Art/Lines.vue | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/components/Art/Lines.vue b/components/Art/Lines.vue index edc6452f..68c8bb22 100644 --- a/components/Art/Lines.vue +++ b/components/Art/Lines.vue @@ -46,8 +46,7 @@ onMounted(() => { diff --git a/components/Block/Quote.vue b/components/Block/Quote.vue index 46b4d772..f557b620 100644 --- a/components/Block/Quote.vue +++ b/components/Block/Quote.vue @@ -43,5 +43,6 @@ const { data: block } = useAsyncData(props.uuid, () => .company-logo { height: var(--space-11); // match byline size width: auto; + max-width: var(--space-36); } From d252bbdd13312b0c8487f925233d45de141c443b Mon Sep 17 00:00:00 2001 From: rijkvanzanten Date: Tue, 5 Sep 2023 16:33:00 -0400 Subject: [PATCH 07/51] Add bit of spacing on bottom of detail pgae --- components/ResourcePage.vue | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/components/ResourcePage.vue b/components/ResourcePage.vue index ea7d5d94..f3bf67e2 100644 --- a/components/ResourcePage.vue +++ b/components/ResourcePage.vue @@ -149,9 +149,8 @@ const related = computed(() => { :spacing="resource?.video ? 'small' : 'medium'" nav-offset="small" background="pristine-white-lines" - class="content" > - +
{ } .content { - padding-block-start: var(--space-5); - - @media (width > 60rem) { - padding-block-start: var(--space-10); - } + padding-block-end: var(--space-20); .columns { .back-button { From d7e8f1c53a74ac331220bf38bb439fd000aa0bbb Mon Sep 17 00:00:00 2001 From: Ben Haynes Date: Tue, 5 Sep 2023 16:37:38 -0400 Subject: [PATCH 08/51] smaller base card titles --- components/Base/Card.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/components/Base/Card.vue b/components/Base/Card.vue index e0506804..507608fc 100644 --- a/components/Base/Card.vue +++ b/components/Base/Card.vue @@ -236,9 +236,9 @@ const imageDimensions = computed(() => { } .title-large .heading { - font-size: var(--font-size-2xl); - line-height: var(--line-height-2xl); - font-weight: 400; + font-size: var(--font-size-xl); + line-height: var(--line-height-xl); + font-weight: 500; } .description { From 3d90a85771ba9320a66890c9d570bb308fe5b0be Mon Sep 17 00:00:00 2001 From: rijkvanzanten Date: Tue, 5 Sep 2023 16:40:39 -0400 Subject: [PATCH 09/51] Only hide footer section on larger screens --- components/Base/Panel.vue | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/components/Base/Panel.vue b/components/Base/Panel.vue index 666e9f98..122004ef 100644 --- a/components/Base/Panel.vue +++ b/components/Base/Panel.vue @@ -39,12 +39,14 @@ gap: var(--space-10); padding: var(--space-10); } -} -.base-panel-header, -.base-panel-footer { - &:empty { - display: none; + @container (width > 50rem) { + .base-panel-header, + .base-panel-footer { + &:empty { + display: none; + } + } } } From 899f8a513750ec80b71c65c844e6dc478bc10a35 Mon Sep 17 00:00:00 2001 From: rijkvanzanten Date: Tue, 5 Sep 2023 17:39:14 -0400 Subject: [PATCH 10/51] Organize nav top to bottom --- components/Nav/Header.vue | 3 +++ 1 file changed, 3 insertions(+) diff --git a/components/Nav/Header.vue b/components/Nav/Header.vue index dad2090c..222e6de5 100644 --- a/components/Nav/Header.vue +++ b/components/Nav/Header.vue @@ -508,7 +508,9 @@ a { .subsection.links ul { display: grid; + grid-auto-flow: column; grid-template-columns: repeat(3, 1fr); + grid-template-rows: repeat(4, 1fr); gap: var(--space-4); li + li { @@ -518,6 +520,7 @@ a { .grid.two-one .subsection.links ul { grid-template-columns: repeat(2, 1fr); + grid-template-rows: repeat(4, 1fr); } } } From ce543e2e6361c8087a5c4b573d14e6feb088206c Mon Sep 17 00:00:00 2001 From: rijkvanzanten Date: Tue, 5 Sep 2023 17:50:07 -0400 Subject: [PATCH 11/51] Increase space a bit on wider headings --- components/Block/Header.vue | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/components/Block/Header.vue b/components/Block/Header.vue index dca11042..2b0e7eea 100644 --- a/components/Block/Header.vue +++ b/components/Block/Header.vue @@ -77,6 +77,14 @@ const { data: block } = useAsyncData(props.uuid, () => } } +.size-large { + @container (width > 35rem) { + & > * + * { + margin-block-start: var(--space-4); + } + } +} + .size-title { grid-column: standard !important; From 7d5659d22a610f913f4f61a4eefa0e1e4afa1d1f Mon Sep 17 00:00:00 2001 From: rijkvanzanten Date: Tue, 5 Sep 2023 17:56:34 -0400 Subject: [PATCH 12/51] No to target blank --- components/Block/Button.vue | 1 - components/Nav/Footer.vue | 2 +- components/Nav/Header.vue | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/components/Block/Button.vue b/components/Block/Button.vue index e27f2d5b..b1002eaa 100644 --- a/components/Block/Button.vue +++ b/components/Block/Button.vue @@ -23,6 +23,5 @@ const { data: block } = useAsyncData(props.uuid, () => :size="block.size" :label="block.label ?? undefined" :outline="block.outline" - :target="block.external_url ? '_blank' : undefined" /> diff --git a/components/Nav/Footer.vue b/components/Nav/Footer.vue index e9799466..53d510f0 100644 --- a/components/Nav/Footer.vue +++ b/components/Nav/Footer.vue @@ -86,7 +86,7 @@ const socials = {
  • - +
    • diff --git a/components/Nav/Header.vue b/components/Nav/Header.vue index 222e6de5..d0936b81 100644 --- a/components/Nav/Header.vue +++ b/components/Nav/Header.vue @@ -183,7 +183,7 @@ watch( :uuid="ctas.header_cta_buttons" /> - + Star us on GitHub From 503a4e18a1b340cb6bfe3301f4268d26a5da5187 Mon Sep 17 00:00:00 2001 From: rijkvanzanten Date: Tue, 5 Sep 2023 18:01:35 -0400 Subject: [PATCH 13/51] Tighten ticker --- components/LogoTicker.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/LogoTicker.vue b/components/LogoTicker.vue index 5caf434c..e2a44978 100644 --- a/components/LogoTicker.vue +++ b/components/LogoTicker.vue @@ -85,7 +85,7 @@ useResizeObserver(ticker, (entries) => { .marquee { display: flex; - gap: var(--space-20); + gap: var(--space-14); &.animate { animation: marquee var(--marquee-duration) linear infinite; From f5ae9a48617f48992079c23cf950f4c2a867109c Mon Sep 17 00:00:00 2001 From: rijkvanzanten Date: Tue, 5 Sep 2023 18:11:06 -0400 Subject: [PATCH 14/51] Tweak spacing for logo title --- components/LogoTitle.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/components/LogoTitle.vue b/components/LogoTitle.vue index 15aff173..800ec5f9 100644 --- a/components/LogoTitle.vue +++ b/components/LogoTitle.vue @@ -71,12 +71,12 @@ li { background: var(--gray-100); border: 1px solid var(--gray-100); font-family: var(--family-display); + padding: var(--space-4) var(--space-1); > * { display: flex; align-items: center; gap: var(--space-2); - height: var(--space-16); text-decoration: none; color: var(--foreground); padding-left: var(--space-2); @@ -93,8 +93,8 @@ li { } .image { - height: 100%; - width: var(--space-16); + block-size: var(--space-9); + inline-size: var(--space-14); object-fit: contain; object-position: center center; } From 4f4b5152a54e84a01e0efb89b83487261185fdba Mon Sep 17 00:00:00 2001 From: rijkvanzanten Date: Tue, 5 Sep 2023 20:07:07 -0400 Subject: [PATCH 15/51] Add colors to gray --- components/PageSection.vue | 31 +++++++++++++------------------ components/ThemeProvider.vue | 20 ++++++++++++++++++-- 2 files changed, 31 insertions(+), 20 deletions(-) diff --git a/components/PageSection.vue b/components/PageSection.vue index 23205f4d..4dccfde8 100644 --- a/components/PageSection.vue +++ b/components/PageSection.vue @@ -17,28 +17,23 @@ withDefaults(defineProps(), { spacing: 'medium', }); -defineOptions({ - inheritAttrs: false, -}); - const { height: headerHeight } = useHeaderHeight(); diff --git a/components/ThemeProvider.vue b/components/ThemeProvider.vue index 942e6672..cd57b33d 100644 --- a/components/ThemeProvider.vue +++ b/components/ThemeProvider.vue @@ -1,9 +1,12 @@ @@ -58,6 +61,19 @@ provide('theme', currentTheme); --shadow-base: 0px 30px 30px -30px rgba(30, 41, 59, 0.1), 0px 2px 4px 0px rgba(30, 41, 59, 0.05), 0px -2px 5px 0px rgba(30, 41, 59, 0.05); --shadow-lg: 0px 10px 40px -10px rgba(14, 28, 47, 0.25), 0px 2px 4px 0px rgba(14, 28, 47, 0.05); + + &.on-colorful { + --gray-50: #f2eaf0; + --gray-100: #f6e9f2; + --gray-200: #efd6e7; + --gray-300: #d3b2c8; + --gray-400: #b796ac; + --gray-500: #8f647f; + --gray-600: #7f526d; + --gray-700: #6f415a; + --gray-800: #51283a; + --gray-900: #331621; + } } .dark { From 76acec753e3eb43c76ce4dfb61c552f1a6e8b4dd Mon Sep 17 00:00:00 2001 From: Bryant Gillespie Date: Wed, 6 Sep 2023 14:41:56 -0400 Subject: [PATCH 16/51] align start (#70) --- components/Block/Showcase.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/components/Block/Showcase.vue b/components/Block/Showcase.vue index a6b98c37..11ffe41d 100644 --- a/components/Block/Showcase.vue +++ b/components/Block/Showcase.vue @@ -63,6 +63,7 @@ loop(); .block-showcase { @container (width > 50rem) { display: grid; + align-items: start; grid-template-columns: repeat(v-bind(sections), 1fr); gap: var(--space-8); } From d4c0ee1a92a18aa03b68c3e4776e98ab2da46e0f Mon Sep 17 00:00:00 2001 From: rijkvanzanten Date: Wed, 6 Sep 2023 15:18:19 -0400 Subject: [PATCH 17/51] Remove empty leftover --- server/routes/sitemap.xml.ts | 16 ---------------- 1 file changed, 16 deletions(-) delete mode 100644 server/routes/sitemap.xml.ts diff --git a/server/routes/sitemap.xml.ts b/server/routes/sitemap.xml.ts deleted file mode 100644 index 9d1cbef8..00000000 --- a/server/routes/sitemap.xml.ts +++ /dev/null @@ -1,16 +0,0 @@ -// import { SitemapStream, streamToPromise } from 'sitemap'; - -export default defineEventHandler(async () => { - /** @TODO: Iterate over all collections which have routes in Directus and add them to the sitemap. */ - // const sitemap = new SitemapStream({ - // hostname: 'https://example.com', - // }); - // for (const doc of docs) { - // sitemap.write({ - // url: doc._path, - // changefreq: doc.seo.sitemap_change_frequency, - // }); - // } - // sitemap.end(); - // return streamToPromise(sitemap); -}); From 10ce6fa7f6a8c9b6b46781f300261ba0f75dcff3 Mon Sep 17 00:00:00 2001 From: Bryant Gillespie Date: Wed, 6 Sep 2023 15:51:10 -0400 Subject: [PATCH 18/51] Team page (#68) * types * route * page component * bump sdk version * add team routes to prerender * add link to team member on resource detail page * fix links for team members on card group dynamic * team page wip * Rough in teams page --------- Co-authored-by: rijkvanzanten --- components/Block/CardGroupDynamic.vue | 7 +- components/ResourcePage.vue | 23 ++- nuxt.config.ts | 29 ++- package.json | 2 +- pages/team/[slug].vue | 280 ++++++++++++++++++++++++++ pnpm-lock.yaml | 248 ++++++++++------------- types/schema/content/team.ts | 3 + 7 files changed, 432 insertions(+), 160 deletions(-) create mode 100644 pages/team/[slug].vue diff --git a/components/Block/CardGroupDynamic.vue b/components/Block/CardGroupDynamic.vue index 6d7540d4..9a8fe34a 100644 --- a/components/Block/CardGroupDynamic.vue +++ b/components/Block/CardGroupDynamic.vue @@ -54,7 +54,7 @@ const { data: cards, pending } = useAsyncData( if (context.collection === 'team') { const teamItems = await $directus.request( $readItems('team', { - fields: ['image', 'name', 'job_title', 'slug'], + fields: ['image', 'name', 'job_title', 'slug', 'resources', 'type'], filter: unref(filter) as Query['filter'], sort: context.sort ? [((context.sort_direction === 'desc' ? '-' : '') + context.sort) as keyof Team] @@ -64,12 +64,13 @@ const { data: cards, pending } = useAsyncData( }) ); - return teamItems.map(({ image, name, job_title, slug }) => ({ + return teamItems.map(({ image, name, job_title, slug, type, resources }) => ({ title: name, image, avatar: null, description: job_title, - href: `/team/${slug}`, + // Don't create a link for non-core team members or guest authors without resources + href: type === 'core_team' || (resources && resources.length > 0) ? `/team/${slug}` : undefined, badge: null, })); } else if (context.collection === 'resources') { diff --git a/components/ResourcePage.vue b/components/ResourcePage.vue index f3bf67e2..c6c78508 100644 --- a/components/ResourcePage.vue +++ b/components/ResourcePage.vue @@ -34,7 +34,7 @@ const { data: resource } = await useAsyncData( 'summary', { image: ['id', 'description'], - author: ['name', 'job_title', 'image'], + author: ['name', 'job_title', 'image', 'slug'], blocks: ['id', 'collection', 'item', 'spacing', 'sort'], type: ['title'], video: ['url', 'file'], @@ -191,11 +191,13 @@ const related = computed(() => {

    Share

    @@ -342,6 +344,15 @@ const related = computed(() => { container-type: inline-size; order: 2; + .author-link { + text-decoration: none; + color: var(--gray-900); + + &:hover { + text-decoration: underline; + } + } + .meta { @media (width > 60rem) { position: sticky; diff --git a/nuxt.config.ts b/nuxt.config.ts index 9db03d31..ed5c7ecd 100644 --- a/nuxt.config.ts +++ b/nuxt.config.ts @@ -21,14 +21,31 @@ const fetchPagePermalinks = async () => { const resources = await directus.request(readItems('resources', { fields: ['slug', { type: ['slug'] }], limit: -1 })); - permalinks.push(...pages.map((page) => page.permalink)); + const team = await directus.request( + readItems('team', { + // Filter for core team members or members with resources so we don't render like 100 empty pages + filter: { + _or: [ + { + type: { + _eq: 'core-team', + }, + }, + { + resources: { + _nnull: true, + }, + }, + ], + } as any, // @TODO fix as any when SDK is updated + fields: ['slug'], + limit: -1, + }) + ); + permalinks.push(...pages.map((page) => page.permalink)); permalinks.push(...resources.map((resource) => `/${resource.type.slug}/${resource.slug}`)); - - /** @TODO Add team members to prerender routes */ - // const team = await directus.request(readItems('team', { fields: ['slug'], limit: -1 })); - - // permalinks.push(...team.map((member) => ({ permalink: `/team/${member.slug}` }))); + permalinks.push(...team.map((member) => `/team/${member.slug}`)); return permalinks; }; diff --git a/package.json b/package.json index ed5ca662..db935f9a 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,7 @@ "format": "prettier --write \"**/*.{md,y?(a)ml,json,vue}\"" }, "devDependencies": { - "@directus/sdk": "11.0.0", + "@directus/sdk": "11.0.3", "@nuxt/devtools": "latest", "@nuxtjs/eslint-module": "4.1.0", "@types/node": "20.2.5", diff --git a/pages/team/[slug].vue b/pages/team/[slug].vue new file mode 100644 index 00000000..3caf8ce0 --- /dev/null +++ b/pages/team/[slug].vue @@ -0,0 +1,280 @@ + + + + + diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 60e66f26..241a19e0 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -14,8 +14,8 @@ dependencies: devDependencies: '@directus/sdk': - specifier: 11.0.0 - version: 11.0.0 + specifier: 11.0.3 + version: 11.0.3 '@nuxt/devtools': specifier: latest version: 0.8.2(nuxt@3.6.5)(vite@4.4.5) @@ -395,8 +395,8 @@ packages: mime: 3.0.0 dev: true - /@directus/sdk@11.0.0: - resolution: {integrity: sha512-cYqvidmPi9PjxeANW1sgzjE1P4mWqy9QZ90LIO+I6hS9dKH6558YExD/Ylopn46yWuoDn/rAUKGHuh04WXEqvg==} + /@directus/sdk@11.0.3: + resolution: {integrity: sha512-fHvHFcDhl8AY5quRP4cgLMHTU6F4c4ynmMpXRsi8dnSd38mIvciFyYmOVOh34Wp2N+a1YNYpXPU+NsHkfIheHw==} engines: {node: '>=18.0.0'} dev: true @@ -1108,8 +1108,8 @@ packages: nuxt: ^3.6.5 vite: '*' dependencies: - '@nuxt/kit': 3.6.5 - '@nuxt/schema': 3.6.5 + '@nuxt/kit': 3.7.0 + '@nuxt/schema': 3.7.0 execa: 7.2.0 nuxt: 3.6.5(@types/node@20.2.5)(eslint@8.42.0)(sass@1.64.1)(typescript@5.1.3)(vue-tsc@1.8.0) vite: 4.4.5(@types/node@20.2.5)(sass@1.64.1) @@ -1192,7 +1192,7 @@ packages: semver: 7.5.4 simple-git: 3.19.1 sirv: 2.0.3 - unimport: 3.2.0 + unimport: 3.2.0(rollup@3.26.3) vite: 4.4.5(@types/node@20.2.5)(sass@1.64.1) vite-plugin-inspect: 0.7.38(@nuxt/kit@3.7.0)(vite@4.4.5) vite-plugin-vue-inspector: 3.6.0(vite@4.4.5) @@ -1254,7 +1254,7 @@ packages: semver: 7.5.4 ufo: 1.3.0 unctx: 2.3.1 - unimport: 3.2.0 + unimport: 3.2.0(rollup@3.26.3) untyped: 1.4.0 transitivePeerDependencies: - rollup @@ -1271,9 +1271,9 @@ packages: pkg-types: 1.0.3 postcss-import-resolver: 2.0.0 std-env: 3.3.3 - ufo: 1.1.2 - unimport: 3.1.0(rollup@3.26.3) - untyped: 1.3.2 + ufo: 1.3.0 + unimport: 3.2.0(rollup@3.26.3) + untyped: 1.4.0 transitivePeerDependencies: - rollup - supports-color @@ -1291,7 +1291,7 @@ packages: postcss-import-resolver: 2.0.0 std-env: 3.4.3 ufo: 1.3.0 - unimport: 3.2.0 + unimport: 3.2.0(rollup@3.26.3) untyped: 1.4.0 transitivePeerDependencies: - rollup @@ -1302,22 +1302,22 @@ packages: resolution: {integrity: sha512-7kr2VDirYIXqyTHqaiWCrfQLgUjAa4qAHzykJOspMCFJWalHU9SVfnv+cTOKGqoXQ4TWOCd09tEd7sLlMFTEqw==} hasBin: true dependencies: - '@nuxt/kit': 3.6.5 + '@nuxt/kit': 3.7.0 chalk: 5.3.0 ci-info: 3.8.0 consola: 3.2.3 create-require: 1.1.1 defu: 6.1.2 - destr: 2.0.0 + destr: 2.0.1 dotenv: 16.3.1 fs-extra: 11.1.1 git-url-parse: 13.1.0 is-docker: 3.0.0 - jiti: 1.19.1 + jiti: 1.19.3 mri: 1.2.0 nanoid: 4.0.2 node-fetch: 3.3.1 - ofetch: 1.1.1 + ofetch: 1.3.3 parse-git-config: 3.0.0 rc9: 2.1.1 std-env: 3.3.3 @@ -1354,12 +1354,12 @@ packages: estree-walker: 3.0.3 externality: 1.0.2 fs-extra: 11.1.1 - get-port-please: 3.0.1 - h3: 1.7.1 + get-port-please: 3.0.2 + h3: 1.8.1 knitwork: 1.0.0 - magic-string: 0.30.1 - mlly: 1.4.0 - ohash: 1.1.2 + magic-string: 0.30.3 + mlly: 1.4.1 + ohash: 1.1.3 pathe: 1.1.1 perfect-debounce: 1.0.0 pkg-types: 1.0.3 @@ -1368,8 +1368,8 @@ packages: postcss-url: 10.1.3(postcss@8.4.26) rollup-plugin-visualizer: 5.9.2(rollup@3.26.3) std-env: 3.3.3 - strip-literal: 1.0.1 - ufo: 1.1.2 + strip-literal: 1.3.0 + ufo: 1.3.0 unplugin: 1.4.0 vite: 4.3.9(@types/node@20.2.5)(sass@1.64.1) vite-node: 0.33.0(@types/node@20.2.5)(sass@1.64.1) @@ -1447,7 +1447,7 @@ packages: rollup: optional: true dependencies: - '@rollup/pluginutils': 5.0.2(rollup@3.26.3) + '@rollup/pluginutils': 5.0.4(rollup@3.26.3) commondir: 1.0.1 estree-walker: 2.0.2 glob: 8.1.0 @@ -1465,7 +1465,7 @@ packages: rollup: optional: true dependencies: - '@rollup/pluginutils': 5.0.2(rollup@3.26.3) + '@rollup/pluginutils': 5.0.4(rollup@3.26.3) estree-walker: 2.0.2 magic-string: 0.27.0 rollup: 3.26.3 @@ -1480,7 +1480,7 @@ packages: rollup: optional: true dependencies: - '@rollup/pluginutils': 5.0.2(rollup@3.26.3) + '@rollup/pluginutils': 5.0.4(rollup@3.26.3) rollup: 3.26.3 dev: true @@ -1493,7 +1493,7 @@ packages: rollup: optional: true dependencies: - '@rollup/pluginutils': 5.0.2(rollup@3.26.3) + '@rollup/pluginutils': 5.0.4(rollup@3.26.3) '@types/resolve': 1.20.2 deepmerge: 4.3.1 is-builtin-module: 3.2.1 @@ -1511,7 +1511,7 @@ packages: rollup: optional: true dependencies: - '@rollup/pluginutils': 5.0.2(rollup@3.26.3) + '@rollup/pluginutils': 5.0.4(rollup@3.26.3) magic-string: 0.27.0 rollup: 3.26.3 dev: true @@ -1551,7 +1551,7 @@ packages: picomatch: 2.3.1 dev: true - /@rollup/pluginutils@5.0.2(rollup@3.26.3): + /@rollup/pluginutils@5.0.2: resolution: {integrity: sha512-pTd9rIsP92h+B6wWwFbW8RkZv4hiR/xKsqre4SIuAOaOEQRxi0lqLke9k2/7WegC85GgUs9pjmOjCUi3In4vwA==} engines: {node: '>=14.0.0'} peerDependencies: @@ -1563,10 +1563,9 @@ packages: '@types/estree': 1.0.1 estree-walker: 2.0.2 picomatch: 2.3.1 - rollup: 3.26.3 dev: true - /@rollup/pluginutils@5.0.4: + /@rollup/pluginutils@5.0.4(rollup@3.26.3): resolution: {integrity: sha512-0KJnIoRI8A+a1dqOYLxH8vBf8bphDmty5QvIm2hqm7oFCFYKCAZWWd2hXgMibaPsNDhI0AtpYfQZJG47pt/k4g==} engines: {node: '>=14.0.0'} peerDependencies: @@ -1578,6 +1577,7 @@ packages: '@types/estree': 1.0.1 estree-walker: 2.0.2 picomatch: 2.3.1 + rollup: 3.26.3 dev: true /@sideway/address@4.1.4: @@ -1977,7 +1977,7 @@ packages: optional: true dependencies: '@babel/types': 7.22.5 - '@rollup/pluginutils': 5.0.2(rollup@3.26.3) + '@rollup/pluginutils': 5.0.4(rollup@3.26.3) '@vue/compiler-sfc': 3.3.4 ast-kit: 0.6.9 local-pkg: 0.4.3 @@ -2034,7 +2034,7 @@ packages: '@vue/reactivity-transform': 3.3.4 '@vue/shared': 3.3.4 estree-walker: 2.0.2 - magic-string: 0.30.2 + magic-string: 0.30.3 postcss: 8.4.26 source-map-js: 1.0.2 @@ -2074,7 +2074,7 @@ packages: '@vue/compiler-core': 3.3.4 '@vue/shared': 3.3.4 estree-walker: 2.0.2 - magic-string: 0.30.2 + magic-string: 0.30.3 /@vue/reactivity@3.3.4: resolution: {integrity: sha512-kLTDLwd0B1jG08NBF3R5rqULtv/f8x3rOFByTDz4J53ttIQEDmALqKqXY0J+XQeN0aV2FBxY8nJDf88yvOPAqQ==} @@ -2516,7 +2516,7 @@ packages: engines: {node: '>=16.14.0'} dependencies: '@babel/parser': 7.22.7 - '@rollup/pluginutils': 5.0.2(rollup@3.26.3) + '@rollup/pluginutils': 5.0.4(rollup@3.26.3) pathe: 1.1.1 transitivePeerDependencies: - rollup @@ -2740,9 +2740,9 @@ packages: defu: 6.1.2 dotenv: 16.3.1 giget: 1.1.2 - jiti: 1.19.1 - mlly: 1.4.0 - ohash: 1.1.2 + jiti: 1.19.3 + mlly: 1.4.1 + ohash: 1.1.3 pathe: 1.1.1 perfect-debounce: 1.0.0 pkg-types: 1.0.3 @@ -3826,9 +3826,9 @@ packages: resolution: {integrity: sha512-LyExtJWKxtgVzmgtEHyQtLFpw1KFhQphF9nTG8TpAIVkiI/xQ3FJh75tRFLYl4hkn7BNIIdLJInuDAavX35pMw==} dependencies: enhanced-resolve: 5.15.0 - mlly: 1.4.0 + mlly: 1.4.1 pathe: 1.1.1 - ufo: 1.2.0 + ufo: 1.3.0 dev: true /fast-deep-equal@3.1.3: @@ -3850,17 +3850,6 @@ packages: - supports-color dev: true - /fast-glob@3.3.0: - resolution: {integrity: sha512-ChDuvbOypPuNjO8yIDf36x7BlZX1smcUMTTcyoIjycexOxd6DFsKsg21qVBzEmr3G7fUKIRy2/psii+CIUt7FA==} - engines: {node: '>=8.6.0'} - dependencies: - '@nodelib/fs.stat': 2.0.5 - '@nodelib/fs.walk': 1.2.8 - glob-parent: 5.1.2 - merge2: 1.4.1 - micromatch: 4.0.5 - dev: true - /fast-glob@3.3.1: resolution: {integrity: sha512-kNFPyjhh5cKjrUltxs+wFx+ZkbRaxxmZ+X0ZU31SOsxCEtP9VPgtq2teZw1DebupL5GmDaNQ6yKMMVcM41iqDg==} engines: {node: '>=8.6.0'} @@ -3993,7 +3982,7 @@ packages: engines: {node: '>=14'} dependencies: cross-spawn: 7.0.3 - signal-exit: 4.0.2 + signal-exit: 4.1.0 dev: true /form-data@4.0.0: @@ -4112,10 +4101,6 @@ packages: has-symbols: 1.0.3 dev: true - /get-port-please@3.0.1: - resolution: {integrity: sha512-R5pcVO8Z1+pVDu8Ml3xaJCEkBiiy1VQN9za0YqH8GIi1nIqD4IzQhzY6dDzMRtdS1lyiGlucRzm8IN8wtLIXng==} - dev: true - /get-port-please@3.0.2: resolution: {integrity: sha512-c14cAITf0E+uqdxGALvyYHwOL7UsnWcv3oDtgDAZksiVSGN87xlWVUWGZcmWQU3cICdaOxT+6LdQzUfK2ei1SA==} dev: true @@ -4152,7 +4137,7 @@ packages: defu: 6.1.2 https-proxy-agent: 5.0.1 mri: 1.2.0 - node-fetch-native: 1.2.0 + node-fetch-native: 1.4.0 pathe: 1.1.1 tar: 6.1.15 transitivePeerDependencies: @@ -4254,7 +4239,7 @@ packages: dependencies: array-union: 2.1.0 dir-glob: 3.0.1 - fast-glob: 3.3.0 + fast-glob: 3.3.1 ignore: 5.2.4 merge2: 1.4.1 slash: 3.0.0 @@ -4301,10 +4286,10 @@ packages: dependencies: cookie-es: 1.0.0 defu: 6.1.2 - destr: 2.0.0 + destr: 2.0.1 iron-webcrypto: 0.7.1 radix3: 1.1.0 - ufo: 1.2.0 + ufo: 1.3.0 uncrypto: 0.1.3 dev: true @@ -4930,13 +4915,13 @@ packages: clipboardy: 3.0.0 consola: 3.2.3 defu: 6.1.2 - get-port-please: 3.0.1 + get-port-please: 3.0.2 http-shutdown: 1.2.2 - jiti: 1.19.1 - mlly: 1.4.0 + jiti: 1.19.3 + mlly: 1.4.1 node-forge: 1.3.1 pathe: 1.1.1 - ufo: 1.2.0 + ufo: 1.3.0 dev: true /loader-runner@4.3.0: @@ -5004,11 +4989,6 @@ packages: resolution: {integrity: sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==} dev: true - /lru-cache@10.0.0: - resolution: {integrity: sha512-svTf/fzsKHffP42sujkO/Rjs37BCIsQVRCeNYIm9WN8rgT7ffoUnRtZCqU+6BqcSBdv8gwJeTz8knJpgACeQMw==} - engines: {node: 14 || >=16.14} - dev: true - /lru-cache@10.0.1: resolution: {integrity: sha512-IJ4uwUTi2qCccrioU6g9g/5rvvVl13bsdczUUcqbciD9iLr095yj8DQKdObriEvuNSx325N1rV1O0sJFszx75g==} engines: {node: 14 || >=16.14} @@ -5036,7 +5016,7 @@ packages: resolution: {integrity: sha512-nnNhBSh8QAd90n3CQeyxKlXY4TKJ4PNjFRi7Ofs1dAr239k6H4CYAaAR4ZKRrWZNBvh1IUTl5dYP91t9dKDjig==} engines: {node: '>=16.14.0'} dependencies: - magic-string: 0.30.2 + magic-string: 0.30.3 dev: true /magic-string@0.27.0: @@ -5053,18 +5033,11 @@ packages: '@jridgewell/sourcemap-codec': 1.4.15 dev: true - /magic-string@0.30.2: - resolution: {integrity: sha512-lNZdu7pewtq/ZvWUp9Wpf/x7WzMTsR26TWV03BRZrXFsv+BI6dy8RAiKgm1uM/kyR0rCfUcqvOlXKG66KhIGug==} - engines: {node: '>=12'} - dependencies: - '@jridgewell/sourcemap-codec': 1.4.15 - /magic-string@0.30.3: resolution: {integrity: sha512-B7xGbll2fG/VjP+SWg4sX3JynwIU0mjoTc6MPpKNuIvftk6u6vqhDnk1R80b8C2GBR6ywqy+1DcKBrevBg+bmw==} engines: {node: '>=12'} dependencies: '@jridgewell/sourcemap-codec': 1.4.15 - dev: true /magicast@0.2.10: resolution: {integrity: sha512-Ah2qatigknxwmoYCd9hx/mmVyrRNhDKiaWZIuW4gL6dWrAGMoOpCVkQ3VpGWARtkaJVFhe8uIphcsxDzLPQUyg==} @@ -5314,7 +5287,7 @@ packages: acorn: 8.10.0 pathe: 1.1.1 pkg-types: 1.0.3 - ufo: 1.1.2 + ufo: 1.3.0 dev: true /mlly@1.4.1: @@ -5395,7 +5368,7 @@ packages: '@rollup/plugin-replace': 5.0.2(rollup@3.26.3) '@rollup/plugin-terser': 0.4.3(rollup@3.26.3) '@rollup/plugin-wasm': 6.1.3(rollup@3.26.3) - '@rollup/pluginutils': 5.0.2(rollup@3.26.3) + '@rollup/pluginutils': 5.0.4(rollup@3.26.3) '@types/http-proxy': 1.17.11 '@vercel/nft': 0.22.6 archiver: 5.3.1 @@ -5406,7 +5379,7 @@ packages: consola: 3.2.3 cookie-es: 1.0.0 defu: 6.1.2 - destr: 2.0.0 + destr: 2.0.1 dot-prop: 7.2.0 esbuild: 0.18.15 escape-string-regexp: 5.0.0 @@ -5414,28 +5387,28 @@ packages: fs-extra: 11.1.1 globby: 13.2.2 gzip-size: 7.0.0 - h3: 1.7.1 + h3: 1.8.1 hookable: 5.5.3 http-graceful-shutdown: 3.1.13 http-proxy: 1.18.1 is-primitive: 3.0.1 - jiti: 1.19.1 + jiti: 1.19.3 klona: 2.0.6 knitwork: 1.0.0 listhen: 1.1.2 - magic-string: 0.30.1 + magic-string: 0.30.3 mime: 3.0.0 - mlly: 1.4.0 + mlly: 1.4.1 mri: 1.2.0 - node-fetch-native: 1.2.0 - ofetch: 1.1.1 - ohash: 1.1.2 + node-fetch-native: 1.4.0 + ofetch: 1.3.3 + ohash: 1.1.3 openapi-typescript: 6.3.4 pathe: 1.1.1 perfect-debounce: 1.0.0 pkg-types: 1.0.3 pretty-bytes: 6.1.1 - radix3: 1.0.1 + radix3: 1.1.0 rollup: 3.26.3 rollup-plugin-visualizer: 5.9.2(rollup@3.26.3) scule: 1.0.0 @@ -5444,10 +5417,10 @@ packages: serve-static: 1.15.0 source-map-support: 0.5.21 std-env: 3.3.3 - ufo: 1.1.2 + ufo: 1.3.0 uncrypto: 0.1.3 - unenv: 1.5.2 - unimport: 3.1.0(rollup@3.26.3) + unenv: 1.7.4 + unimport: 3.2.0(rollup@3.26.3) unstorage: 1.8.0 transitivePeerDependencies: - '@azure/app-configuration' @@ -5469,10 +5442,6 @@ packages: engines: {node: '>=10.5.0'} dev: true - /node-fetch-native@1.2.0: - resolution: {integrity: sha512-5IAMBTl9p6PaAjYCnMv5FmqIF6GcZnawAVnzaCG0rX2aYZJ4CxEkZNtVPuTRug7fL7wyM5BQYTlAzcyMPi6oTQ==} - dev: true - /node-fetch-native@1.4.0: resolution: {integrity: sha512-F5kfEj95kX8tkDhUCYdV8dg3/8Olx/94zB8+ZNthFs6Bz31UpUi8Xh40TN3thLwXgrwXry1pEg9lJ++tLWTcqA==} dev: true @@ -5701,12 +5670,12 @@ packages: /nuxt-site-config-kit@1.0.10: resolution: {integrity: sha512-LvuXp2mWLONdB3biY4GmUPHu47XBZvoPIy2yDceWiGWa4tfwdCp/jVBJwgyFYVqwiXNZ7uJxG0omjNRPafXkqw==} dependencies: - '@nuxt/kit': 3.6.5 - '@nuxt/schema': 3.6.5 + '@nuxt/kit': 3.7.0 + '@nuxt/schema': 3.7.0 defu: 6.1.2 pkg-types: 1.0.3 site-config-stack: 1.0.10 - ufo: 1.2.0 + ufo: 1.3.0 transitivePeerDependencies: - rollup - supports-color @@ -5715,12 +5684,12 @@ packages: /nuxt-site-config@1.0.10: resolution: {integrity: sha512-rXiyDMeJTn32EBSZ5sSLAPrGOee2aacCCbCSFOlLfcQD3uXxNk25FZWFJbNO9RGVaSajY3qcNKcqa5vRKEy35A==} dependencies: - '@nuxt/kit': 3.6.5 - '@nuxt/schema': 3.6.5 + '@nuxt/kit': 3.7.0 + '@nuxt/schema': 3.7.0 nuxt-site-config-kit: 1.0.10 pathe: 1.1.1 site-config-stack: 1.0.10 - ufo: 1.2.0 + ufo: 1.3.0 transitivePeerDependencies: - rollup - supports-color @@ -5782,7 +5751,7 @@ packages: uncrypto: 0.1.3 unctx: 2.3.1 unenv: 1.5.2 - unimport: 3.1.0(rollup@3.26.3) + unimport: 3.1.0 unplugin: 1.4.0 unplugin-vue-router: 0.6.4(vue-router@4.2.4)(vue@3.3.4) untyped: 1.3.2 @@ -5856,9 +5825,9 @@ packages: /ofetch@1.1.1: resolution: {integrity: sha512-SSMoktrp9SNLi20BWfB/BnnKcL0RDigXThD/mZBeQxkIRv1xrd9183MtLdsqRYLYSqW0eTr5t8w8MqjNhvoOQQ==} dependencies: - destr: 2.0.0 - node-fetch-native: 1.2.0 - ufo: 1.1.2 + destr: 2.0.1 + node-fetch-native: 1.4.0 + ufo: 1.3.0 dev: true /ofetch@1.3.3: @@ -6124,7 +6093,7 @@ packages: resolution: {integrity: sha512-nN7pYi0AQqJnoLPC9eHFQ8AcyaixBUOwvqc5TDnIKCMEE6I0y8P7OKA7fPexsXGCGxQDl/cmrLAp26LhcwxZ4A==} dependencies: jsonc-parser: 3.2.0 - mlly: 1.4.0 + mlly: 1.4.1 pathe: 1.1.1 dev: true @@ -6535,10 +6504,6 @@ packages: resolution: {integrity: sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==} dev: true - /radix3@1.0.1: - resolution: {integrity: sha512-y+AcwZ3HcUIGc9zGsNVf5+BY/LxL+z+4h4J3/pp8jxSmy1STaCocPS3qrj4tA5ehUSzqtqK+0Aygvz/r/8vy4g==} - dev: true - /radix3@1.1.0: resolution: {integrity: sha512-pNsHDxbGORSvuSScqNJ+3Km6QAVqk8CfsCBIEoDgpqLrkD2f3QM4I7d1ozJJ172OmIcoUcerZaNWqtLkRXTV3A==} dev: true @@ -6558,7 +6523,7 @@ packages: resolution: {integrity: sha512-lNeOl38Ws0eNxpO3+wD1I9rkHGQyj1NU1jlzv4go2CtEnEQEUfqnIvZG7W+bC/aXdJ27n5x/yUjb6RoT9tko+Q==} dependencies: defu: 6.1.2 - destr: 2.0.0 + destr: 2.0.1 flat: 5.0.2 dev: true @@ -6897,11 +6862,6 @@ packages: resolution: {integrity: sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==} dev: true - /signal-exit@4.0.2: - resolution: {integrity: sha512-MY2/qGx4enyjprQnFaZsHib3Yadh3IXyV2C321GY0pjGfVBu4un0uDJkwgdxqO+Rdx8JMT8IfJIRwbYVz3Ob3Q==} - engines: {node: '>=14'} - dev: true - /signal-exit@4.1.0: resolution: {integrity: sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==} engines: {node: '>=14'} @@ -6945,10 +6905,10 @@ packages: /site-config-stack@1.0.10: resolution: {integrity: sha512-sEKECSkg9XYrzs6ykKWbelxj/P/K8kUgKtWZdETTfLlnKl7e/0JsTS0UZf2Gu4aNEXWUwHrOxtZcvIa3ASYhHA==} dependencies: - '@nuxt/kit': 3.6.5 + '@nuxt/kit': 3.7.0 defu: 6.1.2 pkg-types: 1.0.3 - ufo: 1.2.0 + ufo: 1.3.0 transitivePeerDependencies: - rollup - supports-color @@ -7438,7 +7398,7 @@ packages: dependencies: acorn: 8.10.0 estree-walker: 3.0.3 - magic-string: 0.30.1 + magic-string: 0.30.3 unplugin: 1.4.0 dev: true @@ -7455,7 +7415,7 @@ packages: consola: 3.2.3 defu: 6.1.2 mime: 3.0.0 - node-fetch-native: 1.2.0 + node-fetch-native: 1.4.0 pathe: 1.1.1 dev: true @@ -7478,19 +7438,19 @@ packages: hookable: 5.5.3 dev: true - /unimport@3.1.0(rollup@3.26.3): + /unimport@3.1.0: resolution: {integrity: sha512-ybK3NVWh30MdiqSyqakrrQOeiXyu5507tDA0tUf7VJHrsq4DM6S43gR7oAsZaFojM32hzX982Lqw02D3yf2aiA==} dependencies: - '@rollup/pluginutils': 5.0.2(rollup@3.26.3) + '@rollup/pluginutils': 5.0.4(rollup@3.26.3) escape-string-regexp: 5.0.0 fast-glob: 3.3.1 local-pkg: 0.4.3 - magic-string: 0.30.1 - mlly: 1.4.0 + magic-string: 0.30.3 + mlly: 1.4.1 pathe: 1.1.1 pkg-types: 1.0.3 scule: 1.0.0 - strip-literal: 1.0.1 + strip-literal: 1.3.0 unplugin: 1.4.0 transitivePeerDependencies: - rollup @@ -7499,12 +7459,12 @@ packages: /unimport@3.1.3: resolution: {integrity: sha512-up4TE2yA+nMyyErGTjbYGVw95MriGa2hVRXQ3/JRp7984cwwqULcnBjHaovVpsO8tZc2j0fvgGu9yiBKOyxvYw==} dependencies: - '@rollup/pluginutils': 5.0.2(rollup@3.26.3) + '@rollup/pluginutils': 5.0.2 escape-string-regexp: 5.0.0 fast-glob: 3.3.1 local-pkg: 0.4.3 - magic-string: 0.30.2 - mlly: 1.4.0 + magic-string: 0.30.3 + mlly: 1.4.1 pathe: 1.1.1 pkg-types: 1.0.3 scule: 1.0.0 @@ -7514,15 +7474,15 @@ packages: - rollup dev: true - /unimport@3.2.0: + /unimport@3.2.0(rollup@3.26.3): resolution: {integrity: sha512-9buxPxkNwxwxAlH/RfOFHxtQTUrlmBGi9Ai9HezY2yYbkoOhgJTYPI6+WqxI1EZphoM9cw1SHoCFRkXSb8/fjQ==} dependencies: - '@rollup/pluginutils': 5.0.4 + '@rollup/pluginutils': 5.0.4(rollup@3.26.3) escape-string-regexp: 5.0.0 fast-glob: 3.3.1 local-pkg: 0.4.3 magic-string: 0.30.3 - mlly: 1.4.0 + mlly: 1.4.1 pathe: 1.1.1 pkg-types: 1.0.3 scule: 1.0.0 @@ -7560,14 +7520,14 @@ packages: optional: true dependencies: '@babel/types': 7.22.5 - '@rollup/pluginutils': 5.0.2(rollup@3.26.3) + '@rollup/pluginutils': 5.0.4(rollup@3.26.3) '@vue-macros/common': 1.5.0(vue@3.3.4) ast-walker-scope: 0.4.2 chokidar: 3.5.3 fast-glob: 3.3.1 json5: 2.2.3 local-pkg: 0.4.3 - mlly: 1.4.0 + mlly: 1.4.1 pathe: 1.1.1 scule: 1.0.0 unplugin: 1.4.0 @@ -7621,15 +7581,15 @@ packages: dependencies: anymatch: 3.1.3 chokidar: 3.5.3 - destr: 2.0.0 - h3: 1.7.1 + destr: 2.0.1 + h3: 1.8.1 ioredis: 5.3.2 listhen: 1.1.2 - lru-cache: 10.0.0 + lru-cache: 10.0.1 mri: 1.2.0 - node-fetch-native: 1.2.0 - ofetch: 1.1.1 - ufo: 1.2.0 + node-fetch-native: 1.4.0 + ofetch: 1.3.3 + ufo: 1.3.0 transitivePeerDependencies: - supports-color dev: true @@ -7647,7 +7607,7 @@ packages: '@babel/standalone': 7.22.9 '@babel/types': 7.22.5 defu: 6.1.2 - jiti: 1.19.1 + jiti: 1.19.3 mri: 1.2.0 scule: 1.0.0 transitivePeerDependencies: @@ -7721,7 +7681,7 @@ packages: dependencies: cac: 6.7.14 debug: 4.3.4 - mlly: 1.4.0 + mlly: 1.4.1 pathe: 1.1.1 picocolors: 1.0.0 vite: 4.4.5(@types/node@20.2.5)(sass@1.64.1) @@ -7815,7 +7775,7 @@ packages: dependencies: '@antfu/utils': 0.7.6 '@nuxt/kit': 3.7.0 - '@rollup/pluginutils': 5.0.2(rollup@3.26.3) + '@rollup/pluginutils': 5.0.4(rollup@3.26.3) debug: 4.3.4 error-stack-parser-es: 0.1.1 fs-extra: 11.1.1 @@ -7840,7 +7800,7 @@ packages: '@vue/compiler-dom': 3.3.4 esno: 0.16.3 kolorist: 1.8.0 - magic-string: 0.30.2 + magic-string: 0.30.3 shell-quote: 1.8.1 vite: 4.4.5(@types/node@20.2.5)(sass@1.64.1) transitivePeerDependencies: @@ -7961,7 +7921,7 @@ packages: /vue-bundle-renderer@1.0.3: resolution: {integrity: sha512-EfjX+5TTUl70bki9hPuVp+54JiZOvFIfoWBcfXsSwLzKEiDYyHNi5iX8srnqLIv3YRnvxgbntdcG1WPq0MvffQ==} dependencies: - ufo: 1.1.2 + ufo: 1.3.0 dev: true /vue-demi@0.14.5(vue@3.3.4): diff --git a/types/schema/content/team.ts b/types/schema/content/team.ts index 837ca642..069f5140 100644 --- a/types/schema/content/team.ts +++ b/types/schema/content/team.ts @@ -1,4 +1,5 @@ import type { File, User } from '../system/index.js'; +import type { Resource } from './index.js'; export interface Team { id: string; @@ -11,8 +12,10 @@ export interface Team { name: string; job_title: string | null; bio: string | null; + team: string | null; image: string | File | null; links: { [key: string]: any } | null; slug: string; type: string | null; + resources: string[] | Resource[] | null; } From cfb3f0002342ecb76e75e5c2b4871bdaba65e09d Mon Sep 17 00:00:00 2001 From: rijkvanzanten Date: Wed, 6 Sep 2023 15:51:41 -0400 Subject: [PATCH 19/51] Add sitemap --- public/robots.txt | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 public/robots.txt diff --git a/public/robots.txt b/public/robots.txt new file mode 100644 index 00000000..e168fe16 --- /dev/null +++ b/public/robots.txt @@ -0,0 +1,4 @@ +Sitemap: /sitemap.xml + +User-agent: * +Allow: / From a27f7f3be62524d8ce82cd1ed94503953fa6df7c Mon Sep 17 00:00:00 2001 From: rijkvanzanten Date: Wed, 6 Sep 2023 15:52:44 -0400 Subject: [PATCH 20/51] Mute autoplaying videos --- components/Block/Media.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/components/Block/Media.vue b/components/Block/Media.vue index b6075e76..55e6f0b9 100644 --- a/components/Block/Media.vue +++ b/components/Block/Media.vue @@ -39,6 +39,7 @@ const { data: block } = useAsyncData(props.uuid, () => :url="block.video.url ?? undefined" :uuid="block.video.file?.id ?? undefined" :autoplay="block.video.autoplay" + :muted="block.video.autoplay" :loop="block.video.loop" :controls="block.video.controls" /> From 26221207bb53d1333bbc15e0ec92ecacb317d720 Mon Sep 17 00:00:00 2001 From: rijkvanzanten Date: Wed, 6 Sep 2023 16:00:13 -0400 Subject: [PATCH 21/51] Fix muted prop --- components/Base/DirectusVideo.vue | 11 ++++++++--- components/Block/Media.vue | 1 - 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/components/Base/DirectusVideo.vue b/components/Base/DirectusVideo.vue index e2fd11da..42375f64 100644 --- a/components/Base/DirectusVideo.vue +++ b/components/Base/DirectusVideo.vue @@ -3,14 +3,19 @@ const { public: { directusUrl }, } = useRuntimeConfig(); -export interface DirectusImageProps { +export interface DirectusVideoProps { /** * Directus File ID */ uuid: string; + + muted?: boolean; + autoplay?: boolean; + controls?: boolean; + loop?: boolean; } -const props = defineProps(); +const props = defineProps(); const src = computed(() => { const url = new URL(`/assets/${props.uuid}`, directusUrl); @@ -19,5 +24,5 @@ const src = computed(() => { diff --git a/components/Block/Media.vue b/components/Block/Media.vue index 55e6f0b9..b6075e76 100644 --- a/components/Block/Media.vue +++ b/components/Block/Media.vue @@ -39,7 +39,6 @@ const { data: block } = useAsyncData(props.uuid, () => :url="block.video.url ?? undefined" :uuid="block.video.file?.id ?? undefined" :autoplay="block.video.autoplay" - :muted="block.video.autoplay" :loop="block.video.loop" :controls="block.video.controls" /> From e70716510cf215e3b8db63632e34ad152bbc176a Mon Sep 17 00:00:00 2001 From: rijkvanzanten Date: Wed, 6 Sep 2023 16:05:55 -0400 Subject: [PATCH 22/51] Fix tooltip shenanigans --- components/Block/Tier.vue | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/components/Block/Tier.vue b/components/Block/Tier.vue index 35e05517..e91ac6e8 100644 --- a/components/Block/Tier.vue +++ b/components/Block/Tier.vue @@ -25,10 +25,9 @@ const priceText = computed(() => unref(block)?.price.substring(unref(priceValue) {{ priceValue }} {{ priceText }}  {{ block.term }}  - + - - +

    {{ block.description }}

    From df73af6d1986be2340a3c4ad1a952afcb0067e19 Mon Sep 17 00:00:00 2001 From: rijkvanzanten Date: Wed, 6 Sep 2023 16:07:19 -0400 Subject: [PATCH 23/51] Fix HS rendering shenanigans --- components/Base/HsForm.vue | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/components/Base/HsForm.vue b/components/Base/HsForm.vue index 202e0221..b7ffb8e5 100644 --- a/components/Base/HsForm.vue +++ b/components/Base/HsForm.vue @@ -14,17 +14,6 @@ const props = withDefaults(defineProps(), { const { formId } = toRefs(props); -useHead({ - script: [ - { - src: '//js.hsforms.net/forms/embed/v2.js', - defer: true, - }, - ], -}); - -const generatedId = computed(() => `hs-form-${unref(formId)}`); - declare global { var hbspt: any; } @@ -38,6 +27,18 @@ const renderHsForm = () => { }); }; +useHead({ + script: [ + { + src: '//js.hsforms.net/forms/embed/v2.js', + defer: true, + onload: renderHsForm, + }, + ], +}); + +const generatedId = computed(() => `hs-form-${unref(formId)}`); + const { theme } = useTheme(); onMounted(renderHsForm); From de2ff18e92cfb0b42c4ca200e8bd42d0a40e0273 Mon Sep 17 00:00:00 2001 From: rijkvanzanten Date: Wed, 6 Sep 2023 16:09:01 -0400 Subject: [PATCH 24/51] Fix overflow in code block --- components/Block/Code.vue | 2 ++ 1 file changed, 2 insertions(+) diff --git a/components/Block/Code.vue b/components/Block/Code.vue index baee64d2..ce33deb3 100644 --- a/components/Block/Code.vue +++ b/components/Block/Code.vue @@ -78,8 +78,10 @@ const activeSnippet = ref(0); display: flex; gap: var(--space-2); padding: var(--space-2) var(--space-5); + overflow-x: auto; button { + flex-shrink: 0; color: var(--gray-400); font-size: var(--font-size-sm); line-height: var(--line-height-sm); From 44b3979110f952961acb79c3997b46a35fa594d1 Mon Sep 17 00:00:00 2001 From: rijkvanzanten Date: Wed, 6 Sep 2023 16:10:21 -0400 Subject: [PATCH 25/51] Remove underline from icons --- components/Base/Card.vue | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/components/Base/Card.vue b/components/Base/Card.vue index 507608fc..6abe1b0a 100644 --- a/components/Base/Card.vue +++ b/components/Base/Card.vue @@ -123,6 +123,10 @@ const imageDimensions = computed(() => { &:hover { .heading { text-decoration: underline; + + .icon { + text-decoration: none; + } } &:is(.style-image-fill-16-9, .style-image-fill-1-1) .image img { From 5ff2e6c8307672eee4ff13aa66eedaf394cd5875 Mon Sep 17 00:00:00 2001 From: Bryant Gillespie Date: Wed, 6 Sep 2023 16:14:26 -0400 Subject: [PATCH 26/51] Arcade Fallback Videos (#59) * directus video props to control element * type fallback * use fallback video on mobile * Fix merge problem * Add playsinline to autoplaying vids --------- Co-authored-by: Rijk van Zanten --- components/Base/DirectusVideo.vue | 3 ++- components/Base/Video.vue | 1 + components/Block/Media.vue | 36 ++++++++++++++++++++++++------ types/schema/blocks/block-media.ts | 1 + 4 files changed, 33 insertions(+), 8 deletions(-) diff --git a/components/Base/DirectusVideo.vue b/components/Base/DirectusVideo.vue index 42375f64..5822a9ba 100644 --- a/components/Base/DirectusVideo.vue +++ b/components/Base/DirectusVideo.vue @@ -13,6 +13,7 @@ export interface DirectusVideoProps { autoplay?: boolean; controls?: boolean; loop?: boolean; + playsinline?: boolean; } const props = defineProps(); @@ -24,5 +25,5 @@ const src = computed(() => { diff --git a/components/Base/Video.vue b/components/Base/Video.vue index a16f310f..5ddf6d30 100644 --- a/components/Base/Video.vue +++ b/components/Base/Video.vue @@ -56,6 +56,7 @@ const iframeSrc = computed(() => { class="base-video" :autoplay="autoplay" :muted="autoplay" + :playsinline="autoplay" :controls="controls" :loop="loop" /> diff --git a/components/Block/Media.vue b/components/Block/Media.vue index b6075e76..42c20409 100644 --- a/components/Block/Media.vue +++ b/components/Block/Media.vue @@ -14,6 +14,7 @@ const { data: block } = useAsyncData(props.uuid, () => 'aspect_ratio', 'border', 'arcade_url', + 'arcade_fallback_video', 'external_image_url', 'border_radius', 'caption', @@ -51,12 +52,18 @@ const { data: block } = useAsyncData(props.uuid, () => :alt="block.image.description ?? ''" /> -