Skip to content

Integrate dashboard, extension, and ingestion#10

Merged
benkoppe merged 47 commits into
mainfrom
integration/all-prs
Apr 27, 2026
Merged

Integrate dashboard, extension, and ingestion#10
benkoppe merged 47 commits into
mainfrom
integration/all-prs

Conversation

@benkoppe

@benkoppe benkoppe commented Apr 27, 2026

Copy link
Copy Markdown
Contributor

Summary

  • Merge the dashboard and extension feature branches.
  • Port the listserv ingestion/admin work into the monorepo layout.
  • Reconcile schema, package, and build conflicts.

Checks

  • bun run type-check
  • bun run lint
  • bun run format:check
  • bun run build
  • bun run build:extension

anchen9 and others added 30 commits April 16, 2026 18:09
Remove broken feed Toggle, move SearchBar into feed header, swap
hardcoded Landing hex for secondary-500 token, add Manrope to font
link. Wire RoutedHome with client-side sample posts / side panels
(Convex schema has no post table yet). New playwright helper for
/home screenshots.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Brings in DS component polish (Avatar, Button, Cards, DateBadge, Logo,
SearchBar/Panel, SideBar, Tags, Toggle), new components (Bookmark,
Dropdown, OrgHoverCard), token updates, shared fallbackColors util,
prettier config, and README/CI tweaks.

Conflict resolutions:
- Kept HEAD monorepo layout: all DS code lives under shared/ui,
  apps/dashboard imports via @app/ui barrel.
- Moved annie's root src/components/* + src/utils/* under shared/ui/src/.
- Dropped stray pre-monorepo root files (src/App.tsx, src/main.tsx,
  vite.config.ts) — replaced long ago by apps/dashboard equivalents.
- Rewrote DesignSystem.tsx imports to use @app/ui and @app/ui/assets/*
  subpath; added ./assets/* to shared/ui package exports.
- Extended shared/ui/src/index.ts to re-export Bookmark, Dropdown,
  OrgHoverCard.
- Added lucide-react as peer dep (shared/ui) and dep (apps/dashboard) —
  multiple DS components rely on it.
- Root package.json keeps workspace-dispatch scripts; added prettier
  format / format:check scripts + dev deps.
- Kept Manrope font link addition from previous commit.
- Dropped annie's committed .env (contained a rotated Gemini API key —
  pre-existing leak on source branch, addressed separately). Added
  .env / .env.local to .gitignore.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
It's now way better
benkoppe and others added 9 commits April 27, 2026 13:47
…egration/all-prs

# Conflicts:
#	.gitignore
#	apps/dashboard/eslint.config.js
#	apps/dashboard/src/index.css
#	bun.lock
#	package.json
#	shared/ui/src/assets/profile-avatar.svg
#	shared/ui/src/index.ts
…/all-prs

# Conflicts:
#	apps/dashboard/convex/_shared/adminToken.ts
#	apps/dashboard/convex/crons.ts
#	apps/dashboard/convex/gmailConnection.ts
#	apps/dashboard/convex/gmailOAuth.ts
#	apps/dashboard/convex/ingestion.ts
#	apps/dashboard/convex/listservAdmin.ts
#	apps/dashboard/convex/parser.ts
#	apps/dashboard/convex/sourceAdmin.ts
#	apps/dashboard/eslint.config.js
#	apps/dashboard/src/pages/Admin.tsx
#	src/App.tsx
@benkoppe benkoppe changed the title Integrate Loop feature branches Integrate dashboard, extension, and ingestion Apr 27, 2026
@benkoppe benkoppe merged commit 7b023ff into main Apr 27, 2026
2 checks passed
@benkoppe benkoppe deleted the integration/all-prs branch April 27, 2026 21:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants