Skip to content
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
4 changes: 2 additions & 2 deletions webapp/src/app/layouts/RootLayout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@ export const RootLayout: FC = () => {
}

return (
<div className="flex flex-col h-screen">
<div className="flex flex-col h-svh">
<Header
onLogin={() => navigate("/login")}
onLogout={() => logout()}
isAuthenticated={isAuthenticated}
/>
<main className="flex flex-1">
<main className="flex flex-col flex-1">
<Outlet />
</main>
</div>
Expand Down
11 changes: 4 additions & 7 deletions webapp/src/shared/ui/sidebar.tsx
Original file line number Diff line number Diff line change
@@ -1,12 +1,6 @@
import { type VariantProps, cva } from "class-variance-authority";
import { PanelLeft } from "lucide-react";
import * as React from "react";

import { Slot } from "@radix-ui/react-slot";

import { useIsMobile } from "@shared/hooks/use-mobile";
import { cn } from "@shared/lib/utils";

import { Button } from "@ui/button";
import { Input } from "@ui/input";
import { Separator } from "@ui/separator";
Expand All @@ -24,6 +18,9 @@ import {
TooltipProvider,
TooltipTrigger,
} from "@ui/tooltip";
import { cva, type VariantProps } from "class-variance-authority";
import { PanelLeft } from "lucide-react";
import * as React from "react";

const SIDEBAR_COOKIE_NAME = "sidebar_state";
const SIDEBAR_COOKIE_MAX_AGE = 60 * 60 * 24 * 7;
Expand Down Expand Up @@ -147,7 +144,7 @@ const SidebarProvider = React.forwardRef<
...style,
}}
className={cn(
"group/sidebar-wrapper flex min-h-svh w-full has-[[data-variant=inset]]:bg-sidebar",
"group/sidebar-wrapper flex w-full h-full has-[[data-variant=inset]]:bg-sidebar",
className,
)}
ref={ref}
Expand Down
7 changes: 3 additions & 4 deletions webapp/src/widgets/map/Map.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
import { API_URL } from "@shared/api/client";
import { useLocalStorage } from "@shared/hooks/use-local-storage";
import { createMap } from "coordo";
import { type FC, useEffect, useRef, useState } from "react";

import { API_URL } from "@shared/api/client";
import "./Map.css";
import { useLocalStorage } from "@shared/hooks/use-local-storage";

const STYLE_URL = `${API_URL}/maps/style.json`;

Expand Down Expand Up @@ -90,7 +89,7 @@ export const WidgetMap: FC = () => {
};

return (
<div className="relative w-full h-screen">
<div className="relative w-full h-full">
<div
id="map"
className="w-full h-full"
Expand Down