From 5bf220faf3d91ffaa3812666662a91bd5ccd46eb Mon Sep 17 00:00:00 2001 From: Frozen <1884084+xrdavies@users.noreply.github.com> Date: Thu, 9 Apr 2026 05:25:40 +0800 Subject: [PATCH 01/17] docs(repo): forbid local main merges --- AGENTS.md | 2 ++ docs/deployment.md | 3 ++- docs/production-config.md | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/AGENTS.md b/AGENTS.md index 3b4d981..9105b08 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -28,6 +28,8 @@ Examples: - After a coherent batch is committed locally, push it to `origin/dev`. - Open a pull request from `dev` to `main` for review and release tracking. - Merge the pull request into `main` only after the release candidate is ready. +- If pull request merge permission is unavailable, stop at the PR step and hand the PR back to a maintainer. +- Do not merge `dev` into `main` locally as a substitute for the GitHub pull request flow. - Do not push release changes directly to `origin/main`. ## Documentation Map diff --git a/docs/deployment.md b/docs/deployment.md index 27d4dbd..d99de60 100644 --- a/docs/deployment.md +++ b/docs/deployment.md @@ -19,6 +19,7 @@ For the current production inventory and ownership map, also see `docs/productio - push validated work to `origin/dev` - create a pull request from `dev` to `main` - merge `dev` into `main` only after release validation passes +- if the current operator cannot merge the pull request, stop and hand the PR to a maintainer instead of merging locally - production deployments should run from `main` - `apps/web` and `apps/admin` production must be deployed by Cloudflare Workers Builds from `main` - local `wrangler deploy` to the production Workers is not part of the normal release flow @@ -31,7 +32,7 @@ For Rebase, production frontend releases now follow a single source of truth: 2. validate locally and with preview builds 3. push the validated branch to `origin/dev` 4. create a pull request from `dev` to `main` -5. merge the release candidate into `main` +5. merge the release candidate into `main` through the GitHub pull request 6. let Cloudflare Workers Builds publish production from `main` This avoids a mismatch where production is newer than GitHub. diff --git a/docs/production-config.md b/docs/production-config.md index 2ed00b0..f45a183 100644 --- a/docs/production-config.md +++ b/docs/production-config.md @@ -141,6 +141,7 @@ Use `infra/production/server.env.example` as the committed template. - day-to-day work continues on `dev` - validated work should be pushed to `origin/dev` - releases should move from `dev` to `main` through a pull request +- if the current operator cannot merge the pull request, they must stop at the PR step and wait for a maintainer - production Workers Builds track `main` - API server deployment should use release-ready code, not unreviewed local changes From c5411efd299f4ae46bb3d41fe5257894ddd0ee85 Mon Sep 17 00:00:00 2001 From: Frozen <1884084+xrdavies@users.noreply.github.com> Date: Thu, 9 Apr 2026 05:48:09 +0800 Subject: [PATCH 02/17] fix(home): rework contributor overview --- apps/web/src/pages/index.astro | 191 ++++++++++++++++++++++++++++++--- 1 file changed, 177 insertions(+), 14 deletions(-) diff --git a/apps/web/src/pages/index.astro b/apps/web/src/pages/index.astro index 59a925e..26d4256 100644 --- a/apps/web/src/pages/index.astro +++ b/apps/web/src/pages/index.astro @@ -1,16 +1,24 @@ --- import ArticleCard from '@/components/ArticleCard.astro'; -import ContributorCard from '@/components/ContributorCard.astro'; import EventCard from '@/components/EventCard.astro'; import GeekDailyCard from '@/components/GeekDailyCard.astro'; import JobCard from '@/components/JobCard.astro'; import SectionHeader from '@/components/SectionHeader.astro'; import BaseLayout from '@/layouts/BaseLayout.astro'; -import { getContributors, getHomeFeed, getSiteSettings } from '@/lib/content'; +import { createAvatarData } from '@/lib/avatar'; +import { getContributorsByRole, getHomeFeed, getSiteSettings } from '@/lib/content'; import { formatDate } from '@/lib/dates'; -const [site, feed, contributors] = await Promise.all([getSiteSettings(), getHomeFeed(), getContributors()]); -const featuredContributors = contributors.slice(0, 2); +const [site, feed, contributorGroups] = await Promise.all([getSiteSettings(), getHomeFeed(), getContributorsByRole()]); +const contributorMap = new Map( + contributorGroups.flatMap((group) => group.contributors.map((contributor) => [contributor.slug, contributor] as const)), +); +const contributors = [...contributorMap.values()]; +const contributorPreview = contributors.slice(0, 12); +const contributorStats = [ + { value: String(contributors.length).padStart(2, '0'), label: '公开贡献者' }, + { value: String(contributorGroups.length).padStart(2, '0'), label: '角色分组' }, +]; const liveWire = feed.dynamicFeed.slice(0, 6); const recentGeekDaily = feed.recentGeekDaily.slice(0, 3); const frontPageHighlights = liveWire.slice(0, 3); @@ -158,17 +166,51 @@ const liveWireTypeLabel = {
-
- {featuredContributors.map((contributor) => ( - - ))} -
+
+
+
+ {contributorStats.map((stat) => ( +
+ {stat.value} + {stat.label} +
+ ))} +
+ +
+ {contributorGroups.map((group) => ( +
+ {group.role.name} + {group.contributors.length} 位成员 +
+ ))} +
+ +

+ 这些公开档案覆盖社区内容整理、活动组织、推荐与编辑协作。更多贡献者的故事与联系方式,放在独立页面里持续补全。 +

