refactor: migrate UI components to @ciphera-net/ui v0.0.11
This commit is contained in:
@@ -5,7 +5,7 @@ import { useRouter, useSearchParams } from 'next/navigation'
|
|||||||
import { useAuth } from '@/lib/auth/context'
|
import { useAuth } from '@/lib/auth/context'
|
||||||
import { AUTH_URL } from '@/lib/api/client'
|
import { AUTH_URL } from '@/lib/api/client'
|
||||||
import { exchangeAuthCode, setSessionAction } from '@/app/actions/auth'
|
import { exchangeAuthCode, setSessionAction } from '@/app/actions/auth'
|
||||||
import LoadingOverlay from '@/components/LoadingOverlay'
|
import { LoadingOverlay } from '@ciphera-net/ui'
|
||||||
|
|
||||||
function AuthCallbackContent() {
|
function AuthCallbackContent() {
|
||||||
const router = useRouter()
|
const router = useRouter()
|
||||||
@@ -111,12 +111,12 @@ function AuthCallbackContent() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// * Use standard Pulse loading screen to make transition to Home seamless
|
// * Use standard Pulse loading screen to make transition to Home seamless
|
||||||
return <LoadingOverlay portal={false} />
|
return <LoadingOverlay logoSrc="/pulse_icon_no_margins.png" title="Pulse" portal={false} />
|
||||||
}
|
}
|
||||||
|
|
||||||
export default function AuthCallback() {
|
export default function AuthCallback() {
|
||||||
return (
|
return (
|
||||||
<Suspense fallback={<LoadingOverlay portal={false} />}>
|
<Suspense fallback={<LoadingOverlay logoSrc="/pulse_icon_no_margins.png" title="Pulse" portal={false} />}>
|
||||||
<AuthCallbackContent />
|
<AuthCallbackContent />
|
||||||
</Suspense>
|
</Suspense>
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -47,6 +47,7 @@ export default function LayoutContent({ children }: { children: React.ReactNode
|
|||||||
activeOrgId={auth.user?.org_id}
|
activeOrgId={auth.user?.org_id}
|
||||||
onSwitchWorkspace={handleSwitchWorkspace}
|
onSwitchWorkspace={handleSwitchWorkspace}
|
||||||
onCreateOrganization={handleCreateOrganization}
|
onCreateOrganization={handleCreateOrganization}
|
||||||
|
allowPersonalWorkspace={false}
|
||||||
/>
|
/>
|
||||||
<main className="flex-1 pt-24 pb-8">
|
<main className="flex-1 pt-24 pb-8">
|
||||||
{children}
|
{children}
|
||||||
|
|||||||
@@ -4,9 +4,8 @@ import { useState } from 'react'
|
|||||||
import { useRouter } from 'next/navigation'
|
import { useRouter } from 'next/navigation'
|
||||||
import { createOrganization } from '@/lib/api/organization'
|
import { createOrganization } from '@/lib/api/organization'
|
||||||
import { useAuth } from '@/lib/auth/context'
|
import { useAuth } from '@/lib/auth/context'
|
||||||
import LoadingOverlay from '@/components/LoadingOverlay'
|
import { LoadingOverlay } from '@ciphera-net/ui'
|
||||||
import { Button } from '@/components/ui/Button'
|
import { Button, Input } from '@ciphera-net/ui'
|
||||||
import { Input } from '@/components/ui/Input'
|
|
||||||
|
|
||||||
export default function OnboardingPage() {
|
export default function OnboardingPage() {
|
||||||
const [name, setName] = useState('')
|
const [name, setName] = useState('')
|
||||||
@@ -41,7 +40,7 @@ export default function OnboardingPage() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (loading) return <LoadingOverlay title="Creating Organization..." />
|
if (loading) return <LoadingOverlay logoSrc="/pulse_icon_no_margins.png" title="Creating Organization..." />
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="min-h-screen flex items-center justify-center bg-gray-50 dark:bg-neutral-900 px-4">
|
<div className="min-h-screen flex items-center justify-center bg-gray-50 dark:bg-neutral-900 px-4">
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
import Link from 'next/link'
|
import Link from 'next/link'
|
||||||
import { useAuth } from '@/lib/auth/context'
|
import { useAuth } from '@/lib/auth/context'
|
||||||
import { initiateOAuthFlow, initiateSignupFlow } from '@/lib/api/oauth'
|
import { initiateOAuthFlow, initiateSignupFlow } from '@/lib/api/oauth'
|
||||||
import LoadingOverlay from '@/components/LoadingOverlay'
|
import { LoadingOverlay } from '@ciphera-net/ui'
|
||||||
import SiteList from '@/components/sites/SiteList'
|
import SiteList from '@/components/sites/SiteList'
|
||||||
import { Button } from '@ciphera-net/ui'
|
import { Button } from '@ciphera-net/ui'
|
||||||
import { BarChartIcon, LockClosedIcon, LightningBoltIcon } from '@radix-ui/react-icons'
|
import { BarChartIcon, LockClosedIcon, LightningBoltIcon } from '@radix-ui/react-icons'
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ import { useEffect, useState } from 'react'
|
|||||||
import { useParams, useSearchParams, useRouter } from 'next/navigation'
|
import { useParams, useSearchParams, useRouter } from 'next/navigation'
|
||||||
import { getPublicDashboard, type DashboardData } from '@/lib/api/stats'
|
import { getPublicDashboard, type DashboardData } from '@/lib/api/stats'
|
||||||
import { toast } from 'sonner'
|
import { toast } from 'sonner'
|
||||||
import LoadingOverlay from '@/components/LoadingOverlay'
|
import { LoadingOverlay } from '@ciphera-net/ui'
|
||||||
import Chart from '@/components/dashboard/Chart'
|
import Chart from '@/components/dashboard/Chart'
|
||||||
import TopPages from '@/components/dashboard/ContentStats'
|
import TopPages from '@/components/dashboard/ContentStats'
|
||||||
import TopReferrers from '@/components/dashboard/TopReferrers'
|
import TopReferrers from '@/components/dashboard/TopReferrers'
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
import { useEffect } from 'react'
|
import { useEffect } from 'react'
|
||||||
import { initiateSignupFlow } from '@/lib/api/oauth'
|
import { initiateSignupFlow } from '@/lib/api/oauth'
|
||||||
import LoadingOverlay from '@/components/LoadingOverlay'
|
import { LoadingOverlay } from '@ciphera-net/ui'
|
||||||
|
|
||||||
export default function SignupPage() {
|
export default function SignupPage() {
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ import { getSite, type Site } from '@/lib/api/sites'
|
|||||||
import { getStats, getRealtime, getDailyStats, getTopPages, getTopReferrers, getCountries, getCities, getRegions, getBrowsers, getOS, getDevices, getScreenResolutions, getEntryPages, getExitPages, getDashboard, getPerformanceByPage, type Stats, type DailyStat, type PerformanceByPageStat } from '@/lib/api/stats'
|
import { getStats, getRealtime, getDailyStats, getTopPages, getTopReferrers, getCountries, getCities, getRegions, getBrowsers, getOS, getDevices, getScreenResolutions, getEntryPages, getExitPages, getDashboard, getPerformanceByPage, type Stats, type DailyStat, type PerformanceByPageStat } from '@/lib/api/stats'
|
||||||
import { formatNumber, formatDuration, getDateRange } from '@/lib/utils/format'
|
import { formatNumber, formatDuration, getDateRange } from '@/lib/utils/format'
|
||||||
import { toast } from 'sonner'
|
import { toast } from 'sonner'
|
||||||
import LoadingOverlay from '@/components/LoadingOverlay'
|
import { LoadingOverlay } from '@ciphera-net/ui'
|
||||||
import Select from '@/components/ui/Select'
|
import Select from '@/components/ui/Select'
|
||||||
import DatePicker from '@/components/ui/DatePicker'
|
import DatePicker from '@/components/ui/DatePicker'
|
||||||
import ContentStats from '@/components/dashboard/ContentStats'
|
import ContentStats from '@/components/dashboard/ContentStats'
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ import { useParams, useRouter } from 'next/navigation'
|
|||||||
import { getSite, type Site } from '@/lib/api/sites'
|
import { getSite, type Site } from '@/lib/api/sites'
|
||||||
import { getRealtimeVisitors, getSessionDetails, type Visitor, type SessionEvent } from '@/lib/api/realtime'
|
import { getRealtimeVisitors, getSessionDetails, type Visitor, type SessionEvent } from '@/lib/api/realtime'
|
||||||
import { toast } from 'sonner'
|
import { toast } from 'sonner'
|
||||||
import LoadingOverlay from '@/components/LoadingOverlay'
|
import { LoadingOverlay } from '@ciphera-net/ui'
|
||||||
|
|
||||||
function formatTimeAgo(dateString: string) {
|
function formatTimeAgo(dateString: string) {
|
||||||
const date = new Date(dateString)
|
const date = new Date(dateString)
|
||||||
|
|||||||
@@ -4,9 +4,9 @@ import { useEffect, useState } from 'react'
|
|||||||
import { useParams, useRouter } from 'next/navigation'
|
import { useParams, useRouter } from 'next/navigation'
|
||||||
import { getSite, updateSite, resetSiteData, deleteSite, type Site, type GeoDataLevel } from '@/lib/api/sites'
|
import { getSite, updateSite, resetSiteData, deleteSite, type Site, type GeoDataLevel } from '@/lib/api/sites'
|
||||||
import { toast } from 'sonner'
|
import { toast } from 'sonner'
|
||||||
import LoadingOverlay from '@/components/LoadingOverlay'
|
import { LoadingOverlay } from '@ciphera-net/ui'
|
||||||
import VerificationModal from '@/components/sites/VerificationModal'
|
import VerificationModal from '@/components/sites/VerificationModal'
|
||||||
import PasswordInput from '@/components/PasswordInput'
|
import { PasswordInput } from '@ciphera-net/ui'
|
||||||
import Select from '@/components/ui/Select'
|
import Select from '@/components/ui/Select'
|
||||||
import { APP_URL, API_URL } from '@/lib/api/client'
|
import { APP_URL, API_URL } from '@/lib/api/client'
|
||||||
import { generatePrivacySnippet } from '@/lib/utils/privacySnippet'
|
import { generatePrivacySnippet } from '@/lib/utils/privacySnippet'
|
||||||
|
|||||||
@@ -4,8 +4,7 @@ import { useState } from 'react'
|
|||||||
import { useRouter } from 'next/navigation'
|
import { useRouter } from 'next/navigation'
|
||||||
import { createSite } from '@/lib/api/sites'
|
import { createSite } from '@/lib/api/sites'
|
||||||
import { toast } from 'sonner'
|
import { toast } from 'sonner'
|
||||||
import { Button } from '@/components/ui/Button'
|
import { Button, Input } from '@ciphera-net/ui'
|
||||||
import { Input } from '@/components/ui/Input'
|
|
||||||
|
|
||||||
export default function NewSitePage() {
|
export default function NewSitePage() {
|
||||||
const router = useRouter()
|
const router = useRouter()
|
||||||
|
|||||||
@@ -1,48 +0,0 @@
|
|||||||
'use client'
|
|
||||||
|
|
||||||
import React, { useEffect, useState } from 'react'
|
|
||||||
import { createPortal } from 'react-dom'
|
|
||||||
|
|
||||||
interface LoadingOverlayProps {
|
|
||||||
logoSrc?: string
|
|
||||||
title?: string
|
|
||||||
portal?: boolean
|
|
||||||
}
|
|
||||||
|
|
||||||
export default function LoadingOverlay({
|
|
||||||
logoSrc = "/pulse_icon_no_margins.png",
|
|
||||||
title = "Pulse",
|
|
||||||
portal = true
|
|
||||||
}: LoadingOverlayProps) {
|
|
||||||
const [mounted, setMounted] = useState(false)
|
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
setMounted(true)
|
|
||||||
return () => setMounted(false)
|
|
||||||
}, [])
|
|
||||||
|
|
||||||
const content = (
|
|
||||||
<div className="fixed inset-0 z-[9999] flex items-center justify-center bg-white dark:bg-neutral-950">
|
|
||||||
<div className="flex flex-col items-center gap-6">
|
|
||||||
<div className="flex items-center gap-3">
|
|
||||||
<img
|
|
||||||
src={logoSrc}
|
|
||||||
alt={typeof title === 'string' ? title : "Pulse"}
|
|
||||||
className="h-12 w-auto object-contain"
|
|
||||||
/>
|
|
||||||
<span className="text-3xl font-bold tracking-tight text-neutral-900 dark:text-white">
|
|
||||||
{title}
|
|
||||||
</span>
|
|
||||||
</div>
|
|
||||||
<div className="h-8 w-8 animate-spin rounded-full border-4 border-neutral-200 border-t-brand-orange dark:border-neutral-800 dark:border-t-brand-orange" />
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
)
|
|
||||||
|
|
||||||
if (portal) {
|
|
||||||
if (!mounted) return null
|
|
||||||
return createPortal(content, document.body)
|
|
||||||
}
|
|
||||||
|
|
||||||
return content
|
|
||||||
}
|
|
||||||
@@ -1,109 +0,0 @@
|
|||||||
'use client'
|
|
||||||
|
|
||||||
import { useState } from 'react'
|
|
||||||
|
|
||||||
interface PasswordInputProps {
|
|
||||||
value: string
|
|
||||||
onChange: (value: string) => void
|
|
||||||
label?: string
|
|
||||||
placeholder?: string
|
|
||||||
error?: string | null
|
|
||||||
disabled?: boolean
|
|
||||||
required?: boolean
|
|
||||||
className?: string
|
|
||||||
id?: string
|
|
||||||
autoComplete?: string
|
|
||||||
minLength?: number
|
|
||||||
onFocus?: () => void
|
|
||||||
onBlur?: () => void
|
|
||||||
}
|
|
||||||
|
|
||||||
export default function PasswordInput({
|
|
||||||
value,
|
|
||||||
onChange,
|
|
||||||
label = 'Password',
|
|
||||||
placeholder = 'Enter password',
|
|
||||||
error,
|
|
||||||
disabled = false,
|
|
||||||
required = false,
|
|
||||||
className = '',
|
|
||||||
id,
|
|
||||||
autoComplete,
|
|
||||||
minLength,
|
|
||||||
onFocus,
|
|
||||||
onBlur
|
|
||||||
}: PasswordInputProps) {
|
|
||||||
const [showPassword, setShowPassword] = useState(false)
|
|
||||||
const inputId = id || 'password-input'
|
|
||||||
const errorId = `${inputId}-error`
|
|
||||||
|
|
||||||
return (
|
|
||||||
<div className={`space-y-1.5 ${className}`}>
|
|
||||||
{label && (
|
|
||||||
<label
|
|
||||||
htmlFor={inputId}
|
|
||||||
className="block text-sm font-medium text-neutral-700 dark:text-neutral-300"
|
|
||||||
>
|
|
||||||
{label}
|
|
||||||
{required && <span className="text-brand-orange text-xs ml-1">(Required)</span>}
|
|
||||||
</label>
|
|
||||||
)}
|
|
||||||
<div className="relative group">
|
|
||||||
<input
|
|
||||||
id={inputId}
|
|
||||||
type={showPassword ? 'text' : 'password'}
|
|
||||||
value={value}
|
|
||||||
onChange={(e) => onChange(e.target.value)}
|
|
||||||
placeholder={placeholder}
|
|
||||||
disabled={disabled}
|
|
||||||
autoComplete={autoComplete}
|
|
||||||
minLength={minLength}
|
|
||||||
onFocus={onFocus}
|
|
||||||
onBlur={onBlur}
|
|
||||||
aria-invalid={!!error}
|
|
||||||
aria-describedby={error ? errorId : undefined}
|
|
||||||
className={`w-full pl-11 pr-12 py-3 border rounded-xl bg-neutral-50/50 dark:bg-neutral-900/50 focus:bg-white dark:focus:bg-neutral-900
|
|
||||||
transition-all duration-200 outline-none disabled:opacity-50 disabled:cursor-not-allowed dark:text-white
|
|
||||||
${error
|
|
||||||
? 'border-red-300 dark:border-red-800 focus:border-red-500 focus:ring-4 focus:ring-red-500/10'
|
|
||||||
: 'border-neutral-200 dark:border-neutral-800 hover:border-brand-orange/50 focus:border-brand-orange focus:ring-4 focus:ring-brand-orange/10'
|
|
||||||
}`}
|
|
||||||
/>
|
|
||||||
|
|
||||||
{/* Lock Icon (Left) */}
|
|
||||||
<div className={`absolute left-3.5 top-1/2 -translate-y-1/2 pointer-events-none transition-colors duration-200
|
|
||||||
${error ? 'text-red-400' : 'text-neutral-400 dark:text-neutral-500 group-focus-within:text-brand-orange'}`}>
|
|
||||||
<svg aria-hidden="true" className="w-5 h-5" fill="none" viewBox="0 0 24 24" stroke="currentColor">
|
|
||||||
<path strokeLinecap="round" strokeLinejoin="round" strokeWidth={1.5} d="M12 15v2m-6 4h12a2 2 0 002-2v-6a2 2 0 00-2-2H6a2 2 0 00-2 2v6a2 2 0 002 2zm10-10V7a4 4 0 00-8 0v4h8z" />
|
|
||||||
</svg>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{/* Toggle Visibility Button (Right) */}
|
|
||||||
<button
|
|
||||||
type="button"
|
|
||||||
onClick={() => setShowPassword(!showPassword)}
|
|
||||||
disabled={disabled}
|
|
||||||
aria-label={showPassword ? "Hide password" : "Show password"}
|
|
||||||
className="absolute right-3 top-1/2 -translate-y-1/2 p-1.5 rounded-lg text-neutral-400 dark:text-neutral-500
|
|
||||||
hover:text-neutral-600 dark:hover:text-neutral-300 hover:bg-neutral-100 dark:hover:bg-neutral-800 transition-all duration-200 focus:outline-none"
|
|
||||||
>
|
|
||||||
{showPassword ? (
|
|
||||||
<svg aria-hidden="true" className="w-5 h-5" fill="none" viewBox="0 0 24 24" stroke="currentColor">
|
|
||||||
<path strokeLinecap="round" strokeLinejoin="round" strokeWidth={1.5} d="M13.875 18.825A10.05 10.05 0 0112 19c-4.478 0-8.268-2.943-9.543-7a9.97 9.97 0 011.563-3.029m5.858.908a3 3 0 114.243 4.243M9.878 9.878l4.242 4.242M9.88 9.88l-3.29-3.29m7.532 7.532l3.29 3.29M3 3l3.59 3.59m0 0A9.953 9.953 0 0112 5c4.478 0 8.268 2.943 9.543 7a10.025 10.025 0 01-4.132 5.411m0 0L21 21" />
|
|
||||||
</svg>
|
|
||||||
) : (
|
|
||||||
<svg aria-hidden="true" className="w-5 h-5" fill="none" viewBox="0 0 24 24" stroke="currentColor">
|
|
||||||
<path strokeLinecap="round" strokeLinejoin="round" strokeWidth={1.5} d="M15 12a3 3 0 11-6 0 3 3 0 016 0z" />
|
|
||||||
<path strokeLinecap="round" strokeLinejoin="round" strokeWidth={1.5} d="M2.458 12C3.732 7.943 7.523 5 12 5c4.478 0 8.268 2.943 9.542 7-1.274 4.057-5.064 7-9.542 7-4.477 0-8.268-2.943-9.542-7z" />
|
|
||||||
</svg>
|
|
||||||
)}
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
{error && (
|
|
||||||
<p id={errorId} role="alert" className="text-xs text-red-500 font-medium ml-1">
|
|
||||||
{error}
|
|
||||||
</p>
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
)
|
|
||||||
}
|
|
||||||
@@ -1,109 +0,0 @@
|
|||||||
'use client'
|
|
||||||
|
|
||||||
import { useState } from 'react'
|
|
||||||
import { useRouter } from 'next/navigation'
|
|
||||||
import { PlusIcon, PersonIcon, CubeIcon, CheckIcon } from '@radix-ui/react-icons'
|
|
||||||
import { switchContext, OrganizationMember } from '@/lib/api/organization'
|
|
||||||
import { setSessionAction } from '@/app/actions/auth'
|
|
||||||
import Link from 'next/link'
|
|
||||||
|
|
||||||
export default function WorkspaceSwitcher({ orgs, activeOrgId }: { orgs: OrganizationMember[], activeOrgId: string | null }) {
|
|
||||||
const router = useRouter()
|
|
||||||
const [switching, setSwitching] = useState<string | null>(null)
|
|
||||||
|
|
||||||
const handleSwitch = async (orgId: string | null) => {
|
|
||||||
console.log('Switching to workspace:', orgId)
|
|
||||||
setSwitching(orgId || 'personal')
|
|
||||||
try {
|
|
||||||
// * If orgId is null, we can't switch context via API in the same way if strict mode is on
|
|
||||||
// * BUT, Pulse doesn't support personal workspace.
|
|
||||||
// * So we should probably NOT show the "Personal" option in Pulse if strict mode is enforced.
|
|
||||||
// * However, to match Drop exactly, we might want to show it but have it fail or redirect?
|
|
||||||
// * Let's assume for now we want to match Drop's UI structure.
|
|
||||||
|
|
||||||
if (!orgId) {
|
|
||||||
// * Pulse doesn't support personal context.
|
|
||||||
// * We could redirect to onboarding or show an error.
|
|
||||||
// * For now, let's just return to avoid breaking.
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
const { access_token } = await switchContext(orgId)
|
|
||||||
|
|
||||||
// * Update session cookie via server action
|
|
||||||
// * Note: switchContext only returns access_token, we keep existing refresh token
|
|
||||||
await setSessionAction(access_token)
|
|
||||||
|
|
||||||
// Force reload to pick up new permissions
|
|
||||||
window.location.reload()
|
|
||||||
|
|
||||||
} catch (err) {
|
|
||||||
console.error('Failed to switch workspace', err)
|
|
||||||
setSwitching(null)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return (
|
|
||||||
<div className="border-b border-neutral-100 dark:border-neutral-800 pb-2 mb-2">
|
|
||||||
<div className="px-3 py-2 text-xs font-medium text-neutral-500 uppercase tracking-wider">
|
|
||||||
Workspaces
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{/* Personal Workspace - HIDDEN IN PULSE (Strict Mode) */}
|
|
||||||
{/*
|
|
||||||
<button
|
|
||||||
onClick={() => handleSwitch(null)}
|
|
||||||
className={`w-full flex items-center justify-between px-3 py-2 text-sm rounded-md transition-colors group ${
|
|
||||||
!activeOrgId ? 'bg-neutral-100 dark:bg-neutral-800' : 'hover:bg-neutral-50 dark:hover:bg-neutral-800/50'
|
|
||||||
}`}
|
|
||||||
>
|
|
||||||
<div className="flex items-center gap-2">
|
|
||||||
<div className="h-5 w-5 rounded bg-neutral-200 dark:bg-neutral-700 flex items-center justify-center">
|
|
||||||
<PersonIcon className="h-3 w-3 text-neutral-500 dark:text-neutral-400" />
|
|
||||||
</div>
|
|
||||||
<span className="text-neutral-700 dark:text-neutral-300">Personal</span>
|
|
||||||
</div>
|
|
||||||
<div className="flex items-center gap-2">
|
|
||||||
{switching === 'personal' && <span className="text-xs text-neutral-400">Loading...</span>}
|
|
||||||
{!activeOrgId && !switching && <CheckIcon className="h-4 w-4 text-neutral-600 dark:text-neutral-400" />}
|
|
||||||
</div>
|
|
||||||
</button>
|
|
||||||
*/}
|
|
||||||
|
|
||||||
{/* Organization Workspaces */}
|
|
||||||
{orgs.map((org) => (
|
|
||||||
<button
|
|
||||||
key={org.organization_id}
|
|
||||||
onClick={() => handleSwitch(org.organization_id)}
|
|
||||||
className={`w-full flex items-center justify-between px-3 py-2 text-sm rounded-md transition-colors mt-1 ${
|
|
||||||
activeOrgId === org.organization_id ? 'bg-neutral-100 dark:bg-neutral-800' : 'hover:bg-neutral-50 dark:hover:bg-neutral-800/50'
|
|
||||||
}`}
|
|
||||||
>
|
|
||||||
<div className="flex items-center gap-2">
|
|
||||||
<div className="h-5 w-5 rounded bg-brand-orange/10 flex items-center justify-center">
|
|
||||||
<CubeIcon className="h-3 w-3 text-brand-orange" />
|
|
||||||
</div>
|
|
||||||
<span className="text-neutral-700 dark:text-neutral-300 truncate max-w-[140px]">
|
|
||||||
{org.organization_name}
|
|
||||||
</span>
|
|
||||||
</div>
|
|
||||||
<div className="flex items-center gap-2">
|
|
||||||
{switching === org.organization_id && <span className="text-xs text-neutral-400">Loading...</span>}
|
|
||||||
{activeOrgId === org.organization_id && !switching && <CheckIcon className="h-4 w-4 text-neutral-600 dark:text-neutral-400" />}
|
|
||||||
</div>
|
|
||||||
</button>
|
|
||||||
))}
|
|
||||||
|
|
||||||
{/* Create New */}
|
|
||||||
<Link
|
|
||||||
href="/onboarding"
|
|
||||||
className="w-full flex items-center gap-2 px-3 py-2 text-sm text-neutral-500 hover:text-brand-orange dark:text-neutral-400 dark:hover:text-brand-orange hover:bg-brand-orange/10 rounded-md transition-colors mt-1"
|
|
||||||
>
|
|
||||||
<div className="h-5 w-5 rounded border border-dashed border-neutral-300 dark:border-neutral-600 flex items-center justify-center">
|
|
||||||
<PlusIcon className="h-3 w-3" />
|
|
||||||
</div>
|
|
||||||
<span>Create Organization</span>
|
|
||||||
</Link>
|
|
||||||
</div>
|
|
||||||
)
|
|
||||||
}
|
|
||||||
@@ -15,7 +15,7 @@ import {
|
|||||||
import type { TooltipProps } from 'recharts'
|
import type { TooltipProps } from 'recharts'
|
||||||
import { formatNumber, formatDuration } from '@/lib/utils/format'
|
import { formatNumber, formatDuration } from '@/lib/utils/format'
|
||||||
import { ArrowTopRightIcon, ArrowBottomRightIcon, DownloadIcon, BarChartIcon } from '@radix-ui/react-icons'
|
import { ArrowTopRightIcon, ArrowBottomRightIcon, DownloadIcon, BarChartIcon } from '@radix-ui/react-icons'
|
||||||
import { Button } from '@/components/ui/Button'
|
import { Button } from '@ciphera-net/ui'
|
||||||
import { Checkbox } from '@/components/ui/Checkbox'
|
import { Checkbox } from '@/components/ui/Checkbox'
|
||||||
|
|
||||||
const COLORS = {
|
const COLORS = {
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ import { motion, AnimatePresence } from 'framer-motion'
|
|||||||
import { PersonIcon, LockClosedIcon, EnvelopeClosedIcon, CheckIcon, ExclamationTriangleIcon, Cross2Icon, GearIcon, MobileIcon, FileTextIcon, CopyIcon } from '@radix-ui/react-icons'
|
import { PersonIcon, LockClosedIcon, EnvelopeClosedIcon, CheckIcon, ExclamationTriangleIcon, Cross2Icon, GearIcon, MobileIcon, FileTextIcon, CopyIcon } from '@radix-ui/react-icons'
|
||||||
// @ts-ignore
|
// @ts-ignore
|
||||||
import { Button, Input } from '@ciphera-net/ui'
|
import { Button, Input } from '@ciphera-net/ui'
|
||||||
import PasswordInput from '../PasswordInput'
|
import { PasswordInput } from '@ciphera-net/ui'
|
||||||
import { toast } from 'sonner'
|
import { toast } from 'sonner'
|
||||||
import api from '@/lib/api/client'
|
import api from '@/lib/api/client'
|
||||||
import { deriveAuthKey } from '@/lib/crypto/password'
|
import { deriveAuthKey } from '@/lib/crypto/password'
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ import { useEffect, useState } from 'react'
|
|||||||
import Link from 'next/link'
|
import Link from 'next/link'
|
||||||
import { listSites, deleteSite, type Site } from '@/lib/api/sites'
|
import { listSites, deleteSite, type Site } from '@/lib/api/sites'
|
||||||
import { toast } from 'sonner'
|
import { toast } from 'sonner'
|
||||||
import LoadingOverlay from '../LoadingOverlay'
|
import { LoadingOverlay } from '@ciphera-net/ui'
|
||||||
import { useAuth } from '@/lib/auth/context'
|
import { useAuth } from '@/lib/auth/context'
|
||||||
import { BarChartIcon } from '@radix-ui/react-icons'
|
import { BarChartIcon } from '@radix-ui/react-icons'
|
||||||
|
|
||||||
|
|||||||
@@ -1,44 +0,0 @@
|
|||||||
import React from 'react';
|
|
||||||
|
|
||||||
export interface ButtonProps extends React.ButtonHTMLAttributes<HTMLButtonElement> {
|
|
||||||
variant?: 'primary' | 'secondary' | 'ghost';
|
|
||||||
isLoading?: boolean;
|
|
||||||
}
|
|
||||||
|
|
||||||
export const Button = React.forwardRef<HTMLButtonElement, ButtonProps>(
|
|
||||||
({ className = '', variant = 'primary', isLoading, children, disabled, ...props }, ref) => {
|
|
||||||
// * Base styles common to all buttons
|
|
||||||
// * Removed font-medium from here to allow variants to control weight
|
|
||||||
const baseStyles = 'inline-flex items-center justify-center rounded-xl text-sm px-5 py-2.5 transition-all duration-200 focus:outline-none focus:ring-2 focus:ring-offset-2 dark:focus:ring-offset-neutral-900 disabled:opacity-50 disabled:cursor-not-allowed disabled:hover:translate-y-0 disabled:hover:shadow-none';
|
|
||||||
|
|
||||||
const variants = {
|
|
||||||
// * Primary: Brand orange, semibold, lift effect, colored shadow
|
|
||||||
primary: 'bg-brand-orange text-white font-semibold shadow-sm shadow-orange-200 dark:shadow-none hover:shadow-orange-300 dark:hover:shadow-brand-orange/20 hover:-translate-y-0.5 focus:ring-brand-orange',
|
|
||||||
|
|
||||||
// * Secondary: White/Dark bg, medium weight, subtle border, hover shadow
|
|
||||||
secondary: 'bg-white dark:bg-neutral-900 border border-neutral-200 dark:border-neutral-800 text-neutral-900 dark:text-white font-medium hover:bg-neutral-50 dark:hover:bg-neutral-800 shadow-sm hover:shadow-md dark:shadow-none focus:ring-neutral-200 dark:focus:ring-neutral-700',
|
|
||||||
|
|
||||||
// * Ghost: Transparent, medium weight, hover background
|
|
||||||
ghost: 'text-neutral-600 dark:text-neutral-400 font-medium hover:text-neutral-900 dark:hover:text-white hover:bg-neutral-100 dark:hover:bg-neutral-800 focus:ring-neutral-200',
|
|
||||||
};
|
|
||||||
|
|
||||||
return (
|
|
||||||
<button
|
|
||||||
ref={ref}
|
|
||||||
className={`${baseStyles} ${variants[variant]} ${className}`}
|
|
||||||
disabled={disabled || isLoading}
|
|
||||||
{...props}
|
|
||||||
>
|
|
||||||
{isLoading && (
|
|
||||||
<svg className="w-4 h-4 mr-2 animate-spin" fill="none" viewBox="0 0 24 24">
|
|
||||||
<circle className="opacity-25" cx="12" cy="12" r="10" stroke="currentColor" strokeWidth="4" />
|
|
||||||
<path className="opacity-75" fill="currentColor" d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z" />
|
|
||||||
</svg>
|
|
||||||
)}
|
|
||||||
{children}
|
|
||||||
</button>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
);
|
|
||||||
|
|
||||||
Button.displayName = 'Button';
|
|
||||||
@@ -1,37 +0,0 @@
|
|||||||
import React from 'react';
|
|
||||||
|
|
||||||
export interface InputProps extends React.InputHTMLAttributes<HTMLInputElement> {
|
|
||||||
error?: string;
|
|
||||||
icon?: React.ReactNode;
|
|
||||||
}
|
|
||||||
|
|
||||||
export const Input = React.forwardRef<HTMLInputElement, InputProps>(
|
|
||||||
({ className = '', error, icon, ...props }, ref) => {
|
|
||||||
return (
|
|
||||||
<div className="relative">
|
|
||||||
<input
|
|
||||||
ref={ref}
|
|
||||||
className={`
|
|
||||||
w-full py-3 border rounded-xl bg-neutral-50/50 dark:bg-neutral-900/50 focus:bg-white dark:focus:bg-neutral-900 transition-all duration-200 outline-none disabled:opacity-50 disabled:cursor-not-allowed dark:text-white
|
|
||||||
${icon ? 'pl-11 pr-4' : 'px-4'}
|
|
||||||
${error
|
|
||||||
? 'border-red-300 dark:border-red-800 focus:border-red-500 focus:ring-4 focus:ring-red-500/10'
|
|
||||||
: 'border-neutral-200 dark:border-neutral-800 hover:border-brand-orange/50 focus:border-brand-orange focus:ring-4 focus:ring-brand-orange/10'}
|
|
||||||
${className}
|
|
||||||
`}
|
|
||||||
{...props}
|
|
||||||
/>
|
|
||||||
{icon && (
|
|
||||||
<div className={`
|
|
||||||
absolute left-3.5 top-1/2 -translate-y-1/2 pointer-events-none transition-colors duration-200
|
|
||||||
${error ? 'text-red-400' : 'text-neutral-400 dark:text-neutral-500'}
|
|
||||||
`}>
|
|
||||||
{icon}
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
);
|
|
||||||
|
|
||||||
Input.displayName = 'Input';
|
|
||||||
@@ -3,7 +3,7 @@
|
|||||||
import React, { createContext, useContext, useEffect, useState, useCallback } from 'react'
|
import React, { createContext, useContext, useEffect, useState, useCallback } from 'react'
|
||||||
import { useRouter, usePathname } from 'next/navigation'
|
import { useRouter, usePathname } from 'next/navigation'
|
||||||
import apiRequest from '@/lib/api/client'
|
import apiRequest from '@/lib/api/client'
|
||||||
import LoadingOverlay from '@/components/LoadingOverlay'
|
import { LoadingOverlay } from '@ciphera-net/ui'
|
||||||
import { logoutAction, getSessionAction, setSessionAction } from '@/app/actions/auth'
|
import { logoutAction, getSessionAction, setSessionAction } from '@/app/actions/auth'
|
||||||
import { getUserOrganizations, switchContext } from '@/lib/api/organization'
|
import { getUserOrganizations, switchContext } from '@/lib/api/organization'
|
||||||
|
|
||||||
|
|||||||
@@ -10,7 +10,7 @@
|
|||||||
"type-check": "tsc --noEmit"
|
"type-check": "tsc --noEmit"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@ciphera-net/ui": "^0.0.10",
|
"@ciphera-net/ui": "^0.0.11",
|
||||||
"@radix-ui/react-icons": "^1.3.2",
|
"@radix-ui/react-icons": "^1.3.2",
|
||||||
"axios": "^1.13.2",
|
"axios": "^1.13.2",
|
||||||
"country-flag-icons": "^1.6.4",
|
"country-flag-icons": "^1.6.4",
|
||||||
|
|||||||
Reference in New Issue
Block a user