From 75f82941c4c9562aa290888ac1ad3dc8da9518a9 Mon Sep 17 00:00:00 2001 From: Samuil Berenzon Date: Sat, 28 Dec 2024 11:29:46 +0000 Subject: [PATCH 01/26] git shortcuts --- makefile | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/makefile b/makefile index fb9f20f..f06bb6b 100644 --- a/makefile +++ b/makefile @@ -10,3 +10,9 @@ help: @make -pRrq -f $(MAKEFILE_LIST) : 2>/dev/null | awk -v RS= -F: '/^# Files/,/^# Finished Make data base/ { if ($$1 !~ "^[#.]") print $$1 }' | sort | uniq .PHONY: help + +sync-production: + git fetch origin production:production + +sync-development: + git fetch origin development:development From 382060f3de7cbce3062ead07dfd035af691172d1 Mon Sep 17 00:00:00 2001 From: Samuil Berenzon Date: Sat, 28 Dec 2024 11:30:09 +0000 Subject: [PATCH 02/26] add git pr --- makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/makefile b/makefile index f06bb6b..47c51b3 100644 --- a/makefile +++ b/makefile @@ -11,8 +11,8 @@ help: .PHONY: help -sync-production: +git-sync-production: git fetch origin production:production -sync-development: +git-sync-development: git fetch origin development:development From 1d2794d1480ff7fd8fa6228e47cf6ad4121e7b1a Mon Sep 17 00:00:00 2001 From: Samuil Berenzon Date: Sat, 28 Dec 2024 11:36:17 +0000 Subject: [PATCH 03/26] move --- apps/frontend/ui/src/layout/partials/Sidebar/index.ts | 3 --- .../ui/src/layout/partials/Sidebar/shards/MenuList/index.ts | 3 --- .../partials/Sidebar/shards/MenuList/templates/Tab/index.ts | 3 --- .../partials/Sidebar/shards/MenuList/templates/index.ts | 1 - .../layout/partials/Sidebar/shards/ToggleButton/index.ts | 3 --- .../frontend/ui/src/layout/partials/Sidebar/shards/index.ts | 2 -- apps/frontend/ui/src/layout/partials/index.ts | 1 - apps/frontend/ui/src/{layout => navigation}/index.ts | 2 +- .../{layout => navigation}/partials/Sidebar/constants.ts | 0 .../ui/src/{layout => navigation}/partials/Sidebar/func.tsx | 6 +++--- apps/frontend/ui/src/navigation/partials/Sidebar/index.ts | 3 +++ .../partials/Sidebar/shards/MenuList/func.tsx | 6 +++--- .../navigation/partials/Sidebar/shards/MenuList/index.ts | 3 +++ .../partials/Sidebar/shards/MenuList/templates/Tab/func.tsx | 2 +- .../partials/Sidebar/shards/MenuList/templates/Tab/index.ts | 3 +++ .../Sidebar/shards/MenuList/templates/Tab/styles.ts | 0 .../partials/Sidebar/shards/MenuList/templates/index.ts | 1 + .../partials/Sidebar/shards/ToggleButton/func.tsx | 4 ++-- .../partials/Sidebar/shards/ToggleButton/index.ts | 3 +++ .../partials/Sidebar/shards/ToggleButton/styles.ts | 0 .../ui/src/navigation/partials/Sidebar/shards/index.ts | 2 ++ .../src/{layout => navigation}/partials/Sidebar/stories.tsx | 2 +- .../src/{layout => navigation}/partials/Sidebar/styles.ts | 0 .../src/{layout => navigation}/partials/Sidebar/tests.tsx | 4 ++-- .../ui/src/{layout => navigation}/partials/Sidebar/types.ts | 0 apps/frontend/ui/src/navigation/partials/index.ts | 1 + 26 files changed, 29 insertions(+), 29 deletions(-) delete mode 100644 apps/frontend/ui/src/layout/partials/Sidebar/index.ts delete mode 100644 apps/frontend/ui/src/layout/partials/Sidebar/shards/MenuList/index.ts delete mode 100644 apps/frontend/ui/src/layout/partials/Sidebar/shards/MenuList/templates/Tab/index.ts delete mode 100644 apps/frontend/ui/src/layout/partials/Sidebar/shards/MenuList/templates/index.ts delete mode 100644 apps/frontend/ui/src/layout/partials/Sidebar/shards/ToggleButton/index.ts delete mode 100644 apps/frontend/ui/src/layout/partials/Sidebar/shards/index.ts delete mode 100644 apps/frontend/ui/src/layout/partials/index.ts rename apps/frontend/ui/src/{layout => navigation}/index.ts (74%) rename apps/frontend/ui/src/{layout => navigation}/partials/Sidebar/constants.ts (100%) rename apps/frontend/ui/src/{layout => navigation}/partials/Sidebar/func.tsx (89%) create mode 100644 apps/frontend/ui/src/navigation/partials/Sidebar/index.ts rename apps/frontend/ui/src/{layout => navigation}/partials/Sidebar/shards/MenuList/func.tsx (86%) create mode 100644 apps/frontend/ui/src/navigation/partials/Sidebar/shards/MenuList/index.ts rename apps/frontend/ui/src/{layout => navigation}/partials/Sidebar/shards/MenuList/templates/Tab/func.tsx (92%) create mode 100644 apps/frontend/ui/src/navigation/partials/Sidebar/shards/MenuList/templates/Tab/index.ts rename apps/frontend/ui/src/{layout => navigation}/partials/Sidebar/shards/MenuList/templates/Tab/styles.ts (100%) create mode 100644 apps/frontend/ui/src/navigation/partials/Sidebar/shards/MenuList/templates/index.ts rename apps/frontend/ui/src/{layout => navigation}/partials/Sidebar/shards/ToggleButton/func.tsx (85%) create mode 100644 apps/frontend/ui/src/navigation/partials/Sidebar/shards/ToggleButton/index.ts rename apps/frontend/ui/src/{layout => navigation}/partials/Sidebar/shards/ToggleButton/styles.ts (100%) create mode 100644 apps/frontend/ui/src/navigation/partials/Sidebar/shards/index.ts rename apps/frontend/ui/src/{layout => navigation}/partials/Sidebar/stories.tsx (94%) rename apps/frontend/ui/src/{layout => navigation}/partials/Sidebar/styles.ts (100%) rename apps/frontend/ui/src/{layout => navigation}/partials/Sidebar/tests.tsx (97%) rename apps/frontend/ui/src/{layout => navigation}/partials/Sidebar/types.ts (100%) create mode 100644 apps/frontend/ui/src/navigation/partials/index.ts diff --git a/apps/frontend/ui/src/layout/partials/Sidebar/index.ts b/apps/frontend/ui/src/layout/partials/Sidebar/index.ts deleted file mode 100644 index f2e757c..0000000 --- a/apps/frontend/ui/src/layout/partials/Sidebar/index.ts +++ /dev/null @@ -1,3 +0,0 @@ -import Sidebar from "@app-ui/layout/partials/Sidebar/func"; - -export default Sidebar; diff --git a/apps/frontend/ui/src/layout/partials/Sidebar/shards/MenuList/index.ts b/apps/frontend/ui/src/layout/partials/Sidebar/shards/MenuList/index.ts deleted file mode 100644 index 18089a9..0000000 --- a/apps/frontend/ui/src/layout/partials/Sidebar/shards/MenuList/index.ts +++ /dev/null @@ -1,3 +0,0 @@ -import MenuList from "@app-ui/layout/partials/Sidebar/shards/MenuList/func"; - -export default MenuList; diff --git a/apps/frontend/ui/src/layout/partials/Sidebar/shards/MenuList/templates/Tab/index.ts b/apps/frontend/ui/src/layout/partials/Sidebar/shards/MenuList/templates/Tab/index.ts deleted file mode 100644 index 71e4719..0000000 --- a/apps/frontend/ui/src/layout/partials/Sidebar/shards/MenuList/templates/Tab/index.ts +++ /dev/null @@ -1,3 +0,0 @@ -import Tab from "@app-ui/layout/partials/Sidebar/shards/MenuList/templates/Tab/func"; - -export default Tab; diff --git a/apps/frontend/ui/src/layout/partials/Sidebar/shards/MenuList/templates/index.ts b/apps/frontend/ui/src/layout/partials/Sidebar/shards/MenuList/templates/index.ts deleted file mode 100644 index d439ef7..0000000 --- a/apps/frontend/ui/src/layout/partials/Sidebar/shards/MenuList/templates/index.ts +++ /dev/null @@ -1 +0,0 @@ -export { default as TabTemplate } from "@app-ui/layout/partials/Sidebar/shards/MenuList/templates/Tab/func"; diff --git a/apps/frontend/ui/src/layout/partials/Sidebar/shards/ToggleButton/index.ts b/apps/frontend/ui/src/layout/partials/Sidebar/shards/ToggleButton/index.ts deleted file mode 100644 index c8253a5..0000000 --- a/apps/frontend/ui/src/layout/partials/Sidebar/shards/ToggleButton/index.ts +++ /dev/null @@ -1,3 +0,0 @@ -import ToggleButton from "@app-ui/layout/partials/Sidebar/shards/ToggleButton/func"; - -export default ToggleButton; diff --git a/apps/frontend/ui/src/layout/partials/Sidebar/shards/index.ts b/apps/frontend/ui/src/layout/partials/Sidebar/shards/index.ts deleted file mode 100644 index c8a53c2..0000000 --- a/apps/frontend/ui/src/layout/partials/Sidebar/shards/index.ts +++ /dev/null @@ -1,2 +0,0 @@ -export { default as MenuListShard } from "@app-ui/layout/partials/Sidebar/shards/MenuList"; -export { default as ToggleButtonShard } from "@app-ui/layout/partials/Sidebar/shards/ToggleButton"; diff --git a/apps/frontend/ui/src/layout/partials/index.ts b/apps/frontend/ui/src/layout/partials/index.ts deleted file mode 100644 index c5249f9..0000000 --- a/apps/frontend/ui/src/layout/partials/index.ts +++ /dev/null @@ -1 +0,0 @@ -export { default as SidebarPartial } from "@app-ui/layout/partials/Sidebar"; diff --git a/apps/frontend/ui/src/layout/index.ts b/apps/frontend/ui/src/navigation/index.ts similarity index 74% rename from apps/frontend/ui/src/layout/index.ts rename to apps/frontend/ui/src/navigation/index.ts index 9637ffe..eeefd46 100644 --- a/apps/frontend/ui/src/layout/index.ts +++ b/apps/frontend/ui/src/navigation/index.ts @@ -1 +1 @@ -export { SidebarPartial as SidebarPartialLayout } from "@app-ui/layout/partials"; +export { SidebarPartial as SidebarPartialLayout } from "@app-ui/navigation/partials"; diff --git a/apps/frontend/ui/src/layout/partials/Sidebar/constants.ts b/apps/frontend/ui/src/navigation/partials/Sidebar/constants.ts similarity index 100% rename from apps/frontend/ui/src/layout/partials/Sidebar/constants.ts rename to apps/frontend/ui/src/navigation/partials/Sidebar/constants.ts diff --git a/apps/frontend/ui/src/layout/partials/Sidebar/func.tsx b/apps/frontend/ui/src/navigation/partials/Sidebar/func.tsx similarity index 89% rename from apps/frontend/ui/src/layout/partials/Sidebar/func.tsx rename to apps/frontend/ui/src/navigation/partials/Sidebar/func.tsx index a8b37a6..5090a55 100644 --- a/apps/frontend/ui/src/layout/partials/Sidebar/func.tsx +++ b/apps/frontend/ui/src/navigation/partials/Sidebar/func.tsx @@ -7,10 +7,10 @@ import { Logo } from "@lib-theme"; import { MenuListShard, ToggleButtonShard, -} from "@app-ui/layout/partials/Sidebar/shards"; +} from "@app-ui/navigation/partials/Sidebar/shards"; -import useSidebarClasses from "@app-ui/layout/partials/Sidebar/styles"; -import type { TUiSidebarPageOption } from "@app-ui/layout/partials/Sidebar/types"; +import useSidebarClasses from "@app-ui/navigation/partials/Sidebar/styles"; +import type { TUiSidebarPageOption } from "@app-ui/navigation/partials/Sidebar/types"; type TProps = { defaultTab: TUiSidebarPageOption; diff --git a/apps/frontend/ui/src/navigation/partials/Sidebar/index.ts b/apps/frontend/ui/src/navigation/partials/Sidebar/index.ts new file mode 100644 index 0000000..e8f34a8 --- /dev/null +++ b/apps/frontend/ui/src/navigation/partials/Sidebar/index.ts @@ -0,0 +1,3 @@ +import Sidebar from "@app-ui/navigation/partials/Sidebar/func"; + +export default Sidebar; diff --git a/apps/frontend/ui/src/layout/partials/Sidebar/shards/MenuList/func.tsx b/apps/frontend/ui/src/navigation/partials/Sidebar/shards/MenuList/func.tsx similarity index 86% rename from apps/frontend/ui/src/layout/partials/Sidebar/shards/MenuList/func.tsx rename to apps/frontend/ui/src/navigation/partials/Sidebar/shards/MenuList/func.tsx index f1f1932..8b6c868 100644 --- a/apps/frontend/ui/src/layout/partials/Sidebar/shards/MenuList/func.tsx +++ b/apps/frontend/ui/src/navigation/partials/Sidebar/shards/MenuList/func.tsx @@ -9,10 +9,10 @@ import { import { Flex, TabList } from "@lib-components"; -import constants from "@app-ui/layout/partials/Sidebar/constants"; -import type { TUiSidebarPageOption } from "@app-ui/layout/partials/Sidebar/types"; +import constants from "@app-ui/navigation/partials/Sidebar/constants"; +import type { TUiSidebarPageOption } from "@app-ui/navigation/partials/Sidebar/types"; -import { TabTemplate } from "@app-ui/layout/partials/Sidebar/shards/MenuList/templates"; +import { TabTemplate } from "@app-ui/navigation/partials/Sidebar/shards/MenuList/templates"; type TProps = { isExpanded: boolean; diff --git a/apps/frontend/ui/src/navigation/partials/Sidebar/shards/MenuList/index.ts b/apps/frontend/ui/src/navigation/partials/Sidebar/shards/MenuList/index.ts new file mode 100644 index 0000000..9c9d4e7 --- /dev/null +++ b/apps/frontend/ui/src/navigation/partials/Sidebar/shards/MenuList/index.ts @@ -0,0 +1,3 @@ +import MenuList from "@app-ui/navigation/partials/Sidebar/shards/MenuList/func"; + +export default MenuList; diff --git a/apps/frontend/ui/src/layout/partials/Sidebar/shards/MenuList/templates/Tab/func.tsx b/apps/frontend/ui/src/navigation/partials/Sidebar/shards/MenuList/templates/Tab/func.tsx similarity index 92% rename from apps/frontend/ui/src/layout/partials/Sidebar/shards/MenuList/templates/Tab/func.tsx rename to apps/frontend/ui/src/navigation/partials/Sidebar/shards/MenuList/templates/Tab/func.tsx index ad913de..05ecb24 100644 --- a/apps/frontend/ui/src/layout/partials/Sidebar/shards/MenuList/templates/Tab/func.tsx +++ b/apps/frontend/ui/src/navigation/partials/Sidebar/shards/MenuList/templates/Tab/func.tsx @@ -5,7 +5,7 @@ import { Tab as OriginalTab, Flex } from "@lib-components"; import { EThemeIconSizes } from "@lib-theme"; import type { TFluentIcon } from "@lib-theme"; -import useTabClasses from "@app-ui/layout/partials/Sidebar/shards/MenuList/templates/Tab/styles"; +import useTabClasses from "@app-ui/navigation/partials/Sidebar/shards/MenuList/templates/Tab/styles"; type TProps = { action: () => void; diff --git a/apps/frontend/ui/src/navigation/partials/Sidebar/shards/MenuList/templates/Tab/index.ts b/apps/frontend/ui/src/navigation/partials/Sidebar/shards/MenuList/templates/Tab/index.ts new file mode 100644 index 0000000..884a801 --- /dev/null +++ b/apps/frontend/ui/src/navigation/partials/Sidebar/shards/MenuList/templates/Tab/index.ts @@ -0,0 +1,3 @@ +import Tab from "@app-ui/navigation/partials/Sidebar/shards/MenuList/templates/Tab/func"; + +export default Tab; diff --git a/apps/frontend/ui/src/layout/partials/Sidebar/shards/MenuList/templates/Tab/styles.ts b/apps/frontend/ui/src/navigation/partials/Sidebar/shards/MenuList/templates/Tab/styles.ts similarity index 100% rename from apps/frontend/ui/src/layout/partials/Sidebar/shards/MenuList/templates/Tab/styles.ts rename to apps/frontend/ui/src/navigation/partials/Sidebar/shards/MenuList/templates/Tab/styles.ts diff --git a/apps/frontend/ui/src/navigation/partials/Sidebar/shards/MenuList/templates/index.ts b/apps/frontend/ui/src/navigation/partials/Sidebar/shards/MenuList/templates/index.ts new file mode 100644 index 0000000..d68fc6c --- /dev/null +++ b/apps/frontend/ui/src/navigation/partials/Sidebar/shards/MenuList/templates/index.ts @@ -0,0 +1 @@ +export { default as TabTemplate } from "@app-ui/navigation/partials/Sidebar/shards/MenuList/templates/Tab/func"; diff --git a/apps/frontend/ui/src/layout/partials/Sidebar/shards/ToggleButton/func.tsx b/apps/frontend/ui/src/navigation/partials/Sidebar/shards/ToggleButton/func.tsx similarity index 85% rename from apps/frontend/ui/src/layout/partials/Sidebar/shards/ToggleButton/func.tsx rename to apps/frontend/ui/src/navigation/partials/Sidebar/shards/ToggleButton/func.tsx index 7225e75..3fe9763 100644 --- a/apps/frontend/ui/src/layout/partials/Sidebar/shards/ToggleButton/func.tsx +++ b/apps/frontend/ui/src/navigation/partials/Sidebar/shards/ToggleButton/func.tsx @@ -3,9 +3,9 @@ import type { JSX, Dispatch, SetStateAction } from "react"; import { ChevronLeftFilled, ChevronRightFilled } from "@fluentui/react-icons"; import { Button, Tooltip } from "@lib-components"; -import constants from "@app-ui/layout/partials/Sidebar/constants"; +import constants from "@app-ui/navigation/partials/Sidebar/constants"; -import useToggleButtonClasses from "@app-ui/layout/partials/Sidebar/shards/ToggleButton/styles"; +import useToggleButtonClasses from "@app-ui/navigation/partials/Sidebar/shards/ToggleButton/styles"; type TProps = { isExpanded: boolean; diff --git a/apps/frontend/ui/src/navigation/partials/Sidebar/shards/ToggleButton/index.ts b/apps/frontend/ui/src/navigation/partials/Sidebar/shards/ToggleButton/index.ts new file mode 100644 index 0000000..f66364f --- /dev/null +++ b/apps/frontend/ui/src/navigation/partials/Sidebar/shards/ToggleButton/index.ts @@ -0,0 +1,3 @@ +import ToggleButton from "@app-ui/navigation/partials/Sidebar/shards/ToggleButton/func"; + +export default ToggleButton; diff --git a/apps/frontend/ui/src/layout/partials/Sidebar/shards/ToggleButton/styles.ts b/apps/frontend/ui/src/navigation/partials/Sidebar/shards/ToggleButton/styles.ts similarity index 100% rename from apps/frontend/ui/src/layout/partials/Sidebar/shards/ToggleButton/styles.ts rename to apps/frontend/ui/src/navigation/partials/Sidebar/shards/ToggleButton/styles.ts diff --git a/apps/frontend/ui/src/navigation/partials/Sidebar/shards/index.ts b/apps/frontend/ui/src/navigation/partials/Sidebar/shards/index.ts new file mode 100644 index 0000000..a191b50 --- /dev/null +++ b/apps/frontend/ui/src/navigation/partials/Sidebar/shards/index.ts @@ -0,0 +1,2 @@ +export { default as MenuListShard } from "@app-ui/navigation/partials/Sidebar/shards/MenuList"; +export { default as ToggleButtonShard } from "@app-ui/navigation/partials/Sidebar/shards/ToggleButton"; diff --git a/apps/frontend/ui/src/layout/partials/Sidebar/stories.tsx b/apps/frontend/ui/src/navigation/partials/Sidebar/stories.tsx similarity index 94% rename from apps/frontend/ui/src/layout/partials/Sidebar/stories.tsx rename to apps/frontend/ui/src/navigation/partials/Sidebar/stories.tsx index 0e03a37..00b1623 100644 --- a/apps/frontend/ui/src/layout/partials/Sidebar/stories.tsx +++ b/apps/frontend/ui/src/navigation/partials/Sidebar/stories.tsx @@ -2,7 +2,7 @@ import { useState } from "react"; import type { Meta, StoryObj } from "@storybook/react"; -import Sidebar from "@app-ui/layout/partials/Sidebar"; +import Sidebar from "@app-ui/navigation/partials/Sidebar"; import { tokens } from "@lib-theme"; diff --git a/apps/frontend/ui/src/layout/partials/Sidebar/styles.ts b/apps/frontend/ui/src/navigation/partials/Sidebar/styles.ts similarity index 100% rename from apps/frontend/ui/src/layout/partials/Sidebar/styles.ts rename to apps/frontend/ui/src/navigation/partials/Sidebar/styles.ts diff --git a/apps/frontend/ui/src/layout/partials/Sidebar/tests.tsx b/apps/frontend/ui/src/navigation/partials/Sidebar/tests.tsx similarity index 97% rename from apps/frontend/ui/src/layout/partials/Sidebar/tests.tsx rename to apps/frontend/ui/src/navigation/partials/Sidebar/tests.tsx index 4bb0ba8..07e031e 100644 --- a/apps/frontend/ui/src/layout/partials/Sidebar/tests.tsx +++ b/apps/frontend/ui/src/navigation/partials/Sidebar/tests.tsx @@ -3,8 +3,8 @@ import { useState } from "react"; import { render, screen, fireEvent } from "@tests-unit-browser"; import "@testing-library/jest-dom"; -import constants from "@app-ui/layout/partials/Sidebar/constants"; -import SidebarPartial from "@app-ui/layout/partials/Sidebar"; +import constants from "@app-ui/navigation/partials/Sidebar/constants"; +import SidebarPartial from "@app-ui/navigation/partials/Sidebar"; describe("Sidebar", () => { describe("when specified", () => { diff --git a/apps/frontend/ui/src/layout/partials/Sidebar/types.ts b/apps/frontend/ui/src/navigation/partials/Sidebar/types.ts similarity index 100% rename from apps/frontend/ui/src/layout/partials/Sidebar/types.ts rename to apps/frontend/ui/src/navigation/partials/Sidebar/types.ts diff --git a/apps/frontend/ui/src/navigation/partials/index.ts b/apps/frontend/ui/src/navigation/partials/index.ts new file mode 100644 index 0000000..21b0f9e --- /dev/null +++ b/apps/frontend/ui/src/navigation/partials/index.ts @@ -0,0 +1 @@ +export { default as SidebarPartial } from "@app-ui/navigation/partials/Sidebar"; From ed099c6a814ca2c91924908a5d68032129371b38 Mon Sep 17 00:00:00 2001 From: Samuil Berenzon Date: Sat, 28 Dec 2024 11:41:18 +0000 Subject: [PATCH 04/26] move story --- apps/frontend/ui/src/navigation/partials/Sidebar/stories.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/frontend/ui/src/navigation/partials/Sidebar/stories.tsx b/apps/frontend/ui/src/navigation/partials/Sidebar/stories.tsx index 00b1623..d3c4303 100644 --- a/apps/frontend/ui/src/navigation/partials/Sidebar/stories.tsx +++ b/apps/frontend/ui/src/navigation/partials/Sidebar/stories.tsx @@ -7,7 +7,7 @@ import Sidebar from "@app-ui/navigation/partials/Sidebar"; import { tokens } from "@lib-theme"; const meta: Meta = { - title: "App/UI/Layout/Partials/Sidebar", + title: "App/UI/Navigation/Partials/Sidebar", component: Sidebar, args: { defaultTab: "Overview", From a7e12203a10a771f753811734e21b53658d53ce5 Mon Sep 17 00:00:00 2001 From: Samuil Berenzon Date: Sat, 28 Dec 2024 12:27:43 +0000 Subject: [PATCH 05/26] baseline api --- .vscode/settings.json | 2 +- .../navigation/partials/BrowseMenu/func.tsx | 22 +++++++++++++++++++ .../navigation/partials/BrowseMenu/index.ts | 3 +++ .../partials/BrowseMenu/stories.tsx | 15 +++++++++++++ .../navigation/partials/BrowseMenu/styles.ts | 7 ++++++ .../navigation/partials/BrowseMenu/types.ts | 7 ++++++ .../ui/src/navigation/partials/index.ts | 1 + 7 files changed, 56 insertions(+), 1 deletion(-) create mode 100644 apps/frontend/ui/src/navigation/partials/BrowseMenu/func.tsx create mode 100644 apps/frontend/ui/src/navigation/partials/BrowseMenu/index.ts create mode 100644 apps/frontend/ui/src/navigation/partials/BrowseMenu/stories.tsx create mode 100644 apps/frontend/ui/src/navigation/partials/BrowseMenu/styles.ts create mode 100644 apps/frontend/ui/src/navigation/partials/BrowseMenu/types.ts diff --git a/.vscode/settings.json b/.vscode/settings.json index 94d854b..5470d32 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -13,7 +13,7 @@ "**/config/ci/**/caller.mk": "${dirname}.caller", "**/config/ci/**/runner.ts": "${dirname}.runner", // react-func pattern - "**/src/**/func.tsx": "${dirname(-3)}.${dirname}.func", + "**/src/**/func.tsx": "${dirname}.func", "**/src/**/styles.ts": "${dirname}.styles", "**/src/**/stories.{ts,tsx}": "${dirname}.stories", "**/src/**/index.ts": "${dirname}.module", diff --git a/apps/frontend/ui/src/navigation/partials/BrowseMenu/func.tsx b/apps/frontend/ui/src/navigation/partials/BrowseMenu/func.tsx new file mode 100644 index 0000000..101c992 --- /dev/null +++ b/apps/frontend/ui/src/navigation/partials/BrowseMenu/func.tsx @@ -0,0 +1,22 @@ +import type { JSX } from "react"; + +import useBrowseMenuClasses from "./styles"; + +import type { TUiBrowseMenuOption } from "@app-ui/navigation/partials/BrowseMenu/types"; + +type TProps = { + currentSelection: TUiBrowseMenuOption; + setCurrentSelection: (selection: TUiBrowseMenuOption) => void; + optionSlot: JSX.Element; + isExpanded: boolean; +}; + +export default function BrowseMenu({ + currentSelection, + setCurrentSelection, + optionSlot, + isExpanded, +}: TProps): JSX.Element { + const classes = useBrowseMenuClasses(); + return
BrowseMenu
; +} diff --git a/apps/frontend/ui/src/navigation/partials/BrowseMenu/index.ts b/apps/frontend/ui/src/navigation/partials/BrowseMenu/index.ts new file mode 100644 index 0000000..c24d2a6 --- /dev/null +++ b/apps/frontend/ui/src/navigation/partials/BrowseMenu/index.ts @@ -0,0 +1,3 @@ +import BrowseMenu from "@app-ui/navigation/partials/BrowseMenu/func"; + +export default BrowseMenu; diff --git a/apps/frontend/ui/src/navigation/partials/BrowseMenu/stories.tsx b/apps/frontend/ui/src/navigation/partials/BrowseMenu/stories.tsx new file mode 100644 index 0000000..cc3db23 --- /dev/null +++ b/apps/frontend/ui/src/navigation/partials/BrowseMenu/stories.tsx @@ -0,0 +1,15 @@ +import type { Meta, StoryObj } from "@storybook/react"; + +import BrowseMenu from "@app-ui/navigation/partials/BrowseMenu"; + +const meta: Meta = { + title: "App/UI/Navigation/Partials/BrowseMenu", + component: BrowseMenu, + args: {}, +}; + +export default meta; + +type Story = StoryObj; + +export const Index: Story = {}; diff --git a/apps/frontend/ui/src/navigation/partials/BrowseMenu/styles.ts b/apps/frontend/ui/src/navigation/partials/BrowseMenu/styles.ts new file mode 100644 index 0000000..2678f8b --- /dev/null +++ b/apps/frontend/ui/src/navigation/partials/BrowseMenu/styles.ts @@ -0,0 +1,7 @@ +import { makeStyles } from "@lib-theme"; + +const useBrowseMenuClasses = makeStyles({ + root: {}, +}); + +export default useBrowseMenuClasses; diff --git a/apps/frontend/ui/src/navigation/partials/BrowseMenu/types.ts b/apps/frontend/ui/src/navigation/partials/BrowseMenu/types.ts new file mode 100644 index 0000000..4c97004 --- /dev/null +++ b/apps/frontend/ui/src/navigation/partials/BrowseMenu/types.ts @@ -0,0 +1,7 @@ +export type TUiBrowseMenuOption = + | "Catalogue" + | "Concepts" + | "Random" + | "Word" + | "Advanced" + | "None"; diff --git a/apps/frontend/ui/src/navigation/partials/index.ts b/apps/frontend/ui/src/navigation/partials/index.ts index 21b0f9e..d294e90 100644 --- a/apps/frontend/ui/src/navigation/partials/index.ts +++ b/apps/frontend/ui/src/navigation/partials/index.ts @@ -1 +1,2 @@ export { default as SidebarPartial } from "@app-ui/navigation/partials/Sidebar"; +export { default as BrowseMenuPartial } from "@app-ui/navigation/partials/BrowseMenu"; From 835375bdb4d3e281b7d045c5f6061448b2e823c4 Mon Sep 17 00:00:00 2001 From: Samuil Berenzon Date: Sat, 28 Dec 2024 13:34:45 +0000 Subject: [PATCH 06/26] tab list done --- .../navigation/partials/BrowseMenu/func.tsx | 36 +++++++++++++++- .../navigation/partials/BrowseMenu/styles.ts | 8 +++- libs/theme/src/index.ts | 43 ++++++++++++++++++- 3 files changed, 84 insertions(+), 3 deletions(-) diff --git a/apps/frontend/ui/src/navigation/partials/BrowseMenu/func.tsx b/apps/frontend/ui/src/navigation/partials/BrowseMenu/func.tsx index 101c992..ae09e65 100644 --- a/apps/frontend/ui/src/navigation/partials/BrowseMenu/func.tsx +++ b/apps/frontend/ui/src/navigation/partials/BrowseMenu/func.tsx @@ -2,6 +2,11 @@ import type { JSX } from "react"; import useBrowseMenuClasses from "./styles"; +import { ChevronRightRegular, ChevronLeftRegular } from "@fluentui/react-icons"; + +import { Flex, TabList, Tab, Button, Tooltip } from "@lib-components"; +import { LargeTitle, Title1 } from "@lib-theme"; + import type { TUiBrowseMenuOption } from "@app-ui/navigation/partials/BrowseMenu/types"; type TProps = { @@ -18,5 +23,34 @@ export default function BrowseMenu({ isExpanded, }: TProps): JSX.Element { const classes = useBrowseMenuClasses(); - return
BrowseMenu
; + return ( + + + Browse +