add badge

apps/admin.saladeaula.digital/app/routes/_.$orgid.billing._index/data.ts

@@ -19,5 +19,3 @@ export const labels: Record<string, string> = {
   PENDING: 'Em aberto',
   CLOSED: 'Fechado'
 }
-
-export const tz = 'America/Sao_Paulo'

apps/admin.saladeaula.digital/app/routes/_.$orgid.billing._index/range-period.tsx

@@ -3,13 +3,13 @@ import { ChevronRightIcon, ChevronLeftIcon } from 'lucide-react'
 import { subMonths, addMonths } from 'date-fns'
 import { DateTime as LuxonDateTime } from 'luxon'
 
+import { TZ } from '@/conf'
 import { Button } from '@repo/ui/components/ui/button'
 import { ButtonGroup } from '@repo/ui/components/ui/button-group'
 import { Badge } from '@repo/ui/components/ui/badge'
 import { DateTime } from '@repo/ui/components/datetime'
 
 import { formatDate, billingPeriod } from './util'
-import { tz } from './data'
 
 type RangePeriodProps = {
   startDate: Date
@@ -28,7 +28,7 @@ export function RangePeriod({
   endDate,
   billingDay
 }: RangePeriodProps) {
-  const today = LuxonDateTime.now().setZone(tz).toJSDate()
+  const today = LuxonDateTime.now().setZone(TZ).toJSDate()
   const [, setSearchParams] = useSearchParams()
   const prevPeriod = billingPeriod(billingDay, subMonths(startDate, 1))
   const nextPeriod = billingPeriod(billingDay, addMonths(startDate, 1))

apps/admin.saladeaula.digital/app/routes/_.$orgid.billing._index/route.tsx

@@ -33,9 +33,10 @@ import { Kbd } from '@repo/ui/components/ui/kbd'
 import { Currency } from '@repo/ui/components/currency'
 import { DateTime } from '@repo/ui/components/datetime'
 
+import { TZ } from '@/conf'
 import { billingPeriod, formatDate } from './util'
 import { RangePeriod } from './range-period'
-import { tz, statuses } from './data'
+import { statuses } from './data'
 
 export function meta({}) {
   return [{ title: 'Resumo de cobranças' }]
@@ -55,7 +56,7 @@ export async function loader({ context, request, params }: Route.LoaderArgs) {
 
   const [startDate, endDate] = billingPeriod(
     billing_day,
-    LuxonDateTime.now().setZone(tz).toJSDate()
+    LuxonDateTime.now().setZone(TZ).toJSDate()
   )
   const start = searchParams.get('start') || formatDate(startDate)
   const end = searchParams.get('end') || formatDate(endDate)
@@ -69,8 +70,8 @@ export async function loader({ context, request, params }: Route.LoaderArgs) {
   return {
     billing_day,
     billing,
-    startDate: LuxonDateTime.fromISO(start, { zone: tz }).toJSDate(),
-    endDate: LuxonDateTime.fromISO(end, { zone: tz }).toJSDate()
+    startDate: LuxonDateTime.fromISO(start, { zone: TZ }).toJSDate(),
+    endDate: LuxonDateTime.fromISO(end, { zone: TZ }).toJSDate()
   }
 }
 

apps/admin.saladeaula.digital/app/routes/_.$orgid.enrollments._index/route.tsx

@@ -19,6 +19,7 @@ import { cloudflareContext } from '@repo/auth/context'
 import { headers, sortings, statuses } from '@repo/ui/routes/enrollments/data'
 
 import { columns, type Enrollment } from './columns'
+import { useWorksapce } from '@/components/workspace-switcher'
 
 export function meta({}: Route.MetaArgs) {
   return [{ title: 'Matrículas' }]
@@ -66,6 +67,7 @@ export default function Route({
   loaderData: { enrollments }
 }: Route.ComponentProps) {
   const { orgid } = useParams()
+  const { subscription } = useWorksapce()
   const [searchParams, setSearchParams] = useSearchParams()
   const [selectedRows, setSelectedRows] = useState<Enrollment[]>([])
   const status = searchParams.get('status')
@@ -203,7 +205,7 @@ export default function Route({
                       <DataTableViewOptions className="flex-1" />
 
                       <Button className="flex-1" asChild>
-                        <Link to="add">
+                        <Link to={subscription ? 'add' : 'buy'}>
                           <PlusIcon /> Adicionar
                         </Link>
                       </Button>

apps/admin.saladeaula.digital/app/routes/_.$orgid.enrollments.buy/assigned.tsx

@@ -28,6 +28,7 @@ import {
   HoverCardTrigger
 } from '@repo/ui/components/ui/hover-card'
 
+import { TZ } from '@/conf'
 import {
   MAX_ITEMS,
   formSchema,
@@ -67,7 +68,7 @@ export function Assigned({ courses }: AssignedProps) {
             ...e,
             scheduled_for: e.scheduled_for
               ? DateTime.fromISO(e.scheduled_for, {
-                  zone: 'America/Sao_Paulo'
+                  zone: TZ
                 }).toJSDate()
               : undefined
           }))

apps/admin.saladeaula.digital/app/routes/_.$orgid/route.tsx

@@ -2,58 +2,58 @@ import type { Route } from './+types/route'
 
 import * as cookie from 'cookie'
 import { Outlet, type ShouldRevalidateFunctionArgs } from 'react-router'
-import { useEffect } from 'react'
+import { use, useEffect } from 'react'
 
-import { request as req } from '@repo/util/request'
-import {
-  WorkspaceProvider,
-  type Workspace
-} from '@/components/workspace-switcher'
-import { userContext } from '@repo/auth/context'
-import { Toaster } from '@repo/ui/components/ui/sonner'
-import { authMiddleware } from '@repo/auth/middleware/auth'
-import { ModeToggle, ThemedImage } from '@repo/ui/components/dark-mode'
-import { NavUser } from '@repo/ui/components/nav-user'
 import {
   SidebarInset,
   SidebarProvider,
   SidebarTrigger
 } from '@repo/ui/components/ui/sidebar'
+import { userContext } from '@repo/auth/context'
+import { request as req } from '@repo/util/request'
+import { authMiddleware } from '@repo/auth/middleware/auth'
+import { Toaster } from '@repo/ui/components/ui/sonner'
+import { ModeToggle, ThemedImage } from '@repo/ui/components/dark-mode'
+import { NavUser } from '@repo/ui/components/nav-user'
 
+import { WorkspaceProvider } from '@/components/workspace-switcher'
 import { AppSidebar } from '@/components/app-sidebar'
+import { workspaceMiddleware, workspaceContext } from '@/middleware/workspace'
 
 // import { Notification } from '@/components/notification'
 
-export const middleware: Route.MiddlewareFunction[] = [authMiddleware]
+export const middleware: Route.MiddlewareFunction[] = [
+  authMiddleware,
+  workspaceMiddleware
+]
 
 export async function loader({ params, context, request }: Route.ActionArgs) {
   const user = context.get(userContext)!
+  const { activeWorkspace, workspaces } = context.get(workspaceContext)
   const rawCookie = request.headers.get('cookie') || ''
   const parsedCookies = cookie.parse(rawCookie)
   const { sidebar_state = 'true' } = parsedCookies
 
-  const r = await req({
-    url: `/users/${user.sub}/orgs?limit=25`,
+  const subscription = req({
+    url: `/orgs/${activeWorkspace.id}/subscription`,
     request,
     context
-  })
+  }).then((r) => r.json())
 
-  if (!r.ok) {
-    throw new Response(await r.text(), { status: r.status })
+  const address = req({
+    url: `/orgs/${activeWorkspace.id}/address`,
+    request,
+    context
+  }).then((r) => r.json())
+
+  return {
+    user,
+    activeWorkspace,
+    workspaces,
+    sidebar_state,
+    subscription,
+    address
   }
-
-  const { items = [] } = (await r.json()) as { items: { sk: string }[] }
-  const orgs = items.map(({ sk, ...props }) => {
-    const [, id] = sk?.split('#')
-    return { ...props, id }
-  })
-  const exists = orgs.some(({ id }) => id === params.orgid)
-
-  if (exists) {
-    return { user, orgs, sidebar_state }
-  }
-
-  throw new Response(null, { status: 401 })
 }
 
 export function shouldRevalidate({
@@ -64,7 +64,14 @@ export function shouldRevalidate({
 }
 
 export default function Route({ loaderData }: Route.ComponentProps) {
-  const { user, orgs, sidebar_state } = loaderData
+  const {
+    user,
+    activeWorkspace,
+    workspaces,
+    sidebar_state,
+    subscription: subscription_
+  } = loaderData
+  const subscription = use(subscription_)
 
   useEffect(() => {
     if (typeof window !== 'undefined' && window.rybbit) {
@@ -77,7 +84,11 @@ export default function Route({ loaderData }: Route.ComponentProps) {
   }, [])
 
   return (
-    <WorkspaceProvider workspaces={orgs as Workspace[]}>
+    <WorkspaceProvider
+      activeWorkspace={activeWorkspace}
+      workspaces={workspaces}
+      subscription={subscription}
+    >
       <SidebarProvider defaultOpen={sidebar_state === 'true'} className="flex">
         <AppSidebar />