- {
- setSearchParams((searchParams) => {
- searchParams.delete('courses')
- searchParams.delete('p')
-
- if (statuses.length) {
- courses.forEach((s) =>
- searchParams.has('courses', s)
- ? null
- : searchParams.append('courses', s)
- )
- }
-
- return searchParams
- })
- }}
- title="Cursos"
- options={Object.entries(statuses).map(([key, value]) => ({
- value: key,
- ...value
- }))}
- />
-
{
diff --git a/apps/saladeaula.digital/app/components/logo.svg b/apps/saladeaula.digital/app/components/logo.svg
deleted file mode 100644
index 30500d5..0000000
--- a/apps/saladeaula.digital/app/components/logo.svg
+++ /dev/null
@@ -1,43 +0,0 @@
-
diff --git a/apps/saladeaula.digital/app/components/nav-user.tsx b/apps/saladeaula.digital/app/components/nav-user.tsx
deleted file mode 100644
index 11846c3..0000000
--- a/apps/saladeaula.digital/app/components/nav-user.tsx
+++ /dev/null
@@ -1,141 +0,0 @@
-'use client'
-
-import {
- CirclePlayIcon,
- DollarSignIcon,
- LayoutDashboardIcon,
- LogOutIcon,
- UserIcon
-} from 'lucide-react'
-import { Link } from 'react-router'
-
-import { Avatar, AvatarFallback } from '@/components/ui/avatar'
-import {
- DropdownMenu,
- DropdownMenuContent,
- DropdownMenuGroup,
- DropdownMenuItem,
- DropdownMenuLabel,
- DropdownMenuSeparator,
- DropdownMenuTrigger
-} from '@/components/ui/dropdown-menu'
-import { initials } from '@/lib/utils'
-
-export function NavUser({
- user
-}: {
- user: {
- name: string
- email: string
- scope: string
- }
-}) {
- const scopes = user.scope.split(' ')
-
- return (
-
-
-
- {initials(user.name)}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {grantIfHas(['apps:admin', 'apps:studio'], scopes, 'any') && (
- <>
-
- Aplicações
-
-
- )}
-
- {grantIfHas(['apps:admin'], scopes) && (
- <>
-
-
-
-
- )}
-
- {grantIfHas(['apps:studio'], scopes) && (
- <>
-
-
-
-
- )}
-
-
-
-
-
-
-
- )
-}
-
-function grantIfHas(
- required: string[],
- granted: string[],
- mode: 'all' | 'any' = 'all'
-): boolean {
- const grantedSet: Set = new Set(granted)
-
- if (mode === 'all') {
- return required.every((scope) => grantedSet.has(scope))
- }
-
- return required.some((scope) => grantedSet.has(scope))
-}
diff --git a/apps/saladeaula.digital/app/components/search-form.tsx b/apps/saladeaula.digital/app/components/search-form.tsx
index 38ec93c..8bac56e 100644
--- a/apps/saladeaula.digital/app/components/search-form.tsx
+++ b/apps/saladeaula.digital/app/components/search-form.tsx
@@ -2,7 +2,7 @@ import {
InputGroup,
InputGroupAddon,
InputGroupInput
-} from '@/components/ui/input-group'
+} from '@repo/ui/components/ui/input-group'
import { useKeyPress } from '@/hooks/use-keypress'
import clsx from 'clsx'
import { debounce } from 'lodash'
diff --git a/apps/saladeaula.digital/app/components/ui/avatar.tsx b/apps/saladeaula.digital/app/components/ui/avatar.tsx
deleted file mode 100644
index b7224f0..0000000
--- a/apps/saladeaula.digital/app/components/ui/avatar.tsx
+++ /dev/null
@@ -1,51 +0,0 @@
-import * as React from "react"
-import * as AvatarPrimitive from "@radix-ui/react-avatar"
-
-import { cn } from "@/lib/utils"
-
-function Avatar({
- className,
- ...props
-}: React.ComponentProps) {
- return (
- ) {
- return (
- ) {
- return (
- & { asChild?: boolean }) {
- const Comp = asChild ? Slot : "span"
-
- return (
- & {
- asChild?: boolean
- }) {
- const Comp = asChild ? Slot : "button"
-
- return (
- ) {
- return (
- & {
- title?: string
- description?: string
- className?: string
- showCloseButton?: boolean
-}) {
- return (
-
- )
-}
-
-function CommandInput({
- className,
- ...props
-}: React.ComponentProps) {
- return (
- ) {
- return (
- ) {
- return (
- ) {
- return (
- ) {
- return (
- ) {
- return (
- ) {
- return ) {
- return ) {
- return ) {
- return ) {
- return (
- & {
- showCloseButton?: boolean
-}) {
- return (
-
-
- {children}
- {showCloseButton && (
-
-
- )}
-
-
- )
-}
-
-function DialogHeader({ className, ...props }: React.ComponentProps<"div">) {
- return (
-
- )
-}
-
-function DialogFooter({ className, ...props }: React.ComponentProps<"div">) {
- return (
-
- )
-}
-
-function DialogTitle({
- className,
- ...props
-}: React.ComponentProps) {
- return (
- ) {
- return (
- ) {
- return ) {
- return (
- ) {
- return (
- ) {
- return (
-
-
- )
-}
-
-function DropdownMenuGroup({
- ...props
-}: React.ComponentProps) {
- return (
- & {
- inset?: boolean
- variant?: "default" | "destructive"
-}) {
- return (
- ) {
- return (
-
-
-
-
-
- {children}
-
- )
-}
-
-function DropdownMenuRadioGroup({
- ...props
-}: React.ComponentProps) {
- return (
- ) {
- return (
-
-
-
-
-
- {children}
-
- )
-}
-
-function DropdownMenuLabel({
- className,
- inset,
- ...props
-}: React.ComponentProps & {
- inset?: boolean
-}) {
- return (
- ) {
- return (
- ) {
- return & {
- inset?: boolean
-}) {
- return (
-
- {children}
-
- )
-}
-
-function DropdownMenuSubContent({
- className,
- ...props
-}: React.ComponentProps) {
- return (
- ) {
- return (
-
- )
-}
-
-function EmptyTitle({ className, ...props }: React.ComponentProps<"div">) {
- return (
-
- )
-}
-
-function EmptyDescription({ className, ...props }: React.ComponentProps<"p">) {
- return (
-
-
- {initials(user.name)}
-
-
-
- {user.name}
-
- {user.email}
-
-
-
-
- )
-}
-
-function CommandList({
- className,
- ...props
-}: React.ComponentPropsa:hover]:text-primary text-sm/relaxed [&>a]:underline [&>a]:underline-offset-4",
- className
- )}
- {...props}
- />
- )
-}
-
-function EmptyContent({ className, ...props }: React.ComponentProps<"div">) {
- return (
-
- )
-}
-
-export {
- Empty,
- EmptyHeader,
- EmptyTitle,
- EmptyDescription,
- EmptyContent,
- EmptyMedia,
-}
diff --git a/apps/saladeaula.digital/app/components/ui/form.tsx b/apps/saladeaula.digital/app/components/ui/form.tsx
deleted file mode 100644
index 524b986..0000000
--- a/apps/saladeaula.digital/app/components/ui/form.tsx
+++ /dev/null
@@ -1,167 +0,0 @@
-"use client"
-
-import * as React from "react"
-import * as LabelPrimitive from "@radix-ui/react-label"
-import { Slot } from "@radix-ui/react-slot"
-import {
- Controller,
- FormProvider,
- useFormContext,
- useFormState,
- type ControllerProps,
- type FieldPath,
- type FieldValues,
-} from "react-hook-form"
-
-import { cn } from "@/lib/utils"
-import { Label } from "@/components/ui/label"
-
-const Form = FormProvider
-
-type FormFieldContextValue<
- TFieldValues extends FieldValues = FieldValues,
- TName extends FieldPath = FieldPath,
-> = {
- name: TName
-}
-
-const FormFieldContext = React.createContext(
- {} as FormFieldContextValue
-)
-
-const FormField = <
- TFieldValues extends FieldValues = FieldValues,
- TName extends FieldPath = FieldPath,
->({
- ...props
-}: ControllerProps) => {
- return (
-
-
- )
-}
-
-const useFormField = () => {
- const fieldContext = React.useContext(FormFieldContext)
- const itemContext = React.useContext(FormItemContext)
- const { getFieldState } = useFormContext()
- const formState = useFormState({ name: fieldContext.name })
- const fieldState = getFieldState(fieldContext.name, formState)
-
- if (!fieldContext) {
- throw new Error("useFormField should be used within ")
- }
-
- const { id } = itemContext
-
- return {
- id,
- name: fieldContext.name,
- formItemId: `${id}-form-item`,
- formDescriptionId: `${id}-form-item-description`,
- formMessageId: `${id}-form-item-message`,
- ...fieldState,
- }
-}
-
-type FormItemContextValue = {
- id: string
-}
-
-const FormItemContext = React.createContext(
- {} as FormItemContextValue
-)
-
-function FormItem({ className, ...props }: React.ComponentProps<"div">) {
- const id = React.useId()
-
- return (
-
-
-
- )
-}
-
-function FormLabel({
- className,
- ...props
-}: React.ComponentProps) {
- const { error, formItemId } = useFormField()
-
- return (
-
- )
-}
-
-function FormControl({ ...props }: React.ComponentProps) {
- const { error, formItemId, formDescriptionId, formMessageId } = useFormField()
-
- return (
-
- {body} -
- ) -} - -export { - useFormField, - Form, - FormItem, - FormLabel, - FormControl, - FormDescription, - FormMessage, - FormField, -} diff --git a/apps/saladeaula.digital/app/components/ui/input-group.tsx b/apps/saladeaula.digital/app/components/ui/input-group.tsx deleted file mode 100644 index 6db1784..0000000 --- a/apps/saladeaula.digital/app/components/ui/input-group.tsx +++ /dev/null @@ -1,168 +0,0 @@ -import * as React from "react" -import { cva, type VariantProps } from "class-variance-authority" - -import { cn } from "@/lib/utils" -import { Button } from "@/components/ui/button" -import { Input } from "@/components/ui/input" -import { Textarea } from "@/components/ui/textarea" - -function InputGroup({ className, ...props }: React.ComponentProps<"div">) { - return ( -textarea]:h-auto",
-
- // Variants based on alignment.
- "has-[>[data-align=inline-start]]:[&>input]:pl-2",
- "has-[>[data-align=inline-end]]:[&>input]:pr-2",
- "has-[>[data-align=block-start]]:h-auto has-[>[data-align=block-start]]:flex-col has-[>[data-align=block-start]]:[&>input]:pb-3",
- "has-[>[data-align=block-end]]:h-auto has-[>[data-align=block-end]]:flex-col has-[>[data-align=block-end]]:[&>input]:pt-3",
-
- // Focus state.
- "has-[[data-slot=input-group-control]:focus-visible]:border-ring has-[[data-slot=input-group-control]:focus-visible]:ring-ring/50 has-[[data-slot=input-group-control]:focus-visible]:ring-[3px]",
-
- // Error state.
- "has-[[data-slot][aria-invalid=true]]:ring-destructive/20 has-[[data-slot][aria-invalid=true]]:border-destructive dark:has-[[data-slot][aria-invalid=true]]:ring-destructive/40",
-
- className
- )}
- {...props}
- />
- )
-}
-
-const inputGroupAddonVariants = cva(
- "text-muted-foreground flex h-auto cursor-text items-center justify-center gap-2 py-1.5 text-sm font-medium select-none [&>svg:not([class*='size-'])]:size-4 [&>kbd]:rounded-[calc(var(--radius)-5px)] group-data-[disabled=true]/input-group:opacity-50",
- {
- variants: {
- align: {
- "inline-start":
- "order-first pl-3 has-[>button]:ml-[-0.45rem] has-[>kbd]:ml-[-0.35rem]",
- "inline-end":
- "order-last pr-3 has-[>button]:mr-[-0.45rem] has-[>kbd]:mr-[-0.35rem]",
- "block-start":
- "order-first w-full justify-start px-3 pt-3 [.border-b]:pb-3 group-has-[>input]/input-group:pt-2.5",
- "block-end":
- "order-last w-full justify-start px-3 pb-3 [.border-t]:pt-3 group-has-[>input]/input-group:pb-2.5",
- },
- },
- defaultVariants: {
- align: "inline-start",
- },
- }
-)
-
-function InputGroupAddon({
- className,
- align = "inline-start",
- ...props
-}: React.ComponentProps<"div"> & VariantProps) {
- return (
-
{
- if ((e.target as HTMLElement).closest("button")) {
- return
- }
- e.currentTarget.parentElement?.querySelector("input")?.focus()
- }}
- {...props}
- />
- )
-}
-
-const inputGroupButtonVariants = cva(
- "text-sm shadow-none flex gap-2 items-center",
- {
- variants: {
- size: {
- xs: "h-6 gap-1 px-2 rounded-[calc(var(--radius)-5px)] [&>svg:not([class*='size-'])]:size-3.5 has-[>svg]:px-2",
- sm: "h-8 px-2.5 gap-1.5 rounded-md has-[>svg]:px-2.5",
- "icon-xs":
- "size-6 rounded-[calc(var(--radius)-5px)] p-0 has-[>svg]:p-0",
- "icon-sm": "size-8 p-0 has-[>svg]:p-0",
- },
- },
- defaultVariants: {
- size: "xs",
- },
- }
-)
-
-function InputGroupButton({
- className,
- type = "button",
- variant = "ghost",
- size = "xs",
- ...props
-}: Omit, "size"> &
- VariantProps) {
- return (
-
- )
-}
-
-function InputGroupText({ className, ...props }: React.ComponentProps<"span">) {
- return (
-
- )
-}
-
-function InputGroupInput({
- className,
- ...props
-}: React.ComponentProps<"input">) {
- return (
-
- )
-}
-
-function InputGroupTextarea({
- className,
- ...props
-}: React.ComponentProps<"textarea">) {
- return (
-
- )
-}
-
-export {
- InputGroup,
- InputGroupAddon,
- InputGroupButton,
- InputGroupText,
- InputGroupInput,
- InputGroupTextarea,
-}
diff --git a/apps/saladeaula.digital/app/components/ui/input.tsx b/apps/saladeaula.digital/app/components/ui/input.tsx
deleted file mode 100644
index 8916905..0000000
--- a/apps/saladeaula.digital/app/components/ui/input.tsx
+++ /dev/null
@@ -1,21 +0,0 @@
-import * as React from "react"
-
-import { cn } from "@/lib/utils"
-
-function Input({ className, type, ...props }: React.ComponentProps<"input">) {
- return (
-
- )
-}
-
-export { Input }
diff --git a/apps/saladeaula.digital/app/components/ui/kbd.tsx b/apps/saladeaula.digital/app/components/ui/kbd.tsx
deleted file mode 100644
index 253c69f..0000000
--- a/apps/saladeaula.digital/app/components/ui/kbd.tsx
+++ /dev/null
@@ -1,28 +0,0 @@
-import { cn } from "@/lib/utils"
-
-function Kbd({ className, ...props }: React.ComponentProps<"kbd">) {
- return (
-
- )
-}
-
-function KbdGroup({ className, ...props }: React.ComponentProps<"div">) {
- return (
-
- )
-}
-
-export { Kbd, KbdGroup }
diff --git a/apps/saladeaula.digital/app/components/ui/label.tsx b/apps/saladeaula.digital/app/components/ui/label.tsx
deleted file mode 100644
index ef7133a..0000000
--- a/apps/saladeaula.digital/app/components/ui/label.tsx
+++ /dev/null
@@ -1,22 +0,0 @@
-import * as React from "react"
-import * as LabelPrimitive from "@radix-ui/react-label"
-
-import { cn } from "@/lib/utils"
-
-function Label({
- className,
- ...props
-}: React.ComponentProps) {
- return (
- ) {
- return ) {
- return ) {
- return (
-
-
- )
-}
-
-function PopoverAnchor({
- ...props
-}: React.ComponentProps) {
- return ) {
- return (
-
-
- )
-}
-
-export { Progress }
diff --git a/apps/saladeaula.digital/app/components/ui/select.tsx b/apps/saladeaula.digital/app/components/ui/select.tsx
deleted file mode 100644
index d34798f..0000000
--- a/apps/saladeaula.digital/app/components/ui/select.tsx
+++ /dev/null
@@ -1,185 +0,0 @@
-import * as React from "react"
-import * as SelectPrimitive from "@radix-ui/react-select"
-import { CheckIcon, ChevronDownIcon, ChevronUpIcon } from "lucide-react"
-
-import { cn } from "@/lib/utils"
-
-function Select({
- ...props
-}: React.ComponentProps) {
- return ) {
- return ) {
- return & {
- size?: "sm" | "default"
-}) {
- return (
-
- {children}
-
-
-
- )
-}
-
-function SelectContent({
- className,
- children,
- position = "popper",
- align = "center",
- ...props
-}: React.ComponentProps) {
- return (
-
-
-
- {children}
-
-
-
- )
-}
-
-function SelectLabel({
- className,
- ...props
-}: React.ComponentProps) {
- return (
- ) {
- return (
-
-
-
-
-
- {children}
-
- )
-}
-
-function SelectSeparator({
- className,
- ...props
-}: React.ComponentProps) {
- return (
- ) {
- return (
-
-
- )
-}
-
-function SelectScrollDownButton({
- className,
- ...props
-}: React.ComponentProps) {
- return (
-
-
- )
-}
-
-export {
- Select,
- SelectContent,
- SelectGroup,
- SelectItem,
- SelectLabel,
- SelectScrollDownButton,
- SelectScrollUpButton,
- SelectSeparator,
- SelectTrigger,
- SelectValue,
-}
diff --git a/apps/saladeaula.digital/app/components/ui/separator.tsx b/apps/saladeaula.digital/app/components/ui/separator.tsx
deleted file mode 100644
index 275381c..0000000
--- a/apps/saladeaula.digital/app/components/ui/separator.tsx
+++ /dev/null
@@ -1,28 +0,0 @@
-"use client"
-
-import * as React from "react"
-import * as SeparatorPrimitive from "@radix-ui/react-separator"
-
-import { cn } from "@/lib/utils"
-
-function Separator({
- className,
- orientation = "horizontal",
- decorative = true,
- ...props
-}: React.ComponentProps) {
- return (
- => {
- const sessionStorage = createSessionStorage(context.cloudflare.env)
- const authenticator = createAuth(context.cloudflare.env)
- const strategy = authenticator.get>('oidc')
- const session = await sessionStorage.getSession(request.headers.get('cookie'))
- let user = session.get('user') as User | null
-
- session.set('returnTo', new URL(request.url).toString())
-
- if (!user) {
- console.log('There is no user logged in')
-
- return redirect('/login', {
- headers: { 'Set-Cookie': await sessionStorage.commitSession(session) }
- })
- }
-
- try {
- const accessToken = decodeJwt(user.accessToken) as { exp: number }
- const exp = accessToken.exp * 1000
- const leeway = 30 * 1000
-
- if (Date.now() > exp - leeway) {
- // @ts-ignore
- const tokens = await strategy.refreshToken(user.refreshToken)
-
- user = {
- ...user,
- accessToken: tokens.accessToken(),
- refreshToken: tokens.refreshToken()
- }
-
- session.set('user', user)
- }
- } catch (error) {
- console.error(error)
- // If refreshing the token fails, remove the user from the current session
- // so the user is forced to sign in again
- session.unset('user')
-
- return redirect('/', {
- headers: { 'Set-Cookie': await sessionStorage.commitSession(session) }
- })
- }
-
- context.set(userContext, user)
-
- const response = await next()
- response.headers.set(
- 'Set-Cookie',
- await sessionStorage.commitSession(session)
- )
- return response
-}
diff --git a/apps/saladeaula.digital/app/root.tsx b/apps/saladeaula.digital/app/root.tsx
index 61f941a..b0ecd56 100644
--- a/apps/saladeaula.digital/app/root.tsx
+++ b/apps/saladeaula.digital/app/root.tsx
@@ -1,3 +1,5 @@
+import type { Route } from './+types/root'
+
import {
isRouteErrorResponse,
Links,
@@ -7,23 +9,34 @@ import {
ScrollRestoration
} from 'react-router'
-import type { Route } from './+types/root'
+import { loggingMiddleware } from '@repo/auth/middleware/logging'
+import { ThemeProvider } from '@repo/ui/components/theme-provider'
import './app.css'
+export const middleware: Route.MiddlewareFunction[] = [loggingMiddleware]
+
export function Layout({ children }: { children: React.ReactNode }) {
return (
-
+
+ saladeaula.digital
+ {children}
+
)
diff --git a/apps/saladeaula.digital/app/routes/auth/login.ts b/apps/saladeaula.digital/app/routes/auth/login.ts
index eb78aa2..9724d00 100644
--- a/apps/saladeaula.digital/app/routes/auth/login.ts
+++ b/apps/saladeaula.digital/app/routes/auth/login.ts
@@ -2,13 +2,15 @@ import type { Route } from './+types'
import { redirect } from 'react-router'
-import { createAuth, type User } from '@/lib/auth'
-import { createSessionStorage } from '@/lib/session'
+import { createAuth, type User } from '@repo/auth/auth'
+import { requestIdContext } from '@repo/auth/context'
+import { createSessionStorage } from '@repo/auth/session'
export async function loader({ request, context }: Route.ActionArgs) {
const sessionStorage = createSessionStorage(context.cloudflare.env)
const session = await sessionStorage.getSession(request.headers.get('cookie'))
const returnTo = session.has('returnTo') ? session.get('returnTo') : '/'
+ const requestId = context.get(requestIdContext)
const user = session.get('user') as User | null
if (user) {
@@ -20,7 +22,8 @@ export async function loader({ request, context }: Route.ActionArgs) {
const user = await authenticator.authenticate('oidc', request)
session.set('user', user)
- console.log(`Redirecting the user to ${returnTo}`)
+ console.log(`[${requestId}] Redirecting the user to ${returnTo}`)
+
// Redirect to the home page after successful login
return redirect(returnTo, {
headers: {
@@ -28,7 +31,7 @@ export async function loader({ request, context }: Route.ActionArgs) {
}
})
} catch (error) {
- console.error(error)
+ console.error(`[${requestId}]`, error)
if (error instanceof Error) {
return Response.json(
diff --git a/apps/saladeaula.digital/app/routes/auth/logout.ts b/apps/saladeaula.digital/app/routes/auth/logout.ts
index df6a308..201a130 100644
--- a/apps/saladeaula.digital/app/routes/auth/logout.ts
+++ b/apps/saladeaula.digital/app/routes/auth/logout.ts
@@ -1,10 +1,11 @@
import type { Route } from './+types'
-import { createAuth, type User } from '@/lib/auth'
-import { createSessionStorage } from '@/lib/session'
import { redirect } from 'react-router'
import type { OAuth2Strategy } from 'remix-auth-oauth2'
+import { createAuth, type User } from '@repo/auth/auth'
+import { createSessionStorage } from '@repo/auth/session'
+
export async function loader({ request, context }: Route.LoaderArgs) {
const authenticator = createAuth(context.cloudflare.env)
const sessionStorage = createSessionStorage(context.cloudflare.env)
@@ -17,8 +18,6 @@ export async function loader({ request, context }: Route.LoaderArgs) {
}
return redirect('/login', {
- headers: new Headers({
- 'Set-Cookie': await sessionStorage.destroySession(session)
- })
+ headers: { 'Set-Cookie': await sessionStorage.destroySession(session) }
})
}
diff --git a/apps/saladeaula.digital/app/routes/index.tsx b/apps/saladeaula.digital/app/routes/index.tsx
index 13c35e1..16f02cd 100644
--- a/apps/saladeaula.digital/app/routes/index.tsx
+++ b/apps/saladeaula.digital/app/routes/index.tsx
@@ -7,37 +7,40 @@ import {
EmptyHeader,
EmptyMedia,
EmptyTitle
-} from '@/components/ui/empty'
+} from '@repo/ui/components/ui/empty'
import {
BanIcon,
+ BookCopyIcon,
CircleCheckIcon,
CircleIcon,
CircleOffIcon,
CircleXIcon,
- HelpCircleIcon,
TimerIcon,
type LucideIcon
} from 'lucide-react'
// import lzwCompress from 'lzwcompress'
import Fuse from 'fuse.js'
-import { Suspense, useMemo, useState } from 'react'
-import { Await, useLoaderData } from 'react-router'
+import { MeiliSearchFilterBuilder } from 'meilisearch-helper'
+import { Suspense, useMemo } from 'react'
+import { Await, useSearchParams } from 'react-router'
import placeholder from '@/assets/placeholder.webp'
-import { FacetedFilter } from '@/components/faceted-filter'
-import { SearchForm } from '@/components/search-form'
-import { Skeleton } from '@/components/skeleton'
+import { createSearch } from '@/lib/meili'
+
+import type { User } from '@repo/auth/auth'
+import { userContext } from '@repo/auth/context'
+import { FacetedFilter } from '@repo/ui/components/faceted-filter'
+import { SearchForm } from '@repo/ui/components/search-form'
+import { Skeleton } from '@repo/ui/components/skeleton'
import {
Card,
CardContent,
CardFooter,
CardHeader,
CardTitle
-} from '@/components/ui/card'
-import { Progress } from '@/components/ui/progress'
-import { userContext } from '@/context'
-import type { User } from '@/lib/auth'
-import { createSearch } from '@/lib/meili'
+} from '@repo/ui/components/ui/card'
+import { Kbd } from '@repo/ui/components/ui/kbd'
+import { Progress } from '@repo/ui/components/ui/progress'
export const data = [
{
@@ -72,51 +75,31 @@ export function meta({}: Route.MetaArgs) {
return [{ title: 'Meus cursos' }]
}
-export const loader = async ({ context }: Route.ActionArgs) => {
+export const loader = async ({ request, context }: Route.ActionArgs) => {
const user = context.get(userContext) as User
+ const { searchParams } = new URL(request.url)
+ const status = searchParams.getAll('status') || []
+ let builder = new MeiliSearchFilterBuilder().where('user.id', '=', user.sub)
+
+ if (status.length) {
+ builder = builder.where('status', 'in', status)
+ }
return {
data: createSearch({
index: 'betaeducacao-prod-enrollments',
- filter: `user.id = "${user.sub}"`,
+ filter: builder.build(),
sort: ['created_at:desc'],
env: context.cloudflare.env
})
}
}
-export const statuses = [
- {
- value: 'PENDING',
- label: 'Não iniciado',
- icon: CircleIcon
- },
- {
- value: 'IN_PROGRESS',
- label: 'Em andamento',
- icon: TimerIcon
- },
- {
- value: 'COMPLETED',
- label: 'Aprovado',
- icon: CircleCheckIcon
- },
- {
- value: 'FAILED',
- label: 'Reprovado',
- icon: CircleXIcon
- },
- {
- value: 'CANCELED',
- label: 'Cancelado',
- icon: CircleOffIcon
- }
-]
-
-export default function Component({}: Route.ComponentProps) {
- const { data } = useLoaderData()
- const [term, setTerm] = useState('')
- const [status, setStatus] = useState([])
+export default function Component({
+ loaderData: { data }
+}: Route.ComponentProps) {
+ const [searchParams, setSearchParams] = useSearchParams()
+ const term = searchParams.get('term') as string
return (
@@ -133,16 +116,43 @@ export default function Component({}: Route.ComponentProps) {
{
- setTerm(e.target.value)
- }}
+ defaultValue={searchParams.get('term') || ''}
+ placeholder={
+ <>
+ Pressione / para filtrar...
+
+ }
+ onChange={(value) =>
+ setSearchParams((searchParams) => {
+ searchParams.set('term', String(value))
+ return searchParams
+ })
+ }
/>
{
+ setSearchParams((searchParams) => {
+ searchParams.delete('status')
+
+ if (statuses.length) {
+ statuses.forEach((s) =>
+ searchParams.has('status', s)
+ ? null
+ : searchParams.append('status', s)
+ )
+ }
+
+ return searchParams
+ })
+ }}
title="Status"
- options={statuses}
+ options={Object.entries(statuses).map(([key, value]) => ({
+ value: key,
+ ...value
+ }))}
/>
@@ -253,38 +263,32 @@ function Enrollment({
)
}
-export const statusIcon: Record = {
+const statuses: Record<
+ string,
+ { icon: LucideIcon; color?: string; label: string }
+> = {
PENDING: {
icon: CircleIcon,
- color: 'bg-gray-500/50 border-gray-500'
+ label: 'Não iniciado'
},
IN_PROGRESS: {
icon: TimerIcon,
- color: 'bg-blue-500/50 border-blue-500'
+ color: 'text-blue-400 [&_svg]:text-blue-500',
+ label: 'Em andamento'
},
COMPLETED: {
icon: CircleCheckIcon,
- color: 'bg-green-500/50 border-green-500'
+ color: 'text-green-400 [&_svg]:text-background [&_svg]:fill-green-500',
+ label: 'Aprovado'
},
FAILED: {
icon: CircleXIcon,
- color: 'bg-red-500/50 border-red-500'
+ color: 'text-red-400 [&_svg]:text-red-500',
+ label: 'Reprovado'
},
CANCELED: {
icon: CircleOffIcon,
- color: 'bg-orange-500/50 border-orange-500'
+ color: 'text-orange-400 [&_svg]:text-orange-500',
+ label: 'Cancelado'
}
}
-
-const defaultIcon = {
- icon: HelpCircleIcon,
- color: 'bg-gray-500 border-gray-500'
-}
-
-const statusTranslate: Record = {
- PENDING: 'Não iniciado',
- IN_PROGRESS: 'Em andamento',
- COMPLETED: 'Aprovado',
- FAILED: 'Reprovado',
- CANCELED: 'Cancelado'
-}
diff --git a/apps/saladeaula.digital/app/routes/layout.tsx b/apps/saladeaula.digital/app/routes/layout.tsx
index 030a87f..0896cc6 100644
--- a/apps/saladeaula.digital/app/routes/layout.tsx
+++ b/apps/saladeaula.digital/app/routes/layout.tsx
@@ -1,11 +1,12 @@
import type { Route } from './+types'
-import { Link, Outlet } from 'react-router'
+import { Outlet } from 'react-router'
-import logo from '@/components/logo.svg'
-import { NavUser } from '@/components/nav-user'
-import { userContext } from '@/context'
-import { authMiddleware } from '@/middleware/auth'
+import { userContext } from '@repo/auth/context'
+import { authMiddleware } from '@repo/auth/middleware/auth'
+
+import { ModeToggle, ThemedImage } from '@repo/ui/components/dark-mode'
+import { NavUser } from '@repo/ui/components/nav-user'
export const middleware: Route.MiddlewareFunction[] = [authMiddleware]
@@ -24,11 +25,10 @@ export default function Component({ loaderData }: Route.ComponentProps) {
px-4 py-2 lg:py-4 sticky top-0 z-5"
>
-
- 
-
+ > = {
[Binding in keyof EnvType]: EnvType[Binding] extends string ? EnvType[Binding] : string;
};
declare namespace NodeJS {
- interface ProcessEnv extends StringifyValues> {}
+ interface ProcessEnv extends StringifyValues> {}
}
// Begin runtime types
diff --git a/package-lock.json b/package-lock.json
index bac0b65..6ed0d21 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -25,26 +25,20 @@
"apps/admin.saladeaula.digital": {
"hasInstallScript": true,
"dependencies": {
- "@brazilian-utils/brazilian-utils": "^1.0.0-rc.12",
- "@hookform/resolvers": "^5.2.2",
"@react-router/fs-routes": "^7.9.5",
+ "@repo/auth": "*",
"@repo/ui": "*",
"@tanstack/react-table": "^8.21.3",
"date-fns": "^4.1.0",
"fuse.js": "^7.1.0",
"http-status-codes": "^2.3.0",
"isbot": "^5.1.31",
- "jose": "^6.1.0",
- "lodash": "^4.17.21",
"luxon": "^3.7.2",
"meilisearch": "^0.54.0",
"meilisearch-helper": "github:sergiors/meilisearch-helper",
"react": "^19.2.0",
"react-dom": "^19.2.0",
- "react-hook-form": "^7.66.0",
- "react-number-format": "^5.4.4",
"react-router": "^7.9.5",
- "remix-auth-oauth2": "^3.4.1",
"zod": "^4.1.12"
},
"devDependencies": {
@@ -164,43 +158,25 @@
"apps/saladeaula.digital": {
"hasInstallScript": true,
"dependencies": {
- "@hookform/resolvers": "^5.2.2",
- "@radix-ui/react-avatar": "^1.1.10",
- "@radix-ui/react-dialog": "^1.1.15",
- "@radix-ui/react-dropdown-menu": "^2.1.16",
- "@radix-ui/react-label": "^2.1.7",
- "@radix-ui/react-popover": "^1.1.15",
- "@radix-ui/react-progress": "^1.1.7",
- "@radix-ui/react-select": "^2.2.6",
- "@radix-ui/react-separator": "^1.1.7",
- "@radix-ui/react-slot": "^1.2.3",
- "@radix-ui/react-tabs": "^1.1.13",
- "@react-router/dev": "^7.9.5",
+ "@repo/auth": "*",
+ "@repo/ui": "*",
"@tanstack/react-table": "^8.21.3",
- "class-variance-authority": "^0.7.1",
- "clsx": "^2.1.1",
- "cmdk": "^1.1.1",
"crypto-js": "^4.2.0",
"fuse.js": "^7.1.0",
"isbot": "^5.1.31",
- "jose": "^6.1.0",
- "lodash": "^4.17.21",
- "lucide-react": "^0.548.0",
"lzwcompress": "^1.1.0",
"meilisearch": "^0.54.0",
+ "meilisearch-helper": "github:sergiors/meilisearch-helper",
"react": "^19.2.0",
"react-dom": "^19.2.0",
- "react-hook-form": "^7.65.0",
"react-router": "^7.9.5",
- "remix-auth-oauth2": "^3.4.1",
- "remix-themes": "^2.0.4",
"rrweb": "^2.0.0-alpha.4",
"scorm-again": "^2.6.7",
- "tailwind-merge": "^3.3.1",
"zod": "^4.1.12"
},
"devDependencies": {
"@cloudflare/vite-plugin": "^1.13.17",
+ "@react-router/dev": "^7.9.5",
"@tailwindcss/vite": "^4.1.16",
"@types/crypto-js": "^4.2.2",
"@types/node": "^24",
@@ -3961,6 +3937,10 @@
"dev": true,
"license": "MIT"
},
+ "node_modules/@repo/auth": {
+ "resolved": "packages/auth",
+ "link": true
+ },
"node_modules/@repo/ui": {
"resolved": "packages/ui",
"link": true
@@ -4605,6 +4585,13 @@
"integrity": "sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w==",
"license": "MIT"
},
+ "node_modules/@types/lodash": {
+ "version": "4.17.20",
+ "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.20.tgz",
+ "integrity": "sha512-H3MHACvFUEiujabxhaI/ImO6gUrd8oOurg7LQtS7mbwIXA/cUqWrvBsaeJ23aZEPk1TAYkurjfMbSELfoCXlGA==",
+ "dev": true,
+ "license": "MIT"
+ },
"node_modules/@types/luxon": {
"version": "3.7.1",
"resolved": "https://registry.npmjs.org/@types/luxon/-/luxon-3.7.1.tgz",
@@ -6422,19 +6409,6 @@
"url": "https://github.com/sponsors/isaacs"
}
},
- "node_modules/remix-themes": {
- "version": "2.0.4",
- "resolved": "https://registry.npmjs.org/remix-themes/-/remix-themes-2.0.4.tgz",
- "integrity": "sha512-S1vIx86xdsMv+ceaWGWtlVZBMhU4tmZeBOBzOiZnhbHnGBbd5YeyIlZ5EL3BSEhZq35oEcINeTrMrVju9GPYEA==",
- "license": "MIT",
- "workspaces": [
- "test-apps/*",
- "."
- ],
- "peerDependencies": {
- "react-router": ">=7.0.0"
- }
- },
"node_modules/retry": {
"version": "0.12.0",
"resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz",
@@ -7155,9 +7129,9 @@
}
},
"node_modules/vite": {
- "version": "7.1.12",
- "resolved": "https://registry.npmjs.org/vite/-/vite-7.1.12.tgz",
- "integrity": "sha512-ZWyE8YXEXqJrrSLvYgrRP7p62OziLW7xI5HYGWFzOvupfAlrLvURSzv/FyGyy0eidogEM3ujU+kUG1zuHgb6Ug==",
+ "version": "7.2.0",
+ "resolved": "https://registry.npmjs.org/vite/-/vite-7.2.0.tgz",
+ "integrity": "sha512-C/Naxf8H0pBx1PA4BdpT+c/5wdqI9ILMdwjSMILw7tVIh3JsxzZqdeTLmmdaoh5MYUEOyBnM9K3o0DzoZ/fe+w==",
"license": "MIT",
"dependencies": {
"esbuild": "^0.25.0",
@@ -7966,10 +7940,40 @@
"url": "https://github.com/sponsors/colinhacks"
}
},
+ "packages/auth": {
+ "name": "@repo/auth",
+ "version": "0.0.0",
+ "dependencies": {
+ "jose": "^6.1.0",
+ "remix-auth-oauth2": "^3.4.1"
+ },
+ "devDependencies": {
+ "@types/node": "^24.9.2",
+ "@types/react": "^19.2.2",
+ "@types/react-dom": "^19.2.2",
+ "react-router": "^7.9.5",
+ "typescript": "^5.9.3"
+ }
+ },
+ "packages/auth/node_modules/typescript": {
+ "version": "5.9.3",
+ "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.9.3.tgz",
+ "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==",
+ "dev": true,
+ "license": "Apache-2.0",
+ "bin": {
+ "tsc": "bin/tsc",
+ "tsserver": "bin/tsserver"
+ },
+ "engines": {
+ "node": ">=14.17"
+ }
+ },
"packages/ui": {
"name": "@repo/ui",
"version": "0.0.0",
"dependencies": {
+ "@brazilian-utils/brazilian-utils": "^1.0.0-rc.12",
"@hookform/resolvers": "^5.2.2",
"@radix-ui/react-avatar": "^1.1.10",
"@radix-ui/react-checkbox": "^1.3.3",
@@ -7989,15 +7993,23 @@
"clsx": "^2.1.1",
"cmdk": "^1.1.1",
"date-fns": "^4.1.0",
+ "lodash": "^4.17.21",
"lucide-react": "^0.548.0",
"next-themes": "^0.4.6",
"postcss": "^8.5.6",
"react-day-picker": "^9.11.1",
"react-hook-form": "^7.66.0",
+ "react-number-format": "^5.4.4",
"tailwind-merge": "^3.3.1",
"tailwindcss": "^4.1.16",
"tw-animate-css": "^1.4.0",
"zod": "^4.1.12"
+ },
+ "devDependencies": {
+ "@types/lodash": "^4.17.20",
+ "typescript": "^5.9.2",
+ "vite": "^7.2.0",
+ "vite-tsconfig-paths": "^5.1.4"
}
}
}
diff --git a/packages/auth/package.json b/packages/auth/package.json
new file mode 100644
index 0000000..1449697
--- /dev/null
+++ b/packages/auth/package.json
@@ -0,0 +1,22 @@
+{
+ "name": "@repo/auth",
+ "version": "0.0.0",
+ "private": true,
+ "exports": {
+ "./auth": "./src/auth.ts",
+ "./session": "./src/session.ts",
+ "./context": "./src/context.ts",
+ "./middleware/*": "./src/middleware/*.ts"
+ },
+ "dependencies": {
+ "jose": "^6.1.0",
+ "remix-auth-oauth2": "^3.4.1"
+ },
+ "devDependencies": {
+ "react-router": "^7.9.5",
+ "@types/node": "^24.9.2",
+ "@types/react": "^19.2.2",
+ "@types/react-dom": "^19.2.2",
+ "typescript": "^5.9.3"
+ }
+}
diff --git a/apps/admin.saladeaula.digital/app/lib/auth.ts b/packages/auth/src/auth.ts
similarity index 96%
rename from apps/admin.saladeaula.digital/app/lib/auth.ts
rename to packages/auth/src/auth.ts
index 35bd563..1b766ef 100644
--- a/apps/admin.saladeaula.digital/app/lib/auth.ts
+++ b/packages/auth/src/auth.ts
@@ -13,7 +13,7 @@ export type User = {
refreshToken: string
}
-export function createAuth(env: Env) {
+export function createAuth(env) {
const authenticator = new Authenticator()
const strategy = new OAuth2Strategy(
{
diff --git a/packages/auth/src/context.ts b/packages/auth/src/context.ts
new file mode 100644
index 0000000..d512d04
--- /dev/null
+++ b/packages/auth/src/context.ts
@@ -0,0 +1,5 @@
+import type { User } from '@/auth'
+import { createContext } from 'react-router'
+
+export const userContext = createContext(null)
+export const requestIdContext = createContext(null)
diff --git a/apps/admin.saladeaula.digital/app/middleware/auth.ts b/packages/auth/src/middleware/auth.ts
similarity index 95%
rename from apps/admin.saladeaula.digital/app/middleware/auth.ts
rename to packages/auth/src/middleware/auth.ts
index 119c3d1..a03d57e 100644
--- a/apps/admin.saladeaula.digital/app/middleware/auth.ts
+++ b/packages/auth/src/middleware/auth.ts
@@ -1,7 +1,7 @@
import { requestIdContext, userContext } from '@/context'
-import { createSessionStorage } from '@/lib/session'
+import { createSessionStorage } from '@/session'
-import { createAuth, type User } from '@/lib/auth'
+import { createAuth, type User } from '@/auth'
import { decodeJwt } from 'jose'
import { redirect, type LoaderFunctionArgs } from 'react-router'
import type { OAuth2Strategy } from 'remix-auth-oauth2'
diff --git a/apps/admin.saladeaula.digital/app/middleware/logging.ts b/packages/auth/src/middleware/logging.ts
similarity index 100%
rename from apps/admin.saladeaula.digital/app/middleware/logging.ts
rename to packages/auth/src/middleware/logging.ts
diff --git a/apps/admin.saladeaula.digital/app/lib/session.ts b/packages/auth/src/session.ts
similarity index 87%
rename from apps/admin.saladeaula.digital/app/lib/session.ts
rename to packages/auth/src/session.ts
index ce38e93..91561c1 100644
--- a/apps/admin.saladeaula.digital/app/lib/session.ts
+++ b/packages/auth/src/session.ts
@@ -1,6 +1,6 @@
import { createCookieSessionStorage } from 'react-router'
-export function createSessionStorage(env: Env) {
+export function createSessionStorage(env) {
const sessionStorage = createCookieSessionStorage({
cookie: {
name: '__session',
diff --git a/packages/auth/tsconfig.json b/packages/auth/tsconfig.json
new file mode 100644
index 0000000..95ce42c
--- /dev/null
+++ b/packages/auth/tsconfig.json
@@ -0,0 +1,11 @@
+{
+ "compilerOptions": {
+ "moduleResolution": "bundler",
+ "baseUrl": ".",
+ "paths": {
+ "@/*": ["./src/*"]
+ }
+ },
+ "include": ["src"],
+ "exclude": ["node_modules"]
+}
diff --git a/packages/ui/package.json b/packages/ui/package.json
index 3231a5d..c8955a0 100644
--- a/packages/ui/package.json
+++ b/packages/ui/package.json
@@ -4,8 +4,6 @@
"private": true,
"exports": {
"./globals.css": "./src/globals.css",
- "./postcss.config": "./postcss.config.js",
- "./tailwind.config": "./tailwind.config.ts",
"./lib/*": "./src/lib/*.ts",
"./hooks/*": [
"./src/hooks/*.ts",
@@ -15,6 +13,7 @@
"./components/*.svg": "./src/components/*.svg"
},
"dependencies": {
+ "@brazilian-utils/brazilian-utils": "^1.0.0-rc.12",
"@hookform/resolvers": "^5.2.2",
"@radix-ui/react-avatar": "^1.1.10",
"@radix-ui/react-checkbox": "^1.3.3",
@@ -34,14 +33,22 @@
"clsx": "^2.1.1",
"cmdk": "^1.1.1",
"date-fns": "^4.1.0",
+ "lodash": "^4.17.21",
"lucide-react": "^0.548.0",
"next-themes": "^0.4.6",
"postcss": "^8.5.6",
"react-day-picker": "^9.11.1",
"react-hook-form": "^7.66.0",
+ "react-number-format": "^5.4.4",
"tailwind-merge": "^3.3.1",
"tailwindcss": "^4.1.16",
"tw-animate-css": "^1.4.0",
"zod": "^4.1.12"
+ },
+ "devDependencies": {
+ "@types/lodash": "^4.17.20",
+ "typescript": "^5.9.2",
+ "vite": "^7.2.0",
+ "vite-tsconfig-paths": "^5.1.4"
}
}
diff --git a/apps/admin.saladeaula.digital/app/components/dark-mode.tsx b/packages/ui/src/components/dark-mode.tsx
similarity index 93%
rename from apps/admin.saladeaula.digital/app/components/dark-mode.tsx
rename to packages/ui/src/components/dark-mode.tsx
index 0eb39fb..b11c5b7 100644
--- a/apps/admin.saladeaula.digital/app/components/dark-mode.tsx
+++ b/packages/ui/src/components/dark-mode.tsx
@@ -3,15 +3,15 @@
import { Moon, Sun, SunMoon } from 'lucide-react'
import { useTheme } from 'next-themes'
-import { Button } from '@repo/ui/components/ui/button'
+import dark from './logo-dark.svg'
+import light from './logo-light.svg'
+import { Button } from './ui/button'
import {
DropdownMenu,
DropdownMenuContent,
DropdownMenuItem,
DropdownMenuTrigger
-} from '@repo/ui/components/ui/dropdown-menu'
-import dark from './logo-dark.svg'
-import light from './logo-light.svg'
+} from './ui/dropdown-menu'
export function ModeToggle() {
const { setTheme } = useTheme()
diff --git a/apps/admin.saladeaula.digital/app/components/faceted-filter.tsx b/packages/ui/src/components/faceted-filter.tsx
similarity index 100%
rename from apps/admin.saladeaula.digital/app/components/faceted-filter.tsx
rename to packages/ui/src/components/faceted-filter.tsx
diff --git a/apps/admin.saladeaula.digital/app/components/nav-user.tsx b/packages/ui/src/components/nav-user.tsx
similarity index 67%
rename from apps/admin.saladeaula.digital/app/components/nav-user.tsx
rename to packages/ui/src/components/nav-user.tsx
index 7849887..04df52b 100644
--- a/apps/admin.saladeaula.digital/app/components/nav-user.tsx
+++ b/packages/ui/src/components/nav-user.tsx
@@ -4,12 +4,16 @@ import {
CirclePlayIcon,
DollarSignIcon,
GraduationCapIcon,
+ LayoutDashboardIcon,
+ LightbulbIcon,
LogOutIcon,
- UserIcon
+ UserIcon,
+ type LucideIcon
} from 'lucide-react'
import { Link } from 'react-router'
-import { Avatar, AvatarFallback } from '@repo/ui/components/ui/avatar'
+import { initials } from '../lib/utils'
+import { Avatar, AvatarFallback } from './ui/avatar'
import {
DropdownMenu,
DropdownMenuContent,
@@ -18,8 +22,40 @@ import {
DropdownMenuLabel,
DropdownMenuSeparator,
DropdownMenuTrigger
-} from '@repo/ui/components/ui/dropdown-menu'
-import { initials } from '@repo/ui/lib/utils'
+} from './ui/dropdown-menu'
+
+type NavItem = {
+ title: string
+ url: string
+ icon: LucideIcon
+ scope?: string[]
+}
+
+const apps: NavItem[] = [
+ {
+ title: 'Sala de aula',
+ url: '//scorm.eduseg.workers.dev',
+ icon: GraduationCapIcon
+ },
+ {
+ title: 'Administrador',
+ url: '//admin.saladeaula.digital',
+ icon: LayoutDashboardIcon,
+ scope: ['apps:admin']
+ },
+ {
+ title: 'EDUSEG® Estúdio',
+ url: '//studio.saladeaula.digital',
+ icon: CirclePlayIcon,
+ scope: ['apps:studio']
+ },
+ {
+ title: 'EDUSEG® Insights',
+ url: '//insights.saladeaula.digital',
+ icon: LightbulbIcon,
+ scope: ['apps:insights']
+ }
+]
export function NavUser({
user
@@ -30,7 +66,7 @@ export function NavUser({
scope: string
}
}) {
- const scopes = user.scope.split(' ')
+ const userScope = user.scope.split(' ')
return (
@@ -82,7 +118,11 @@ export function NavUser({
- {grantIfHas(['apps:admin', 'apps:studio'], scopes, 'any') && (
+ {grantIfHas(
+ ['apps:admin', 'apps:studio', 'apps:insights'],
+ userScope,
+ 'any'
+ ) && (
<>
@@ -91,26 +131,19 @@ export function NavUser({
)}
-
-
-
+ {apps.map(({ title, url, scope = [], icon: Icon }, idx) => {
+ if (grantIfHas(scope, userScope)) {
+ return (
+
+
+
+ )
+ }
- {grantIfHas(['apps:studio'], scopes) && (
- <>
-
-
-
-
- )}
+ return <>
+ })}
+
diff --git a/apps/saladeaula.digital/app/routes/payments.tsx b/apps/saladeaula.digital/app/routes/payments.tsx
index b850151..729a386 100644
--- a/apps/saladeaula.digital/app/routes/payments.tsx
+++ b/apps/saladeaula.digital/app/routes/payments.tsx
@@ -9,7 +9,7 @@ import {
BreadcrumbList,
BreadcrumbPage,
BreadcrumbSeparator
-} from '@/components/ui/breadcrumb'
+} from '@repo/ui/components/ui/breadcrumb'
export function meta({}: Route.MetaArgs) {
return [{ title: 'Histórico de compras' }]
diff --git a/apps/saladeaula.digital/app/routes/settings.tsx b/apps/saladeaula.digital/app/routes/settings.tsx
index 62a12e4..ceb4af2 100644
--- a/apps/saladeaula.digital/app/routes/settings.tsx
+++ b/apps/saladeaula.digital/app/routes/settings.tsx
@@ -2,6 +2,9 @@ import type { Route } from './+types'
import { Link } from 'react-router'
+import { userContext } from '@/context'
+import { request as req } from '@/lib/request'
+import type { User } from '@/middleware/auth'
import {
Breadcrumb,
BreadcrumbItem,
@@ -9,15 +12,15 @@ import {
BreadcrumbList,
BreadcrumbPage,
BreadcrumbSeparator
-} from '@/components/ui/breadcrumb'
-import { Button } from '@/components/ui/button'
+} from '@repo/ui/components/ui/breadcrumb'
+import { Button } from '@repo/ui/components/ui/button'
import {
Card,
CardContent,
CardDescription,
CardHeader,
CardTitle
-} from '@/components/ui/card'
+} from '@repo/ui/components/ui/card'
import {
Form,
FormControl,
@@ -25,12 +28,9 @@ import {
FormItem,
FormLabel,
FormMessage
-} from '@/components/ui/form'
-import { Input } from '@/components/ui/input'
-import { Spinner } from '@/components/ui/spinner'
-import { userContext } from '@/context'
-import { request as req } from '@/lib/request'
-import type { User } from '@/middleware/auth'
+} from '@repo/ui/components/ui/form'
+import { Input } from '@repo/ui/components/ui/input'
+import { Spinner } from '@repo/ui/components/ui/spinner'
import { useForm } from 'react-hook-form'
export function meta({}: Route.MetaArgs) {
diff --git a/apps/saladeaula.digital/package.json b/apps/saladeaula.digital/package.json
index e9c3ce3..ad124d3 100644
--- a/apps/saladeaula.digital/package.json
+++ b/apps/saladeaula.digital/package.json
@@ -12,42 +12,24 @@
"typecheck": "npm run cf-typegen && react-router typegen && tsc --noEmit"
},
"dependencies": {
- "@hookform/resolvers": "^5.2.2",
- "@radix-ui/react-avatar": "^1.1.10",
- "@radix-ui/react-dialog": "^1.1.15",
- "@radix-ui/react-dropdown-menu": "^2.1.16",
- "@radix-ui/react-label": "^2.1.7",
- "@radix-ui/react-popover": "^1.1.15",
- "@radix-ui/react-progress": "^1.1.7",
- "@radix-ui/react-select": "^2.2.6",
- "@radix-ui/react-separator": "^1.1.7",
- "@radix-ui/react-slot": "^1.2.3",
- "@radix-ui/react-tabs": "^1.1.13",
- "@react-router/dev": "^7.9.5",
+ "@repo/auth": "*",
+ "@repo/ui": "*",
"@tanstack/react-table": "^8.21.3",
- "class-variance-authority": "^0.7.1",
- "clsx": "^2.1.1",
- "cmdk": "^1.1.1",
+ "meilisearch-helper": "github:sergiors/meilisearch-helper",
"crypto-js": "^4.2.0",
"fuse.js": "^7.1.0",
"isbot": "^5.1.31",
- "jose": "^6.1.0",
- "lodash": "^4.17.21",
- "lucide-react": "^0.548.0",
"lzwcompress": "^1.1.0",
"meilisearch": "^0.54.0",
"react": "^19.2.0",
"react-dom": "^19.2.0",
- "react-hook-form": "^7.65.0",
"react-router": "^7.9.5",
- "remix-auth-oauth2": "^3.4.1",
- "remix-themes": "^2.0.4",
"rrweb": "^2.0.0-alpha.4",
"scorm-again": "^2.6.7",
- "tailwind-merge": "^3.3.1",
"zod": "^4.1.12"
},
"devDependencies": {
+ "@react-router/dev": "^7.9.5",
"@cloudflare/vite-plugin": "^1.13.17",
"@tailwindcss/vite": "^4.1.16",
"@types/crypto-js": "^4.2.2",
diff --git a/apps/saladeaula.digital/worker-configuration.d.ts b/apps/saladeaula.digital/worker-configuration.d.ts
index 51d389a..6613d27 100644
--- a/apps/saladeaula.digital/worker-configuration.d.ts
+++ b/apps/saladeaula.digital/worker-configuration.d.ts
@@ -1,5 +1,5 @@
/* eslint-disable */
-// Generated by Wrangler by running `wrangler types` (hash: e18fc2110ce73cc9f6afb0de66f703db)
+// Generated by Wrangler by running `wrangler types` (hash: a901705264ceb3e725e174d55b20e764)
// Runtime types generated with workerd@1.20251011.0 2025-04-04 nodejs_compat
declare namespace Cloudflare {
interface GlobalProps {
@@ -7,13 +7,16 @@ declare namespace Cloudflare {
}
interface Env {
CLIENT_ID: "1a5483ab-4521-4702-9115-5857ac676851";
- REDIRECT_URI: "https://scorm.eduseg.workers.dev/login";
SCOPE: "openid profile email offline_access";
API_URL: "https://bcs7fgb9og.execute-api.sa-east-1.amazonaws.com";
ISSUER_URL: "https://id.saladeaula.digital";
BUCKET_NAME: "saladeaula.digital";
BUCKET_ENDPOINT: "https://s3.sa-east-1.amazonaws.com";
MEILI_HOST: "https://search.saladeaula.digital";
+ CLIENT_SECRET: string;
+ REDIRECT_URI: string;
+ SESSION_SECRET: string;
+ MEILI_API_KEY: string;
}
}
interface Env extends Cloudflare.Env {}
@@ -21,7 +24,7 @@ type StringifyValues
+