fix: standardize SpaceSwitcher to use subdomain URLs
Space links now go to <space>.<app-domain> (e.g., myspace.rswag.online) instead of rspace.online/<space>. Matches the standard rApp header pattern used across all rStack apps. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
parent
9b85041226
commit
f4f1e140a9
|
|
@ -59,7 +59,7 @@ export default async function RootLayout({
|
|||
</head>
|
||||
<body className={GeistSans.className}>
|
||||
<div className="min-h-screen flex flex-col">
|
||||
<HeaderBar name={name} logoUrl={logoUrl ?? null} spaceId={spaceId} />
|
||||
<HeaderBar name={name} logoUrl={logoUrl ?? null} />
|
||||
|
||||
{/* ── Main Content ────────────────────────────────── */}
|
||||
<main className="flex-1">{children}</main>
|
||||
|
|
|
|||
|
|
@ -8,22 +8,19 @@ import { AuthButton } from '@/components/AuthButton';
|
|||
interface HeaderBarProps {
|
||||
name: string;
|
||||
logoUrl: string | null;
|
||||
spaceId?: string;
|
||||
}
|
||||
|
||||
export function HeaderBar({ name, logoUrl, spaceId = 'default' }: HeaderBarProps) {
|
||||
export function HeaderBar({ name, logoUrl }: HeaderBarProps) {
|
||||
return (
|
||||
<header className="border-b sticky top-0 z-50 bg-background/90 backdrop-blur-sm">
|
||||
<header className="border-b border-slate-800 sticky top-0 z-50 bg-background/90 backdrop-blur-sm">
|
||||
<div className="max-w-6xl mx-auto px-4 py-2.5 flex items-center justify-between gap-3">
|
||||
{/* Left: App switcher + Space switcher + Logo */}
|
||||
<div className="flex items-center gap-2">
|
||||
<div className="flex items-center gap-1 min-w-0">
|
||||
<AppSwitcher current="swag" />
|
||||
<div className="w-px h-5 bg-white/10 hidden sm:block" />
|
||||
<SpaceSwitcher currentSpaceId={spaceId} />
|
||||
<div className="w-px h-5 bg-white/10 hidden sm:block" />
|
||||
<SpaceSwitcher />
|
||||
<Link
|
||||
href="/"
|
||||
className="flex items-center gap-2 font-bold text-lg"
|
||||
className="flex items-center gap-2 font-bold text-lg ml-1"
|
||||
>
|
||||
{logoUrl ? (
|
||||
<img src={logoUrl} alt="" className="h-7 w-7 rounded" />
|
||||
|
|
|
|||
|
|
@ -2,27 +2,30 @@
|
|||
|
||||
import { useState, useRef, useEffect } from 'react';
|
||||
|
||||
const API_URL = process.env.NEXT_PUBLIC_API_URL || 'http://localhost:8000/api';
|
||||
|
||||
interface SpaceInfo {
|
||||
id: string;
|
||||
slug: string;
|
||||
name: string;
|
||||
tagline: string;
|
||||
description: string;
|
||||
domain: string;
|
||||
logo_url: string | null;
|
||||
icon?: string;
|
||||
role?: string;
|
||||
}
|
||||
|
||||
interface SpaceSwitcherProps {
|
||||
currentSpaceId?: string;
|
||||
/** Current app domain, e.g. 'rswag.online'. Space links become <space>.<domain> */
|
||||
domain?: string;
|
||||
}
|
||||
|
||||
export function SpaceSwitcher({ currentSpaceId = 'default' }: SpaceSwitcherProps) {
|
||||
export function SpaceSwitcher({ domain }: SpaceSwitcherProps) {
|
||||
const [open, setOpen] = useState(false);
|
||||
const [spaces, setSpaces] = useState<SpaceInfo[]>([]);
|
||||
const [loaded, setLoaded] = useState(false);
|
||||
const [isAuthenticated, setIsAuthenticated] = useState(false);
|
||||
const ref = useRef<HTMLDivElement>(null);
|
||||
|
||||
// Click-outside to close
|
||||
// Derive domain from window.location if not provided
|
||||
const appDomain = domain || (typeof window !== 'undefined'
|
||||
? window.location.hostname.split('.').slice(-2).join('.')
|
||||
: 'rspace.online');
|
||||
|
||||
useEffect(() => {
|
||||
function handleClick(e: MouseEvent) {
|
||||
if (ref.current && !ref.current.contains(e.target as Node)) {
|
||||
|
|
@ -33,105 +36,128 @@ export function SpaceSwitcher({ currentSpaceId = 'default' }: SpaceSwitcherProps
|
|||
return () => document.removeEventListener('click', handleClick);
|
||||
}, []);
|
||||
|
||||
// Fetch available spaces
|
||||
// Check auth status on mount
|
||||
useEffect(() => {
|
||||
fetch(`${API_URL}/spaces`)
|
||||
.then((r) => (r.ok ? r.json() : []))
|
||||
.then((data: SpaceInfo[]) => setSpaces(data))
|
||||
fetch('/api/me')
|
||||
.then((r) => r.json())
|
||||
.then((data) => {
|
||||
if (data.authenticated) setIsAuthenticated(true);
|
||||
})
|
||||
.catch(() => {});
|
||||
}, []);
|
||||
|
||||
const currentSpace = spaces.find((s) => s.id === currentSpaceId) || {
|
||||
id: 'default',
|
||||
name: 'rSwag',
|
||||
tagline: 'Community Merch',
|
||||
domain: 'rswag.online',
|
||||
logo_url: null,
|
||||
const loadSpaces = async () => {
|
||||
if (loaded) return;
|
||||
try {
|
||||
const res = await fetch('/api/spaces');
|
||||
if (res.ok) {
|
||||
const data = await res.json();
|
||||
setSpaces(data.spaces || []);
|
||||
}
|
||||
} catch {
|
||||
// API not available
|
||||
}
|
||||
setLoaded(true);
|
||||
};
|
||||
|
||||
function switchSpace(spaceId: string) {
|
||||
// Set cookie and reload to apply space theme
|
||||
document.cookie = `space_id=${spaceId}; path=/; max-age=${60 * 60 * 24 * 365}; samesite=lax`;
|
||||
setOpen(false);
|
||||
window.location.reload();
|
||||
}
|
||||
const handleOpen = async () => {
|
||||
const nowOpen = !open;
|
||||
setOpen(nowOpen);
|
||||
if (nowOpen && !loaded) {
|
||||
await loadSpaces();
|
||||
}
|
||||
};
|
||||
|
||||
/** Build URL for a space: <space>.<current-app-domain> */
|
||||
const spaceUrl = (slug: string) => `https://${slug}.${appDomain}`;
|
||||
|
||||
const mySpaces = spaces.filter((s) => s.role);
|
||||
const publicSpaces = spaces.filter((s) => !s.role);
|
||||
|
||||
return (
|
||||
<div className="relative" ref={ref}>
|
||||
{/* Trigger */}
|
||||
<button
|
||||
onClick={(e) => { e.stopPropagation(); setOpen(!open); }}
|
||||
className="flex items-center gap-2 px-2.5 py-1.5 rounded-lg text-sm font-semibold bg-white/[0.08] hover:bg-white/[0.12] text-slate-200 transition-colors"
|
||||
onClick={(e) => { e.stopPropagation(); handleOpen(); }}
|
||||
className="flex items-center gap-1 px-3 py-1.5 rounded-lg text-sm font-medium text-slate-400 hover:bg-white/[0.05] transition-colors"
|
||||
>
|
||||
<span className="w-6 h-6 rounded-md bg-gradient-to-br from-primary/80 to-secondary/80 flex items-center justify-center text-[9px] font-black text-white leading-none flex-shrink-0">
|
||||
{currentSpace.name.charAt(0).toUpperCase()}
|
||||
</span>
|
||||
<span className="hidden sm:inline max-w-[100px] truncate">{currentSpace.name}</span>
|
||||
<span className="text-[0.7em] opacity-60">▾</span>
|
||||
<span className="opacity-40 font-light mr-0.5">/</span>
|
||||
<span className="max-w-[160px] truncate">personal</span>
|
||||
<span className="text-[0.7em] opacity-50">▾</span>
|
||||
</button>
|
||||
|
||||
{/* Dropdown */}
|
||||
{open && (
|
||||
<div className="absolute top-full left-0 mt-1.5 w-[280px] rounded-xl bg-slate-800 border border-white/10 shadow-xl shadow-black/30 z-[200]">
|
||||
{/* Header */}
|
||||
<div className="px-3.5 py-3 border-b border-white/[0.08]">
|
||||
<div className="text-[0.6rem] font-bold uppercase tracking-widest text-slate-500 select-none">
|
||||
Spaces
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{/* Space list */}
|
||||
{spaces.length > 0 ? (
|
||||
spaces.map((s) => (
|
||||
<button
|
||||
key={s.id}
|
||||
onClick={() => switchSpace(s.id)}
|
||||
className={`flex items-center gap-2.5 w-full px-3.5 py-2.5 text-left transition-colors ${
|
||||
s.id === currentSpaceId
|
||||
? 'bg-white/[0.07]'
|
||||
: 'hover:bg-white/[0.04]'
|
||||
}`}
|
||||
<div className="absolute top-full left-0 mt-1.5 min-w-[240px] max-h-[400px] overflow-y-auto rounded-xl bg-slate-800 border border-white/10 shadow-xl shadow-black/30 z-[200]">
|
||||
{!loaded ? (
|
||||
<div className="px-4 py-4 text-center text-sm text-slate-400">Loading spaces...</div>
|
||||
) : spaces.length === 0 ? (
|
||||
<>
|
||||
<div className="px-4 py-4 text-center text-sm text-slate-400">
|
||||
{isAuthenticated ? 'No spaces yet' : 'Sign in to see your spaces'}
|
||||
</div>
|
||||
<a
|
||||
href="https://rspace.online/new"
|
||||
className="flex items-center px-3.5 py-2.5 text-sm font-semibold text-cyan-400 hover:bg-cyan-500/[0.08] transition-colors no-underline"
|
||||
onClick={() => setOpen(false)}
|
||||
>
|
||||
{/* Space avatar */}
|
||||
<span className="w-7 h-7 rounded-md bg-gradient-to-br from-primary/60 to-secondary/60 flex items-center justify-center text-[10px] font-black text-white leading-none flex-shrink-0">
|
||||
{s.name.charAt(0).toUpperCase()}
|
||||
</span>
|
||||
<div className="flex flex-col min-w-0 flex-1">
|
||||
<div className="flex items-center gap-1.5">
|
||||
<span className="text-sm font-semibold text-slate-200 truncate">
|
||||
{s.name}
|
||||
</span>
|
||||
{s.id === currentSpaceId && (
|
||||
<span className="text-[10px] text-primary">✓</span>
|
||||
)}
|
||||
</div>
|
||||
{s.tagline && (
|
||||
<span className="text-[11px] text-slate-400 truncate">
|
||||
{s.tagline}
|
||||
</span>
|
||||
)}
|
||||
</div>
|
||||
</button>
|
||||
))
|
||||
+ Create new space
|
||||
</a>
|
||||
</>
|
||||
) : (
|
||||
<div className="px-3.5 py-4 text-sm text-slate-500 text-center">
|
||||
No spaces available
|
||||
</div>
|
||||
)}
|
||||
<>
|
||||
{mySpaces.length > 0 && (
|
||||
<>
|
||||
<div className="px-3.5 pt-2.5 pb-1 text-[0.65rem] font-bold uppercase tracking-wider text-slate-500 select-none">
|
||||
Your spaces
|
||||
</div>
|
||||
{mySpaces.map((s) => (
|
||||
<a
|
||||
key={s.slug}
|
||||
href={spaceUrl(s.slug)}
|
||||
className="flex items-center gap-2.5 px-3.5 py-2.5 text-slate-200 no-underline transition-colors hover:bg-white/[0.05]"
|
||||
onClick={() => setOpen(false)}
|
||||
>
|
||||
<span className="text-base">{s.icon || '🌐'}</span>
|
||||
<span className="text-sm font-medium flex-1">{s.name}</span>
|
||||
{s.role && (
|
||||
<span className="text-[0.6rem] font-bold uppercase bg-cyan-500/15 text-cyan-300 px-1.5 py-0.5 rounded tracking-wide">
|
||||
{s.role}
|
||||
</span>
|
||||
)}
|
||||
</a>
|
||||
))}
|
||||
</>
|
||||
)}
|
||||
|
||||
{/* Footer */}
|
||||
<div className="px-3.5 py-2.5 border-t border-white/[0.08] flex items-center justify-between">
|
||||
<span className="text-[11px] text-slate-500">
|
||||
{spaces.length} space{spaces.length !== 1 ? 's' : ''}
|
||||
</span>
|
||||
<a
|
||||
href="/spaces/new"
|
||||
className="text-[11px] text-primary hover:text-primary/80 transition-colors no-underline font-medium"
|
||||
onClick={() => setOpen(false)}
|
||||
>
|
||||
+ Create Space
|
||||
</a>
|
||||
</div>
|
||||
{publicSpaces.length > 0 && (
|
||||
<>
|
||||
{mySpaces.length > 0 && <div className="h-px bg-white/[0.08] my-1" />}
|
||||
<div className="px-3.5 pt-2.5 pb-1 text-[0.65rem] font-bold uppercase tracking-wider text-slate-500 select-none">
|
||||
Public spaces
|
||||
</div>
|
||||
{publicSpaces.map((s) => (
|
||||
<a
|
||||
key={s.slug}
|
||||
href={spaceUrl(s.slug)}
|
||||
className="flex items-center gap-2.5 px-3.5 py-2.5 text-slate-200 no-underline transition-colors hover:bg-white/[0.05]"
|
||||
onClick={() => setOpen(false)}
|
||||
>
|
||||
<span className="text-base">{s.icon || '🌐'}</span>
|
||||
<span className="text-sm font-medium flex-1">{s.name}</span>
|
||||
</a>
|
||||
))}
|
||||
</>
|
||||
)}
|
||||
|
||||
<div className="h-px bg-white/[0.08] my-1" />
|
||||
<a
|
||||
href="https://rspace.online/new"
|
||||
className="flex items-center px-3.5 py-2.5 text-sm font-semibold text-cyan-400 hover:bg-cyan-500/[0.08] transition-colors no-underline"
|
||||
onClick={() => setOpen(false)}
|
||||
>
|
||||
+ Create new space
|
||||
</a>
|
||||
</>
|
||||
)}
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
|
|
|
|||
Loading…
Reference in New Issue