Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/sidebar refactor #75

Merged
merged 33 commits into from
Jan 30, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
2705602
fix: ui problems
timothyrusso Jan 4, 2024
161ed16
feat: add sidebar to storybook
timothyrusso Jan 4, 2024
98af998
Merge remote-tracking branch 'origin/dev' into feature/sidebar-refactor
timothyrusso Jan 11, 2024
08d31ad
Merge branch 'dev' into feature/sidebar-refactor
Dan-Y-Ko Jan 12, 2024
9edfefe
feat: add custom button to the sidebar
Jan 12, 2024
24627a2
fix button ui problem
timothyrusso Jan 12, 2024
724d285
fix: import issue
timothyrusso Jan 13, 2024
6d21769
Merge remote-tracking branch 'origin/dev' into feature/sidebar-refactor
timothyrusso Jan 15, 2024
851e748
feat: update user check for my voyage pages
timothyrusso Jan 15, 2024
81496d1
fix: lint errors
timothyrusso Jan 15, 2024
b810ce6
fix: prettier
timothyrusso Jan 16, 2024
2997d79
Merge branch 'dev' into feature/sidebar-refactor
Dan-Y-Ko Jan 18, 2024
1b32fc3
feat: use neutral variant and remove unused classnames
timothyrusso Jan 21, 2024
e448dae
fix: lint errors
timothyrusso Jan 21, 2024
84477ac
feat: voyage icons alignment
timothyrusso Jan 21, 2024
89b8710
update colors for neutral variant in button component
Dan-Y-Ko Jan 21, 2024
767115f
Merge remote-tracking branch 'origin/dev' into feature/sidebar-refactor
timothyrusso Jan 23, 2024
67931a1
fix: selected button when current path change
timothyrusso Jan 23, 2024
69435fd
Merge branch 'feature/sidebar-refactor' of https://github.com/chingu-…
timothyrusso Jan 23, 2024
d3c44d0
Merge remote-tracking branch 'origin/dev' into feature/sidebar-refactor
timothyrusso Jan 25, 2024
7e9e5e8
fix: remove unused classes
timothyrusso Jan 25, 2024
253452c
feat: remove unused hook
timothyrusso Jan 25, 2024
f48ae24
fix: lint errors
timothyrusso Jan 25, 2024
f46a0b4
feat: remove usless check on sidebar page
timothyrusso Jan 25, 2024
becba89
feat: add check for the voyage status
timothyrusso Jan 26, 2024
9fea9a3
fix: storybook error
timothyrusso Jan 26, 2024
c803874
fix: push error
timothyrusso Jan 26, 2024
344d45f
style: remove unused comments
timothyrusso Jan 26, 2024
f6c189a
Merge remote-tracking branch 'origin/dev' into feature/sidebar-refactor
timothyrusso Jan 28, 2024
84d6e6c
fix: pr comments
timothyrusso Jan 28, 2024
5ee4162
fix: pr comments
timothyrusso Jan 29, 2024
6417bd6
fix: pr comments
timothyrusso Jan 30, 2024
8f8b9d9
style: lint formatting
timothyrusso Jan 30, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/components/Button.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ const button = cva(
"bg-base-200",
"border-base-100",
"hover:bg-base-100",
"focus:bg-neutral-content",
"active:bg-neutral-content",
"disabled:text-neutral-focus",
"disabled:bg-neutral-content",
],
Expand Down Expand Up @@ -73,7 +73,7 @@ const button = cva(
size: "md",
outline: false,
},
},
}
);

export interface ButtonProps
Expand Down
38 changes: 19 additions & 19 deletions src/components/sidebar/PageButton.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -43,28 +43,28 @@ export default function PageButton({
: ""
}
>
<Button
type="button"
size="lg"
variant="neutral"
data-tip={element.name}
className={`${buttonStyles} ${getButtonBackgroundStyle(
element.link,
)} ${element.marginBottom} flex items-center`}
onMouseEnter={() => setHoveredButton(element.name)}
onMouseLeave={() => setHoveredButton(null)}
onClick={() => onClick(element)}
<Tooltip
content={element.name}
position="right"
tooltipWidth="small"
isDisplay={!isOpen}
>
<Tooltip
content={element.name}
position="right"
tooltipWidth="small"
isDisplay={!isOpen}
<Button
type="button"
size="lg"
variant="neutral"
data-tip={element.name}
className={`${buttonStyles} ${getButtonBackgroundStyle(
element.link
)} ${element.marginBottom} flex items-center`}
onMouseEnter={() => setHoveredButton(element.name)}
onMouseLeave={() => setHoveredButton(null)}
onClick={() => onClick(element)}
>
{element.icon}
</Tooltip>
{getButtonText(element.name)}
</Button>
{getButtonText(element.name)}
</Button>
</Tooltip>
</Link>
</li>
);
Expand Down
2 changes: 1 addition & 1 deletion src/components/sidebar/VoyagePageButton.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ export default function VoyagePageButton({
<button
type="button"
className={`bg-transparent hover:bg-transparent w-[9.375rem] h-[1.1875rem] min-h-0 mb-2.5 flex justify-start ${
isVoyageStarted ? "pl-11" : "pl-6 pointer-events-none"
isVoyageStarted ? "pl-11" : "pl-6"
} text-neutral-focus capitalize border-none relative`}
onMouseEnter={() => setHoveredButton(element.link)}
onMouseLeave={() => setHoveredButton(null)}
Expand Down
Loading