Merge branch 'main' of https://github.com/VAR-Virtual-Air-Rescue/var-monorepo
This commit is contained in:
@@ -9,8 +9,7 @@ const AuthLayout: NextPage<
|
|||||||
<div
|
<div
|
||||||
className="hero min-h-screen"
|
className="hero min-h-screen"
|
||||||
style={{
|
style={{
|
||||||
backgroundImage:
|
backgroundImage: "url('/bg.png')",
|
||||||
"url(https://img.daisyui.com/images/stock/photo-1507358522600-9f71e620c44e.webp)",
|
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
<div className="hero-overlay bg-opacity-60"></div>
|
<div className="hero-overlay bg-opacity-60"></div>
|
||||||
|
|||||||
@@ -335,7 +335,7 @@ const AircraftMarker = ({
|
|||||||
|
|
||||||
const handleZoom = () => {
|
const handleZoom = () => {
|
||||||
const zoom = map.getZoom();
|
const zoom = map.getZoom();
|
||||||
setHideMarker(zoom < 9);
|
setHideMarker(zoom < 8);
|
||||||
handleConflict();
|
handleConflict();
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -277,7 +277,7 @@ const MissionMarker = ({ mission }: { mission: Mission }) => {
|
|||||||
|
|
||||||
const handleZoom = () => {
|
const handleZoom = () => {
|
||||||
const zoom = map.getZoom();
|
const zoom = map.getZoom();
|
||||||
setHideMarker(zoom < 9);
|
setHideMarker(zoom < 8);
|
||||||
handleConflict();
|
handleConflict();
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -251,7 +251,7 @@ export const MarkerCluster = () => {
|
|||||||
};
|
};
|
||||||
});
|
});
|
||||||
|
|
||||||
if (zoom >= 9) {
|
if (zoom >= 8) {
|
||||||
setCluster([]);
|
setCluster([]);
|
||||||
} else {
|
} else {
|
||||||
setCluster(clusterWithAvgPos);
|
setCluster(clusterWithAvgPos);
|
||||||
|
|||||||
@@ -28,11 +28,14 @@ const DispatchPage = () => {
|
|||||||
<h2 className="card-title mb-2">MRT & DME</h2>
|
<h2 className="card-title mb-2">MRT & DME</h2>
|
||||||
<div className="card bg-base-200 shadow-xl mb-4">
|
<div className="card bg-base-200 shadow-xl mb-4">
|
||||||
<div className="card-body w-full h-full flex items-center justify-center">
|
<div className="card-body w-full h-full flex items-center justify-center">
|
||||||
|
<div className=" max-w-150">
|
||||||
<Mrt />
|
<Mrt />
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
</div>
|
||||||
<div className="card bg-base-200 shadow-xl h-1/2 flex">
|
<div className="card bg-base-200 shadow-xl h-1/2 flex">
|
||||||
<div className="card-body w-full h-full p-4 mb-0 flex items-center justify-center">
|
<div className="card-body w-full h-full p-4 mb-0 flex items-center justify-center">
|
||||||
|
<div className=" max-w-140">
|
||||||
<Dme />
|
<Dme />
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -40,6 +43,7 @@ const DispatchPage = () => {
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
</div>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
BIN
apps/dispatch/public/bg.png
Normal file
BIN
apps/dispatch/public/bg.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 11 MiB |
@@ -2,7 +2,7 @@ import Logbook from "./_components/Logbook";
|
|||||||
import { ArrowRight, NotebookText } from "lucide-react";
|
import { ArrowRight, NotebookText } from "lucide-react";
|
||||||
import Link from "next/link";
|
import Link from "next/link";
|
||||||
import Events from "./_components/Events";
|
import Events from "./_components/Events";
|
||||||
import { Stats } from "./_components/Stats";
|
import { Stats } from "./_components/stats";
|
||||||
import { Badges } from "./_components/Badges";
|
import { Badges } from "./_components/Badges";
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|||||||
@@ -11,8 +11,7 @@ const AuthLayout: NextPage<
|
|||||||
<div
|
<div
|
||||||
className="hero min-h-screen"
|
className="hero min-h-screen"
|
||||||
style={{
|
style={{
|
||||||
backgroundImage:
|
backgroundImage: "url('/bg.png')",
|
||||||
"url(https://img.daisyui.com/images/stock/photo-1507358522600-9f71e620c44e.webp)",
|
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
<div className="hero-overlay bg-neutral/60"></div>
|
<div className="hero-overlay bg-neutral/60"></div>
|
||||||
|
|||||||
Reference in New Issue
Block a user