From 378cf25521f0f07c1bd3aa68dcc96b07a7f37abb Mon Sep 17 00:00:00 2001 From: Peer Richelsen Date: Thu, 30 Sep 2021 12:31:04 +0100 Subject: [PATCH] turned teams page into flex from grid to center it (#828) * turned teams page into flex from grid to center it, removed h-screen from user page * new icon button Co-authored-by: Alex van Andel --- components/team/TeamListItem.tsx | 13 ++++++------- components/team/screens/Team.tsx | 4 ++-- components/ui/Button.tsx | 12 ++++++++++-- pages/[user].tsx | 2 +- 4 files changed, 19 insertions(+), 12 deletions(-) diff --git a/components/team/TeamListItem.tsx b/components/team/TeamListItem.tsx index f0df19e6..660fa878 100644 --- a/components/team/TeamListItem.tsx +++ b/components/team/TeamListItem.tsx @@ -72,7 +72,7 @@ export default function TeamListItem(props: {
{props.team.name} - {process.env.NEXT_PUBLIC_APP_URL}/{props.team.slug} + {process.env.NEXT_PUBLIC_APP_URL}/team/{props.team.slug}
@@ -94,7 +94,7 @@ export default function TeamListItem(props: { )} {props.team.role === "OWNER" && ( -
+
Owner @@ -106,13 +106,14 @@ export default function TeamListItem(props: { ); showToast("Link copied!", "success"); }} + size="icon" color="minimal" - className="w-full pl-5 ml-8" StartIcon={LinkIcon} - type="button"> + type="button" + /> - + @@ -123,7 +124,6 @@ export default function TeamListItem(props: { className="w-full" onClick={() => props.onActionSelect("edit")} StartIcon={PencilAltIcon}> - {" "} Edit team @@ -131,7 +131,6 @@ export default function TeamListItem(props: { diff --git a/components/team/screens/Team.tsx b/components/team/screens/Team.tsx index 97ddc496..c8136ecd 100644 --- a/components/team/screens/Team.tsx +++ b/components/team/screens/Team.tsx @@ -57,9 +57,9 @@ const Team = ({ team }) => { } return ( -
+
{members.map((member) => { - return ; + return member.user.username !== null && ; })}
); diff --git a/components/ui/Button.tsx b/components/ui/Button.tsx index 54c00099..2345135b 100644 --- a/components/ui/Button.tsx +++ b/components/ui/Button.tsx @@ -6,7 +6,7 @@ import { SVGComponent } from "@lib/types/SVGComponent"; export type ButtonProps = { color?: "primary" | "secondary" | "minimal" | "warn"; - size?: "base" | "sm" | "lg" | "fab"; + size?: "base" | "sm" | "lg" | "fab" | "icon"; loading?: boolean; disabled?: boolean; onClick?: (event: React.MouseEvent) => void; @@ -52,6 +52,7 @@ export const Button = forwardRef - {StartIcon && } + {StartIcon && ( + + )} {props.children} {loading && (
diff --git a/pages/[user].tsx b/pages/[user].tsx index cf6f536e..26760183 100644 --- a/pages/[user].tsx +++ b/pages/[user].tsx @@ -33,7 +33,7 @@ export default function User(props: inferSSRProps) { avatar={user.avatar} /> {isReady && ( -
+