Skip to content
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

Jump to bottom

fix: added missing link in branding #1312

Merged
merged 5 commits into from
Oct 29, 2024
+43 −5
Merged

fix: added missing link in branding #1312

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7b1c875
fix: added missing link in branding
JeevaRamanathan Oct 27, 2024
6377f2c
fix: links
JeevaRamanathan Oct 28, 2024
77f0431
chore: add new link and text color
mfts Oct 29, 2024
b556dba
Merge branch 'main' into fix/missing-link
mfts Oct 29, 2024
583f510
fix: lint issue
mfts Oct 29, 2024
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
22 changes: 21 additions & 1 deletion pages/datarooms/[id]/branding/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { useRouter } from "next/router";
import { useCallback, useEffect, useState } from "react";

import { useTeam } from "@/context/team-context";
import { PlusIcon } from "lucide-react";
import { CircleHelpIcon, InfoIcon, PlusIcon } from "lucide-react";
import { HexColorInput, HexColorPicker } from "react-colorful";
import { toast } from "sonner";
import { mutate } from "swr";
Expand All @@ -20,6 +20,7 @@ import {
PopoverContent,
PopoverTrigger,
} from "@/components/ui/popover";
import { BadgeTooltip } from "@/components/ui/tooltip";

import { useDataroomBrand } from "@/lib/swr/use-brand";
import { useDataroom } from "@/lib/swr/use-dataroom";
Expand Down Expand Up @@ -184,6 +185,25 @@ export default function DataroomBrandPage() {
<DataroomNavigation dataroomId={dataroom.id} />
</header>

<div className="mb-4 flex items-center justify-between md:mb-8 lg:mb-12">
<div className="space-y-1">
<h3 className="text-2xl font-semibold tracking-tight text-foreground">
Customization
</h3>
<p className="flex flex-row items-center gap-2 text-sm text-muted-foreground">
Customize your data room&apos;s branding for a cohesive user
experience.
<BadgeTooltip
linkText="Click here"
content="How to customize data room branding?"
key="branding"
link="https://www.papermark.io/help/article/dataroom-branding"
>
<CircleHelpIcon className="h-4 w-4 shrink-0 text-muted-foreground hover:text-foreground" />
</BadgeTooltip>
</p>
</div>
</div>
<div className="space-y-4">
<div>
<Card className="dark:bg-secondary">
Expand Down
21 changes: 19 additions & 2 deletions pages/datarooms/[id]/groups/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import Link from "next/link";

import { useState } from "react";

import { UsersIcon } from "lucide-react";
import { CircleHelpIcon, InfoIcon, UsersIcon } from "lucide-react";

import { UpgradePlanModal } from "@/components/billing/upgrade-plan-modal";
import { DataroomHeader } from "@/components/datarooms/dataroom-header";
Expand All @@ -12,6 +12,7 @@ import GroupCard from "@/components/datarooms/groups/group-card";
import { GroupCardPlaceholder } from "@/components/datarooms/groups/group-card-placeholder";
import AppLayout from "@/components/layouts/app";
import { Button } from "@/components/ui/button";
import { BadgeTooltip } from "@/components/ui/tooltip";

import { usePlan } from "@/lib/swr/use-billing";
import { useDataroom } from "@/lib/swr/use-dataroom";
Expand Down Expand Up @@ -58,7 +59,23 @@ export default function DataroomGroupPage() {
<div className="grid gap-5">
<div className="flex flex-wrap justify-between gap-6">
<div className="flex items-center gap-x-2">
<h1 className="text-xl font-semibold tracking-tight">Groups</h1>
<div className="space-y-1">
<h3 className="text-2xl font-semibold tracking-tight text-foreground">
Groups
</h3>
<p className="flex flex-row items-center gap-2 text-sm text-muted-foreground">
Control document access with granular permissions through
groups.{" "}
<BadgeTooltip
linkText="Learn more"
content="Manage Access with Granular Permissions for Data Room Groups"
key="groups"
link="https://www.papermark.io/help/article/granular-permissions"
>
<CircleHelpIcon className="h-4 w-4 shrink-0 text-muted-foreground hover:text-foreground" />
</BadgeTooltip>
</p>
</div>
</div>
<div className="flex w-full flex-wrap items-center gap-3 sm:w-auto">
<ButtonComponent />
Expand Down
5 changes: 3 additions & 2 deletions pages/settings/branding.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,13 +146,14 @@ export default function Branding() {
<p className="flex flex-row items-center gap-2 text-sm text-muted-foreground">
Customize how your brand appears globally across Papermark
documents your visitors see.
{/* <BadgeTooltip
<BadgeTooltip
linkText="Click here"
content="How to customize document branding?"
key="branding"
link="https://www.papermark.io/help/article/document-branding"
>
<CircleHelpIcon className="h-4 w-4 shrink-0 text-muted-foreground hover:text-foreground" />
</BadgeTooltip> */}
</BadgeTooltip>
</p>
</div>
</div>
Expand Down