From 2509a84169b547758c8cc2d60b389918e5d03338 Mon Sep 17 00:00:00 2001
From: "shitratgit[bot]" <286405550+shitratgit[bot]@users.noreply.github.com>
Date: Tue, 10 Nov 2026 09:37:05 -0800
Subject: [PATCH 1/5] fix: reserve the workshop lesson video aspect ratio
---
.../src/pages/workshops/[slug]/[lesson].astro | 24 +++++++++++++------
1 file changed, 17 insertions(+), 7 deletions(-)
diff --git a/apps/website/src/pages/workshops/[slug]/[lesson].astro b/apps/website/src/pages/workshops/[slug]/[lesson].astro
index f19052d..99a8e87 100644
--- a/apps/website/src/pages/workshops/[slug]/[lesson].astro
+++ b/apps/website/src/pages/workshops/[slug]/[lesson].astro
@@ -118,13 +118,15 @@ const path = `/workshops/${workshop.slug}`;
)}
{playback ? (
-
+
+
+
) : (
The video is not available yet.
)}
@@ -158,3 +160,11 @@ const path = `/workshops/${workshop.slug}`;
+
+
From f92563853284ee3ea7ba24dc9a2142e571c5f604 Mon Sep 17 00:00:00 2001
From: "shitratgit[bot]" <286405550+shitratgit[bot]@users.noreply.github.com>
Date: Tue, 10 Nov 2026 09:38:07 -0800
Subject: [PATCH 2/5] style: share workshop prose styles with lesson pages
---
apps/website/src/pages/workshops/[slug].astro | 93 +-------------
.../src/pages/workshops/[slug]/[lesson].astro | 5 +-
apps/website/src/styles/workshop-body.css | 120 ++++++++++++++++++
3 files changed, 124 insertions(+), 94 deletions(-)
create mode 100644 apps/website/src/styles/workshop-body.css
diff --git a/apps/website/src/pages/workshops/[slug].astro b/apps/website/src/pages/workshops/[slug].astro
index 740f01f..2288cf1 100644
--- a/apps/website/src/pages/workshops/[slug].astro
+++ b/apps/website/src/pages/workshops/[slug].astro
@@ -1,4 +1,5 @@
---
+import '../../styles/workshop-body.css';
import WorkshopTicket from '../../components/workshops/workshop-ticket.astro';
import WorkshopChapters from '../../components/workshops/workshop-chapters.astro';
import { chapterUnlockLabel } from '../../coursebuilder/workshop-lessons';
@@ -376,96 +377,6 @@ const included = [
}
}
- .workshop-body {
- color: var(--text);
- font-family: var(--font-family);
- font-size: 1.0625rem;
- line-height: 1.6;
- max-inline-size: 68ch;
- min-inline-size: 0;
- overflow-wrap: anywhere;
-
- :global(> :first-child) {
- margin-block-start: 0;
- }
-
- :global(> * + *) {
- margin-block-start: 1.25rem;
- }
-
- :global(:is(h2, h3, h4)) {
- color: var(--text-emphasized);
- font-family: var(--font-family-heading);
- line-height: 1.2;
- }
-
- :global(:is(h2, h3, h4):not(:first-child)) {
- margin-block-start: 2.5rem;
- }
-
- :global(:is(h2, h3, h4) + *) {
- margin-block-start: 0.75rem;
- }
-
- :global(h3) {
- font-size: 1.25em;
- }
-
- :global(:is(ul, ol)) {
- padding-inline-start: 1.5em;
- }
-
- :global(li) {
- padding-inline-start: 0.25em;
- }
-
- :global(li + li) {
- margin-block-start: 0.5rem;
- }
-
- :global(li::marker) {
- color: var(--orange);
- }
-
- :global(li > :is(ul, ol, p) + *) {
- margin-block-start: 0.75rem;
- }
-
- :global(blockquote) {
- background: var(--bg);
- border-inline-start: 0.25rem solid var(--orange);
- color: var(--text-emphasized);
- font-style: italic;
- padding: 1rem 1.25rem;
- }
-
- :global(blockquote > * + *) {
- margin-block-start: 1rem;
- }
-
- :global(blockquote + p) {
- color: var(--text-muted);
- font-size: 1rem;
- margin-block-start: 0.5rem;
- }
-
- :global(blockquote + p + *) {
- margin-block-start: 1rem;
- }
-
- :global(a) {
- color: var(--text-link);
- text-decoration: underline;
- text-decoration-thickness: 0.08em;
- text-underline-offset: 0.15em;
- }
-
- :global(pre) {
- max-inline-size: 100%;
- overflow-x: auto;
- }
- }
-
.workshop-faq {
:global(p:has(> strong:first-child):not(:first-child)) {
margin-block-start: 2rem;
@@ -494,7 +405,6 @@ const included = [
text-align: center;
}
- .workshop-body :global(a:focus-visible),
.workshop-hero-cta:focus-visible {
outline: 3px solid var(--orange);
outline-offset: 4px;
@@ -506,7 +416,6 @@ const included = [
}
.workshop-body {
- font-size: 1.125rem;
grid-column: 2;
}
}
diff --git a/apps/website/src/pages/workshops/[slug]/[lesson].astro b/apps/website/src/pages/workshops/[slug]/[lesson].astro
index 99a8e87..03c36d6 100644
--- a/apps/website/src/pages/workshops/[slug]/[lesson].astro
+++ b/apps/website/src/pages/workshops/[slug]/[lesson].astro
@@ -1,4 +1,5 @@
---
+import '../../../styles/workshop-body.css';
import { and, eq, isNull } from 'drizzle-orm';
import Layout from '../../../layouts/default.astro';
import MuxVideoPlayer from '../../../components/mux-video-player.astro';
@@ -132,9 +133,9 @@ const path = `/workshops/${workshop.slug}`;
)}
{sections.map((section) => (
-
+
{section.headingHtml && }
-
+
))}
diff --git a/apps/website/src/styles/workshop-body.css b/apps/website/src/styles/workshop-body.css
new file mode 100644
index 0000000..d57cb1f
--- /dev/null
+++ b/apps/website/src/styles/workshop-body.css
@@ -0,0 +1,120 @@
+.workshop-body {
+ color: var(--text);
+ font-family: var(--font-family);
+ font-size: 1.0625rem;
+ line-height: 1.6;
+ max-inline-size: 68ch;
+ min-inline-size: 0;
+ overflow-wrap: anywhere;
+
+ > :first-child {
+ margin-block-start: 0;
+ }
+
+ > * + * {
+ margin-block-start: 1.25rem;
+ }
+
+ :is(h2, h3, h4) {
+ color: var(--text-emphasized);
+ font-family: var(--font-family-heading);
+ line-height: 1.2;
+ }
+
+ :is(h2, h3, h4):not(:first-child) {
+ margin-block-start: 2.5rem;
+ }
+
+ :is(h2, h3, h4) + * {
+ margin-block-start: 0.75rem;
+ }
+
+ h3 {
+ font-size: 1.25em;
+ }
+
+ :is(ul, ol) {
+ padding-inline-start: 1.5em;
+ }
+
+ li {
+ padding-inline-start: 0.25em;
+ }
+
+ li + li {
+ margin-block-start: 0.5rem;
+ }
+
+ li::marker {
+ color: var(--orange);
+ }
+
+ li > :is(ul, ol, p) + * {
+ margin-block-start: 0.75rem;
+ }
+
+ blockquote {
+ background: var(--bg);
+ border-inline-start: 0.25rem solid var(--orange);
+ color: var(--text-emphasized);
+ font-style: italic;
+ padding: 1rem 1.25rem;
+ }
+
+ blockquote > * + * {
+ margin-block-start: 1rem;
+ }
+
+ blockquote + p {
+ color: var(--text-muted);
+ font-size: 1rem;
+ margin-block-start: 0.5rem;
+ }
+
+ blockquote + p + * {
+ margin-block-start: 1rem;
+ }
+
+ a {
+ color: var(--text-link);
+ text-decoration: underline;
+ text-decoration-thickness: 0.08em;
+ text-underline-offset: 0.15em;
+ }
+
+ a:focus-visible {
+ outline: 3px solid var(--orange);
+ outline-offset: 4px;
+ }
+
+ code,
+ pre {
+ font-family:
+ 'monaspace-argon', 'Operator Mono', Consolas, Monaco, 'Andale Mono',
+ 'Ubuntu Mono', monospace;
+ }
+
+ code:not(pre code) {
+ background: var(--bg);
+ border-radius: 2.5px;
+ color: var(--text-emphasized);
+ font-size: 0.875em;
+ padding: 0.125em 0.25em;
+ }
+
+ pre {
+ background: var(--black);
+ border-radius: 2.5px;
+ color: var(--white);
+ font-size: 0.8em;
+ max-inline-size: 100%;
+ overflow-x: auto;
+ padding: 20px;
+ }
+}
+
+@media (min-width: 800px) {
+ .workshop-body {
+ font-size: 1.125rem;
+ }
+}
From 07fe984e2bbd70da3fc6a382f295cfb324c927b5 Mon Sep 17 00:00:00 2001
From: "shitratgit[bot]" <286405550+shitratgit[bot]@users.noreply.github.com>
Date: Tue, 10 Nov 2026 09:39:05 -0800
Subject: [PATCH 3/5] style: use the site Block layout for workshop lessons
---
.../src/pages/workshops/[slug]/[lesson].astro | 236 +++++++++++++-----
1 file changed, 167 insertions(+), 69 deletions(-)
diff --git a/apps/website/src/pages/workshops/[slug]/[lesson].astro b/apps/website/src/pages/workshops/[slug]/[lesson].astro
index 03c36d6..16ab4f3 100644
--- a/apps/website/src/pages/workshops/[slug]/[lesson].astro
+++ b/apps/website/src/pages/workshops/[slug]/[lesson].astro
@@ -2,6 +2,7 @@
import '../../../styles/workshop-body.css';
import { and, eq, isNull } from 'drizzle-orm';
import Layout from '../../../layouts/default.astro';
+import Block from '../../../components/design-system/block.astro';
import MuxVideoPlayer from '../../../components/mux-video-player.astro';
import {
getWorkshopForSale,
@@ -87,85 +88,182 @@ const path = `/workshops/${workshop.slug}`;
---
-
- {workshop.title}
- {chapter.title}
- {
- !hasTicket && !preview ? (
-
- {chapterUnlockLabel(chapter.startsAt)}{' '}
- Get a ticket to watch this workshop.{' '}
- {!clerkUser && (
-
- Sign in
-
- )}
-
- ) : !unlocked && !preview ? (
- {chapterUnlockLabel(chapter.startsAt)}
- ) : (
- <>
- {preview && !unlocked && (
-
-
- Preview:{' '}
- {chapterUnlockLabel(chapter.startsAt).replace(
- 'Unlocks',
- 'unlocks for buyers',
- )}
-
-
- )}
- {playback ? (
-
-
-
- ) : (
- The video is not available yet.
- )}
-
- {sections.map((section) => (
-
- {section.headingHtml && }
-
-
- ))}
-
- >
- )
- }
-
+
+
+
+ {
+ previous && (
+
+ Previous: {previous.title}
+
+ )
+ }
+ {
+ next && (
+
+ Next: {next.title}
+
+ )
+ }
+
+
From ed6be2f23e9b7b5c5c19c2afa759b451bf3a3450 Mon Sep 17 00:00:00 2001
From: "shitratgit[bot]" <286405550+shitratgit[bot]@users.noreply.github.com>
Date: Tue, 10 Nov 2026 09:39:28 -0800
Subject: [PATCH 4/5] fix: label released workshop chapters as unlocked
---
.../src/coursebuilder/workshop-lessons.test.ts | 14 +++++++++++++-
apps/website/src/coursebuilder/workshop-lessons.ts | 5 +++--
2 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/apps/website/src/coursebuilder/workshop-lessons.test.ts b/apps/website/src/coursebuilder/workshop-lessons.test.ts
index b7aed30..0be0d11 100644
--- a/apps/website/src/coursebuilder/workshop-lessons.test.ts
+++ b/apps/website/src/coursebuilder/workshop-lessons.test.ts
@@ -54,11 +54,23 @@ it('releases signed playback to buyers at the stored instant, never public playb
null,
);
assert.equal(
- chapterUnlockLabel('2026-11-10T08:00:00Z'),
+ chapterUnlockLabel('2026-11-10T08:00:00Z', input.now),
'Unlocks Tue, Nov 10 at 12:00 AM PT',
);
});
+it('labels released chapters as unlocked at and after their release time', () => {
+ for (const now of [
+ new Date('2026-11-10T08:00:00Z'),
+ new Date('2026-11-11T08:00:00Z'),
+ ]) {
+ assert.equal(
+ chapterUnlockLabel('2026-11-10T08:00:00Z', now),
+ 'Unlocked Tue, Nov 10 at 12:00 AM PT',
+ );
+ }
+});
+
it('public content projections remove playback and exercises through nested resource/edge API shapes', () => {
const video = {
id: 'video',
diff --git a/apps/website/src/coursebuilder/workshop-lessons.ts b/apps/website/src/coursebuilder/workshop-lessons.ts
index 37dc4ce..99559f4 100644
--- a/apps/website/src/coursebuilder/workshop-lessons.ts
+++ b/apps/website/src/coursebuilder/workshop-lessons.ts
@@ -14,10 +14,11 @@ export function isChapterUnlocked(startsAt: string | null, now = new Date()) {
);
}
-export function chapterUnlockLabel(startsAt: string | null) {
+export function chapterUnlockLabel(startsAt: string | null, now = new Date()) {
if (!startsAt || !Number.isFinite(Date.parse(startsAt)))
return 'Release date to be announced';
- return `Unlocks ${new Intl.DateTimeFormat('en-US', {
+ const label = isChapterUnlocked(startsAt, now) ? 'Unlocked' : 'Unlocks';
+ return `${label} ${new Intl.DateTimeFormat('en-US', {
timeZone: 'America/Los_Angeles',
weekday: 'short',
month: 'short',
From 6417f420d198078f6aa7428828cb81525b344061 Mon Sep 17 00:00:00 2001
From: "shitratgit[bot]" <286405550+shitratgit[bot]@users.noreply.github.com>
Date: Tue, 10 Nov 2026 09:50:55 -0800
Subject: [PATCH 5/5] style: give workshop code blocks a visible surface
---
apps/website/src/styles/workshop-body.css | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/apps/website/src/styles/workshop-body.css b/apps/website/src/styles/workshop-body.css
index d57cb1f..31f8e18 100644
--- a/apps/website/src/styles/workshop-body.css
+++ b/apps/website/src/styles/workshop-body.css
@@ -102,8 +102,12 @@
padding: 0.125em 0.25em;
}
+ blockquote code:not(pre code) {
+ background: var(--gray-200);
+ }
+
pre {
- background: var(--black);
+ background: var(--gray-200);
border-radius: 2.5px;
color: var(--white);
font-size: 0.8em;