fix: onboarding invitations overflow (#1575)

* fix: onboarding invitations overflow

* fix: user avatar in the notification card

* style: update graph grid color
This commit is contained in:
Aaryan Khandelwal 2023-07-19 17:09:53 +05:30 committed by GitHub
parent b38898753f
commit 124c2f772e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 102 additions and 94 deletions

View File

@ -120,7 +120,7 @@ export const EmailCodeForm = ({ handleSignIn }: any) => {
Please check your inbox at <span className="font-medium">{watch("email")}</span> Please check your inbox at <span className="font-medium">{watch("email")}</span>
</p> </p>
)} )}
<form className="space-y-4 mt-10"> <form className="space-y-4 mt-10 sm:w-[360px] mx-auto">
<div className="space-y-1"> <div className="space-y-1">
<Input <Input
id="email" id="email"

View File

@ -90,13 +90,15 @@ export const NotificationCard: React.FC<NotificationCardProps> = (props) => {
<div className="relative w-12 h-12 rounded-full"> <div className="relative w-12 h-12 rounded-full">
{notification.triggered_by_details.avatar && {notification.triggered_by_details.avatar &&
notification.triggered_by_details.avatar !== "" ? ( notification.triggered_by_details.avatar !== "" ? (
<div className="h-12 w-12 rounded-full">
<Image <Image
src={notification.triggered_by_details.avatar} src={notification.triggered_by_details.avatar}
alt="profile image" alt="Profile Image"
layout="fill" layout="fill"
objectFit="cover" objectFit="cover"
className="rounded-full" className="rounded-full"
/> />
</div>
) : ( ) : (
<div className="w-12 h-12 bg-custom-background-100 rounded-full flex justify-center items-center"> <div className="w-12 h-12 bg-custom-background-100 rounded-full flex justify-center items-center">
<span className="text-custom-text-100 font-medium text-lg"> <span className="text-custom-text-100 font-medium text-lg">

View File

@ -88,7 +88,7 @@ export const JoinWorkspaces: React.FC<Props> = ({ stepChange }) => {
<div className="w-full space-y-7 sm:space-y-10"> <div className="w-full space-y-7 sm:space-y-10">
<h5 className="sm:text-lg">We see that someone has invited you to</h5> <h5 className="sm:text-lg">We see that someone has invited you to</h5>
<h4 className="text-xl sm:text-2xl font-semibold">Join a workspace</h4> <h4 className="text-xl sm:text-2xl font-semibold">Join a workspace</h4>
<div className="md:w-3/5 space-y-4"> <div className="max-h-[37vh] overflow-y-auto md:w-3/5 space-y-4">
{invitations && {invitations &&
invitations.map((invitation) => { invitations.map((invitation) => {
const isSelected = invitationsRespond.includes(invitation.id); const isSelected = invitationsRespond.includes(invitation.id);
@ -146,7 +146,11 @@ export const JoinWorkspaces: React.FC<Props> = ({ stepChange }) => {
> >
Accept & Join Accept & Join
</PrimaryButton> </PrimaryButton>
<SecondaryButton className="border border-none bg-transparent" size="md" onClick={finishOnboarding} > <SecondaryButton
className="border border-none bg-transparent"
size="md"
onClick={finishOnboarding}
>
Skip for now Skip for now
</SecondaryButton> </SecondaryButton>
</div> </div>

View File

@ -17,12 +17,12 @@ export const CHARTS_THEME: Theme = {
background: "rgb(var(--color-background-80))", background: "rgb(var(--color-background-80))",
color: "rgb(var(--color-text-200))", color: "rgb(var(--color-text-200))",
fontSize: "0.8rem", fontSize: "0.8rem",
border: "1px solid rgb(var(--color-background-80))", border: "1px solid rgb(var(--color-border-300))",
}, },
}, },
grid: { grid: {
line: { line: {
stroke: "rgb(var(--color-background-80))", stroke: "rgb(var(--color-border-100))",
}, },
}, },
}; };

View File

@ -145,11 +145,11 @@ const HomePage: NextPage = () => {
<h1 className="text-center text-2xl sm:text-2.5xl font-semibold text-custom-text-100"> <h1 className="text-center text-2xl sm:text-2.5xl font-semibold text-custom-text-100">
Sign in to Plane Sign in to Plane
</h1> </h1>
<div className="flex flex-col divide-y divide-custom-border-200 sm:w-[360px] mx-auto"> <div className="flex flex-col divide-y divide-custom-border-200">
<div className="pb-7"> <div className="pb-7">
<EmailCodeForm handleSignIn={handleEmailCodeSignIn} /> <EmailCodeForm handleSignIn={handleEmailCodeSignIn} />
</div> </div>
<div className="flex flex-col items-center justify-center gap-4 pt-7 overflow-hidden"> <div className="flex flex-col items-center justify-center gap-4 pt-7 sm:w-[360px] mx-auto overflow-hidden">
<GoogleLoginButton handleSignIn={handleGoogleSignIn} /> <GoogleLoginButton handleSignIn={handleGoogleSignIn} />
<GithubLoginButton handleSignIn={handleGitHubSignIn} /> <GithubLoginButton handleSignIn={handleGitHubSignIn} />
</div> </div>

View File

@ -105,12 +105,13 @@ const OnBoard: NextPage = () => {
{user?.email} {user?.email}
</div> </div>
</div> </div>
{invitations && invitations.length > 0 ? ( {invitations ? (
invitations.length > 0 ? (
<div className="relative flex justify-center sm:justify-start sm:items-center h-full px-8 pb-8 sm:p-0 sm:pr-[8.33%] sm:w-10/12 md:w-9/12 lg:w-4/5"> <div className="relative flex justify-center sm:justify-start sm:items-center h-full px-8 pb-8 sm:p-0 sm:pr-[8.33%] sm:w-10/12 md:w-9/12 lg:w-4/5">
<div className="w-full space-y-10"> <div className="w-full space-y-10">
<h5 className="text-lg">We see that someone has invited you to</h5> <h5 className="text-lg">We see that someone has invited you to</h5>
<h4 className="text-2xl font-semibold">Join a workspace</h4> <h4 className="text-2xl font-semibold">Join a workspace</h4>
<div className="md:w-3/5 space-y-4"> <div className="max-h-[37vh] md:w-3/5 space-y-4 overflow-y-auto">
{invitations.map((invitation) => { {invitations.map((invitation) => {
const isSelected = invitationsRespond.includes(invitation.id); const isSelected = invitationsRespond.includes(invitation.id);
@ -189,7 +190,8 @@ const OnBoard: NextPage = () => {
onClick={() => router.push("/")} onClick={() => router.push("/")}
/> />
</div> </div>
)} )
) : null}
</div> </div>
</DefaultLayout> </DefaultLayout>
</UserAuthorizationLayout> </UserAuthorizationLayout>