sidebar fix (#697)

chore: left menu fix
coingaming · Aug 17, 2023 · f26bc3b · f26bc3b
1 parent 565c8f5
commit f26bc3b
Show file tree

Hide file tree

Showing 9 changed files with 43 additions and 30 deletions.
diff --git a/lib/moon_web/components/facing/for_developers.ex b/lib/moon_web/components/facing/for_developers.ex
@@ -45,11 +45,13 @@ defmodule MoonWeb.Components.Facing.ForDevelopers do
         >Github</Button>
         <Button variant="secondary" as="a" href="/getting-started">Getting Started</Button>
         <Button variant="secondary" as="a" href="/tokens">Design Tokens</Button>
-        <!--
-          <Button variant="secondary" as="a" href="https://github.com/coingaming/theme-moon/blob/develop/packages/themes/src/moonDesignDark/moonDesignDark.ts"
+        <Button
+          variant="secondary"
+          as="a"
+          href="https://github.com/coingaming/moon/tree/main/priv/static/themes"
           target="_blank"
-          rel="noreferrer">Creating Themes</Button>
-       -->
+          rel="noreferrer"
+        >Creating Themes</Button>
         <Button
           variant="secondary"
           as="a"

diff --git a/lib/moon_web/components/left_menu.ex b/lib/moon_web/components/left_menu.ex
@@ -19,7 +19,11 @@ defmodule MoonWeb.Components.LeftMenu do
 
   def render(assigns) do
     ~F"""
-    <Drawer lg_persists id="left-menu" class="lg:flex lg:start-0 lg:inset-y-0 lg:w-80 lg:z-50">
+    <Drawer
+      lg_persists
+      id="left-menu"
+      class="lg:flex lg:start-0 lg:inset-y-0 lg:w-80 lg:z-50 inset-auto"
+    >
       <Drawer.Backdrop class="lg:hidden" />
       <Drawer.Panel position="start" class="w-80 bg-goku shadow-moon-none">
         <nav

diff --git a/lib/moon_web/examples/design/menu_item_example/expand_collapse.ex b/lib/moon_web/examples/design/menu_item_example/expand_collapse.ex
@@ -20,7 +20,7 @@ defmodule MoonWeb.Examples.Design.MenuItemExample.ExpandCollapse do
         <MenuItem>Vision</MenuItem>
         <MenuItem>Getting started</MenuItem>
         <MenuItem>How to contribute?</MenuItem>
-        <MenuItem>Colours palette</MenuItem>
+        <MenuItem>Colours</MenuItem>
         <MenuItem>Tokens</MenuItem>
         <MenuItem>Transform SVG</MenuItem>
         <MenuItem>Manifest</MenuItem>
@@ -204,7 +204,7 @@ defmodule MoonWeb.Examples.Design.MenuItemExample.ExpandCollapse do
           <MenuItem>Vision</MenuItem>
           <MenuItem>Getting started</MenuItem>
           <MenuItem>How to contribute?</MenuItem>
-          <MenuItem>Colours palette</MenuItem>
+          <MenuItem>Colours</MenuItem>
           <MenuItem>Tokens</MenuItem>
           <MenuItem>Transform SVG</MenuItem>
           <MenuItem>Manifest</MenuItem>

diff --git a/lib/moon_web/pages/colours_palette_page.ex b/lib/moon_web/pages/colours_palette_page.ex
@@ -1,4 +1,4 @@
-defmodule MoonWeb.Pages.ColoursPalettePage do
+defmodule MoonWeb.Pages.ColoursPage do
   @moduledoc false
 
   use MoonWeb, :live_view

diff --git a/lib/moon_web/pages/components_page.ex b/lib/moon_web/pages/components_page.ex
@@ -1,4 +1,4 @@
-defmodule MoonWeb.Pages.ComponentPage do
+defmodule MoonWeb.Pages.ComponentsPage do
   @moduledoc false
 
   use MoonWeb, :live_view

diff --git a/lib/moon_web/pages/contribute_page.ex b/lib/moon_web/pages/contribute_page.ex
@@ -1,4 +1,4 @@
-defmodule MoonWeb.Pages.ContributePage do
+defmodule MoonWeb.Pages.HowToContributePage do
   @moduledoc false
 
   use MoonWeb, :live_view

diff --git a/lib/moon_web/pages/tokens_page.ex b/lib/moon_web/pages/tokens_page.ex
@@ -88,7 +88,7 @@ defmodule MoonWeb.Pages.TokensPage do
               rel="noreferrer"
               is_underline="underline"
             >theme template file</Link>.</li>
-          <li>Check the <Link to="/colours-palette" is_underline="underline">guide for colours</Link>.</li>
+          <li>Check the <Link to="/colours" is_underline="underline">guide for colours</Link>.</li>
           <li>Replace colour values one by one.</li>
           <li>Change the values to your product ones.</li>
           <li>Publish your changes.</li>

diff --git a/lib/moon_web/router.ex b/lib/moon_web/router.ex
@@ -42,9 +42,9 @@ defmodule MoonWeb.Router do
     live("/", MoonWeb.Pages.MainPage)
     live("/vision", MoonWeb.Pages.VisionPage)
     live("/getting-started/", MoonWeb.Pages.GettingStartedPage)
-    live("/contribute", MoonWeb.Pages.ContributePage)
-    live("/colours", MoonWeb.Pages.ColoursPalettePage)
-    live("/components", MoonWeb.Pages.ComponentPage)
+    live("/contribute", MoonWeb.Pages.HowToContributePage)
+    live("/colours", MoonWeb.Pages.ColoursPage)
+    live("/components", MoonWeb.Pages.ComponentsPage)
     live("/tokens", MoonWeb.Pages.TokensPage)
     live("/typography", MoonWeb.Pages.TypographyPage)
     live("/assets/age_limit", MoonWeb.Pages.Assets.AgeLimitPage)

diff --git a/lib/moon_web/schema/link.ex b/lib/moon_web/schema/link.ex
@@ -6,11 +6,11 @@ defmodule MoonWeb.Schema.Link do
     [
       [MoonWeb.Pages.VisionPage, icon: "generic_loyalty"],
       [MoonWeb.Pages.GettingStartedPage, icon: "other_rocket"],
-      [MoonWeb.Pages.ContributePage, icon: "other_lifebuoy"],
-      [MoonWeb.Pages.ColoursPalettePage, icon: "software_settings"],
+      [MoonWeb.Pages.HowToContributePage, icon: "other_lifebuoy"],
+      [MoonWeb.Pages.ColoursPage, icon: "software_settings"],
       [MoonWeb.Pages.TokensPage, icon: "software_puzzle"],
       [MoonWeb.Pages.TypographyPage, icon: "text_size"],
-      [MoonWeb.Pages.ComponentPage, icon: "software_plate"],
+      [MoonWeb.Pages.ComponentsPage, icon: "software_plate"],
       [MoonWeb.Pages.ManifestPage, icon: "generic_trophy"],
       MoonWeb.Pages.Design.AccordionPage,
       MoonWeb.Pages.Design.AlertPage,
@@ -62,20 +62,27 @@ defmodule MoonWeb.Schema.Link do
 
   @doc "returns structured list of pages - for menu"
   def menu() do
-    titles()
-    |> Enum.reduce(%{}, fn
-      item, acc ->
+    items = titles()
+
+    items_with_icon = Enum.filter(items, fn item -> item[:icon] != nil end)
+    items_without_icon = Enum.filter(items, fn item -> item[:icon] == nil end)
+
+    sorted_items_without_icon =
+      items_without_icon
+      |> Enum.reduce(%{}, fn item, acc ->
         group = get_group(item[:page])
-        acc |> Map.put(group, (acc[group] || []) ++ [item])
-    end)
-    |> Enum.map(fn {key, value} ->
-      if length(value) == 1 do
-        List.first(value)
-      else
-        [key: group_to_title(key), children: value]
-      end
-    end)
-    |> Enum.sort_by(& &1[:key])
+        acc |> Map.update(group, [item], &(&1 ++ [item]))
+      end)
+      |> Enum.map(fn {key, value} ->
+        if length(value) == 1 do
+          List.first(value)
+        else
+          [key: group_to_title(key), children: value]
+        end
+      end)
+      |> Enum.sort_by(& &1[:key])
+
+    sorted_items_without_icon ++ items_with_icon
   end
 
   defp get_group(page) do