Skip to content

Commit 85c4f6f

Browse files
committed
feat: update DOrganizationCard layout and styling for improved presentation
1 parent ef52c18 commit 85c4f6f

File tree

3 files changed

+35
-42
lines changed

3 files changed

+35
-42
lines changed

src/components/card/Card.style.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
@use "../../styles/variables";
44
@use "sass:math";
55

6-
$padding: variables.$xs;
6+
$padding: variables.$xl;
77

88
.card {
99

src/components/d-organization/DOrganizationCard.stories.tsx

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,23 +6,26 @@ import {useReactiveArrayService} from "../../utils/reactiveArrayService"
66
import {DOrganizationView} from "./DOrganization.view"
77
import {DOrganizationReactiveService} from "./DOrganization.service"
88
import {
9-
NamespacesLicensesCreateInput, NamespacesLicensesCreatePayload,
10-
NamespacesLicensesDeleteInput, NamespacesLicensesDeletePayload,
9+
NamespacesLicensesCreateInput,
10+
NamespacesLicensesCreatePayload,
11+
NamespacesLicensesDeleteInput,
12+
NamespacesLicensesDeletePayload,
1113
NamespacesProjectsAssignRuntimesInput,
1214
NamespacesProjectsCreateInput,
1315
NamespacesProjectsDeleteInput,
1416
OrganizationsCreateInput,
1517
OrganizationsCreatePayload,
16-
OrganizationsDeleteInput, OrganizationsDeletePayload,
18+
OrganizationsDeleteInput,
19+
OrganizationsDeletePayload,
1720
OrganizationsUpdateInput,
1821
OrganizationsUpdatePayload
1922
} from "@code0-tech/sagittarius-graphql-types"
20-
import {DNamespaceProjectReactiveService} from "../d-namespace/project/DNamespaceProject.service"
2123
import {DNamespaceProjectView} from "../d-namespace/project/DNamespaceProject.view"
2224
import {DNamespaceLicenseReactiveService} from "../d-namespace/license/DNamespaceLicense.service"
2325
import {DNamespaceLicenseView} from "../d-namespace/license/DNamespaceLicense.view"
2426
import {DNamespaceView} from "../d-namespace/DNamespace.view"
2527
import {DNamespaceReactiveService} from "../d-namespace/DNamespace.service"
28+
import {Container} from "../container/Container";
2629

2730
const meta: Meta = {
2831
title: "DOrganizationCard",
@@ -124,10 +127,11 @@ export const DOrganizationCardExample: DOrganizationCardStory = {
124127
])
125128

126129
return (
127-
<ContextStoreProvider services={[[organizationStore, organizationService], [namespaceStore, namespaceService], [licenseStore, licenseService]]}>
128-
{React.useMemo(() => {
129-
return <DOrganizationCard organizationId={"gid://sagittarius/Organization/1"}/>
130-
}, [])}
130+
<ContextStoreProvider
131+
services={[[organizationStore, organizationService], [namespaceStore, namespaceService], [licenseStore, licenseService]]}>
132+
<Container>
133+
<DOrganizationCard organizationId={"gid://sagittarius/Organization/1"}/>
134+
</Container>
131135
</ContextStoreProvider>
132136
)
133137
}

src/components/d-organization/DOrganizationCard.tsx

Lines changed: 22 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import {Button} from "../button/Button";
1414
import CardSection from "../card/CardSection";
1515
import {DNamespaceReactiveService} from "../d-namespace/DNamespace.service"
1616
import {DNamespaceLicenseReactiveService} from "../d-namespace/license/DNamespaceLicense.service"
17+
import {Spacing} from "../spacing/Spacing";
1718

1819
export interface DOrganizationCardProps extends Code0Component<HTMLDivElement> {
1920
organizationId: Scalars['OrganizationID']['output']
@@ -43,45 +44,33 @@ const DOrganizationCard: React.FC<DOrganizationCardProps> = props => {
4344

4445
return React.useMemo(() => {
4546
return (
46-
<Card maw={"400px"}>
47+
<Card>
4748
<Flex align={"center"} style={{gap: "0.7rem"}} justify={"space-between"}>
48-
<Text size={"lg"} hierarchy={"primary"} display={"block"}>
49-
{organization?.name}
50-
</Text>
49+
<Flex style={{flexDirection: "column"}}>
50+
<Text size={"lg"} hierarchy={"primary"} display={"block"}>
51+
{organization?.name}
52+
</Text>
53+
<Spacing spacing={"md"}/>
54+
<Flex align={"center"} style={{gap: "1.3rem", flexWrap: "wrap"}}>
55+
<Flex align={"center"} style={{gap: "0.35rem"}}>
56+
<IconFolder size={18}/>
57+
<Text size={"xs"} hierarchy={"tertiary"}>{`${projectCount ?? 0} project${(projectCount ?? 0) !== 1 ? "s" : ""}`}</Text>
58+
</Flex>
59+
<Flex align={"center"} style={{gap: "0.35rem"}}>
60+
<IconUser size={18}/>
61+
<Text size={"xs"} hierarchy={"tertiary"}> {`${memberCount ?? 0} member${(memberCount ?? 0) !== 1 ? "s" : ""}`}</Text>
62+
</Flex>
63+
<Flex align={"center"} style={{gap: "0.35rem"}}>
64+
<IconServer size={18}/>
65+
<Text size={"xs"} hierarchy={"tertiary"}>{`${runtimeCount ?? 0} runtime${(runtimeCount ?? 0) !== 1 ? "s" : ""}`}</Text>
66+
</Flex>
67+
</Flex>
68+
</Flex>
5169
<Flex align={"center"} style={{gap: "0.35rem"}}>
5270
<Button color={"secondary"} onClick={() => onSettingsClick(organizationId)}><IconSettings size={16}/></Button>
5371
<Button color={"error"} onClick={() => onLeaveClick(organizationId)}><IconLogout size={16}/> Leave</Button>
5472
</Flex>
5573
</Flex>
56-
<Text size={"sm"} hierarchy={"tertiary"} display={"block"}>
57-
{organization?.name}
58-
</Text>
59-
<CardSection border>
60-
<Flex align={"center"} style={{gap: "0.35rem", flexWrap: "wrap"}}>
61-
{/* Project count */}
62-
<Badge color={"info"}>
63-
<IconFolder size={18}/>
64-
<Text size={"xs"}>{`${projectCount ?? 0} project${(projectCount ?? 0) !== 1 ? "s" : ""}`}</Text>
65-
</Badge>
66-
{/* Members count */}
67-
<Badge color={"info"}>
68-
<IconUser size={18}/>
69-
<Text size={"xs"}>{`${memberCount ?? 0} member${(memberCount ?? 0) !== 1 ? "s" : ""}`}</Text>
70-
</Badge>
71-
{/* Which License (CE / EE) */}
72-
{/*
73-
<Badge color={"info"}>
74-
<IconAward size={18}/>
75-
<Text size={"xs"}>{`${licenseName} license`}</Text>
76-
</Badge>
77-
*/}
78-
{/* Runtime Count */}
79-
<Badge color={"info"}>
80-
<IconServer size={18}/>
81-
<Text size={"xs"}>{`${runtimeCount ?? 0} runtime${(runtimeCount ?? 0) !== 1 ? "s" : ""}`}</Text>
82-
</Badge>
83-
</Flex>
84-
</CardSection>
8574
</Card>
8675
)
8776
}, [organizationStore, namespaceStore, licenseStore])

0 commit comments

Comments
 (0)