-
Notifications
You must be signed in to change notification settings - Fork 1.1k
Slack/reform #1852
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.
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
Merged
Slack/reform #1852
Changes from 12 commits
Commits
Show all changes
19 commits
Select commit
Hold shift + click to select a range
2ec19e7
Feat: Slack native integration
AshishViradiya153 6170031
Merge branch 'main' into 421-slack
AshishViradiya153 3e121a0
chore: package-lock file
AshishViradiya153 b70dabd
improvement
AshishViradiya153 1398e65
dark mode fix
AshishViradiya153 f4e19c1
slack integration improvement
AshishViradiya153 58d2459
Merge branch 'main' into 421-slack
AshishViradiya153 4026635
Merge branch 'main' into 421-slack
AshishViradiya153 beea381
schema rebase
AshishViradiya153 de4cc50
chore: remove date-fns-tz
AshishViradiya153 0cb076f
schema update
AshishViradiya153 9a90173
slack integration
AshishViradiya153 cdce68c
improvement
AshishViradiya153 fcda408
improvement
AshishViradiya153 3fa8929
Merge branch 'main' into slack/reform
mfts ff9a550
feat: slack integration improvements and simplification
mfts e106ba4
refactor: redirect
mfts aa4c443
feat: add featureflag for slack
mfts 977fee1
chore: remove nodemailer
mfts File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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 hidden or 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 hidden or 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,84 @@ | ||
| import React from "react"; | ||
|
|
||
| import { | ||
| Body, | ||
| Button, | ||
| Container, | ||
| Head, | ||
| Hr, | ||
| Html, | ||
| Preview, | ||
| Section, | ||
| Tailwind, | ||
| Text, | ||
| } from "@react-email/components"; | ||
|
|
||
| export default function SlackIntegrationNotification({ | ||
| teamName, | ||
| userEmail, | ||
| settingsUrl, | ||
| }: { | ||
| teamName: string; | ||
| userEmail: string; | ||
| settingsUrl: string; | ||
| }) { | ||
| return ( | ||
| <Html> | ||
| <Head /> | ||
| <Preview>Slack integration has been added to your workspace</Preview> | ||
| <Tailwind> | ||
| <Body className="mx-auto my-auto bg-white font-sans"> | ||
| <Container className="mx-auto my-10 w-[465px] p-5"> | ||
| <Text className="mx-0 mb-8 mt-4 p-0 text-center text-2xl font-normal"> | ||
| <span className="font-bold tracking-tighter">Papermark</span> | ||
| </Text> | ||
| <Text className="mx-0 my-7 p-0 text-center text-xl font-semibold text-black"> | ||
| An integration has been added to your workspace | ||
| </Text> | ||
| <Text className="text-sm leading-6 text-black"> | ||
| The Slack integration has been added to your workspace{" "} | ||
| <span className="font-semibold">{teamName}</span> on{" "} | ||
| <span className="font-semibold">Papermark</span>. | ||
| </Text> | ||
| <Text className="text-sm leading-6 text-black"> | ||
| You can now receive notifications about document views, dataroom | ||
| access and downloads directly in your Slack channels. | ||
| </Text> | ||
| <Section className="my-8 text-center"> | ||
| <Button | ||
| className="rounded bg-black text-center text-xs font-semibold text-white no-underline" | ||
| href={settingsUrl} | ||
| style={{ padding: "12px 20px" }} | ||
| > | ||
| View installed integration | ||
| </Button> | ||
| </Section> | ||
| <Text className="text-sm leading-6 text-black"> | ||
| or copy and paste this URL into your browser: | ||
| </Text> | ||
| <Text className="max-w-sm flex-wrap break-words font-medium text-purple-600 no-underline"> | ||
| {settingsUrl.replace(/^https?:\/\//, "")} | ||
| </Text> | ||
| <Hr /> | ||
| <Section className="mt-8 text-gray-400"> | ||
| <Text className="text-xs"> | ||
| © {new Date().getFullYear()}{" "} | ||
| <a | ||
| href="https://www.papermark.com" | ||
| className="text-gray-400 no-underline hover:text-gray-400" | ||
| target="_blank" | ||
| > | ||
| papermark.com | ||
| </a> | ||
AshishViradiya153 marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| </Text> | ||
| <Text className="text-xs"> | ||
| If you have any feedback or questions about this email, simply | ||
| reply to it. I'd love to hear from you! | ||
| </Text> | ||
| </Section> | ||
| </Container> | ||
| </Body> | ||
| </Tailwind> | ||
| </Html> | ||
| ); | ||
| } | ||
This file contains hidden or 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 hidden or 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 hidden or 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,82 @@ | ||
| import { Skeleton } from "@/components/ui/skeleton"; | ||
|
|
||
| export default function SlackSettingsSkeleton() { | ||
| return ( | ||
| <div className="space-y-6"> | ||
| {/* Header Skeleton */} | ||
| <div className="mb-4 flex items-center justify-between md:mb-8 lg:mb-12"> | ||
| <div className="space-y-2"> | ||
| <Skeleton className="h-8 w-48" /> | ||
| <Skeleton className="h-4 w-80" /> | ||
| </div> | ||
| <Skeleton className="h-10 w-32" /> | ||
| </div> | ||
|
|
||
| {/* Main Content Skeleton */} | ||
| <div className="space-y-6"> | ||
| {/* Card 1 */} | ||
| <div className="rounded-lg border bg-card p-6"> | ||
| <div className="space-y-4"> | ||
| <div className="space-y-2"> | ||
| <Skeleton className="h-6 w-40" /> | ||
| <Skeleton className="h-4 w-60" /> | ||
| </div> | ||
| <div className="space-y-4"> | ||
| <div className="flex items-center justify-between"> | ||
| <div className="space-y-1"> | ||
| <Skeleton className="h-5 w-32" /> | ||
| <Skeleton className="h-4 w-48" /> | ||
| </div> | ||
| <Skeleton className="h-6 w-11" /> | ||
| </div> | ||
| <div className="space-y-3"> | ||
| <div className="space-y-2"> | ||
| <Skeleton className="h-4 w-32" /> | ||
| <Skeleton className="h-4 w-64" /> | ||
| </div> | ||
| <div className="flex items-center rounded-lg border border-border bg-background"> | ||
| <div className="flex flex-1 items-center gap-2 px-2"> | ||
| <Skeleton className="h-6 w-20" /> | ||
| <Skeleton className="h-6 w-24" /> | ||
| </div> | ||
| <Skeleton className="h-6 w-px" /> | ||
| <Skeleton className="h-8 w-32 shrink-0" /> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </div> | ||
|
|
||
| {/* Card 2 */} | ||
| <div className="rounded-lg border bg-card p-6"> | ||
| <div className="space-y-4"> | ||
| <div className="space-y-2"> | ||
| <Skeleton className="h-6 w-44" /> | ||
| <Skeleton className="h-4 w-72" /> | ||
| </div> | ||
| <div className="space-y-4"> | ||
| <div className="flex space-x-6"> | ||
| {[1, 2, 3].map((i) => ( | ||
| <div key={i} className="flex items-center space-x-2"> | ||
| <Skeleton className="h-4 w-4" /> | ||
| <Skeleton className="h-4 w-16" /> | ||
| </div> | ||
| ))} | ||
| </div> | ||
| <div className="grid gap-4 md:grid-cols-2"> | ||
| <div className="space-y-2"> | ||
| <Skeleton className="h-4 w-12" /> | ||
| <Skeleton className="h-10 w-full" /> | ||
| </div> | ||
| <div className="space-y-2"> | ||
| <Skeleton className="h-4 w-20" /> | ||
| <Skeleton className="h-10 w-full" /> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| ); | ||
| } |
This file contains hidden or 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,36 @@ | ||
| import React from "react"; | ||
|
|
||
| interface SlackIconProps { | ||
| className?: string; | ||
| size?: number; | ||
| } | ||
|
|
||
| export function SlackIcon({ className = "", size = 24 }: SlackIconProps) { | ||
| return ( | ||
| <svg | ||
| width={size} | ||
| height={size} | ||
| viewBox="0 0 24 24" | ||
| fill="none" | ||
| className={className} | ||
| > | ||
| {/* Slack logo with proper colors */} | ||
| <path | ||
| d="M5.042 15.165a2.528 2.528 0 0 1-2.52 2.523A2.528 2.528 0 0 1 0 15.165a2.527 2.527 0 0 1 2.522-2.52h2.52v2.52zM6.313 15.165a2.527 2.527 0 0 1 2.521-2.52 2.527 2.527 0 0 1 2.521 2.52v6.313A2.528 2.528 0 0 1 8.834 24a2.528 2.528 0 0 1-2.521-2.522v-6.313z" | ||
| fill="#E01E5A" | ||
| /> | ||
| <path | ||
| d="M8.834 5.042a2.528 2.528 0 0 1-2.521-2.52A2.527 2.527 0 0 1 8.834 0a2.527 2.527 0 0 1 2.521 2.522v2.52H8.834zM8.834 6.313a2.528 2.528 0 0 1 2.521 2.52 2.527 2.527 0 0 1-2.521 2.521H2.522A2.527 2.527 0 0 1 0 8.833a2.528 2.528 0 0 1 2.522-2.52h6.312z" | ||
| fill="#36C5F0" | ||
| /> | ||
| <path | ||
| d="M18.956 8.834a2.528 2.528 0 0 1 2.522-2.521A2.527 2.527 0 0 1 24 8.834a2.527 2.527 0 0 1-2.522 2.52h-2.522V8.834zM17.688 8.834a2.527 2.527 0 0 1-2.52 2.52 2.526 2.526 0 0 1-2.52-2.52V2.522A2.527 2.527 0 0 1 15.166 0a2.527 2.527 0 0 1 2.522 2.522v6.312z" | ||
| fill="#2EB67D" | ||
| /> | ||
| <path | ||
| d="M15.166 18.956a2.528 2.528 0 0 1 2.52 2.522A2.527 2.527 0 0 1 15.166 24a2.527 2.527 0 0 1-2.52-2.522v-2.52h2.52zM15.166 17.688a2.527 2.527 0 0 1-2.52-2.52 2.526 2.526 0 0 1 2.52-2.52h6.313A2.527 2.527 0 0 1 24 15.168a2.528 2.528 0 0 1-2.522 2.52h-6.312z" | ||
| fill="#ECB22E" | ||
| /> | ||
| </svg> | ||
| ); | ||
| } |
This file contains hidden or 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
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.