Skip to content

Commit

Permalink
Merge pull request #378 from dataforgoodfr/enhancement/frontend/left-…
Browse files Browse the repository at this point in the history
…bar-footer-2

Enhancement/frontend/left bar footer 2
  • Loading branch information
HenriChabert authored Dec 17, 2024
2 parents 3ca7f18 + fb8a948 commit 354b3bf
Show file tree
Hide file tree
Showing 11 changed files with 20 additions and 3 deletions.
2 changes: 1 addition & 1 deletion frontend/app/map/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import { useLoaderStore } from "@/libs/stores/loader-store"
import { useMapStore } from "@/libs/stores/map-store"
import { useTrackModeOptionsStore } from "@/libs/stores/track-mode-options-store"
import { useVesselsStore } from "@/libs/stores/vessels-store"
import LeftPanel from "@/components/core/left-panel"
import LeftPanel from "@/components/core/left-panel/main"
import MapControls from "@/components/core/map-controls"
import Map from "@/components/core/map/main-map"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import { useMapStore } from "@/libs/stores/map-store"
import NavigationLink from "@/components/ui/navigation-link"
import { VesselFinderDemo } from "@/components/core/command/vessel-finder"

import Spinner from "../ui/custom/spinner"
import Spinner from "../../ui/custom/spinner"
import TrackedVesselsPanel from "./tracked-vessel/tracked-vessels-panel"

const containerVariants = {
Expand Down Expand Up @@ -93,7 +93,7 @@ export default function LeftPanel() {
className="absolute left-0 top-0 z-10 flex max-h-screen flex-col gap-3 rounded-br-lg bg-color-3 shadow-lg"
>
<div className="flex w-full flex-row place-items-center justify-between p-5">
<a href="/dashboard">
<a href="/dashboard" className="flex items-center gap-3">
<Image
src={TrawlWatchLogo}
alt="Trawlwatch logo"
Expand Down
2 changes: 2 additions & 0 deletions frontend/components/core/map/main-map.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import MapVesselTooltip from "@/components/ui/map-vessel-tooltip"
import MapZoneTooltip from "@/components/ui/map-zone-tooltip"

import DeckGLMap from "./deck-gl-map"
import PartnerCredits from "./partner-credits"
import { getPickObjectType } from "./utils"

type MainMapProps = {
Expand Down Expand Up @@ -127,6 +128,7 @@ export default function MainMap({ zones }: MainMapProps) {

return (
<div className="relative size-full">
<PartnerCredits />
<ContextMenu>
<ContextMenuTrigger>
<MemoizedDeckGLMap zones={zones} onHover={onMapHover} />
Expand Down
15 changes: 15 additions & 0 deletions frontend/components/core/map/partner-credits.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
import Image from "next/image"

export default function PartnerCredits() {
return (
<div className="fixed bottom-2 left-2 z-50 flex justify-around gap-4 rounded-full bg-color-2/30 p-5 hover:bg-color-2/50">
<Image src="/img/bloom-logo.png" alt="Logo" width={50} height={50} />
<Image
src="/img/data-for-good-logo.png"
alt="Logo"
width={50}
height={50}
/>
</div>
)
}
Binary file added frontend/public/img/bloom-logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added frontend/public/img/data-for-good-logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 354b3bf

Please sign in to comment.