这是indexloc提供的服务，不要输入任何密码
Skip to content

Issue/369 update header UI for component and icon alignment #371

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.

Sign up for GitHub

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

Merged
merged 5 commits into from
Jun 12, 2024
Merged

Issue/369 update header UI for component and icon alignment #371

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ac1bd6f
fix : update style
WidaSuryani Jun 12, 2024
773cab9
fix : updated style switcher
WidaSuryani Jun 12, 2024
45c3a7a
fix : delete unuse code
WidaSuryani Jun 12, 2024
02114f5
fix : update size icon
WidaSuryani Jun 12, 2024
71ba86d
fix : update gap
WidaSuryani Jun 12, 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
8 changes: 5 additions & 3 deletions hosting/src/app/(protected)/forms/form-elements/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,11 @@ const FormElementsPage = () => {
</ContentCard>

<ContentCard title="Toggle switch input">
<Switcher />
<Switcher style="rounded" />
<Switcher onIcon="i-ic-round-check" offIcon="i-ic-round-close" />
<div className="flex flex-col gap-4">
<Switcher />
<Switcher style="rounded" />
<Switcher onIcon="i-ic-round-check" offIcon="i-ic-round-close" />
</div>
</ContentCard>

<ContentCard title="Time and date">
Expand Down
18 changes: 13 additions & 5 deletions hosting/src/components/Form/Switcher.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,16 +34,20 @@ export function Switcher({
return (
<>
<div
className={`h-5 w-14 rounded-full shadow-inner transition ${
className={`h-5 w-14 rounded-full transition ${
enabled ? "bg-primary dark:bg-primary" : "bg-meta-9 dark:bg-[#5A616B]"
}`}
></div>
<div
className={`dot absolute -top-1 left-0 flex h-7 w-7 items-center justify-center rounded-full bg-white dark:bg-[#b0b0b0] transition-transform ${
className={`dot shadow-md absolute -top-1 left-0 flex h-7 w-7 items-center justify-center rounded-full bg-white dark:bg-[#b0b0b0] transition-transform ${
enabled ? "translate-x-full" : ""
}`}
>
{onIcon && offIcon && <span className={clsx("w-[16px] h-[16px]", enabled ? onIcon : offIcon)} />}
{onIcon && offIcon && (
<span
className={clsx("w-[16px] h-[16px] text-black dark:text-[#5A616B]", enabled ? onIcon : offIcon)}
/>
)}
</div>
</>
);
Expand All @@ -61,15 +65,19 @@ export function Switcher({
enabled ? "translate-x-full" : ""
}`}
>
{onIcon && offIcon && <span className={clsx("w-[16px] h-[16px]", enabled ? onIcon : offIcon)} />}
{onIcon && offIcon && (
<span
className={clsx("w-[16px] h-[16px] text-black dark:text-[#5A616B]", enabled ? onIcon : offIcon)}
/>
)}
</div>
</>
);
}
};

return (
<div className={`flex items-center mb-2 ${disabled ? "cursor-not-allowed opacity-50" : "cursor-pointer"}`}>
<div className={`flex items-center ${disabled ? "cursor-not-allowed opacity-50" : "cursor-pointer"}`}>
<label className="flex items-center select-none">
<div className="relative">
<input type="checkbox" className="sr-only" onChange={handleToggle} checked={enabled} disabled={disabled} />
Expand Down
16 changes: 7 additions & 9 deletions hosting/src/components/Header/DarkModeSwitcher.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,13 @@ const DarkModeSwitcher = () => {
};

return (
<li>
<Switcher
style="default"
defaultChecked={colorMode === "dark"}
onChange={handleColorModeToggle}
onIcon="i-ri-moon-clear-fill text-white"
offIcon="i-ri-sun-line"
/>
</li>
<Switcher
style="default"
defaultChecked={colorMode === "dark"}
onChange={handleColorModeToggle}
onIcon="i-ri-moon-clear-fill text-white"
offIcon="i-ri-sun-line"
/>
);
};

Expand Down
12 changes: 6 additions & 6 deletions hosting/src/components/Header/DropdownUser.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ function DropdownItem({href, icon, label}: DropdownItemProps) {
href={href}
className="flex items-center gap-3.5 text-sm font-medium duration-300 ease-in-out hover:text-primary lg:text-base"
>
<span className={clsx("w-[20px] h-[20px]", icon)} />
<span className={clsx("w-[24px] h-[24px]", icon)} />
{label}
</Link>
</li>
Expand Down Expand Up @@ -66,12 +66,12 @@ export default function DropdownUser({displayName, avatar}: DropdownUserProps) {
<span className="block text-sm font-medium text-black dark:text-white">{displayName}</span>
</span>

<span className="h-12 w-12 rounded-full">
<Suspense fallback={<PlaceholderAvatar size={64} />}>
<UserAvatar src={avatar} size={64} />
<span className="rounded-full">
<Suspense fallback={<PlaceholderAvatar size={40} />}>
<UserAvatar src={avatar} size={40} />
</Suspense>
</span>
<span className="i-ic-round-keyboard-arrow-down w-[20px] h-[20px]" />
<span className="i-ic-round-keyboard-arrow-down w-[24px] h-[24px]" />
</Link>

{/* <!-- Dropdown Start --> */}
Expand All @@ -91,7 +91,7 @@ export default function DropdownUser({displayName, avatar}: DropdownUserProps) {
onClick={signout}
className="flex items-center gap-3.5 px-6 py-4 text-sm font-medium duration-300 ease-in-out hover:text-primary lg:text-base"
>
<span className="i-ic-outline-logout w-[20px] h-[20px]" />
<span className="i-ic-outline-logout w-[24px] h-[24px]" />
Log Out
</button>
</div>
Expand Down
2 changes: 1 addition & 1 deletion hosting/src/components/Header/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ const Header = (props: {sidebarOpen: string | boolean | undefined; setSidebarOpe
</form> */}
</div>

<div className="flex items-center gap-3 2xsm:gap-7">
<div className="flex items-center gap-2 2xsm:gap-4">
<ul className="flex items-center gap-2 2xsm:gap-4">
<DarkModeSwitcher />
</ul>
Expand Down