feat: revert navbar

packages/website-ue/src/components/AvatarCard/index.tsx

@@ -1,5 +1,5 @@
 import { literals } from "@blitzkit/i18n";
-import { Grade } from "@protos/auto_items";
+import { Grade } from "@protos/blitz_static_standard_grades_enum";
 import { DownloadIcon, StarFilledIcon } from "@radix-ui/react-icons";
 import type { Color } from "../../core/ui/color";
 import { useGameStrings } from "../../hooks/useGameStrings";
@@ -55,11 +55,11 @@ interface DetailsProps {
 }
 
 const gradeColors: Record<Grade, Color> = {
-  [Grade.GRADE_GRADE_UNSPECIFIED]: "gray",
+  [Grade.GRADE_UNSPECIFIED]: "gray",
-  [Grade.GRADE_GRADE_COMMON]: "gray",
+  [Grade.GRADE_COMMON]: "gray",
-  [Grade.GRADE_GRADE_RARE]: "blue",
+  [Grade.GRADE_RARE]: "blue",
-  [Grade.GRADE_GRADE_EPIC]: "purple",
+  [Grade.GRADE_EPIC]: "purple",
-  [Grade.GRADE_GRADE_LEGENDARY]: "amber",
+  [Grade.GRADE_LEGENDARY]: "amber",
 };
 
 function Details({ avatars }: DetailsProps) {

packages/website-ue/src/components/Navbar.astro

@@ -5,108 +5,77 @@ import { Text } from "./Text";
 import { api } from "../core/api/dynamic";
 import { tools } from "../core/tools/tools";
 import type { Tool } from "../core/tools/tools";
+import { HamburgerMenuIcon, MagnifyingGlassIcon } from "@radix-ui/react-icons";
 
 interface Props {
   locale: string;
-  selectedTool?: Tool;
 }
 
-const { locale, selectedTool } = Astro.props;
+const { locale } = Astro.props;
-const strings = await api.strings(locale);
-const toolsArray = Object.values(tools);
-
-const toolsSorted =
-  selectedTool === undefined
-    ? toolsArray
-    : [selectedTool, ...toolsArray.filter((tool) => tool !== selectedTool)];
 ---
 
 <style>
   #navbar {
-    position: fixed;
+    position: sticky;
-    bottom: 0;
+    top: 0;
     left: 0;
     width: 100%;
 
     display: flex;
-    flex-direction: column;
+    justify-content: center;
-    align-items: center;
 
     z-index: 1;
-    background-color: var(--gray-a5);
+    background-color: var(--gray-a2);
     box-shadow: var(--shadow-none);
-    backdrop-filter: var(--blur-glass) brightness(5%);
+    backdrop-filter: var(--blur-glass) brightness(10%);
-    border-radius: var(--space-4) var(--space-4) 0 0;
+    box-shadow: var(--shadow-subtle);
 
     transition-duration: var(--duration-brief);
 
     &[data-sticky="true"] {
-      transform: translateY(100%);
+      transform: translateY(-100%);
-    }
+      box-shadow: var(--shadow-none);
-
-    .bar {
-      width: 100%;
-      max-width: var(--space-6);
-      height: var(--space-2);
-      margin-top: var(--space-3);
-
-      background-color: var(--white-a2);
-
-      border-radius: var(--max-size);
     }
 
     .content {
+      display: flex;
+      justify-content: space-between;
+
       width: 100%;
       max-width: calc(var(--page-width) + 2 * var(--space-4));
 
-      display: grid;
+      .group {
-      grid-template-columns: repeat(4, 1fr);
-
-      .action {
-        flex: 1;
-
         display: flex;
-        flex-direction: column;
-        align-items: center;
-        padding: var(--space-3);
         gap: var(--space-2);
 
-        cursor: pointer;
+        .action {
-        color: var(--color-regular);
+          display: flex;
-        text-decoration: none;
+          flex-direction: column;
-        color: var(--gray-11);
+          align-items: center;
+          padding: var(--space-3);
+          gap: var(--space-2);
 
-        &[data-selected="true"] {
+          cursor: pointer;
-          color: var(--accent-12);
+          color: var(--color-regular);
+          text-decoration: none;
+          color: var(--gray-11);
 
           .selector {
-            background-color: var(--accent-5);
+            padding: var(--space-2);
-          }
+            border-radius: var(--max-size);
 
-          .label {
+            display: flex;
-            color: var(--gray-12) !important;
+            justify-content: center;
-          }
-        }
 
-        .selector {
-          padding: var(--space-2);
-          border-radius: var(--max-size);
-
-          display: flex;
-          justify-content: center;
-
-          width: 100%;
-          max-width: var(--space-6);
-
-          .icon {
-            height: 1.25em;
             width: 100%;
-            vertical-align: top;
+            max-width: var(--space-6);
-          }
-        }
 
-        .label {
+            .icon {
-          font-size: var(--font-size-minor);
+              height: 1.25em;
+              width: 100%;
+              vertical-align: top;
+            }
+          }
         }
       }
     }
@@ -120,7 +89,10 @@ const toolsSorted =
   function handleScroll() {
     const dy = window.scrollY - lastScrollY;
     lastScrollY = window.scrollY;
-    navbar.dataset.sticky = `${dy > 0}`;
+
+    const hide = window.scrollY > navbar.clientHeight && dy > 0;
+
+    navbar.dataset.sticky = `${hide}`;
   }
 
   handleScroll();
@@ -128,41 +100,27 @@ const toolsSorted =
 </script>
 
 <div id="navbar">
-  <div class="bar"></div>
-
   <div class="content">
-    <LinkI18n
+    <div class="group">
-      {locale}
+      <LinkI18n {locale} href="/" className="action" tabIndex={0}>
-      href="/"
+        <div class="selector">
-      className="action"
+          <BlitzKitIcon className="icon" />
-      tabIndex={0}
+        </div>
-      data-selected={selectedTool === undefined}
+      </LinkI18n>
-    >
+    </div>
-      <div class="selector">
-        <BlitzKitIcon className="icon" />
-      </div>
-      <Text lowContrast className="label">{strings.navbar.home}</Text>
-    </LinkI18n>
 
-    {
+    <div class="group">
-      toolsSorted.map(({ id, Icon }) => (
+      <LinkI18n {locale} href="/" className="action" tabIndex={0}>
-        <LinkI18n
+        <div class="selector">
-          key={id}
+          <MagnifyingGlassIcon className="icon" />
-          {locale}
+        </div>
-          href={`/${id}`}
+      </LinkI18n>
-          className="action"
-          tabIndex={0}
-          data-selected={selectedTool?.id === id}
-        >
-          <div class="selector">
-            <Icon className="icon" />
-          </div>
 
-          <Text lowContrast className="label">
+      <LinkI18n {locale} href="/" className="action" tabIndex={0}>
-            {strings.tools[id as keyof typeof strings.tools].name}
+        <div class="selector">
-          </Text>
+          <HamburgerMenuIcon className="icon" />
-        </LinkI18n>
+        </div>
-      ))
+      </LinkI18n>
-    }
+    </div>
   </div>
 </div>

packages/website-ue/src/components/ToolBanner.astro

@@ -1,9 +1,7 @@
 ---
-import { ArrowLeftIcon } from "@radix-ui/react-icons";
 import { api } from "../core/api/dynamic";
 import type { Tool } from "../core/tools/tools";
 import { Heading } from "./Heading";
-import { LinkI18n } from "./LinkI18n";
 import { Text } from "./Text";
 
 interface Props {
@@ -26,7 +24,7 @@ const toolStrings = strings.tools[tool.id as keyof typeof strings.tools];
       position: relative;
 
       display: flex;
-      flex-direction: column;
+      justify-content: center;
       gap: var(--space-4);
       padding: var(--space-5) var(--space-4);
       box-sizing: border-box;
@@ -37,10 +35,6 @@ const toolStrings = strings.tools[tool.id as keyof typeof strings.tools];
         padding: var(--space-6) var(--space-4);
       }
 
-      .back {
-        z-index: 1;
-      }
-
       .centered {
         flex: 1;
         max-width: var(--page-width);
@@ -77,10 +71,6 @@ const toolStrings = strings.tools[tool.id as keyof typeof strings.tools];
   }}
 >
   <div class="content">
-    <LinkI18n highContrast className="back" {locale} href="/">
-      <ArrowLeftIcon />
-    </LinkI18n>
-
     <div
       class="pattern"
       style={{ backgroundImage: `url(/assets/patterns/${tool.id}.svg)` }}

packages/website-ue/src/core/tools/tools.ts

@@ -1,11 +1,3 @@
-import {
-  ExclamationTriangleIcon,
-  GearIcon,
-  PersonIcon,
-} from "@radix-ui/react-icons";
-import type { IconProps } from "@radix-ui/react-icons/dist/types";
-import type { ComponentProps, ReactNode } from "react";
-import { TankIcon } from "../../icons/Tank";
 import type { Color } from "../ui/color";
 
 export interface Tool {
@@ -13,17 +5,12 @@ export interface Tool {
 
   accent: Color;
   banner_background_position: "top" | "center" | "bottom";
-
-  Icon:
-    | ((props: ComponentProps<"svg">) => ReactNode)
-    | ((props: IconProps) => ReactNode);
 }
 
 export const tools: Record<string, Tool> = {
   tanks: {
     id: "tanks",
 
-    Icon: TankIcon,
     accent: "purple",
     banner_background_position: "top",
   },
@@ -31,7 +18,6 @@ export const tools: Record<string, Tool> = {
   players: {
     id: "players",
 
-    Icon: PersonIcon,
     accent: "purple",
     banner_background_position: "top",
   },
@@ -39,7 +25,6 @@ export const tools: Record<string, Tool> = {
   settings: {
     id: "settings",
 
-    Icon: GearIcon,
     accent: "gray",
     banner_background_position: "top",
   },
@@ -47,7 +32,6 @@ export const tools: Record<string, Tool> = {
   avatars: {
     id: "avatars",
 
-    Icon: ExclamationTriangleIcon,
     accent: "gold",
     banner_background_position: "bottom",
   },
@@ -55,7 +39,6 @@ export const tools: Record<string, Tool> = {
   backgrounds: {
     id: "backgrounds",
 
-    Icon: ExclamationTriangleIcon,
     accent: "gold",
     banner_background_position: "bottom",
   },
@@ -63,7 +46,6 @@ export const tools: Record<string, Tool> = {
   api: {
     id: "api",
 
-    Icon: ExclamationTriangleIcon,
     accent: "lime",
     banner_background_position: "bottom",
   },
@@ -71,7 +53,6 @@ export const tools: Record<string, Tool> = {
   compare: {
     id: "compare",
 
-    Icon: ExclamationTriangleIcon,
     accent: "crimson",
     banner_background_position: "bottom",
   },
@@ -79,7 +60,6 @@ export const tools: Record<string, Tool> = {
   performance: {
     id: "performance",
 
-    Icon: ExclamationTriangleIcon,
     accent: "jade",
     banner_background_position: "bottom",
   },
@@ -87,7 +67,6 @@ export const tools: Record<string, Tool> = {
   playlist: {
     id: "playlist",
 
-    Icon: ExclamationTriangleIcon,
     accent: "tomato",
     banner_background_position: "bottom",
   },
@@ -95,7 +74,6 @@ export const tools: Record<string, Tool> = {
   mixer: {
     id: "mixer",
 
-    Icon: ExclamationTriangleIcon,
     accent: "gray",
     banner_background_position: "bottom",
   },
@@ -103,7 +81,6 @@ export const tools: Record<string, Tool> = {
   guesser: {
     id: "guesser",
 
-    Icon: ExclamationTriangleIcon,
     accent: "cyan",
     banner_background_position: "bottom",
   },
@@ -111,7 +88,6 @@ export const tools: Record<string, Tool> = {
   session: {
     id: "session",
 
-    Icon: ExclamationTriangleIcon,
     accent: "blue",
     banner_background_position: "bottom",
   },

packages/website-ue/src/layouts/BaseLayout.astro

@@ -61,12 +61,12 @@ const { accent, noNavbar, locale, selectedTool } = Astro.props;
   </head>
 
   <body class="dark">
+    {!noNavbar && <Navbar {selectedTool} {locale} />}
+
     <slot name="pre-app" />
 
     <div class="app">
       <slot />
     </div>
-
-    {!noNavbar && <Navbar {selectedTool} {locale} />}
   </body>
 </html>