Upgrade - #32
Merged
Merged
Conversation
* init * clean user nav * alignment * format * fix(deps): bump better-auth --------- Co-authored-by: James Waugh <multidaomensional@gmail.com>
- Resolve requireRole global-vs-org-scoped concern: requireOrganization sets context.user.role from org membership
- Add requireRole("client") to 001-01 gate migration table
- Fix 003-04 report gate to include "client" role with auto-scoping
- Fix resolveClientId middleware: no UUID fallback, descriptive errors
- Document NEAR account identity chain (primaryAccountId → walletAddress / nearAccountId / nearAccount)
- Clarify isOperator convenience mapping (orgRole check, rename follow-up)
- Add explicit 001-01 dependency to Epic 003 003-02 ticket
- Remove .docs from gitignore
…AuthMiddleware from lib/auth.ts
…rns both networks
feat: consolidate admin UX shell and fix project/NEARN operator flows
Co-authored-by: Elliot Braem <elliot@ejlbraem.com>
Merge v1's 47 commits into main. Both branches independently converged on the same structural improvements (absorbed admin sections, inlined icons, hardcoded brand, API method renames, .env cleanup). The only true divergence was the network state pattern: - v1 used a cookie-based network.ts (getNetwork/setNetwork via document.cookie) - main used authClient.near.getNetwork() threaded through every query function Resolution: accept v1's decoupled architecture (no authClient param on query options) but replace network.ts internals to delegate to authClient.near instead of cookies. A setAuthClient() singleton is wired in __root.tsx beforeLoad, giving network.ts access to the auth client without coupling query functions to it. Also fixes auto-merged migration files: main renamed 0000_initial.sql to 0000_tired_butterfly.sql (with dao_account_id already in settings), while v1 kept 0000_initial.sql (without it) + added 0001_glossy_boom_boom.sql. Restored v1's migration pair to avoid the duplicate-column error.
…pace rename PR #22 — Epic 002 Admin UX Consolidation: - Extracted admin sections from public pages into dedicated admin route shell (/admin/applications, /admin/billings, /admin/budgets, /admin/contributors, /admin/projects) — team.tsx (-571), work.tsx (-788), treasury.tsx (-1156) - New admin components: applications-section, assignments-section, billings-section, budgets-manager, contributors-section, internal-listing-form, members-section, project-form, projects-section - Admin sidebar nav + section state components - Internal listing lifecycle (draft→published→winners→archived) - NEARN linking UUID fix + 0002 migration for external_uuid - use-budget-actions hook, listing-lifecycle lib, near-account validator - DataTable upgrades: sort, search, column visibility, CSV export - Docs + Mermaid rendering, 4 new doc pages PR #23 — Org → Workspace rename - Renamed org terminology to workspace throughout - CI cache/badge documentation Also fixes duplicate formatNearnReward/NearnRewardShape block from merge.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.