Skip to content

[comp] Production Deploy #576

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
carhartlewis merged 2 commits into from
May 11, 2025
Merged

[comp] Production Deploy #576

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8152fea
chore: update dependencies and enhance onboarding visuals
carhartlewis May 11, 2025
fd34d61
Merge pull request #575 from trycompai/lewis/comp-trust-center-ui-tweaks
carhartlewis May 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added apps/app/public/onboarding/cloud-dark.webp
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added apps/app/public/onboarding/cloud-light.webp
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added apps/app/public/onboarding/people-dark.webp
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added apps/app/public/onboarding/people-light.webp
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added apps/app/public/onboarding/risk-dark.webp
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added apps/app/public/onboarding/risk-light.webp
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added apps/app/public/onboarding/vendor-dark.webp
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added apps/app/public/onboarding/vendor-light.webp
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
25 changes: 11 additions & 14 deletions apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,13 +64,9 @@ export default async function Layout({
return notFound();
}

// Fetch onboarding status
const onboardingStatus = await getOnboardingStatus(currentOrganization.id);

// Handle potential error during fetching
if ("error" in onboardingStatus) {
// Decide how to handle the error - maybe log it or show a generic error message
// For now, we'll proceed without the checklist
console.error("Error fetching onboarding status:", onboardingStatus.error);
}

Expand All @@ -84,16 +80,17 @@ export default async function Layout({
<main className="px-4 mx-auto pb-8">{children}</main>
<AssistantSheet />
</AnimatedLayout>
{/* Render floating checklist only if onboarding is not complete and no fetch error */}
{!("error" in onboardingStatus) &&
onboardingStatus.completedItems < onboardingStatus.totalItems && (
<FloatingOnboardingChecklist
orgId={currentOrganization.id}
completedItems={onboardingStatus.completedItems}
totalItems={onboardingStatus.totalItems}
checklistItems={onboardingStatus.checklistItems}
/>
)}
<div className="hidden md:flex">
{!("error" in onboardingStatus) &&
onboardingStatus.completedItems < onboardingStatus.totalItems && (
<FloatingOnboardingChecklist
orgId={currentOrganization.id}
completedItems={onboardingStatus.completedItems}
totalItems={onboardingStatus.totalItems}
checklistItems={onboardingStatus.checklistItems}
/>
)}
</div>
<HotKeys />
</SidebarProvider>
);
Expand Down
3 changes: 2 additions & 1 deletion apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/risk/(overview)/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,8 @@ export default async function RiskRegisterPage({
"app_onboarding.risk_management.description",
)}
cta={t("app_onboarding.risk_management.cta")}
imageSrc="/onboarding/risk-management.webp"
imageSrcLight="/onboarding/risk-light.webp"
imageSrcDark="/onboarding/risk-dark.webp"
imageAlt="Risk Management"
sheetName="create-risk-sheet"
faqs={[
Expand Down
3 changes: 2 additions & 1 deletion apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/risk/backup-overview/layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@ export default async function Layout({
"app_onboarding.risk_management.description",
)}
cta={t("app_onboarding.risk_management.cta")}
imageSrc="/onboarding/risk-management.webp"
imageSrcDark="/onboarding/risk-management.webp"
imageSrcLight="/onboarding/risk-management-light.webp"
imageAlt="Risk Management"
sheetName="create-risk-sheet"
faqs={[
Expand Down
5 changes: 3 additions & 2 deletions ...src/app/[locale]/(app)/(dashboard)/[orgId]/settings/trust-portal/actions/custom-domain.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,10 @@ export const customDomainAction = authActionClient
}

try {
await db.trust.update({
await db.trust.upsert({
where: { organizationId: activeOrganizationId },
data: { domain, domainVerified: false },
update: { domain },
create: { organizationId: activeOrganizationId, domain },
});

revalidatePath("/settings/trust-portal");
Expand Down
58 changes: 30 additions & 28 deletions ...[locale]/(app)/(dashboard)/[orgId]/settings/trust-portal/components/TrustPortalDomain.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ export function TrustPortalDomain({
toast.success("DNS record verified.");
}
},
onError: (error) => {
onError: () => {
toast.error("DNS record verification failed, check the records are valid or try again later.");
},
});
Expand Down Expand Up @@ -142,32 +142,34 @@ export function TrustPortalDomain({
<FormField
control={form.control}
name="domain"
render={({ field, fieldState }) => (
render={({ field }) => (
<FormItem>
<FormLabel className="flex items-center gap-2">
Custom Domain
{domainVerified ? (
<TooltipProvider>
<Tooltip>
<TooltipTrigger>
<CheckCircle className="h-4 w-4 text-green-500" />
</TooltipTrigger>
<TooltipContent>
Domain is verified
</TooltipContent>
</Tooltip>
</TooltipProvider>
) : (
<TooltipProvider>
<Tooltip>
<TooltipTrigger>
<AlertCircle className="h-4 w-4 text-amber-500" />
</TooltipTrigger>
<TooltipContent>
Domain is not verified yet
</TooltipContent>
</Tooltip>
</TooltipProvider>
{initialDomain !== "" && (
domainVerified ? (
<TooltipProvider>
<Tooltip>
<TooltipTrigger type="button">
<CheckCircle className="h-4 w-4 text-green-500" />
</TooltipTrigger>
<TooltipContent>
Domain is verified
</TooltipContent>
</Tooltip>
</TooltipProvider>
) : (
<TooltipProvider>
<Tooltip>
<TooltipTrigger type="button">
<AlertCircle className="h-4 w-4 text-red-500" />
</TooltipTrigger>
<TooltipContent>
Domain is not verified yet
</TooltipContent>
</Tooltip>
</TooltipProvider>
)
)}
</FormLabel>
<div className="flex flex-col md:flex-row gap-2">
Expand All @@ -182,7 +184,7 @@ export function TrustPortalDomain({
spellCheck="false"
/>
</FormControl>
{field.value === initialDomain && !domainVerified && (
{field.value === initialDomain && initialDomain !== "" && !domainVerified && (
<Button
type="button"
className="md:max-w-[300px]"
Expand All @@ -201,7 +203,7 @@ export function TrustPortalDomain({
)}
/>

{form.watch("domain") === initialDomain && !domainVerified && (
{form.watch("domain") === initialDomain && initialDomain !== "" && !domainVerified && (
<div className="space-y-2 pt-2">
<div className="rounded-md border">
<div className="text-sm">
Expand All @@ -220,7 +222,7 @@ export function TrustPortalDomain({
{isCnameVerified ? (
<CheckCircle className="h-4 w-4 text-green-500" />
) : (
<AlertCircle className="h-4 w-4 text-amber-500" />
<AlertCircle className="h-4 w-4 text-red-500" />
)}
</td>
<td>CNAME</td>
Expand Down Expand Up @@ -265,7 +267,7 @@ export function TrustPortalDomain({
{isTxtVerified ? (
<CheckCircle className="h-4 w-4 text-green-500" />
) : (
<AlertCircle className="h-4 w-4 text-amber-500" />
<AlertCircle className="h-4 w-4 text-red-500" />
)}
</td>
<td>TXT</td>
Expand Down
12 changes: 9 additions & 3 deletions ...[locale]/(app)/(dashboard)/[orgId]/settings/trust-portal/components/TrustPortalSwitch.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,9 +112,15 @@ export function TrustPortalSwitch({
/>
</CardContent>
<CardFooter className="flex justify-between">
<div className="text-xs text-muted-foreground">
{enabled ? `Your trust portal is live & accessible at ${domainVerified ? `https://${domain}` : `https://trust.trycomp.ai/${slug}`}` : "Share your compliance status with potential customers."}
</div>
{enabled ? (
<Link href={domainVerified ? `https://${domain}` : `https://trust.trycomp.ai/${slug}`} target="_blank" className="text-xs text-muted-foreground hover:text-foreground">
Click here to visit your trust portal.
</Link>
) : (
<p className="text-xs text-muted-foreground">
Trust portal is currently disabled.
</p>
)}
</CardFooter>
</Card>
</form>
Expand Down
3 changes: 2 additions & 1 deletion apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/tests/(overview)/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ export default async function CloudTests({
<AppOnboarding
title={t("app_onboarding.cloud_tests.title")}
description={t("app_onboarding.cloud_tests.description")}
imageSrc="/onboarding/cloud-management.webp"
imageSrcLight="/onboarding/cloud-light.webp"
imageSrcDark="/onboarding/cloud-dark.webp"
imageAlt="Cloud Management"
sheetName="create-cloud-test-sheet"
faqs={[
Expand Down
3 changes: 2 additions & 1 deletion apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/(overview)/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,8 @@ export default async function Page({
title={t("app_onboarding.vendors.title")}
description={t("app_onboarding.vendors.description")}
cta={t("app_onboarding.vendors.cta")}
imageSrc="/onboarding/vendor-management.webp"
imageSrcLight="/onboarding/vendor-light.webp"
imageSrcDark="/onboarding/vendor-dark.webp"
imageAlt="Vendor Management"
sheetName="createVendorSheet"
faqs={[
Expand Down
3 changes: 2 additions & 1 deletion apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/backup-overview/layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,8 @@ export default async function Layout({
"app_onboarding.vendors.description",
)}
cta={t("app_onboarding.vendors.cta")}
imageSrc="/onboarding/vendor-management.webp"
imageSrcDark="/onboarding/vendor-management.webp"
imageSrcLight="/onboarding/vendor-management-light.webp"
imageAlt="Vendor Management"
sheetName="createVendorSheet"
faqs={[
Expand Down
8 changes: 6 additions & 2 deletions .../app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/components/create-vendor-form.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,12 @@ import {
FormMessage,
} from "@comp/ui/form";
import { Input } from "@comp/ui/input";
import { Popover, PopoverContent, PopoverTrigger } from "@comp/ui/popover";
import {
Popover,
PopoverContent,
PopoverPrimitive,
PopoverTrigger,
} from "@comp/ui/popover";
import {
Select,
SelectContent,
Expand Down Expand Up @@ -156,7 +161,6 @@ export function CreateVendorForm({
<Popover open={popoverOpen} onOpenChange={setPopoverOpen}>
<PopoverTrigger asChild>
<FormControl>
{/* We use a Button as the trigger, but use CommandInput inside Popover */}
<Button
variant="outline"
role="combobox"
Expand Down
72 changes: 36 additions & 36 deletions apps/app/src/components/app-onboarding.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import {
import { PlusIcon } from "lucide-react";
import { BookOpen, Clock, HelpCircle } from "lucide-react";
import Image from "next/image";
import { useTheme } from "next-themes";
import { useQueryState } from "nuqs";
import Link from "next/link";

Expand All @@ -32,7 +33,8 @@ type Props = {
title: string;
description: string;
cta?: string;
imageSrc: string;
imageSrcLight: string;
imageSrcDark: string;
imageAlt: string;
faqs?: FAQ[];
sheetName?: string;
Expand All @@ -43,7 +45,8 @@ export function AppOnboarding({
title,
description,
cta,
imageSrc,
imageSrcLight,
imageSrcDark,
imageAlt,
faqs,
sheetName,
Expand All @@ -52,6 +55,7 @@ export function AppOnboarding({
const t = useI18n();
const [open, setOpen] = useQueryState(sheetName ?? "sheet");
const isOpen = Boolean(open);
const { theme } = useTheme();

return (
<Card className="w-full overflow-hidden border">
Expand Down Expand Up @@ -128,52 +132,48 @@ export function AppOnboarding({
))}
</Accordion>
)}

{cta && (
<div className="flex mt-4 w-full">
{href ? (
<Link href={href}>
<Button
variant="default"
className="flex items-center gap-2 w-full"
>
<PlusIcon className="w-4 h-4" />
{cta}
</Button>
</Link>
) : (
<Button
variant="default"
className="flex items-center gap-2 w-full"
onClick={() => setOpen("true")}
>
<PlusIcon className="w-4 h-4" />
{cta}
</Button>
)}
</div>
)}
</div>

<div className="flex flex-col items-center justify-center relative hidden lg:flex">
<div className="hidden flex-col items-center justify-center relative lg:flex">
<div className="absolute inset-0 bg-gradient-radial from-accent/20 to-transparent opacity-70 rounded-full" />
<Image
src={imageSrc}
src={theme === "dark" ? imageSrcDark : imageSrcLight}
alt={imageAlt}
height={350}
width={350}
height={400}
width={400}
quality={100}
className="relative z-10 drop-shadow-md"
className="relative z-10 drop-shadow-md rounded-lg"
/>
</div>
</div>
</CardContent>
</div>
</div>

{cta && (
<CardFooter className="py-4 bg-muted/30 border-t flex items-center justify-end sm:justify-between">
<div className="hidden sm:flex items-center text-sm text-muted-foreground">
<Clock className="h-3.5 w-3.5 mr-1.5" />
<span>Estimated time: ~5 minutes</span>
</div>
{href ? (
<Link href={href}>
<Button
variant="default"
className="flex items-center gap-2"
>
<PlusIcon className="w-4 h-4" />
{cta}
</Button>
</Link>
) : (
<Button
variant="default"
className="flex items-center gap-2"
onClick={() => setOpen("true")}
>
<PlusIcon className="w-4 h-4" />
{cta}
</Button>
)}
</CardFooter>
)}
</div>
</Card>
);
Expand Down
6 changes: 3 additions & 3 deletions apps/app/src/components/data-table/data-table-pagination.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,13 +113,13 @@ export function DataTablePagination<TData>({
)}
{...props}
>
<div className="flex-1 flex items-center gap-2 select-none">
<div className="hidden sm:flex-1 sm:flex items-center gap-2 select-none">
<p className="text-sm text-muted-foreground">
{table.getCoreRowModel().rows.length} items
</p>
</div>
<div className="flex flex-col-reverse items-center gap-4 sm:flex-row sm:gap-6 lg:gap-8 select-none">
<div className="flex items-center space-x-2">
<div className="hidden sm:flex items-center space-x-2">
<p className="whitespace-nowrap text-sm">Rows per page</p>
<Select
value={`${table.getState().pagination.pageSize}`}
Expand All @@ -144,7 +144,7 @@ export function DataTablePagination<TData>({
</SelectContent>
</Select>
</div>
<div className="flex items-center justify-center text-sm">
<div className="hidden sm:flex items-center justify-center text-sm">
Page {table.getState().pagination.pageIndex + 1} of{" "}
{table.getPageCount()}
</div>
Expand Down
Loading
Loading