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.

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

visual bugs fixed #86

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

visual bugs fixed #86

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
49be4c3
v bugs fixed
griffinbaker12 Jul 16, 2024
04e5687
Merge branch 'master' into visual-bugs
griffinbaker12 Jul 16, 2024
44f1965
Merge branch 'master' into visual-bugs
griffinbaker12 Jul 31, 2024
827a829
synced package updates
griffinbaker12 Jul 31, 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
20 changes: 10 additions & 10 deletions src/pages/dashboard/Dashboard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ import type { Device } from '~/types'

import Button from '~/components/material/Button'
import Drawer from '~/components/material/Drawer'
import Icon from '~/components/material/Icon'
import IconButton from '~/components/material/IconButton'
import TopAppBar from '~/components/material/TopAppBar'

Expand Down Expand Up @@ -52,15 +51,16 @@ const DashboardDrawer = (props: {
<h2 class="mx-4 mb-2 text-label-sm">
Devices
</h2>
<Show when={props.devices} keyed>
{devices => <DeviceList class="p-2" devices={devices} />}
</Show>
<div class="grow" />
<Button class="m-4" leading={<Icon>add</Icon>} href="/pair" onClick={props.onClose}>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like the Add new device button was lost while resolving merge conflicts

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

got it, will update this weekend

Add new device
</Button>
<hr class="mx-4 opacity-20" />
<Button class="m-4" color="error" href="/logout">Sign out</Button>
<hr class="opacity-20" />
<div class="hide-scrollbar mx-2 grow overflow-y-auto pt-2">
<Show when={props.devices} keyed>
{devices => <DeviceList devices={devices} />}
</Show>
</div>
<hr class="opacity-20" />
<div class="p-4">
<Button class="w-full" href="/logout">Sign out</Button>
</div>
</>
)
}
Expand Down
1 change: 1 addition & 0 deletions src/pages/dashboard/components/DeviceList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ const DeviceList: VoidComponent<DeviceListProps> = (props) => {
selected={isSelected(device)}
onClick={onClick(device)}
href={`/${device.dongle_id}`}
class="mb-2"
>
<ListItemContent
headline={getDeviceName(device)}
Expand Down