Skip to content

Commit

Permalink
Fix menu (#36)
Browse files Browse the repository at this point in the history
* bad code but ok

* trabajo en la oficina

* center nav menu

---------

Co-authored-by: Benjamin Halasz <[email protected]>
  • Loading branch information
akeamc and Equasa authored Mar 3, 2025
1 parent 94cb632 commit 0c844e9
Show file tree
Hide file tree
Showing 13 changed files with 649 additions and 26 deletions.
12 changes: 9 additions & 3 deletions .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,14 @@
FROM oven/bun:latest

# To get fresh apk
RUN apt update
# Update packages and install prerequisites
RUN apt update && apt install -y \
curl \
git \
openssh-client \
iputils-ping

RUN apt install -y git openssh-client curl iputils-ping
# Install Node.js 18.x (includes a newer npm)
RUN curl -fsSL https://deb.nodesource.com/setup_18.x | bash - && \
apt-get install -y nodejs

ENV ENV=development
35 changes: 31 additions & 4 deletions bun.lock

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
"@radix-ui/react-dialog": "^1.1.5",
"@radix-ui/react-icons": "^1.3.1",
"@radix-ui/react-label": "^2.1.0",
"@radix-ui/react-navigation-menu": "^1.2.5",
"@radix-ui/react-popover": "^1.1.4",
"@radix-ui/react-select": "^2.1.4",
"@radix-ui/react-separator": "^1.1.1",
Expand Down
2 changes: 1 addition & 1 deletion src/app/admin/layout.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { SidebarProvider, SidebarTrigger } from "@/components/ui/sidebar";
import { AdminSidebar } from "./AdminSidebar";
import initTranslations, { Locale, Namespace } from "../i18n";
import initTranslations, { type Locale, type Namespace } from "../i18n";
import TranslationsProvider from "@/components/TranslationsProvider";
import LoginWall from "@/components/LoginWall";

Expand Down
4 changes: 2 additions & 2 deletions src/app/i18n.tsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import { createInstance, i18n, Resource } from "i18next";
import { createInstance, type i18n, type Resource } from "i18next";
import { initReactI18next } from "react-i18next/initReactI18next";
import i18nConfig from "@/i18nConfig";
import resourcesToBackend from "i18next-resources-to-backend";

export type Locale = "en" | "sv";
export type Namespace = "admin"; // todo: add more namespaces
export type Namespace = "admin" | "main"; // todo: add more namespaces

export default async function initTranslations(
locale: Locale,
Expand Down
45 changes: 29 additions & 16 deletions src/app/layout.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
import QueryClientProvider from "@/components/QueryClientProvider";
import "./globals.css";
import { client } from "@/api";
import { NavigationMenuDemo } from "../components/NavBar";
import initTranslations, { type Locale, type Namespace } from "./i18n";
import TranslationsProvider from "@/components/TranslationsProvider";

const locale = "sv" satisfies Locale;
const i18nNamespaces = ["main"] satisfies Namespace[];

export default async function RootLayout({
children,
Expand All @@ -10,23 +16,30 @@ export default async function RootLayout({
client.setConfig({ baseUrl: "http://host.docker.internal:8000" });

// FIXME: TEMPORARY
const { resources } = await initTranslations(locale, i18nNamespaces);

return (
<QueryClientProvider>
<html lang="en">
<head>
<title>F-sektionen WWW-Web</title>
<link rel="preconnect" href="https://fonts.googleapis.com" />
<link rel="preconnect" href="https://fonts.gstatic.com" />
<link
href="https://fonts.googleapis.com/css2?family=Inter:ital,opsz,wght@0,14..32,100..900;1,14..32,100..900&display=swap"
rel="stylesheet"
/>
</head>
<body>
<div id="root">{children}</div>
</body>
</html>
</QueryClientProvider>
<TranslationsProvider
namespaces={i18nNamespaces}
locale={locale}
resources={resources}
>
<QueryClientProvider>
<html lang="en">
<head>
<title>F-sektionen WWW-Web</title>
<link rel="preconnect" href="https://fonts.googleapis.com" />
<link rel="preconnect" href="https://fonts.gstatic.com" />
<link
href="https://fonts.googleapis.com/css2?family=Inter:ital,opsz,wght@0,14..32,100..900;1,14..32,100..900&display=swap"
rel="stylesheet"
/>
</head>
<body>
<div id="root">{children}</div>
</body>
</html>
</QueryClientProvider>
</TranslationsProvider>
);
}
17 changes: 17 additions & 0 deletions src/app/page.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
import Link from "next/link";
import { NavigationMenuDemo } from "../components/NavBar";

export default function MainLanding() {
return (
<>
<NavigationMenuDemo />
<div>
<p>
Hej! 👋 Du 🫵 ser 👀 denna 📄 sida 📘 för 💡 att ✨ du 🫶 är 🧊 cool
😎 och 🕸️ spindel 🕷️.
</p>
<Link href="news">Goto news</Link>
</div>
</>
);
}
208 changes: 208 additions & 0 deletions src/assets/f-logga.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
16 changes: 16 additions & 0 deletions src/assets/f-logga.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
// FLogga.tsx
import Image from "next/image";
import fLoggaSrc from "@/assets/f-logga.svg";
import { cn } from "@/lib/utils"; // if you’re using a utility to combine class names

interface FLoggaProps {
className?: string;
}

export default function FLogga({ className = "" }: FLoggaProps) {
return (
<div className={cn(className)}>
<Image src={fLoggaSrc} alt="" width={100} height={100} />
</div>
);
}
182 changes: 182 additions & 0 deletions src/components/NavBar.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,182 @@
"use client";

import * as React from "react";
import Link from "next/link";

import { cn } from "@/lib/utils";
import {
NavigationMenu,
NavigationMenuContent,
NavigationMenuItem,
NavigationMenuLink,
NavigationMenuList,
NavigationMenuTrigger,
navigationMenuTriggerStyle,
} from "@/components/ui/navigation-menu";

const components: { title: string; href: string; description: string }[] = [
{
title: "Alert Dialog",
href: "/docs/primitives/alert-dialog",
description:
"A modal dialog that interrupts the user with important content and expects a response.",
},
{
title: "Hover Card",
href: "/docs/primitives/hover-card",
description:
"For sighted users to preview content available behind a link.",
},
{
title: "Progress",
href: "/docs/primitives/progress",
description:
"Displays an indicator showing the completion progress of a task, typically displayed as a progress bar.",
},
{
title: "Scroll-area",
href: "/docs/primitives/scroll-area",
description: "Visually or semantically separates content.",
},
{
title: "Tabs",
href: "/docs/primitives/tabs",
description:
"A set of layered sections of content—known as tab panels—that are displayed one at a time.",
},
{
title: "Tooltip",
href: "/docs/primitives/tooltip",
description:
"A popup that displays information related to an element when the element receives keyboard focus or the mouse hovers over it.",
},
];

export function NavigationMenuDemo() {
function onNavChange() {
setTimeout(() => {
// Select elements with the state "open"
const triggers = document.querySelectorAll(
'.submenu-trigger[data-state="open"]',
);
const dropdowns = document.querySelectorAll(
'.nav-viewport[data-state="open"]',
);

if (!triggers.length || !dropdowns.length) return;

const padding = 16;
const { x, width } = (triggers[0] as HTMLElement).getBoundingClientRect();
const menuWidth = dropdowns[0].children[0].clientWidth;
let menuLeftPosition = x + width / 2 - menuWidth / 2;
if (menuLeftPosition < padding) {
menuLeftPosition = padding;
} else if (menuLeftPosition + menuWidth > window.innerWidth - padding) {
menuLeftPosition = window.innerWidth - menuWidth - padding;
}

// Apply the calculated position
document.documentElement.style.setProperty(
"--menu-left-position",
`${menuLeftPosition}px`,
);
});
}

return (
<div>
<NavigationMenu
onValueChange={onNavChange}
className="w-full max-w-full py-2"
>
<NavigationMenuList>
<NavigationMenuItem>
<NavigationMenuTrigger className="submenu-trigger">
Getting started
</NavigationMenuTrigger>
<NavigationMenuContent>
<ul className="grid gap-3 p-4 md:w-[400px] lg:w-[500px] lg:grid-cols-[.75fr_1fr]">
<li className="row-span-3">
<NavigationMenuLink asChild>
<a
className="flex h-full w-full select-none flex-col justify-end rounded-md bg-gradient-to-b from-muted/50 to-muted p-6 no-underline outline-none focus:shadow-md"
href="/"
>
<div className="mb-2 mt-4 text-lg font-medium">
shadcn/ui
</div>
<p className="text-sm leading-tight text-muted-foreground">
Beautifully designed components built with Radix UI and
Tailwind CSS.
</p>
</a>
</NavigationMenuLink>
</li>
<ListItem href="/docs" title="Introduction">
Re-usable components built using Radix UI and Tailwind CSS.
</ListItem>
<ListItem href="/docs/installation" title="Installation">
How to install dependencies and structure your app.
</ListItem>
<ListItem href="/docs/primitives/typography" title="Typography">
Styles for headings, paragraphs, lists...etc
</ListItem>
</ul>
</NavigationMenuContent>
</NavigationMenuItem>
<NavigationMenuItem>
<NavigationMenuTrigger className="submenu-trigger">
Components
</NavigationMenuTrigger>
<NavigationMenuContent>
<ul className="grid w-[400px] gap-3 p-4 md:w-[500px] md:grid-cols-2 lg:w-[600px] ">
{components.map((component) => (
<ListItem
key={component.title}
title={component.title}
href={component.href}
>
{component.description}
</ListItem>
))}
</ul>
</NavigationMenuContent>
</NavigationMenuItem>
<NavigationMenuItem>
<Link href="/docs" legacyBehavior passHref>
<NavigationMenuLink className={navigationMenuTriggerStyle()}>
Documentation
</NavigationMenuLink>
</Link>
</NavigationMenuItem>
</NavigationMenuList>
</NavigationMenu>
</div>
);
}

const ListItem = React.forwardRef<
React.ElementRef<"a">,
React.ComponentPropsWithoutRef<"a">
>(({ className, title, children, ...props }, ref) => {
return (
<li>
<NavigationMenuLink asChild>
<a
ref={ref}
className={cn(
"block select-none space-y-1 rounded-md p-3 leading-none no-underline outline-none transition-colors hover:bg-accent hover:text-accent-foreground focus:bg-accent focus:text-accent-foreground",
className,
)}
{...props}
>
<div className="text-sm font-medium leading-none">{title}</div>
<p className="line-clamp-2 text-sm leading-snug text-muted-foreground">
{children}
</p>
</a>
</NavigationMenuLink>
</li>
);
});
ListItem.displayName = "ListItem";
Loading

0 comments on commit 0c844e9

Please sign in to comment.