diff --git a/Dockerfile b/Dockerfile index 560f8d0..f9d5d58 100644 --- a/Dockerfile +++ b/Dockerfile @@ -61,5 +61,8 @@ RUN set -eu; \ } > /srv/build-info.json EXPOSE 3000 +RUN mkdir -p /config/caddy /data/caddy \ + && chown -R caddy:caddy /config /data \ + && setcap -r /usr/bin/caddy USER caddy ENTRYPOINT ["caddy", "run", "--config=/etc/caddy/Caddyfile"] diff --git a/app/components/Navbar.tsx b/app/components/Navbar.tsx index f38521e..2fba869 100644 --- a/app/components/Navbar.tsx +++ b/app/components/Navbar.tsx @@ -3,7 +3,7 @@ import Image from "next/image" import Link from "next/link" import { usePathname } from "next/navigation" -import DevshLogo from "@/public/devsh_transparent_1920.png" +import DevshLogo from "@/public/brand/devsh-logo-glow.png" import { ReactNode, useEffect, useState } from "react" import { motion } from "framer-motion" @@ -30,10 +30,25 @@ function DropdownIcon() { ) } -function NavbarLink({children, href, onClick}: {children: ReactNode, href: string, onClick?: () => void}) { +function NavbarLink({children, href, active, onClick}: {children: ReactNode, href: string, active?: boolean, onClick?: () => void}) { return ( -
  • - {children} +
  • + + {children} +
  • ) } @@ -46,20 +61,24 @@ export default function Navbar() { setIsDropdownEnabled(false) }, [pathname]) + const isActive = (href: string) => ( + href === "/" ? pathname === "/" : pathname === href + ) + return ( -