Skip to content

Commit

Permalink
Merge pull request #306 from and-voila/fix-stripe-checkout-issues
Browse files Browse the repository at this point in the history
fix: stripe checkout issues
  • Loading branch information
srizvi authored Nov 1, 2023
2 parents e5ba0ab + e7abb9b commit 7eae2f6
Show file tree
Hide file tree
Showing 9 changed files with 30 additions and 20 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ const ChapterIdPage = async ({
<Container>
<div className="mx-auto flex flex-col pb-20">
{userProgress?.isCompleted && (
<Banner variant="success" label="You've completed this chapter." />
<Banner variant="success" label="You've completed this playbook." />
)}
<div className="py-4">
<VideoPlayer
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ const ChapterIdPage = async ({
{!chapter.isPublished && (
<Banner
variant="warning"
label="This chapter is unpublished. It will not be visible in the course"
label="This play ain't published yet. No one can take it until it is."
/>
)}
<div className="p-6">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ const CourseIdPage = async ({ params }: { params: { courseId: string } }) => {
return (
<div className="mx-auto max-w-3xl bg-background pb-24 dark:bg-[#242629] lg:pb-32">
{!course.isPublished && (
<Banner label="This course is unpublished. It will not be visible to the students." />
<Banner label="This playbook ain't published. No one will be able to see it yo." />
)}
<div className="p-6">
<div className="flex items-center justify-between">
Expand Down
10 changes: 0 additions & 10 deletions apps/lms/app/api/whoAmI/route.ts

This file was deleted.

12 changes: 8 additions & 4 deletions apps/lms/app/ui/session-info.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,13 @@ export const SessionInfo = () => {
}

return (
<div className="text-xs bg-alternate/50 backdrop-blur-md absolute bottom-6 right-6 p-4 rounded-lg text-black">
<p className="font-mono font-bold ">For testing purposes</p>
<pre>User ID: {obfuscatedUserId}</pre>
</div>
<>
{process.env.NODE_ENV !== 'production' && (
<div className="text-xs bg-alternate/50 backdrop-blur-md absolute bottom-6 right-6 p-4 rounded-lg text-black">
<p className="font-mono font-bold ">For testing purposes</p>
<pre>User ID: {obfuscatedUserId}</pre>
</div>
)}
</>
);
};
16 changes: 16 additions & 0 deletions apps/lms/app/ui/tailwind-indicator.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
export function TailwindIndicator() {
if (process.env.NODE_ENV === 'production') return null;

return (
<div className="fixed bottom-1 left-1 z-50 flex h-6 w-6 items-center justify-center rounded-full bg-gray-800 p-3 font-mono text-xs text-white">
<div className="block sm:hidden">xs</div>
<div className="hidden sm:block md:hidden lg:hidden xl:hidden 2xl:hidden">
sm
</div>
<div className="hidden md:block lg:hidden xl:hidden 2xl:hidden">md</div>
<div className="hidden lg:block xl:hidden 2xl:hidden">lg</div>
<div className="hidden xl:block 2xl:hidden">xl</div>
<div className="hidden 2xl:block">2xl</div>
</div>
);
}
2 changes: 1 addition & 1 deletion apps/lms/app/ui/user-account-nav.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ export function UserAccountNav({ user }: UserAccountNavProps) {
});
}}
>
Sign out
Log out
</DropdownMenuItem>
</DropdownMenuContent>
</DropdownMenu>
Expand Down
2 changes: 1 addition & 1 deletion apps/lms/app/ui/user-avatar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ export function UserAvatar({ user, ...props }: UserAvatarProps) {
) : (
<AvatarFallback>
<span className="sr-only">{user.name}</span>
<Icons.user className="h-4 w-4" />
<Icons.user className="h-8 w-8" />
</AvatarFallback>
)}
</Avatar>
Expand Down
2 changes: 1 addition & 1 deletion packages/ui/components/ui/avatar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ const AvatarFallback = React.forwardRef<
<AvatarPrimitive.Fallback
ref={ref}
className={cn(
'flex h-full w-full items-center justify-center rounded-full bg-muted',
'flex h-full w-full items-center justify-center rounded-full',
className,
)}
{...props}
Expand Down

0 comments on commit 7eae2f6

Please sign in to comment.