+
+ + +
@@ -469,9 +511,121 @@ const liveWireTypeLabel = { box-shadow: 0 14px 28px rgba(15, 118, 110, 0.1); } + .contributors-overview { + display: grid; + grid-template-columns: minmax(0, 1.05fr) minmax(18rem, 0.95fr); + gap: 1.2rem; + align-items: center; + padding: 1.2rem; + background: + radial-gradient(circle at top left, rgba(243, 196, 110, 0.18), transparent 24%), + radial-gradient(circle at 88% 18%, rgba(15, 118, 110, 0.16), transparent 22%), + linear-gradient(180deg, rgba(255, 255, 255, 0.96), rgba(248, 252, 251, 0.92)); + } + + .contributors-copy { + display: grid; + gap: 1rem; + } + + .contributors-stats { + display: grid; + grid-template-columns: repeat(2, minmax(0, 1fr)); + gap: 0.85rem; + } + + .contributors-stats article { + display: grid; + gap: 0.22rem; + padding: 1rem 1.05rem; + border: 1px solid rgba(15, 118, 110, 0.1); + border-radius: 1.2rem; + background: rgba(255, 255, 255, 0.84); + } + + .contributors-stats strong { + font-size: clamp(1.6rem, 2vw, 2rem); + line-height: 1; + } + + .contributors-stats span, + .contributors-note, + .role-pill span { + color: var(--muted); + } + + .contributors-role-list { + display: flex; + flex-wrap: wrap; + gap: 0.7rem; + } + + .role-pill { + display: grid; + gap: 0.18rem; + min-width: 9.5rem; + padding: 0.9rem 1rem; + border: 1px solid rgba(15, 118, 110, 0.1); + border-radius: 1rem; + background: rgba(255, 255, 255, 0.82); + } + + .role-pill strong { + font-size: 0.98rem; + line-height: 1.35; + } + + .role-pill span, + .contributors-note { + line-height: 1.65; + } + + .contributors-note { + margin: 0; + max-width: 56ch; + } + + .contributors-cloud { + display: grid; + grid-template-columns: repeat(4, minmax(0, 1fr)); + gap: 0.8rem; + align-content: start; + justify-items: center; + } + + .avatar-token, + .avatar-fallback, + .avatar-token img { + width: 4.6rem; + height: 4.6rem; + border-radius: 1.4rem; + } + + .avatar-token { + position: relative; + overflow: hidden; + border: 1px solid rgba(15, 118, 110, 0.12); + background: rgba(255, 255, 255, 0.88); + box-shadow: 0 16px 36px rgba(26, 40, 34, 0.1); + } + + .avatar-token img { + display: block; + object-fit: cover; + } + + .avatar-fallback { + display: grid; + place-items: center; + color: white; + font-size: 1.4rem; + font-weight: 800; + } + @media (max-width: 960px) { .hero-highlights, - .dispatch-grid { + .dispatch-grid, + .contributors-overview { grid-template-columns: 1fr; } @@ -493,5 +647,14 @@ const liveWireTypeLabel = { .highlight-card strong { font-size: 1.08rem; } + + .contributors-stats, + .feed-links { + grid-template-columns: 1fr; + } + + .contributors-cloud { + grid-template-columns: repeat(3, minmax(0, 1fr)); + } } From 48a89858810e322ad4d1b3e786a08083d490aecc Mon Sep 17 00:00:00 2001 From: Frozen <1884084+xrdavies@users.noreply.github.com> Date: Thu, 9 Apr 2026 05:52:38 +0800 Subject: [PATCH 03/17] fix(home): tighten contributor section --- apps/web/src/pages/index.astro | 86 +++++++++++++--------------------- 1 file changed, 32 insertions(+), 54 deletions(-) diff --git a/apps/web/src/pages/index.astro b/apps/web/src/pages/index.astro index 26d4256..ee5a91b 100644 --- a/apps/web/src/pages/index.astro +++ b/apps/web/src/pages/index.astro @@ -15,10 +15,6 @@ const contributorMap = new Map( ); const contributors = [...contributorMap.values()]; const contributorPreview = contributors.slice(0, 12); -const contributorStats = [ - { value: String(contributors.length).padStart(2, '0'), label: '公开贡献者' }, - { value: String(contributorGroups.length).padStart(2, '0'), label: '角色分组' }, -]; const liveWire = feed.dynamicFeed.slice(0, 6); const recentGeekDaily = feed.recentGeekDaily.slice(0, 3); const frontPageHighlights = liveWire.slice(0, 3); @@ -168,19 +164,15 @@ const liveWireTypeLabel = {
-
- {contributorStats.map((stat) => ( -
- {stat.value} - {stat.label} -
- ))} +
+

+ Rebase 由志愿者、GeekDaily 智囊团、编辑与其他社区成员共同维护。首页先展示这张不断扩展的协作网络,再进入完整的贡献者档案。 +

@@ -525,80 +517,66 @@ const liveWireTypeLabel = { .contributors-copy { display: grid; - gap: 1rem; + gap: 0.9rem; } - .contributors-stats { - display: grid; - grid-template-columns: repeat(2, minmax(0, 1fr)); - gap: 0.85rem; - } - - .contributors-stats article { - display: grid; - gap: 0.22rem; - padding: 1rem 1.05rem; - border: 1px solid rgba(15, 118, 110, 0.1); - border-radius: 1.2rem; - background: rgba(255, 255, 255, 0.84); + .contributors-intro p, + .contributors-note, + .role-pill span { + margin: 0; + color: var(--muted); } - .contributors-stats strong { - font-size: clamp(1.6rem, 2vw, 2rem); - line-height: 1; + .contributors-intro { + max-width: 58ch; } - .contributors-stats span, - .contributors-note, - .role-pill span { - color: var(--muted); + .contributors-intro p, + .contributors-note { + line-height: 1.72; } .contributors-role-list { display: flex; flex-wrap: wrap; - gap: 0.7rem; + gap: 0.6rem; } .role-pill { display: grid; gap: 0.18rem; - min-width: 9.5rem; - padding: 0.9rem 1rem; - border: 1px solid rgba(15, 118, 110, 0.1); - border-radius: 1rem; - background: rgba(255, 255, 255, 0.82); + min-width: 8.6rem; + padding: 0.76rem 0.9rem; + border: 1px solid rgba(15, 118, 110, 0.08); + border-radius: 0.95rem; + background: rgba(255, 255, 255, 0.76); } .role-pill strong { - font-size: 0.98rem; + font-size: 0.92rem; line-height: 1.35; } - .role-pill span, - .contributors-note { - line-height: 1.65; - } - .contributors-note { margin: 0; max-width: 56ch; + line-height: 1.72; } .contributors-cloud { display: grid; - grid-template-columns: repeat(4, minmax(0, 1fr)); - gap: 0.8rem; + grid-template-columns: repeat(4, minmax(0, 4.2rem)); + gap: 0.65rem; align-content: start; - justify-items: center; + justify-content: end; } .avatar-token, .avatar-fallback, .avatar-token img { - width: 4.6rem; - height: 4.6rem; - border-radius: 1.4rem; + width: 4.2rem; + height: 4.2rem; + border-radius: 1.25rem; } .avatar-token { @@ -618,7 +596,7 @@ const liveWireTypeLabel = { display: grid; place-items: center; color: white; - font-size: 1.4rem; + font-size: 1.25rem; font-weight: 800; } @@ -648,13 +626,13 @@ const liveWireTypeLabel = { font-size: 1.08rem; } - .contributors-stats, .feed-links { grid-template-columns: 1fr; } .contributors-cloud { - grid-template-columns: repeat(3, minmax(0, 1fr)); + grid-template-columns: repeat(3, minmax(0, 4.2rem)); + justify-content: start; } } From 304effa73de34201b219a8449689595544541e71 Mon Sep 17 00:00:00 2001 From: Frozen <1884084+xrdavies@users.noreply.github.com> Date: Thu, 9 Apr 2026 05:53:46 +0800 Subject: [PATCH 04/17] fix(home): remove homepage stats strip --- apps/web/src/pages/index.astro | 9 --------- 1 file changed, 9 deletions(-) diff --git a/apps/web/src/pages/index.astro b/apps/web/src/pages/index.astro index ee5a91b..7c353f8 100644 --- a/apps/web/src/pages/index.astro +++ b/apps/web/src/pages/index.astro @@ -75,15 +75,6 @@ const liveWireTypeLabel = {
-
- {site.homeStats.map((stat) => ( -
- {stat.value} - {stat.label} -
- ))} -
-
Date: Thu, 9 Apr 2026 05:54:56 +0800 Subject: [PATCH 05/17] fix(home): remove contributor role counts --- apps/web/src/pages/index.astro | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/apps/web/src/pages/index.astro b/apps/web/src/pages/index.astro index 7c353f8..668c0a5 100644 --- a/apps/web/src/pages/index.astro +++ b/apps/web/src/pages/index.astro @@ -75,6 +75,15 @@ const liveWireTypeLabel = {
+
+ {site.homeStats.map((stat) => ( +
+ {stat.value} + {stat.label} +
+ ))} +
+
(
{group.role.name} - {group.contributors.length} 位成员
))} @@ -512,8 +520,7 @@ const liveWireTypeLabel = { } .contributors-intro p, - .contributors-note, - .role-pill span { + .contributors-note { margin: 0; color: var(--muted); } @@ -534,10 +541,8 @@ const liveWireTypeLabel = { } .role-pill { - display: grid; - gap: 0.18rem; - min-width: 8.6rem; - padding: 0.76rem 0.9rem; + min-width: 7.8rem; + padding: 0.7rem 0.9rem; border: 1px solid rgba(15, 118, 110, 0.08); border-radius: 0.95rem; background: rgba(255, 255, 255, 0.76); @@ -549,7 +554,6 @@ const liveWireTypeLabel = { } .contributors-note { - margin: 0; max-width: 56ch; line-height: 1.72; } From 865792c9f055391ab8255774027d0a2a59577135 Mon Sep 17 00:00:00 2001 From: Frozen <1884084+xrdavies@users.noreply.github.com> Date: Thu, 9 Apr 2026 05:56:35 +0800 Subject: [PATCH 06/17] fix(home): remove contributor role labels --- apps/web/src/pages/index.astro | 27 --------------------------- 1 file changed, 27 deletions(-) diff --git a/apps/web/src/pages/index.astro b/apps/web/src/pages/index.astro index 668c0a5..a7bc6fb 100644 --- a/apps/web/src/pages/index.astro +++ b/apps/web/src/pages/index.astro @@ -175,14 +175,6 @@ const liveWireTypeLabel = {

-
- {contributorGroups.map((group) => ( -
- {group.role.name} -
- ))} -
-

这些公开档案覆盖社区内容整理、活动组织、推荐与编辑协作。更多贡献者的故事与联系方式,放在独立页面里持续补全。

@@ -534,25 +526,6 @@ const liveWireTypeLabel = { line-height: 1.72; } - .contributors-role-list { - display: flex; - flex-wrap: wrap; - gap: 0.6rem; - } - - .role-pill { - min-width: 7.8rem; - padding: 0.7rem 0.9rem; - border: 1px solid rgba(15, 118, 110, 0.08); - border-radius: 0.95rem; - background: rgba(255, 255, 255, 0.76); - } - - .role-pill strong { - font-size: 0.92rem; - line-height: 1.35; - } - .contributors-note { max-width: 56ch; line-height: 1.72; From 3e51e7486275b8cdd5cb50d0aba62327442304fa Mon Sep 17 00:00:00 2001 From: Frozen <1884084+xrdavies@users.noreply.github.com> Date: Thu, 9 Apr 2026 06:01:22 +0800 Subject: [PATCH 07/17] chore(contributors): add volunteer preview fixtures --- apps/web/src/pages/index.astro | 3 +- scripts/directus/baseline-data.mjs | 130 +++++++++++++++++++++++++++++ 2 files changed, 132 insertions(+), 1 deletion(-) diff --git a/apps/web/src/pages/index.astro b/apps/web/src/pages/index.astro index a7bc6fb..3881145 100644 --- a/apps/web/src/pages/index.astro +++ b/apps/web/src/pages/index.astro @@ -14,7 +14,8 @@ const contributorMap = new Map( contributorGroups.flatMap((group) => group.contributors.map((contributor) => [contributor.slug, contributor] as const)), ); const contributors = [...contributorMap.values()]; -const contributorPreview = contributors.slice(0, 12); +const contributorPreviewLimit = 12; +const contributorPreview = contributors.slice(0, contributorPreviewLimit); const liveWire = feed.dynamicFeed.slice(0, 6); const recentGeekDaily = feed.recentGeekDaily.slice(0, 3); const frontPageHighlights = liveWire.slice(0, 3); diff --git a/scripts/directus/baseline-data.mjs b/scripts/directus/baseline-data.mjs index a51ffd1..a5f407f 100644 --- a/scripts/directus/baseline-data.mjs +++ b/scripts/directus/baseline-data.mjs @@ -359,4 +359,134 @@ export const contributors = [ wechat: null, telegram: '@annie_rebase', }, + { + slug: 'test-volunteer-01', + status: 'published', + name: 'test volunteer 01', + avatar_url: null, + avatar_seed: 'test-volunteer-01', + headline: 'community volunteer', + bio: '用于验证首页贡献者群像布局的测试志愿者档案。', + role_slugs: ['volunteers'], + twitter_url: null, + wechat: null, + telegram: null, + }, + { + slug: 'test-volunteer-02', + status: 'published', + name: 'test volunteer 02', + avatar_url: null, + avatar_seed: 'test-volunteer-02', + headline: 'community volunteer', + bio: '用于验证首页贡献者群像布局的测试志愿者档案。', + role_slugs: ['volunteers'], + twitter_url: null, + wechat: null, + telegram: null, + }, + { + slug: 'test-volunteer-03', + status: 'published', + name: 'test volunteer 03', + avatar_url: null, + avatar_seed: 'test-volunteer-03', + headline: 'community volunteer', + bio: '用于验证首页贡献者群像布局的测试志愿者档案。', + role_slugs: ['volunteers'], + twitter_url: null, + wechat: null, + telegram: null, + }, + { + slug: 'test-volunteer-04', + status: 'published', + name: 'test volunteer 04', + avatar_url: null, + avatar_seed: 'test-volunteer-04', + headline: 'community volunteer', + bio: '用于验证首页贡献者群像布局的测试志愿者档案。', + role_slugs: ['volunteers'], + twitter_url: null, + wechat: null, + telegram: null, + }, + { + slug: 'test-volunteer-05', + status: 'published', + name: 'test volunteer 05', + avatar_url: null, + avatar_seed: 'test-volunteer-05', + headline: 'community volunteer', + bio: '用于验证首页贡献者群像布局的测试志愿者档案。', + role_slugs: ['volunteers'], + twitter_url: null, + wechat: null, + telegram: null, + }, + { + slug: 'test-volunteer-06', + status: 'published', + name: 'test volunteer 06', + avatar_url: null, + avatar_seed: 'test-volunteer-06', + headline: 'community volunteer', + bio: '用于验证首页贡献者群像布局的测试志愿者档案。', + role_slugs: ['volunteers'], + twitter_url: null, + wechat: null, + telegram: null, + }, + { + slug: 'test-volunteer-07', + status: 'published', + name: 'test volunteer 07', + avatar_url: null, + avatar_seed: 'test-volunteer-07', + headline: 'community volunteer', + bio: '用于验证首页贡献者群像布局的测试志愿者档案。', + role_slugs: ['volunteers'], + twitter_url: null, + wechat: null, + telegram: null, + }, + { + slug: 'test-volunteer-08', + status: 'published', + name: 'test volunteer 08', + avatar_url: null, + avatar_seed: 'test-volunteer-08', + headline: 'community volunteer', + bio: '用于验证首页贡献者群像布局的测试志愿者档案。', + role_slugs: ['volunteers'], + twitter_url: null, + wechat: null, + telegram: null, + }, + { + slug: 'test-volunteer-09', + status: 'published', + name: 'test volunteer 09', + avatar_url: null, + avatar_seed: 'test-volunteer-09', + headline: 'community volunteer', + bio: '用于验证首页贡献者群像布局的测试志愿者档案。', + role_slugs: ['volunteers'], + twitter_url: null, + wechat: null, + telegram: null, + }, + { + slug: 'test-volunteer-10', + status: 'published', + name: 'test volunteer 10', + avatar_url: null, + avatar_seed: 'test-volunteer-10', + headline: 'community volunteer', + bio: '用于验证首页贡献者群像布局的测试志愿者档案。', + role_slugs: ['volunteers'], + twitter_url: null, + wechat: null, + telegram: null, + }, ]; From 43e08ca2b896b8f4296b1d2a4a72335f1902ab9c Mon Sep 17 00:00:00 2001 From: Frozen <1884084+xrdavies@users.noreply.github.com> Date: Thu, 9 Apr 2026 06:05:41 +0800 Subject: [PATCH 08/17] fix(home): soften contributor collage --- apps/web/src/pages/index.astro | 73 ++++++++++++++++++++++++++++------ 1 file changed, 61 insertions(+), 12 deletions(-) diff --git a/apps/web/src/pages/index.astro b/apps/web/src/pages/index.astro index 3881145..941e99a 100644 --- a/apps/web/src/pages/index.astro +++ b/apps/web/src/pages/index.astro @@ -172,12 +172,12 @@ const liveWireTypeLabel = {

- Rebase 由志愿者、GeekDaily 智囊团、编辑与其他社区成员共同维护。首页先展示这张不断扩展的协作网络,再进入完整的贡献者档案。 + Rebase 由志愿者、编辑与长期协作者共同维护。首页先给出一张不断扩展的社区群像,再进入完整的贡献者档案。

- 这些公开档案覆盖社区内容整理、活动组织、推荐与编辑协作。更多贡献者的故事与联系方式,放在独立页面里持续补全。 + 这些公开档案覆盖内容整理、活动组织、推荐与编辑协作。更多参与者的故事与联系方式,会在独立页面里持续补全。

@@ -496,20 +496,35 @@ const liveWireTypeLabel = { } .contributors-overview { + position: relative; + overflow: hidden; display: grid; grid-template-columns: minmax(0, 1.05fr) minmax(18rem, 0.95fr); gap: 1.2rem; align-items: center; - padding: 1.2rem; + padding: 1.25rem; background: - radial-gradient(circle at top left, rgba(243, 196, 110, 0.18), transparent 24%), - radial-gradient(circle at 88% 18%, rgba(15, 118, 110, 0.16), transparent 22%), - linear-gradient(180deg, rgba(255, 255, 255, 0.96), rgba(248, 252, 251, 0.92)); + radial-gradient(circle at top left, rgba(243, 196, 110, 0.22), transparent 26%), + radial-gradient(circle at 82% 18%, rgba(15, 118, 110, 0.18), transparent 24%), + linear-gradient(180deg, rgba(255, 255, 255, 0.97), rgba(247, 252, 250, 0.93)); + } + + .contributors-overview::after { + content: ''; + position: absolute; + inset: auto -3rem -5rem auto; + width: 12rem; + height: 12rem; + border-radius: 999px; + background: radial-gradient(circle, rgba(15, 118, 110, 0.12), transparent 70%); + pointer-events: none; } .contributors-copy { + position: relative; + z-index: 1; display: grid; - gap: 0.9rem; + gap: 0.75rem; } .contributors-intro p, @@ -522,22 +537,27 @@ const liveWireTypeLabel = { max-width: 58ch; } - .contributors-intro p, - .contributors-note { - line-height: 1.72; + .contributors-intro p { + color: var(--text); + font-size: 1.02rem; + line-height: 1.78; } .contributors-note { max-width: 56ch; - line-height: 1.72; + font-size: 0.95rem; + line-height: 1.7; } .contributors-cloud { + position: relative; + z-index: 1; display: grid; grid-template-columns: repeat(4, minmax(0, 4.2rem)); - gap: 0.65rem; + gap: 0.7rem; align-content: start; justify-content: end; + padding: 0.35rem 0 0.35rem 1rem; } .avatar-token, @@ -554,6 +574,7 @@ const liveWireTypeLabel = { border: 1px solid rgba(15, 118, 110, 0.12); background: rgba(255, 255, 255, 0.88); box-shadow: 0 16px 36px rgba(26, 40, 34, 0.1); + transition: transform 180ms ease, box-shadow 180ms ease, border-color 180ms ease; } .avatar-token img { @@ -561,6 +582,13 @@ const liveWireTypeLabel = { object-fit: cover; } + .avatar-token:hover, + .avatar-token:focus-visible { + transform: translateY(-2px) scale(1.02); + border-color: rgba(15, 118, 110, 0.22); + box-shadow: 0 18px 38px rgba(26, 40, 34, 0.14); + } + .avatar-fallback { display: grid; place-items: center; @@ -569,6 +597,22 @@ const liveWireTypeLabel = { font-weight: 800; } + .avatar-token:nth-child(4n + 1) { + transform: translateY(-0.3rem) rotate(-3deg); + } + + .avatar-token:nth-child(4n + 2) { + transform: translateY(0.28rem) rotate(2deg); + } + + .avatar-token:nth-child(4n + 3) { + transform: translateY(-0.15rem) rotate(3deg); + } + + .avatar-token:nth-child(4n) { + transform: translateY(0.34rem) rotate(-2deg); + } + @media (max-width: 960px) { .hero-highlights, .dispatch-grid, @@ -602,6 +646,11 @@ const liveWireTypeLabel = { .contributors-cloud { grid-template-columns: repeat(3, minmax(0, 4.2rem)); justify-content: start; + padding-left: 0; + } + + .avatar-token:nth-child(n) { + transform: none; } } From e90c2c13e90d9c85678f97d0c60fec6b87a59208 Mon Sep 17 00:00:00 2001 From: Frozen <1884084+xrdavies@users.noreply.github.com> Date: Thu, 9 Apr 2026 06:07:32 +0800 Subject: [PATCH 09/17] fix(home): widen contributor collage --- apps/web/src/pages/index.astro | 46 ++++++++++++++++++++++------------ 1 file changed, 30 insertions(+), 16 deletions(-) diff --git a/apps/web/src/pages/index.astro b/apps/web/src/pages/index.astro index 941e99a..6d693b5 100644 --- a/apps/web/src/pages/index.astro +++ b/apps/web/src/pages/index.astro @@ -499,10 +499,10 @@ const liveWireTypeLabel = { position: relative; overflow: hidden; display: grid; - grid-template-columns: minmax(0, 1.05fr) minmax(18rem, 0.95fr); - gap: 1.2rem; + grid-template-columns: minmax(0, 0.9fr) minmax(24rem, 1.1fr); + gap: 1.4rem; align-items: center; - padding: 1.25rem; + padding: 1.3rem 1.35rem; background: radial-gradient(circle at top left, rgba(243, 196, 110, 0.22), transparent 26%), radial-gradient(circle at 82% 18%, rgba(15, 118, 110, 0.18), transparent 24%), @@ -553,18 +553,18 @@ const liveWireTypeLabel = { position: relative; z-index: 1; display: grid; - grid-template-columns: repeat(4, minmax(0, 4.2rem)); - gap: 0.7rem; + grid-template-columns: repeat(5, minmax(0, 4.45rem)); + gap: 0.55rem 0.8rem; align-content: start; justify-content: end; - padding: 0.35rem 0 0.35rem 1rem; + padding: 0.25rem 0.2rem 0.45rem 1.6rem; } .avatar-token, .avatar-fallback, .avatar-token img { - width: 4.2rem; - height: 4.2rem; + width: 4.45rem; + height: 4.45rem; border-radius: 1.25rem; } @@ -597,20 +597,34 @@ const liveWireTypeLabel = { font-weight: 800; } - .avatar-token:nth-child(4n + 1) { - transform: translateY(-0.3rem) rotate(-3deg); + .avatar-token:nth-child(5n + 1) { + transform: translate(-0.2rem, -0.45rem) rotate(-8deg); } - .avatar-token:nth-child(4n + 2) { - transform: translateY(0.28rem) rotate(2deg); + .avatar-token:nth-child(5n + 2) { + transform: translate(0.25rem, 0.32rem) rotate(5deg); } - .avatar-token:nth-child(4n + 3) { - transform: translateY(-0.15rem) rotate(3deg); + .avatar-token:nth-child(5n + 3) { + transform: translate(-0.15rem, -0.1rem) rotate(9deg); } - .avatar-token:nth-child(4n) { - transform: translateY(0.34rem) rotate(-2deg); + .avatar-token:nth-child(5n + 4) { + transform: translate(0.28rem, 0.55rem) rotate(-6deg); + } + + .avatar-token:nth-child(5n) { + transform: translate(-0.3rem, 0.12rem) rotate(4deg); + } + + .avatar-token:nth-child(6), + .avatar-token:nth-child(11) { + transform: translate(0.6rem, -0.2rem) rotate(-10deg) scale(0.98); + } + + .avatar-token:nth-child(8), + .avatar-token:nth-child(12) { + transform: translate(-0.55rem, 0.45rem) rotate(11deg) scale(1.03); } @media (max-width: 960px) { From 3f27d3dc765021da4d6f067abce2393edccfc220 Mon Sep 17 00:00:00 2001 From: Frozen <1884084+xrdavies@users.noreply.github.com> Date: Thu, 9 Apr 2026 19:54:18 +0800 Subject: [PATCH 10/17] fix(home): add contributor collage texture --- apps/web/src/pages/index.astro | 40 ++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/apps/web/src/pages/index.astro b/apps/web/src/pages/index.astro index 6d693b5..aa53805 100644 --- a/apps/web/src/pages/index.astro +++ b/apps/web/src/pages/index.astro @@ -551,6 +551,7 @@ const liveWireTypeLabel = { .contributors-cloud { position: relative; + isolation: isolate; z-index: 1; display: grid; grid-template-columns: repeat(5, minmax(0, 4.45rem)); @@ -560,6 +561,37 @@ const liveWireTypeLabel = { padding: 0.25rem 0.2rem 0.45rem 1.6rem; } + .contributors-cloud::before { + content: ''; + position: absolute; + inset: 0.55rem 0 0.15rem 1rem; + z-index: -2; + border: 1px dashed rgba(15, 118, 110, 0.14); + border-radius: 1.5rem; + background: + linear-gradient(180deg, rgba(255, 255, 255, 0.78), rgba(247, 252, 250, 0.46)), + radial-gradient(circle at 1px 1px, rgba(15, 118, 110, 0.08) 1.1px, transparent 0); + background-size: auto, 16px 16px; + box-shadow: 0 18px 40px rgba(26, 40, 34, 0.08); + transform: rotate(-4deg); + } + + .contributors-cloud::after { + content: ''; + position: absolute; + top: 0.1rem; + right: 2.4rem; + width: 4.6rem; + height: 1.1rem; + z-index: -1; + border-radius: 0.45rem; + background: + linear-gradient(180deg, rgba(243, 196, 110, 0.6), rgba(243, 196, 110, 0.24)); + box-shadow: 0 8px 16px rgba(243, 196, 110, 0.14); + opacity: 0.72; + transform: rotate(8deg); + } + .avatar-token, .avatar-fallback, .avatar-token img { @@ -663,6 +695,14 @@ const liveWireTypeLabel = { padding-left: 0; } + .contributors-cloud::before { + inset: 0.45rem 0.2rem 0 0; + } + + .contributors-cloud::after { + right: 0.8rem; + } + .avatar-token:nth-child(n) { transform: none; } From 184d5c3ae96a1791a5016ca7669a01fd4792d11d Mon Sep 17 00:00:00 2001 From: Frozen <1884084+xrdavies@users.noreply.github.com> Date: Thu, 9 Apr 2026 20:00:31 +0800 Subject: [PATCH 11/17] fix(home): restyle contributor photo wall --- apps/web/src/pages/index.astro | 67 +++++++++++++++++++++------------- 1 file changed, 41 insertions(+), 26 deletions(-) diff --git a/apps/web/src/pages/index.astro b/apps/web/src/pages/index.astro index aa53805..2b911da 100644 --- a/apps/web/src/pages/index.astro +++ b/apps/web/src/pages/index.astro @@ -499,7 +499,7 @@ const liveWireTypeLabel = { position: relative; overflow: hidden; display: grid; - grid-template-columns: minmax(0, 0.9fr) minmax(24rem, 1.1fr); + grid-template-columns: minmax(0, 0.82fr) minmax(28rem, 1.18fr); gap: 1.4rem; align-items: center; padding: 1.3rem 1.35rem; @@ -554,11 +554,11 @@ const liveWireTypeLabel = { isolation: isolate; z-index: 1; display: grid; - grid-template-columns: repeat(5, minmax(0, 4.45rem)); - gap: 0.55rem 0.8rem; + grid-template-columns: repeat(5, minmax(0, 5.25rem)); + gap: 1rem 1.15rem; align-content: start; justify-content: end; - padding: 0.25rem 0.2rem 0.45rem 1.6rem; + padding: 0.35rem 0.45rem 0.65rem 2rem; } .contributors-cloud::before { @@ -592,31 +592,46 @@ const liveWireTypeLabel = { transform: rotate(8deg); } - .avatar-token, - .avatar-fallback, - .avatar-token img { - width: 4.45rem; - height: 4.45rem; - border-radius: 1.25rem; - } - .avatar-token { + --photo-transform: translate(0, 0) rotate(0deg); position: relative; overflow: hidden; - border: 1px solid rgba(15, 118, 110, 0.12); - background: rgba(255, 255, 255, 0.88); - box-shadow: 0 16px 36px rgba(26, 40, 34, 0.1); + width: 5.25rem; + padding: 0.3rem 0.3rem 0.78rem; + border: 1px solid rgba(15, 118, 110, 0.1); + border-radius: 0.7rem; + background: rgba(255, 255, 255, 0.96); + box-shadow: 0 18px 36px rgba(26, 40, 34, 0.12); + transform: var(--photo-transform); transition: transform 180ms ease, box-shadow 180ms ease, border-color 180ms ease; } - .avatar-token img { + .avatar-token::before { + content: ''; + position: absolute; + top: 0.18rem; + left: 50%; + width: 2.2rem; + height: 0.5rem; + border-radius: 0.3rem; + background: linear-gradient(180deg, rgba(243, 196, 110, 0.55), rgba(243, 196, 110, 0.2)); + box-shadow: 0 6px 12px rgba(243, 196, 110, 0.16); + opacity: 0.76; + transform: translateX(-50%) rotate(-5deg); + } + + .avatar-token img, + .avatar-fallback { display: block; + width: 100%; + aspect-ratio: 1; object-fit: cover; + border-radius: 0.52rem; } .avatar-token:hover, .avatar-token:focus-visible { - transform: translateY(-2px) scale(1.02); + transform: var(--photo-transform) translateY(-0.18rem) scale(1.02); border-color: rgba(15, 118, 110, 0.22); box-shadow: 0 18px 38px rgba(26, 40, 34, 0.14); } @@ -625,38 +640,38 @@ const liveWireTypeLabel = { display: grid; place-items: center; color: white; - font-size: 1.25rem; + font-size: 1.35rem; font-weight: 800; } .avatar-token:nth-child(5n + 1) { - transform: translate(-0.2rem, -0.45rem) rotate(-8deg); + --photo-transform: translate(-0.18rem, -0.22rem) rotate(-6deg); } .avatar-token:nth-child(5n + 2) { - transform: translate(0.25rem, 0.32rem) rotate(5deg); + --photo-transform: translate(0.22rem, 0.18rem) rotate(4deg); } .avatar-token:nth-child(5n + 3) { - transform: translate(-0.15rem, -0.1rem) rotate(9deg); + --photo-transform: translate(-0.08rem, -0.08rem) rotate(6deg); } .avatar-token:nth-child(5n + 4) { - transform: translate(0.28rem, 0.55rem) rotate(-6deg); + --photo-transform: translate(0.18rem, 0.3rem) rotate(-5deg); } .avatar-token:nth-child(5n) { - transform: translate(-0.3rem, 0.12rem) rotate(4deg); + --photo-transform: translate(-0.16rem, 0.08rem) rotate(3deg); } .avatar-token:nth-child(6), .avatar-token:nth-child(11) { - transform: translate(0.6rem, -0.2rem) rotate(-10deg) scale(0.98); + --photo-transform: translate(0.4rem, -0.12rem) rotate(-8deg) scale(0.98); } .avatar-token:nth-child(8), .avatar-token:nth-child(12) { - transform: translate(-0.55rem, 0.45rem) rotate(11deg) scale(1.03); + --photo-transform: translate(-0.34rem, 0.22rem) rotate(8deg) scale(1.02); } @media (max-width: 960px) { @@ -690,7 +705,7 @@ const liveWireTypeLabel = { } .contributors-cloud { - grid-template-columns: repeat(3, minmax(0, 4.2rem)); + grid-template-columns: repeat(3, minmax(0, 5rem)); justify-content: start; padding-left: 0; } From f17e7921fa78b0911d444d9fdbef78571b53d3e1 Mon Sep 17 00:00:00 2001 From: Frozen <1884084+xrdavies@users.noreply.github.com> Date: Thu, 9 Apr 2026 20:28:08 +0800 Subject: [PATCH 12/17] fix(home): align contributor wall layout --- apps/web/src/pages/index.astro | 122 ++++++++++++++++++++++++--------- 1 file changed, 91 insertions(+), 31 deletions(-) diff --git a/apps/web/src/pages/index.astro b/apps/web/src/pages/index.astro index 2b911da..98c4b56 100644 --- a/apps/web/src/pages/index.astro +++ b/apps/web/src/pages/index.astro @@ -553,49 +553,46 @@ const liveWireTypeLabel = { position: relative; isolation: isolate; z-index: 1; - display: grid; - grid-template-columns: repeat(5, minmax(0, 5.25rem)); - gap: 1rem 1.15rem; - align-content: start; - justify-content: end; - padding: 0.35rem 0.45rem 0.65rem 2rem; + min-height: 19rem; + width: min(100%, 35rem); + margin-left: auto; } .contributors-cloud::before { content: ''; position: absolute; - inset: 0.55rem 0 0.15rem 1rem; + inset: 0.35rem 0.25rem 0.2rem; z-index: -2; - border: 1px dashed rgba(15, 118, 110, 0.14); - border-radius: 1.5rem; + border: 1px solid rgba(15, 118, 110, 0.1); + border-radius: 1.35rem; background: - linear-gradient(180deg, rgba(255, 255, 255, 0.78), rgba(247, 252, 250, 0.46)), - radial-gradient(circle at 1px 1px, rgba(15, 118, 110, 0.08) 1.1px, transparent 0); - background-size: auto, 16px 16px; - box-shadow: 0 18px 40px rgba(26, 40, 34, 0.08); - transform: rotate(-4deg); + linear-gradient(180deg, rgba(255, 255, 255, 0.86), rgba(247, 252, 250, 0.56)), + radial-gradient(circle at 1px 1px, rgba(15, 118, 110, 0.06) 1px, transparent 0); + background-size: auto, 18px 18px; + box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.68), 0 18px 40px rgba(26, 40, 34, 0.08); } .contributors-cloud::after { content: ''; position: absolute; - top: 0.1rem; - right: 2.4rem; - width: 4.6rem; - height: 1.1rem; + top: 1rem; + left: 50%; + width: 5.2rem; + height: 1.15rem; z-index: -1; border-radius: 0.45rem; background: linear-gradient(180deg, rgba(243, 196, 110, 0.6), rgba(243, 196, 110, 0.24)); box-shadow: 0 8px 16px rgba(243, 196, 110, 0.14); opacity: 0.72; - transform: rotate(8deg); + transform: translateX(-50%) rotate(-2deg); } .avatar-token { --photo-transform: translate(0, 0) rotate(0deg); position: relative; overflow: hidden; + position: absolute; width: 5.25rem; padding: 0.3rem 0.3rem 0.78rem; border: 1px solid rgba(15, 118, 110, 0.1); @@ -645,33 +642,87 @@ const liveWireTypeLabel = { } .avatar-token:nth-child(5n + 1) { - --photo-transform: translate(-0.18rem, -0.22rem) rotate(-6deg); + --photo-transform: rotate(-6deg); } .avatar-token:nth-child(5n + 2) { - --photo-transform: translate(0.22rem, 0.18rem) rotate(4deg); + --photo-transform: rotate(4deg); } .avatar-token:nth-child(5n + 3) { - --photo-transform: translate(-0.08rem, -0.08rem) rotate(6deg); + --photo-transform: rotate(6deg); } .avatar-token:nth-child(5n + 4) { - --photo-transform: translate(0.18rem, 0.3rem) rotate(-5deg); + --photo-transform: rotate(-5deg); } .avatar-token:nth-child(5n) { - --photo-transform: translate(-0.16rem, 0.08rem) rotate(3deg); + --photo-transform: rotate(3deg); + } + + .avatar-token:nth-child(1) { + top: 1.2rem; + left: 1.2rem; + } + + .avatar-token:nth-child(2) { + top: 1rem; + left: 7.2rem; + } + + .avatar-token:nth-child(3) { + top: 0.95rem; + left: 13.3rem; + } + + .avatar-token:nth-child(4) { + top: 1.1rem; + left: 19.4rem; + } + + .avatar-token:nth-child(5) { + top: 1.35rem; + left: 25.5rem; + } + + .avatar-token:nth-child(6) { + top: 7rem; + left: 2rem; + --photo-transform: rotate(-8deg) scale(0.98); + } + + .avatar-token:nth-child(7) { + top: 6.95rem; + left: 8.6rem; + } + + .avatar-token:nth-child(8) { + top: 6.65rem; + left: 15rem; + --photo-transform: rotate(8deg) scale(1.02); + } + + .avatar-token:nth-child(9) { + top: 7.15rem; + left: 21.15rem; + } + + .avatar-token:nth-child(10) { + top: 7rem; + left: 27.25rem; } - .avatar-token:nth-child(6), .avatar-token:nth-child(11) { - --photo-transform: translate(0.4rem, -0.12rem) rotate(-8deg) scale(0.98); + top: 12.65rem; + left: 6.1rem; + --photo-transform: rotate(-7deg) scale(0.98); } - .avatar-token:nth-child(8), .avatar-token:nth-child(12) { - --photo-transform: translate(-0.34rem, 0.22rem) rotate(8deg) scale(1.02); + top: 12.45rem; + left: 16.25rem; + --photo-transform: rotate(7deg) scale(1.02); } @media (max-width: 960px) { @@ -705,20 +756,29 @@ const liveWireTypeLabel = { } .contributors-cloud { + display: grid; grid-template-columns: repeat(3, minmax(0, 5rem)); + gap: 0.85rem; + min-height: auto; + width: 100%; justify-content: start; - padding-left: 0; + margin-left: 0; + padding-top: 0.95rem; } .contributors-cloud::before { - inset: 0.45rem 0.2rem 0 0; + inset: 0.3rem 0 0; } .contributors-cloud::after { - right: 0.8rem; + top: 0.65rem; } .avatar-token:nth-child(n) { + position: relative; + top: auto; + left: auto; + width: 5rem; transform: none; } } From 5b6ffb48b0c0d9224052c6f71a9f491c68f99169 Mon Sep 17 00:00:00 2001 From: Frozen <1884084+xrdavies@users.noreply.github.com> Date: Thu, 9 Apr 2026 20:31:06 +0800 Subject: [PATCH 13/17] fix(home): add hierarchy to contributor wall --- apps/web/src/pages/index.astro | 32 +++++++++++++++++++------------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/apps/web/src/pages/index.astro b/apps/web/src/pages/index.astro index 98c4b56..af8b70e 100644 --- a/apps/web/src/pages/index.astro +++ b/apps/web/src/pages/index.astro @@ -590,10 +590,11 @@ const liveWireTypeLabel = { .avatar-token { --photo-transform: translate(0, 0) rotate(0deg); + --photo-width: 5.25rem; position: relative; overflow: hidden; position: absolute; - width: 5.25rem; + width: var(--photo-width); padding: 0.3rem 0.3rem 0.78rem; border: 1px solid rgba(15, 118, 110, 0.1); border-radius: 0.7rem; @@ -608,7 +609,7 @@ const liveWireTypeLabel = { position: absolute; top: 0.18rem; left: 50%; - width: 2.2rem; + width: 42%; height: 0.5rem; border-radius: 0.3rem; background: linear-gradient(180deg, rgba(243, 196, 110, 0.55), rgba(243, 196, 110, 0.2)); @@ -662,28 +663,30 @@ const liveWireTypeLabel = { } .avatar-token:nth-child(1) { - top: 1.2rem; - left: 1.2rem; + --photo-width: 6rem; + top: 0.95rem; + left: 0.85rem; + box-shadow: 0 20px 42px rgba(26, 40, 34, 0.14); } .avatar-token:nth-child(2) { top: 1rem; - left: 7.2rem; + left: 7.85rem; } .avatar-token:nth-child(3) { top: 0.95rem; - left: 13.3rem; + left: 14.05rem; } .avatar-token:nth-child(4) { top: 1.1rem; - left: 19.4rem; + left: 20.2rem; } .avatar-token:nth-child(5) { top: 1.35rem; - left: 25.5rem; + left: 26.25rem; } .avatar-token:nth-child(6) { @@ -698,19 +701,21 @@ const liveWireTypeLabel = { } .avatar-token:nth-child(8) { - top: 6.65rem; - left: 15rem; - --photo-transform: rotate(8deg) scale(1.02); + --photo-width: 5.8rem; + top: 6.35rem; + left: 14.55rem; + --photo-transform: rotate(8deg) scale(1.01); + box-shadow: 0 20px 42px rgba(26, 40, 34, 0.14); } .avatar-token:nth-child(9) { top: 7.15rem; - left: 21.15rem; + left: 21.65rem; } .avatar-token:nth-child(10) { top: 7rem; - left: 27.25rem; + left: 27.85rem; } .avatar-token:nth-child(11) { @@ -778,6 +783,7 @@ const liveWireTypeLabel = { position: relative; top: auto; left: auto; + --photo-width: 5rem; width: 5rem; transform: none; } From 1400e339d22c42fa6bb7dd71eca30290ecea1f7e Mon Sep 17 00:00:00 2001 From: Frozen <1884084+xrdavies@users.noreply.github.com> Date: Thu, 9 Apr 2026 20:38:17 +0800 Subject: [PATCH 14/17] fix(home): expand contributor wall coverage --- apps/web/src/pages/index.astro | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/apps/web/src/pages/index.astro b/apps/web/src/pages/index.astro index af8b70e..91441aa 100644 --- a/apps/web/src/pages/index.astro +++ b/apps/web/src/pages/index.astro @@ -14,7 +14,7 @@ const contributorMap = new Map( contributorGroups.flatMap((group) => group.contributors.map((contributor) => [contributor.slug, contributor] as const)), ); const contributors = [...contributorMap.values()]; -const contributorPreviewLimit = 12; +const contributorPreviewLimit = 14; const contributorPreview = contributors.slice(0, contributorPreviewLimit); const liveWire = feed.dynamicFeed.slice(0, 6); const recentGeekDaily = feed.recentGeekDaily.slice(0, 3); @@ -553,7 +553,7 @@ const liveWireTypeLabel = { position: relative; isolation: isolate; z-index: 1; - min-height: 19rem; + min-height: 19.5rem; width: min(100%, 35rem); margin-left: auto; } @@ -730,6 +730,19 @@ const liveWireTypeLabel = { --photo-transform: rotate(7deg) scale(1.02); } + .avatar-token:nth-child(13) { + --photo-width: 5.45rem; + top: 12.35rem; + left: 23.2rem; + --photo-transform: rotate(-4deg); + } + + .avatar-token:nth-child(14) { + top: 12.7rem; + left: 29.05rem; + --photo-transform: rotate(5deg) scale(0.98); + } + @media (max-width: 960px) { .hero-highlights, .dispatch-grid, From ecccead9cd15b26f7b0550a798765b1812a9eac1 Mon Sep 17 00:00:00 2001 From: Frozen <1884084+xrdavies@users.noreply.github.com> Date: Thu, 9 Apr 2026 20:55:35 +0800 Subject: [PATCH 15/17] fix(home): remove contributor wall overlaps --- apps/web/src/pages/index.astro | 122 +++++++++------------------------ 1 file changed, 33 insertions(+), 89 deletions(-) diff --git a/apps/web/src/pages/index.astro b/apps/web/src/pages/index.astro index 91441aa..e3db397 100644 --- a/apps/web/src/pages/index.astro +++ b/apps/web/src/pages/index.astro @@ -553,15 +553,20 @@ const liveWireTypeLabel = { position: relative; isolation: isolate; z-index: 1; - min-height: 19.5rem; - width: min(100%, 35rem); + display: grid; + grid-template-columns: repeat(5, minmax(0, 5.2rem)); + gap: 1.15rem 0.95rem; + align-items: start; + justify-content: end; + width: min(100%, 34rem); margin-left: auto; + padding: 1.25rem 0.9rem 1.15rem 1rem; } .contributors-cloud::before { content: ''; position: absolute; - inset: 0.35rem 0.25rem 0.2rem; + inset: 0.3rem 0.2rem 0.15rem; z-index: -2; border: 1px solid rgba(15, 118, 110, 0.1); border-radius: 1.35rem; @@ -589,18 +594,14 @@ const liveWireTypeLabel = { } .avatar-token { - --photo-transform: translate(0, 0) rotate(0deg); - --photo-width: 5.25rem; position: relative; - overflow: hidden; - position: absolute; - width: var(--photo-width); + justify-self: center; + width: 5.05rem; padding: 0.3rem 0.3rem 0.78rem; border: 1px solid rgba(15, 118, 110, 0.1); border-radius: 0.7rem; background: rgba(255, 255, 255, 0.96); box-shadow: 0 18px 36px rgba(26, 40, 34, 0.12); - transform: var(--photo-transform); transition: transform 180ms ease, box-shadow 180ms ease, border-color 180ms ease; } @@ -629,7 +630,7 @@ const liveWireTypeLabel = { .avatar-token:hover, .avatar-token:focus-visible { - transform: var(--photo-transform) translateY(-0.18rem) scale(1.02); + transform: translateY(-0.18rem) scale(1.02); border-color: rgba(15, 118, 110, 0.22); box-shadow: 0 18px 38px rgba(26, 40, 34, 0.14); } @@ -643,104 +644,51 @@ const liveWireTypeLabel = { } .avatar-token:nth-child(5n + 1) { - --photo-transform: rotate(-6deg); + transform: rotate(-5deg); + justify-self: start; } .avatar-token:nth-child(5n + 2) { - --photo-transform: rotate(4deg); + transform: rotate(4deg); } .avatar-token:nth-child(5n + 3) { - --photo-transform: rotate(6deg); + transform: rotate(6deg); + margin-top: 0.15rem; } .avatar-token:nth-child(5n + 4) { - --photo-transform: rotate(-5deg); + transform: rotate(-4deg); } .avatar-token:nth-child(5n) { - --photo-transform: rotate(3deg); - } - - .avatar-token:nth-child(1) { - --photo-width: 6rem; - top: 0.95rem; - left: 0.85rem; - box-shadow: 0 20px 42px rgba(26, 40, 34, 0.14); - } - - .avatar-token:nth-child(2) { - top: 1rem; - left: 7.85rem; - } - - .avatar-token:nth-child(3) { - top: 0.95rem; - left: 14.05rem; - } - - .avatar-token:nth-child(4) { - top: 1.1rem; - left: 20.2rem; - } - - .avatar-token:nth-child(5) { - top: 1.35rem; - left: 26.25rem; - } - - .avatar-token:nth-child(6) { - top: 7rem; - left: 2rem; - --photo-transform: rotate(-8deg) scale(0.98); - } - - .avatar-token:nth-child(7) { - top: 6.95rem; - left: 8.6rem; - } - - .avatar-token:nth-child(8) { - --photo-width: 5.8rem; - top: 6.35rem; - left: 14.55rem; - --photo-transform: rotate(8deg) scale(1.01); - box-shadow: 0 20px 42px rgba(26, 40, 34, 0.14); + transform: rotate(3deg); + justify-self: end; + margin-top: 0.25rem; } + .avatar-token:nth-child(6), .avatar-token:nth-child(9) { - top: 7.15rem; - left: 21.65rem; + margin-top: 0.45rem; } + .avatar-token:nth-child(7), .avatar-token:nth-child(10) { - top: 7rem; - left: 27.85rem; + margin-top: 0.3rem; } - .avatar-token:nth-child(11) { - top: 12.65rem; - left: 6.1rem; - --photo-transform: rotate(-7deg) scale(0.98); - } - - .avatar-token:nth-child(12) { - top: 12.45rem; - left: 16.25rem; - --photo-transform: rotate(7deg) scale(1.02); + .avatar-token:nth-child(8) { + margin-top: 0.1rem; } + .avatar-token:nth-child(11), .avatar-token:nth-child(13) { - --photo-width: 5.45rem; - top: 12.35rem; - left: 23.2rem; - --photo-transform: rotate(-4deg); + margin-top: 0.2rem; } + .avatar-token:nth-child(12), .avatar-token:nth-child(14) { - top: 12.7rem; - left: 29.05rem; - --photo-transform: rotate(5deg) scale(0.98); + margin-top: 0.05rem; } @media (max-width: 960px) { @@ -774,14 +722,12 @@ const liveWireTypeLabel = { } .contributors-cloud { - display: grid; grid-template-columns: repeat(3, minmax(0, 5rem)); gap: 0.85rem; - min-height: auto; width: 100%; justify-content: start; margin-left: 0; - padding-top: 0.95rem; + padding: 1rem 0 0.85rem; } .contributors-cloud::before { @@ -793,12 +739,10 @@ const liveWireTypeLabel = { } .avatar-token:nth-child(n) { - position: relative; - top: auto; - left: auto; - --photo-width: 5rem; width: 5rem; transform: none; + margin-top: 0; + justify-self: start; } } From 644f257a0b3e599444d416ea31f6e398c4373689 Mon Sep 17 00:00:00 2001 From: Frozen <1884084+xrdavies@users.noreply.github.com> Date: Thu, 9 Apr 2026 21:09:26 +0800 Subject: [PATCH 16/17] fix(home): reduce contributor wall density --- apps/web/src/pages/index.astro | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/apps/web/src/pages/index.astro b/apps/web/src/pages/index.astro index e3db397..757676e 100644 --- a/apps/web/src/pages/index.astro +++ b/apps/web/src/pages/index.astro @@ -14,7 +14,7 @@ const contributorMap = new Map( contributorGroups.flatMap((group) => group.contributors.map((contributor) => [contributor.slug, contributor] as const)), ); const contributors = [...contributorMap.values()]; -const contributorPreviewLimit = 14; +const contributorPreviewLimit = 10; const contributorPreview = contributors.slice(0, contributorPreviewLimit); const liveWire = feed.dynamicFeed.slice(0, 6); const recentGeekDaily = feed.recentGeekDaily.slice(0, 3); @@ -558,9 +558,9 @@ const liveWireTypeLabel = { gap: 1.15rem 0.95rem; align-items: start; justify-content: end; - width: min(100%, 34rem); + width: min(100%, 33rem); margin-left: auto; - padding: 1.25rem 0.9rem 1.15rem 1rem; + padding: 1.15rem 0.75rem 0.95rem 0.9rem; } .contributors-cloud::before { @@ -681,16 +681,6 @@ const liveWireTypeLabel = { margin-top: 0.1rem; } - .avatar-token:nth-child(11), - .avatar-token:nth-child(13) { - margin-top: 0.2rem; - } - - .avatar-token:nth-child(12), - .avatar-token:nth-child(14) { - margin-top: 0.05rem; - } - @media (max-width: 960px) { .hero-highlights, .dispatch-grid, From f836d3a59d7cbc424d3d259d00f0ddfbd4bdb854 Mon Sep 17 00:00:00 2001 From: Frozen <1884084+xrdavies@users.noreply.github.com> Date: Thu, 9 Apr 2026 21:26:20 +0800 Subject: [PATCH 17/17] feat(home): randomize contributor previews --- apps/api/src/lib/contributors.ts | 29 ++++++++++++++++++++++++++++- apps/api/src/routes/public.ts | 6 ++++-- apps/web/src/lib/content.ts | 9 +++++++++ apps/web/src/pages/index.astro | 10 +++------- 4 files changed, 44 insertions(+), 10 deletions(-) diff --git a/apps/api/src/lib/contributors.ts b/apps/api/src/lib/contributors.ts index e57a19d..2ab5082 100644 --- a/apps/api/src/lib/contributors.ts +++ b/apps/api/src/lib/contributors.ts @@ -1,4 +1,4 @@ -import { asc, count, desc, eq, inArray } from 'drizzle-orm'; +import { asc, count, desc, eq, inArray, sql } from 'drizzle-orm'; import { contributorRoleBindings, contributorRoles, contributors } from '@rebase/db'; import type { @@ -341,3 +341,30 @@ export const listPublicContributorGroups = async () => { contributors: contributorsByRole.get(role.id) ?? [], })); }; + +export const listRandomPublicContributors = async (limit = 10) => { + const db = getDb(); + const contributorRows = + limit > 0 + ? await db + .select({ + slug: contributors.slug, + name: contributors.name, + avatarAssetId: contributors.avatarAssetId, + avatarSeed: contributors.avatarSeed, + }) + .from(contributors) + .where(eq(contributors.status, 'published')) + .orderBy(sql`random()`) + .limit(limit) + : []; + + const avatarUrls = await listPublicAssetUrlsById(contributorRows.map((contributor) => contributor.avatarAssetId)); + + return contributorRows.map((contributor) => ({ + slug: contributor.slug, + name: contributor.name, + avatarUrl: contributor.avatarAssetId ? avatarUrls.get(contributor.avatarAssetId) : undefined, + avatarSeed: contributor.avatarSeed, + })); +}; diff --git a/apps/api/src/routes/public.ts b/apps/api/src/routes/public.ts index aa2d992..e46a784 100644 --- a/apps/api/src/routes/public.ts +++ b/apps/api/src/routes/public.ts @@ -2,7 +2,7 @@ import { Hono } from 'hono'; import { ok } from '../lib/http.js'; import { getPublicArticleBySlug, listPublicArticles } from '../lib/articles.js'; -import { listPublicContributorGroups } from '../lib/contributors.js'; +import { listPublicContributorGroups, listRandomPublicContributors } from '../lib/contributors.js'; import { getPublicEventBySlug, listPublicEvents } from '../lib/events.js'; import { getGeekDailySearchDocuments, @@ -34,13 +34,14 @@ publicRoutes.get('/site-config', async (c) => c.json(ok(await getPublicSiteConfi publicRoutes.get('/about', async (c) => c.json(ok(await getPublicAboutPage()))); publicRoutes.get('/home', async (c) => { - const [site, about, articles, jobs, events, geekdaily] = await Promise.all([ + const [site, about, articles, jobs, events, geekdaily, featuredContributors] = await Promise.all([ getPublicSiteConfig(), getPublicAboutPage(), listPublicArticles(), listPublicJobs(), listPublicEvents(), listPublicGeekDailyEpisodes(3), + listRandomPublicContributors(10), ]); const recentArticles = sortByPublishedAtDesc(articles).slice(0, 3); @@ -90,6 +91,7 @@ publicRoutes.get('/home', async (c) => { recentJobs, upcomingEvents, recentGeekDaily: geekdaily, + featuredContributors, dynamicFeed, }), ); diff --git a/apps/web/src/lib/content.ts b/apps/web/src/lib/content.ts index fe99e69..e5d0664 100644 --- a/apps/web/src/lib/content.ts +++ b/apps/web/src/lib/content.ts @@ -38,6 +38,13 @@ interface ContributorGroupPayload { contributors: Contributor[]; } +interface HomeContributorPreviewPayload { + slug: string; + name: string; + avatarUrl?: string; + avatarSeed: string; +} + interface PublicGeekDailyItemPayload { title: string; authorName: string; @@ -67,6 +74,7 @@ interface HomeFeedPayload { recentJobs: Job[]; upcomingEvents: Event[]; recentGeekDaily: PublicGeekDailyEpisodePayload[]; + featuredContributors: HomeContributorPreviewPayload[]; dynamicFeed: Array<{ type: 'article' | 'job' | 'event' | 'geekdaily'; title: string; @@ -245,6 +253,7 @@ export async function getHomeFeed() { latestEvents: payload.upcomingEvents, latestGeekDaily: payload.latestGeekDaily ? mapGeekDailyEpisode(payload.latestGeekDaily) : undefined, recentGeekDaily: payload.recentGeekDaily.map(mapGeekDailyEpisode), + featuredContributors: payload.featuredContributors, dynamicFeed: payload.dynamicFeed.map((item) => { if (item.type !== 'event' || !item.publishedAt || !item.href.startsWith('/events/')) { return item; diff --git a/apps/web/src/pages/index.astro b/apps/web/src/pages/index.astro index 757676e..3b2e0ef 100644 --- a/apps/web/src/pages/index.astro +++ b/apps/web/src/pages/index.astro @@ -6,16 +6,12 @@ import JobCard from '@/components/JobCard.astro'; import SectionHeader from '@/components/SectionHeader.astro'; import BaseLayout from '@/layouts/BaseLayout.astro'; import { createAvatarData } from '@/lib/avatar'; -import { getContributorsByRole, getHomeFeed, getSiteSettings } from '@/lib/content'; +import { getHomeFeed, getSiteSettings } from '@/lib/content'; import { formatDate } from '@/lib/dates'; -const [site, feed, contributorGroups] = await Promise.all([getSiteSettings(), getHomeFeed(), getContributorsByRole()]); -const contributorMap = new Map( - contributorGroups.flatMap((group) => group.contributors.map((contributor) => [contributor.slug, contributor] as const)), -); -const contributors = [...contributorMap.values()]; +const [site, feed] = await Promise.all([getSiteSettings(), getHomeFeed()]); const contributorPreviewLimit = 10; -const contributorPreview = contributors.slice(0, contributorPreviewLimit); +const contributorPreview = feed.featuredContributors.slice(0, contributorPreviewLimit); const liveWire = feed.dynamicFeed.slice(0, 6); const recentGeekDaily = feed.recentGeekDaily.slice(0, 3); const frontPageHighlights = liveWire.slice(0, 3);