Skip to content

feat: add session restore, admin dashboard, and innovision components… - #39

Merged
Krish-2118 merged 1 commit into
OpencodeNIT-R:mainfrom
Tiyas04:main
Oct 13, 2026
Merged

Krish-2118 merged 1 commit into
OpencodeNIT-R:mainfrom
Tiyas04:main

Conversation

@Tiyas04

@Tiyas04 Tiyas04 commented Oct 13, 2026

Copy link
Copy Markdown
Contributor

… with Supabase integration

@vercel

vercel Bot commented Oct 13, 2026

Copy link
Copy Markdown
Contributor

@Tiyas04 is attempting to deploy a commit to the OpenCode NITR's projects Team on Vercel.

A member of the Team first needs to authorize it.

@Krish-2118
Krish-2118 merged commit cd79350 into OpencodeNIT-R:main Oct 13, 2026
1 of 2 checks passed
Krish-2118 added a commit to Krish-2118/project-spacex that referenced this pull request Oct 20, 2026
Bring in upstream development (PRs OpencodeNIT-R#39-OpencodeNIT-R#45): the /merch2 orbit store,
Curtain updates, footer credits, the session route no longer returning
tokens in its JSON body (the client reads the auth cookies instead),
Supabase/ImageKit guards for builds without credentials, and
`next build --webpack`.

Fix what the upstream merge left broken or what clashed with main:
- layout.tsx: development had two <html> roots after a bad conflict
  resolution; keep one with suppressHydrationWarning and <Analytics />
- imagekit.ts: development had two getImageKit() definitions (the first
  unclosed); keep the one that throws a clear error on missing config
- data.ts: restore PRODUCTS, Product and inr, which useMerchV.ts
  (/merch2) imports; the /merch store itself uses src/config/merch.ts
- move ALLOWED_EVENT_CATEGORIES and AllowedEventCategory to
  src/lib/events.ts: development un-exported them from the admin events
  route (route files may only export handlers), which broke the import
  in /api/admin/events/order

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
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.

2 participants