Skip to content

Commit 224cad7

Browse files
committed
fix: minor formatting
1 parent 0b840ea commit 224cad7

File tree

2 files changed

+27
-28
lines changed

2 files changed

+27
-28
lines changed

GUI/ETVR/src/components/header/CustomPopover/index.tsx

+11-15
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
import { Image, Popover } from '@kobalte/core'
2-
import { Link /* , useLocation */ } from '@solidjs/router'
32
import { createSignal, createEffect, Show, onMount } from 'solid-js'
43

54
export interface ICustomPopover {
65
icon: string
76
id: string
8-
path: string
97
popoverContent?: string
108
disablePopover?: boolean
119
onClick?: () => void
@@ -42,19 +40,17 @@ export const CustomPopover = (props: ICustomPopover) => {
4240
return (
4341
<div class="group relative inline-flex" onClick={() => props.onClick?.()}>
4442
<Popover.Root isOpen={open()}>
45-
<Link href={props.path} id={props.id} class="no-underline">
46-
<Popover.Trigger class="rounded-[8px] pl-[1.5rem] pr-[1.5rem] focus:bg-[#252536] hover:bg-[#252536] outline-none">
47-
<Image.Root>
48-
<Image.Img
49-
src={props.icon}
50-
alt="logo"
51-
width="20px"
52-
height="35px"
53-
class="pt-1 pb-1"
54-
/>
55-
</Image.Root>
56-
</Popover.Trigger>
57-
</Link>
43+
<Popover.Trigger class="rounded-[8px] pl-[1.5rem] pr-[1.5rem] focus:bg-[#252536] hover:bg-[#252536]">
44+
<Image.Root>
45+
<Image.Img
46+
src={props.icon}
47+
alt="logo"
48+
width="20px"
49+
height="35px"
50+
class="pt-1 pb-1"
51+
/>
52+
</Image.Root>
53+
</Popover.Trigger>
5854
<Show when={!props.disablePopover}>
5955
<Popover.Portal>
6056
<Popover.Content class="popover__content">

GUI/ETVR/src/components/header/index.tsx

+16-13
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1+
import { Link } from '@solidjs/router'
12
import { CustomPopover } from './CustomPopover'
23
import { Logo } from './Logo'
3-
import icons from '@assets/images/index'
4+
import icons from '@assets/images'
45
import './styles.css'
56

67
interface Iprops {
@@ -17,18 +18,20 @@ export default function Header(props: Iprops) {
1718
<div class="flex h-[55%] content-center mt-[5px]">
1819
<div class="flex grow justify-center border-none shadow-lg items-center content-center leading-5 font-sans font-medium text-[.75rem] rounded-[15px] h-[100%] w-[100%] bg-[#0e0e0e] text-[#5f5f5f]">
1920
<div class="flex grow content-center justify-between h-[100%] leading-5 font-sans font-medium rounded-[14px] pl-[5px] pr-[5px] pt-[5px] bg-[#0e0e0e] w-[145px]">
20-
<CustomPopover
21-
id="tracker-manager-popover"
22-
icon={icons.cameraSolid}
23-
path="/"
24-
popoverContent="Tracker manager"
25-
/>
26-
<CustomPopover
27-
id="settings-popover"
28-
path="/settings"
29-
icon={icons.gearSolid}
30-
popoverContent="Settings"
31-
/>
21+
<Link href="/" id="tracker-manager-popover" class="no-underline">
22+
<CustomPopover
23+
id="tracker-manager-popover"
24+
icon={icons.cameraSolid}
25+
popoverContent="Tracker manager"
26+
/>
27+
</Link>
28+
<Link href="/settings" id="settings-popover" class="no-underline">
29+
<CustomPopover
30+
id="settings-popover"
31+
icon={icons.gearSolid}
32+
popoverContent="Settings"
33+
/>
34+
</Link>
3235
</div>
3336
</div>
3437
</div>

0 commit comments

Comments
 (0)