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

Mobile layout tweaks and bugfixes #11397

Merged
merged 1 commit into from
May 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 7 additions & 1 deletion web/src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import Statusbar from "./components/Statusbar";
import Bottombar from "./components/navigation/Bottombar";
import { Suspense, lazy } from "react";
import { Redirect } from "./components/navigation/Redirect";
import { cn } from "./lib/utils";

const Live = lazy(() => import("@/pages/Live"));
const Events = lazy(() => import("@/pages/Events"));
Expand All @@ -31,7 +32,12 @@ function App() {
{isMobile && <Bottombar />}
<div
id="pageRoot"
className={`absolute right-0 top-0 overflow-hidden ${isMobile ? "bottom-16 left-0" : "bottom-8 left-[52px]"}`}
className={cn(
"absolute right-0 top-0 overflow-hidden",
isMobile
? "bottom-12 left-0 md:bottom-16 landscape:bottom-14 landscape:md:bottom-16"
: "bottom-8 left-[52px]",
)}
>
<Suspense>
<Routes>
Expand Down
2 changes: 1 addition & 1 deletion web/src/components/Wrapper.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ type TWrapperProps = {
};

const Wrapper = ({ children }: TWrapperProps) => {
return <main className="h-dvh w-screen overflow-hidden">{children}</main>;
return <main className="h-dvh w-full overflow-hidden">{children}</main>;
};

export default Wrapper;
20 changes: 16 additions & 4 deletions web/src/components/navigation/Bottombar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,18 @@ import {
} from "@/context/statusbar-provider";
import { Link } from "react-router-dom";
import { cn } from "@/lib/utils";
import { isMobile } from "react-device-detect";

function Bottombar() {
const navItems = useNavigation("secondary");

return (
<div className="absolute inset-x-4 bottom-0 flex h-16 flex-row items-center justify-between">
<div
className={cn(
"absolute inset-x-4 bottom-0 flex flex-row items-center justify-between",
isMobile ? "h-12 landscape:md:h-16" : "h-16",
)}
>
{navItems.map((item) => (
<NavItem key={item.id} className="p-2" item={item} Icon={item.icon} />
))}
Expand Down Expand Up @@ -72,8 +78,10 @@ function StatusAlertNav({ className }: StatusAlertNavProps) {

return (
<Drawer>
<DrawerTrigger>
<IoIosWarning className="size-5 text-danger" />
<DrawerTrigger asChild>
<div className="p-2">
<IoIosWarning className="size-5 text-danger md:m-[6px]" />
</div>
</DrawerTrigger>
<DrawerContent
className={cn(
Expand All @@ -95,7 +103,11 @@ function StatusAlertNav({ className }: StatusAlertNavProps) {
);

if (link) {
return <Link to={link}>{message}</Link>;
return (
<Link key={id} to={link}>
{message}
</Link>
);
} else {
return message;
}
Expand Down
2 changes: 1 addition & 1 deletion web/src/pages/Exports.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ function Exports() {
const [selected, setSelected] = useState<Export>();

return (
<div className="flex size-full flex-col gap-2 overflow-hidden p-2">
<div className="flex size-full flex-col gap-2 overflow-hidden px-1 pt-2 md:p-2">
<AlertDialog
open={deleteClip != undefined}
onOpenChange={() => setDeleteClip(undefined)}
Expand Down
2 changes: 1 addition & 1 deletion web/src/views/events/EventView.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@ export default function EventView({
}

return (
<div className="flex size-full flex-col py-2">
<div className="flex size-full flex-col pt-2 md:py-2">
<Toaster closeButton={true} />
<div className="relative mb-2 flex h-11 items-center justify-between pl-3 pr-2">
{isMobile && (
Expand Down
5 changes: 4 additions & 1 deletion web/src/views/live/LiveDashboardView.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,10 @@ export default function LiveDashboardView({
const birdseyeConfig = useMemo(() => config?.birdseye, [config]);

return (
<div className="size-full overflow-y-auto p-2" ref={containerRef}>
<div
className="size-full overflow-y-auto px-1 pt-2 md:p-2"
ref={containerRef}
>
{isMobile && (
<div className="relative flex h-11 items-center justify-between">
<Logo className="absolute inset-x-1/2 h-8 -translate-x-1/2" />
Expand Down
Loading