-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add Redis for session storage and UI enhancements
- Implement Redis storage for SMART client state due to iron-session's 4KB cookie size limit - Add Docker configuration for Redis - Implement user avatar and dropdown menu components - Enhance SMART launch flow and authorization - Clean up console logs and improve code style - Remove unused test endpoint The switch to Redis was necessary because the SMART client state exceeds iron-session's 4096-byte cookie size limit. Now the cookie only stores a reference while the full state is kept in Redis.
- Loading branch information
1 parent
d1e6193
commit c8c5134
Showing
19 changed files
with
667 additions
and
53 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -40,3 +40,4 @@ yarn-error.log* | |
*.tsbuildinfo | ||
next-env.d.ts | ||
/pgdata | ||
/redisdata |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,50 @@ | ||
"use client"; | ||
|
||
import * as React from "react"; | ||
import * as AvatarPrimitive from "@radix-ui/react-avatar"; | ||
|
||
import { cn } from "@/lib/utils"; | ||
|
||
const Avatar = React.forwardRef< | ||
React.ElementRef<typeof AvatarPrimitive.Root>, | ||
React.ComponentPropsWithoutRef<typeof AvatarPrimitive.Root> | ||
>(({ className, ...props }, ref) => ( | ||
<AvatarPrimitive.Root | ||
ref={ref} | ||
className={cn( | ||
"relative flex h-10 w-10 shrink-0 overflow-hidden rounded-full", | ||
className, | ||
)} | ||
{...props} | ||
/> | ||
)); | ||
Avatar.displayName = AvatarPrimitive.Root.displayName; | ||
|
||
const AvatarImage = React.forwardRef< | ||
React.ElementRef<typeof AvatarPrimitive.Image>, | ||
React.ComponentPropsWithoutRef<typeof AvatarPrimitive.Image> | ||
>(({ className, ...props }, ref) => ( | ||
<AvatarPrimitive.Image | ||
ref={ref} | ||
className={cn("aspect-square h-full w-full", className)} | ||
{...props} | ||
/> | ||
)); | ||
AvatarImage.displayName = AvatarPrimitive.Image.displayName; | ||
|
||
const AvatarFallback = React.forwardRef< | ||
React.ElementRef<typeof AvatarPrimitive.Fallback>, | ||
React.ComponentPropsWithoutRef<typeof AvatarPrimitive.Fallback> | ||
>(({ className, ...props }, ref) => ( | ||
<AvatarPrimitive.Fallback | ||
ref={ref} | ||
className={cn( | ||
"flex h-full w-full items-center justify-center rounded-full bg-muted", | ||
className, | ||
)} | ||
{...props} | ||
/> | ||
)); | ||
AvatarFallback.displayName = AvatarPrimitive.Fallback.displayName; | ||
|
||
export { Avatar, AvatarImage, AvatarFallback }; |
201 changes: 201 additions & 0 deletions
201
aidbox-forms-smart-launch-2/src/components/ui/dropdown-menu.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,201 @@ | ||
"use client"; | ||
|
||
import * as React from "react"; | ||
import * as DropdownMenuPrimitive from "@radix-ui/react-dropdown-menu"; | ||
import { Check, ChevronRight, Circle } from "lucide-react"; | ||
|
||
import { cn } from "@/lib/utils"; | ||
|
||
const DropdownMenu = DropdownMenuPrimitive.Root; | ||
|
||
const DropdownMenuTrigger = DropdownMenuPrimitive.Trigger; | ||
|
||
const DropdownMenuGroup = DropdownMenuPrimitive.Group; | ||
|
||
const DropdownMenuPortal = DropdownMenuPrimitive.Portal; | ||
|
||
const DropdownMenuSub = DropdownMenuPrimitive.Sub; | ||
|
||
const DropdownMenuRadioGroup = DropdownMenuPrimitive.RadioGroup; | ||
|
||
const DropdownMenuSubTrigger = React.forwardRef< | ||
React.ElementRef<typeof DropdownMenuPrimitive.SubTrigger>, | ||
React.ComponentPropsWithoutRef<typeof DropdownMenuPrimitive.SubTrigger> & { | ||
inset?: boolean; | ||
} | ||
>(({ className, inset, children, ...props }, ref) => ( | ||
<DropdownMenuPrimitive.SubTrigger | ||
ref={ref} | ||
className={cn( | ||
"flex cursor-default gap-2 select-none items-center rounded-sm px-2 py-1.5 text-sm outline-none focus:bg-accent data-[state=open]:bg-accent [&_svg]:pointer-events-none [&_svg]:size-4 [&_svg]:shrink-0", | ||
inset && "pl-8", | ||
className, | ||
)} | ||
{...props} | ||
> | ||
{children} | ||
<ChevronRight className="ml-auto" /> | ||
</DropdownMenuPrimitive.SubTrigger> | ||
)); | ||
DropdownMenuSubTrigger.displayName = | ||
DropdownMenuPrimitive.SubTrigger.displayName; | ||
|
||
const DropdownMenuSubContent = React.forwardRef< | ||
React.ElementRef<typeof DropdownMenuPrimitive.SubContent>, | ||
React.ComponentPropsWithoutRef<typeof DropdownMenuPrimitive.SubContent> | ||
>(({ className, ...props }, ref) => ( | ||
<DropdownMenuPrimitive.SubContent | ||
ref={ref} | ||
className={cn( | ||
"z-50 min-w-[8rem] overflow-hidden rounded-md border bg-popover p-1 text-popover-foreground shadow-lg data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2", | ||
className, | ||
)} | ||
{...props} | ||
/> | ||
)); | ||
DropdownMenuSubContent.displayName = | ||
DropdownMenuPrimitive.SubContent.displayName; | ||
|
||
const DropdownMenuContent = React.forwardRef< | ||
React.ElementRef<typeof DropdownMenuPrimitive.Content>, | ||
React.ComponentPropsWithoutRef<typeof DropdownMenuPrimitive.Content> | ||
>(({ className, sideOffset = 4, ...props }, ref) => ( | ||
<DropdownMenuPrimitive.Portal> | ||
<DropdownMenuPrimitive.Content | ||
ref={ref} | ||
sideOffset={sideOffset} | ||
className={cn( | ||
"z-50 min-w-[8rem] overflow-hidden rounded-md border bg-popover p-1 text-popover-foreground shadow-md", | ||
"data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2", | ||
className, | ||
)} | ||
{...props} | ||
/> | ||
</DropdownMenuPrimitive.Portal> | ||
)); | ||
DropdownMenuContent.displayName = DropdownMenuPrimitive.Content.displayName; | ||
|
||
const DropdownMenuItem = React.forwardRef< | ||
React.ElementRef<typeof DropdownMenuPrimitive.Item>, | ||
React.ComponentPropsWithoutRef<typeof DropdownMenuPrimitive.Item> & { | ||
inset?: boolean; | ||
} | ||
>(({ className, inset, ...props }, ref) => ( | ||
<DropdownMenuPrimitive.Item | ||
ref={ref} | ||
className={cn( | ||
"relative flex cursor-default select-none items-center gap-2 rounded-sm px-2 py-1.5 text-sm outline-none transition-colors focus:bg-accent focus:text-accent-foreground data-[disabled]:pointer-events-none data-[disabled]:opacity-50 [&>svg]:size-4 [&>svg]:shrink-0", | ||
inset && "pl-8", | ||
className, | ||
)} | ||
{...props} | ||
/> | ||
)); | ||
DropdownMenuItem.displayName = DropdownMenuPrimitive.Item.displayName; | ||
|
||
const DropdownMenuCheckboxItem = React.forwardRef< | ||
React.ElementRef<typeof DropdownMenuPrimitive.CheckboxItem>, | ||
React.ComponentPropsWithoutRef<typeof DropdownMenuPrimitive.CheckboxItem> | ||
>(({ className, children, checked, ...props }, ref) => ( | ||
<DropdownMenuPrimitive.CheckboxItem | ||
ref={ref} | ||
className={cn( | ||
"relative flex cursor-default select-none items-center rounded-sm py-1.5 pl-8 pr-2 text-sm outline-none transition-colors focus:bg-accent focus:text-accent-foreground data-[disabled]:pointer-events-none data-[disabled]:opacity-50", | ||
className, | ||
)} | ||
checked={checked} | ||
{...props} | ||
> | ||
<span className="absolute left-2 flex h-3.5 w-3.5 items-center justify-center"> | ||
<DropdownMenuPrimitive.ItemIndicator> | ||
<Check className="h-4 w-4" /> | ||
</DropdownMenuPrimitive.ItemIndicator> | ||
</span> | ||
{children} | ||
</DropdownMenuPrimitive.CheckboxItem> | ||
)); | ||
DropdownMenuCheckboxItem.displayName = | ||
DropdownMenuPrimitive.CheckboxItem.displayName; | ||
|
||
const DropdownMenuRadioItem = React.forwardRef< | ||
React.ElementRef<typeof DropdownMenuPrimitive.RadioItem>, | ||
React.ComponentPropsWithoutRef<typeof DropdownMenuPrimitive.RadioItem> | ||
>(({ className, children, ...props }, ref) => ( | ||
<DropdownMenuPrimitive.RadioItem | ||
ref={ref} | ||
className={cn( | ||
"relative flex cursor-default select-none items-center rounded-sm py-1.5 pl-8 pr-2 text-sm outline-none transition-colors focus:bg-accent focus:text-accent-foreground data-[disabled]:pointer-events-none data-[disabled]:opacity-50", | ||
className, | ||
)} | ||
{...props} | ||
> | ||
<span className="absolute left-2 flex h-3.5 w-3.5 items-center justify-center"> | ||
<DropdownMenuPrimitive.ItemIndicator> | ||
<Circle className="h-2 w-2 fill-current" /> | ||
</DropdownMenuPrimitive.ItemIndicator> | ||
</span> | ||
{children} | ||
</DropdownMenuPrimitive.RadioItem> | ||
)); | ||
DropdownMenuRadioItem.displayName = DropdownMenuPrimitive.RadioItem.displayName; | ||
|
||
const DropdownMenuLabel = React.forwardRef< | ||
React.ElementRef<typeof DropdownMenuPrimitive.Label>, | ||
React.ComponentPropsWithoutRef<typeof DropdownMenuPrimitive.Label> & { | ||
inset?: boolean; | ||
} | ||
>(({ className, inset, ...props }, ref) => ( | ||
<DropdownMenuPrimitive.Label | ||
ref={ref} | ||
className={cn( | ||
"px-2 py-1.5 text-sm font-semibold", | ||
inset && "pl-8", | ||
className, | ||
)} | ||
{...props} | ||
/> | ||
)); | ||
DropdownMenuLabel.displayName = DropdownMenuPrimitive.Label.displayName; | ||
|
||
const DropdownMenuSeparator = React.forwardRef< | ||
React.ElementRef<typeof DropdownMenuPrimitive.Separator>, | ||
React.ComponentPropsWithoutRef<typeof DropdownMenuPrimitive.Separator> | ||
>(({ className, ...props }, ref) => ( | ||
<DropdownMenuPrimitive.Separator | ||
ref={ref} | ||
className={cn("-mx-1 my-1 h-px bg-muted", className)} | ||
{...props} | ||
/> | ||
)); | ||
DropdownMenuSeparator.displayName = DropdownMenuPrimitive.Separator.displayName; | ||
|
||
const DropdownMenuShortcut = ({ | ||
className, | ||
...props | ||
}: React.HTMLAttributes<HTMLSpanElement>) => { | ||
return ( | ||
<span | ||
className={cn("ml-auto text-xs tracking-widest opacity-60", className)} | ||
{...props} | ||
/> | ||
); | ||
}; | ||
DropdownMenuShortcut.displayName = "DropdownMenuShortcut"; | ||
|
||
export { | ||
DropdownMenu, | ||
DropdownMenuTrigger, | ||
DropdownMenuContent, | ||
DropdownMenuItem, | ||
DropdownMenuCheckboxItem, | ||
DropdownMenuRadioItem, | ||
DropdownMenuLabel, | ||
DropdownMenuSeparator, | ||
DropdownMenuShortcut, | ||
DropdownMenuGroup, | ||
DropdownMenuPortal, | ||
DropdownMenuSub, | ||
DropdownMenuSubContent, | ||
DropdownMenuSubTrigger, | ||
DropdownMenuRadioGroup, | ||
}; |
26 changes: 26 additions & 0 deletions
26
aidbox-forms-smart-launch-2/src/components/user-avatar.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
import React from "react"; | ||
import { Avatar, AvatarFallback, AvatarImage } from "@/components/ui/avatar"; | ||
import { Patient, Practitioner } from "fhir/r4"; | ||
import { constructInitials } from "@/lib/utils"; | ||
|
||
export function UserAvatar({ user }: { user: Patient | Practitioner }) { | ||
const initials = constructInitials(user.name); | ||
|
||
return ( | ||
<Avatar className="h-8 w-8"> | ||
{user.photo?.[0]?.url || user.photo?.[0]?.data ? ( | ||
<AvatarImage src={user.photo?.[0]?.url || user.photo?.[0]?.data} /> | ||
) : ( | ||
<AvatarFallback | ||
className={ | ||
user.resourceType === "Patient" | ||
? "bg-pink-400 text-pink-50" | ||
: "bg-teal-400 text-teal-50" | ||
} | ||
> | ||
{initials} | ||
</AvatarFallback> | ||
)} | ||
</Avatar> | ||
); | ||
} |
Oops, something went wrong.