Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 5dd85ad

Browse files
committedNov 26, 2024
added more
1 parent 8721fe5 commit 5dd85ad

File tree

9 files changed

+106
-23
lines changed

9 files changed

+106
-23
lines changed
 

‎apps/frontend/ui/src/layout/partials/Sidebar/func.tsx

+40-3
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,68 @@
11
import type { JSX } from "react";
22

3-
import { Flex, Divider } from "@lib-components";
3+
import {
4+
LightbulbFilled,
5+
SearchFilled,
6+
HandshakeFilled,
7+
} from "@fluentui/react-icons";
8+
9+
import { Flex, Divider, TabList, Tab, Tooltip } from "@lib-components";
410
import { Logo } from "@lib-theme";
511

612
import useSidebarClasses from "@app-ui/layout/partials/Sidebar/styles";
713

814
type TProps = {
15+
defaultTab: "overview" | "browse" | "contribute";
916
isExpanded: boolean;
1017
toggleExpandAction: (isExpanded: boolean) => void;
18+
overviewTabAction: () => void;
19+
browseTabAction: () => void;
1120
};
1221

1322
export default function Sidebar({
23+
defaultTab,
1424
isExpanded,
1525
toggleExpandAction,
26+
overviewTabAction,
27+
browseTabAction,
1628
}: TProps): JSX.Element {
1729
const classes = useSidebarClasses();
1830
return (
1931
<Flex
2032
className={classes.root}
2133
direction="column"
2234
justifyContent="start"
35+
alignItems="center"
2336
padding={["SNudge"]}
37+
gap="S"
2438
>
2539
<Logo size="extraLarge" />
2640
<Divider appearance="subtle" />
27-
<Flex shHeight="100%" shWidth="100%">
28-
Content
41+
<Flex
42+
shHeight="100%"
43+
shWidth="100%"
44+
// justifyContent="center"
45+
margin={["None", "XS", "None", "M"]}
46+
>
47+
<TabList vertical defaultSelectedValue={defaultTab}>
48+
<Tab icon={<LightbulbFilled />} value="overview">
49+
Overview
50+
</Tab>
51+
<Tab icon={<SearchFilled />} value="browse">
52+
Browse
53+
</Tab>
54+
<Tooltip
55+
content="Will be available in 2.0"
56+
relationship="label"
57+
appearance="inverted"
58+
withArrow
59+
positioning="below-end"
60+
>
61+
<Tab icon={<HandshakeFilled />} value="contribute" disabled>
62+
Contribute
63+
</Tab>
64+
</Tooltip>
65+
</TabList>
2966
</Flex>
3067
</Flex>
3168
);

‎apps/frontend/ui/src/layout/partials/Sidebar/stories.tsx

+7-3
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,24 @@ import type { Meta, StoryObj } from "@storybook/react";
22

33
import Sidebar from "@app-ui/layout/partials/Sidebar";
44

5-
import { Flex } from "@lib-components";
65
import { tokens } from "@lib-theme";
76

87
const meta: Meta = {
98
title: "App/UI/Layout/Partials/Sidebar",
109
component: Sidebar,
10+
args: {
11+
defaultTab: "overview",
12+
isExpanded: true,
13+
toggleExpandAction: (_: boolean) => _,
14+
},
1115
};
1216

1317
export default meta;
1418

1519
type TStory = StoryObj<typeof Sidebar>;
1620

1721
export const Index: TStory = {
18-
render: () => (
22+
render: (args) => (
1923
<div
2024
style={{
2125
display: "flex",
@@ -25,7 +29,7 @@ export const Index: TStory = {
2529
height: "700px",
2630
}}
2731
>
28-
<Sidebar />
32+
<Sidebar {...args} />
2933
<div
3034
style={{
3135
width: "100%",

‎apps/frontend/ui/src/layout/partials/Sidebar/styles.ts

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import { makeStyles, tokens } from "@lib-theme";
33
const useSidebarClasses = makeStyles({
44
root: {
55
backgroundColor: tokens.colorNeutralBackground1,
6+
borderRadius: tokens.borderRadiusLarge,
67
},
78
});
89

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
import type { JSX } from "react";
2+
3+
import { Tooltip as UnmountedTooltip } from "@fluentui/react-components";
4+
import type { TooltipProps } from "@fluentui/react-components";
5+
6+
import { useFuiProviderNode } from "@lib-theme";
7+
8+
type TProps = Omit<TooltipProps, "mountNode">;
9+
10+
export default function Tooltip(props: TProps): JSX.Element {
11+
const { fuiProviderNode } = useFuiProviderNode();
12+
// eslint-disable-next-line react/jsx-props-no-spreading
13+
return <UnmountedTooltip {...props} mountNode={fuiProviderNode} />;
14+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
import Tooltip from "@lib-components/atoms/Tooltipp/func";
2+
3+
export default Tooltip;

‎libs/components/src/atoms/index.ts

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
export { default as Tooltip } from "@lib-components/atoms/Tooltipp";

‎libs/components/src/index.ts

+3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
export { Divider } from "@fluentui/react-components";
2+
export { Tab } from "@fluentui/react-components";
3+
export { TabList } from "@fluentui/react-components";
24

5+
export { Tooltip } from "@lib-components/atoms";
36
export { Flex } from "@lib-components/layout";

‎libs/theme/src/Provider/colors.ts

+35-16
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,42 @@
11
import type { BrandVariants, Theme } from "@fluentui/react-components";
22
import { createLightTheme, createDarkTheme } from "@fluentui/react-components";
33

4+
// const myNewTheme: BrandVariants = {
5+
// 10: "#020403",
6+
// 20: "#111B19",
7+
// 30: "#172E2A",
8+
// 40: "#1C3B36",
9+
// 50: "#1F4942",
10+
// 60: "#23574F",
11+
// 70: "#26665C",
12+
// 80: "#297569",
13+
// 90: "#2C8477",
14+
// 100: "#2E9485",
15+
// 110: "#30A493",
16+
// 120: "#31B4A2",
17+
// 130: "#56C2B0",
18+
// 140: "#7CCEBF",
19+
// 150: "#9DDACE",
20+
// 160: "#BDE6DD",
21+
// };
22+
423
const myNewTheme: BrandVariants = {
5-
10: "#020403",
6-
20: "#111B19",
7-
30: "#172E2A",
8-
40: "#1C3B36",
9-
50: "#1F4942",
10-
60: "#23574F",
11-
70: "#26665C",
12-
80: "#297569",
13-
90: "#2C8477",
14-
100: "#2E9485",
15-
110: "#30A493",
16-
120: "#31B4A2",
17-
130: "#56C2B0",
18-
140: "#7CCEBF",
19-
150: "#9DDACE",
20-
160: "#BDE6DD",
24+
10: "#000405",
25+
20: "#011B21",
26+
30: "#002B36",
27+
40: "#003746",
28+
50: "#004558",
29+
60: "#00526A",
30+
70: "#00607E",
31+
80: "#006E92",
32+
90: "#007CA8",
33+
100: "#008BBF",
34+
110: "#0099D7",
35+
120: "#31A7EA",
36+
130: "#55B5F9",
37+
140: "#7CC2FF",
38+
150: "#A2CEFF",
39+
160: "#C1DBFF",
2140
};
2241

2342
const lightTheme: Theme = {

‎libs/theme/src/index.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import { makeStyles, tokens, mergeClasses } from "@fluentui/react-components";
22

33
import ThemeProvider from "@lib-theme/Provider";
44
import Logo from "@lib-theme/Logo";
5+
import { useFuiProviderNode } from "@lib-theme/hooks";
56

67
export {
78
EThemeDimensions,
@@ -15,6 +16,6 @@ export type {
1516
TThemeShorthandSpacing,
1617
} from "@lib-theme/types";
1718

18-
export { ThemeProvider, Logo };
19+
export { ThemeProvider, Logo, useFuiProviderNode };
1920

2021
export { makeStyles, mergeClasses, tokens };

0 commit comments

Comments
 (0)
Please sign in to comment.