Skip to content

fix: always have title bar in dash pane one #515

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

Closed
greatgitsby wants to merge 1 commit into from
Closed

fix: always have title bar in dash pane one #515

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 15 additions & 2 deletions src/pages/dashboard/Dashboard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ const DashboardLayout: Component<{
paneTwo: JSXElement
paneTwoContent: boolean
}> = (props) => {
const { modal } = useDrawerContext()
return (
<div class="relative size-full overflow-hidden">
<div
Expand All @@ -93,7 +94,19 @@ const DashboardLayout: Component<{
props.paneTwoContent ? '-translate-x-full md:translate-x-0' : 'translate-x-0',
)}
>
<div class="min-w-full overflow-y-scroll">{props.paneOne}</div>
<div class="min-w-full overflow-y-scroll">
<TopAppBar
class="font-bold"
leading={
<Show when={!modal()} fallback={<DrawerToggleButton />}>
<img alt="" src="/images/comma-white.png" class="h-8" />
</Show>
}
>
connect
</TopAppBar>
{props.paneOne}
</div>
<div class="min-w-full overflow-y-scroll">{props.paneTwo}</div>
</div>
</div>
Expand Down Expand Up @@ -128,7 +141,7 @@ const Dashboard: Component<RouteSectionProps> = () => {

return (
<Drawer drawer={<DashboardDrawer devices={devices()} />}>
<Switch fallback={<TopAppBar leading={<DrawerToggleButton />}>No device</TopAppBar>}>
<Switch>
<Match when={urlState().dongleId === 'pair' || !!location.query.pair}>
<PairActivity />
</Match>
Expand Down
14 changes: 0 additions & 14 deletions src/pages/dashboard/activities/DeviceActivity.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,8 @@ import { getDevice, SHARED_DEVICE } from '~/api/devices'
import { ATHENA_URL } from '~/api/config'
import { getAccessToken } from '~/api/auth/client'

import { DrawerToggleButton, useDrawerContext } from '~/components/material/Drawer'
import Icon from '~/components/material/Icon'
import IconButton from '~/components/material/IconButton'
import TopAppBar from '~/components/material/TopAppBar'
import DeviceLocation from '~/components/DeviceLocation'
import DeviceStatistics from '~/components/DeviceStatistics'
import { deviceIsOnline, getDeviceName } from '~/utils/device'
Expand Down Expand Up @@ -107,20 +105,8 @@ const DeviceActivity: VoidComponent<DeviceActivityProps> = (props) => {
setSnapshot({ ...snapshot(), error: null })
}

const { modal } = useDrawerContext()

return (
<>
<TopAppBar
class="font-bold"
leading={
<Show when={!modal()} fallback={<DrawerToggleButton />}>
<img alt="" src="/images/comma-white.png" class="h-8" />
</Show>
}
>
connect
</TopAppBar>
<div class="flex flex-col gap-4 px-4 pb-4">
<div class="h-min overflow-hidden rounded-lg bg-surface-container-low">
<Suspense fallback={<div class="h-[240px] skeleton-loader size-full" />}>
Expand Down