From 1989620ae1d6c2a755f2160a88a0770abe92a8eb Mon Sep 17 00:00:00 2001
From: David Karlsson <35727626+dvdksn@users.noreply.github.com>
Date: Wed, 20 Nov 2024 11:31:33 +0100
Subject: [PATCH 1/3] feat: add support for sidebar grouping

Signed-off-by: David Karlsson <35727626+dvdksn@users.noreply.github.com>
---
 hugo_stats.json                        |  1 +
 layouts/partials/sidebar/sections.html | 19 ++++++++++++++-----
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/hugo_stats.json b/hugo_stats.json
index dde209194f..0cc860b066 100644
--- a/hugo_stats.json
+++ b/hugo_stats.json
@@ -515,6 +515,7 @@
       "transition",
       "truncate",
       "underline-offset-2",
+      "uppercase",
       "w-2",
       "w-8",
       "w-[1200px]",
diff --git a/layouts/partials/sidebar/sections.html b/layouts/partials/sidebar/sections.html
index fff61376a8..988c4557ee 100644
--- a/layouts/partials/sidebar/sections.html
+++ b/layouts/partials/sidebar/sections.html
@@ -2,7 +2,6 @@
 <nav class="md:text-sm flex flex-col">
   <div
     class="block py-4 md:hidden text-gray-light dark:text-gray-dark">This section</div>
-  {{/* The current page is in the table of contents */}}
   <ul>
     {{ template "renderChildren" .FirstSection }}
   </ul>
@@ -13,16 +12,26 @@
   {{- if .Params.sidebar.reverse }}
     {{ $pages = .Pages.Reverse }}
   {{- end }}
-  {{- range $pages }}
-    {{- if eq .Params.sitemap false }}
-      {{- continue }}
-    {{- end }}
+  {{- $pages = where .Pages "Params.sitemap" "ne" "false" }}
+  {{- $ungrouped := where $pages "Params.sidebar.group" "==" nil }}
+  {{- range $ungrouped }}
     {{- if .IsSection }}
       {{- template "renderList" . }}
     {{- else }}
       {{- template "renderSingle" . }}
     {{- end }}
   {{- end }}
+  {{- range .Params.sidebar.groups }}
+    <li class="px-2 py-2 pb-2 text-gray-light dark:text-gray-dark uppercase
+      text-xs font-semibold">{{ . }}</li>
+    {{- range where $pages "Params.sidebar.group" . }}
+      {{- if .IsSection }}
+        {{- template "renderList" . }}
+      {{- else }}
+        {{- template "renderSingle" . }}
+      {{- end }}
+    {{- end }}
+  {{- end }}
 {{ end }}
 
 {{/* Recursive template for sidebar items */}}

From b98c303498379a0b464299aea1aa8ee596642a25 Mon Sep 17 00:00:00 2001
From: David Karlsson <35727626+dvdksn@users.noreply.github.com>
Date: Tue, 26 Nov 2024 13:49:53 +0100
Subject: [PATCH 2/3] chore: add sidebar groups to top-level pages in manuals
 section

Signed-off-by: David Karlsson <35727626+dvdksn@users.noreply.github.com>
---
 content/manuals/_index.md                 | 5 +++++
 content/manuals/accounts/_index.md        | 4 +++-
 content/manuals/admin/_index.md           | 4 +++-
 content/manuals/billing/_index.md         | 4 +++-
 content/manuals/build-cloud/_index.md     | 5 ++++-
 content/manuals/build/_index.md           | 5 ++++-
 content/manuals/cloud/index.md            | 3 +++
 content/manuals/compose/_index.md         | 5 ++++-
 content/manuals/copilot/_index.md         | 3 ++-
 content/manuals/desktop/_index.md         | 5 ++++-
 content/manuals/docker-hub/_index.md      | 7 +++++--
 content/manuals/engine/_index.md          | 5 ++++-
 content/manuals/extensions/_index.md      | 5 ++++-
 content/manuals/harmonia/_index.md        | 3 +++
 content/manuals/registry.md               | 3 +++
 content/manuals/release-lifecycle.md      | 3 +++
 content/manuals/scout/_index.md           | 5 ++++-
 content/manuals/security/_index.md        | 4 +++-
 content/manuals/subscription/_index.md    | 4 +++-
 content/manuals/tcc.md                    | 3 ++-
 content/manuals/trusted-content/_index.md | 4 +++-
 21 files changed, 72 insertions(+), 17 deletions(-)

diff --git a/content/manuals/_index.md b/content/manuals/_index.md
index af786bfcf7..ed9779d68d 100644
--- a/content/manuals/_index.md
+++ b/content/manuals/_index.md
@@ -7,6 +7,11 @@ url: /manuals/
 layout: wide
 params:
   icon: description
+  sidebar:
+    groups:
+      - Open source
+      - Products
+      - Platform
   notoc: true
   development:
   - title: Docker Desktop
diff --git a/content/manuals/accounts/_index.md b/content/manuals/accounts/_index.md
index b4b2b0a307..6da49ef20b 100644
--- a/content/manuals/accounts/_index.md
+++ b/content/manuals/accounts/_index.md
@@ -1,8 +1,10 @@
 ---
 title: Docker accounts
-weight: 200
 description: Learn how to create and manage your Docker account.
 keywords: accounts, docker ID, account management, account settings, docker account, docker home
+params:
+  sidebar:
+    group: Platform
 grid:
 - title: Create a Docker ID
   description: Get started with Docker and create an account.
diff --git a/content/manuals/admin/_index.md b/content/manuals/admin/_index.md
index f32ba7a787..72f14268db 100644
--- a/content/manuals/admin/_index.md
+++ b/content/manuals/admin/_index.md
@@ -1,8 +1,10 @@
 ---
 title: Administration
-weight: 200
 description: Discover manuals on administration for accounts, organizations, and companies.
 keywords: admin, administration, company, organization, Admin Console, user accounts, account management
+params:
+  sidebar:
+    group: Platform
 grid:
 - title: Company administration
   description: Explore how to manage a company.
diff --git a/content/manuals/billing/_index.md b/content/manuals/billing/_index.md
index 5a046e414a..57e0b2359e 100644
--- a/content/manuals/billing/_index.md
+++ b/content/manuals/billing/_index.md
@@ -1,9 +1,11 @@
 ---
 title: Billing and payments
 linkTitle: Billing
-weight: 200
 description: Discover information on billing and payment processes for Docker subscriptions.
 keywords: billing, invoice, payment, subscription
+params:
+  sidebar:
+    group: Platform
 grid_core:
 - title: Get started
   description: Learn how to set up a Docker Core subscription for a personal account or organization.
diff --git a/content/manuals/build-cloud/_index.md b/content/manuals/build-cloud/_index.md
index 4280dabab5..3c31b1be7f 100644
--- a/content/manuals/build-cloud/_index.md
+++ b/content/manuals/build-cloud/_index.md
@@ -1,8 +1,11 @@
 ---
 title: Docker Build Cloud
-weight: 100
+weight: 20
 description: Find documentation on Docker Build Cloud to help you build your container images faster, both locally and in CI
 keywords: build, cloud, cloud build, remote builder
+params:
+  sidebar:
+    group: Products
 aliases:
   - /build/cloud/faq/
   - /build/cloud/
diff --git a/content/manuals/build/_index.md b/content/manuals/build/_index.md
index 88bf305324..c4af3ceb1a 100644
--- a/content/manuals/build/_index.md
+++ b/content/manuals/build/_index.md
@@ -1,8 +1,11 @@
 ---
 title: Docker Build
-weight: 100
+weight: 20
 description: Get an overview of Docker Build to package and bundle your code and ship it anywhere
 keywords: build, buildx, buildkit
+params:
+  sidebar:
+    group: Open source
 grid:
 - title: Packaging your software
   description: 'Build and package your application to run it anywhere: locally or
diff --git a/content/manuals/cloud/index.md b/content/manuals/cloud/index.md
index df096fb61e..7f65177807 100644
--- a/content/manuals/cloud/index.md
+++ b/content/manuals/cloud/index.md
@@ -2,6 +2,9 @@
 title: Cloud integrations
 description: ACI and ECS integration information
 keywords: compose, ACI, ECS, amazon, cloud integration
+params:
+  sidebar:
+    group: Products
 aliases:
 - /engine/context/aci-integration/
 - /cloud/aci-integration/
diff --git a/content/manuals/compose/_index.md b/content/manuals/compose/_index.md
index 88d396af20..71c95c12a2 100644
--- a/content/manuals/compose/_index.md
+++ b/content/manuals/compose/_index.md
@@ -1,11 +1,14 @@
 ---
 title: Docker Compose
-weight: 100
+weight: 30
 description: Learn how to use Docker Compose to define and run multi-container applications
   with this detailed introduction to the tool.
 keywords: docker compose, docker-compose, docker compose command, docker compose files,
   docker compose documentation, using docker compose, compose container, docker compose
   service
+params:
+  sidebar:
+    group: Open source
 grid:
 - title: Why use Compose?
   description: Understand Docker Compose's key benefits
diff --git a/content/manuals/copilot/_index.md b/content/manuals/copilot/_index.md
index 08f501b111..e38267582a 100644
--- a/content/manuals/copilot/_index.md
+++ b/content/manuals/copilot/_index.md
@@ -2,10 +2,11 @@
 title: Docker for GitHub Copilot
 params:
   sidebar:
+    group: Products
     badge:
       color: violet
       text: EA
-weight: 100
+weight: 50
 description: |
   Learn how to streamline Docker-related tasks with the Docker for GitHub
   Copilot extension. This integration helps you generate Docker assets, analyze
diff --git a/content/manuals/desktop/_index.md b/content/manuals/desktop/_index.md
index 0a27c21381..17c87b9cfc 100644
--- a/content/manuals/desktop/_index.md
+++ b/content/manuals/desktop/_index.md
@@ -1,9 +1,12 @@
 ---
 title: Docker Desktop
-weight: 100
+weight: 10
 description: Explore Docker Desktop, what it has to offer, and its key features. Take the next step by downloading or find additional resources
 keywords: how to use docker desktop, what is docker desktop used for, what does docker
   desktop do, using docker desktop
+params:
+  sidebar:
+    group: Products
 grid:
 - title: Install Docker Desktop
   description: |
diff --git a/content/manuals/docker-hub/_index.md b/content/manuals/docker-hub/_index.md
index d793487640..c6ab1a0838 100644
--- a/content/manuals/docker-hub/_index.md
+++ b/content/manuals/docker-hub/_index.md
@@ -2,7 +2,10 @@
 description: Get an overview on Docker Hub to find and share container images
 keywords: docker hub, hub, repositories
 title: Docker Hub
-weight: 100
+weight: 30
+params:
+  sidebar:
+    group: Products
 grid:
 - title: Quickstart
   description: Step-by-step instructions on getting started on Docker Hub.
@@ -46,4 +49,4 @@ In addition to the graphical interface, you can interact with Docker Hub using
 the [Docker Hub API](../../reference/api/hub/latest.md) or experimental [Docker
 Hub CLI tool](https://github.com/docker/hub-tool#readme).
 
-{{< grid >}}
\ No newline at end of file
+{{< grid >}}
diff --git a/content/manuals/engine/_index.md b/content/manuals/engine/_index.md
index 68846eb6a3..febf3717d8 100644
--- a/content/manuals/engine/_index.md
+++ b/content/manuals/engine/_index.md
@@ -1,8 +1,11 @@
 ---
 title: Docker Engine
-weight: 100
+weight: 10
 description: Find a comprehensive overview of Docker Engine, including how to install, storage details, networking, and more
 keywords: Engine
+params:
+  sidebar:
+    group: Open source
 grid:
 - title: Install Docker Engine
   description: Learn how to install the open source Docker Engine for your distribution.
diff --git a/content/manuals/extensions/_index.md b/content/manuals/extensions/_index.md
index a538211d29..92beb943cb 100644
--- a/content/manuals/extensions/_index.md
+++ b/content/manuals/extensions/_index.md
@@ -1,8 +1,11 @@
 ---
 title: Docker Extensions
-weight: 100
+weight: 60
 description: Extensions
 keywords: Docker Extensions, Docker Desktop, Linux, Mac, Windows
+params:
+  sidebar:
+    group: Products
 aliases:
  - /desktop/extensions/
 ---
diff --git a/content/manuals/harmonia/_index.md b/content/manuals/harmonia/_index.md
index 3a2a72b3b1..84c0dadbdd 100644
--- a/content/manuals/harmonia/_index.md
+++ b/content/manuals/harmonia/_index.md
@@ -3,6 +3,9 @@ title: Project Harmonia
 description: Learn how you can run your applications in the cloud with Project Harmonia
 keywords: run, cloud, docker desktop, resources
 sitemap: false
+params:
+  sidebar:
+    group: Products
 aliases:
 - /run-cloud/
 ---
diff --git a/content/manuals/registry.md b/content/manuals/registry.md
index c4b34bef8b..e65a439e35 100644
--- a/content/manuals/registry.md
+++ b/content/manuals/registry.md
@@ -2,6 +2,9 @@
 title: Registry
 description: The Docker Hub registry implementation 
 keywords: registry, distribution, docker hub, spec, schema, api, manifest, auth
+params:
+  sidebar:
+    group: Open source
 aliases:
   - /registry/compatibility/
   - /registry/configuration/
diff --git a/content/manuals/release-lifecycle.md b/content/manuals/release-lifecycle.md
index b5b7c22bb0..4b54d2cc3c 100644
--- a/content/manuals/release-lifecycle.md
+++ b/content/manuals/release-lifecycle.md
@@ -4,6 +4,9 @@ linkTitle: Release lifecycle
 description: Describes the various stages of feature lifecycle from beta
   to GA.
 keywords: beta, GA, Early Access,
+params:
+  sidebar:
+    group: Products
 ---
 
 This page details Docker's product release lifecycle and how Docker defines each stage. It also provides information on the product retirement process. Features and products may progress through some or all of these phases. 
diff --git a/content/manuals/scout/_index.md b/content/manuals/scout/_index.md
index e08c4253be..81a56203f2 100644
--- a/content/manuals/scout/_index.md
+++ b/content/manuals/scout/_index.md
@@ -1,11 +1,14 @@
 ---
 title: Docker Scout
-weight: 100
+weight: 40
 keywords: scout, supply chain, vulnerabilities, packages, cves, scan, analysis, analyze
 description:
   Get an overview on Docker Scout to proactively enhance your software supply chain security
 aliases:
   - /engine/scan/
+params:
+  sidebar:
+    group: Products
 grid:
   - title: Quickstart
     link: /scout/quickstart/
diff --git a/content/manuals/security/_index.md b/content/manuals/security/_index.md
index 4b5eb7bf5a..8b359f083a 100644
--- a/content/manuals/security/_index.md
+++ b/content/manuals/security/_index.md
@@ -1,8 +1,10 @@
 ---
 title: Security
-weight: 200
 description: Learn about security features Docker has to offer and explore best practices
 keywords: docker, docker hub, docker desktop, security
+params:
+  sidebar:
+    group: Platform
 grid_admins:
 - title: Settings Management
   description: Learn how Settings Management can secure your developers' workflows.
diff --git a/content/manuals/subscription/_index.md b/content/manuals/subscription/_index.md
index 5dd8112151..906eca32b3 100644
--- a/content/manuals/subscription/_index.md
+++ b/content/manuals/subscription/_index.md
@@ -1,8 +1,10 @@
 ---
 title: Subscription
-weight: 200
 description: Learn about subscription features and how to manage your subscription
 keywords: Docker, pricing, billing, Pro, Team, business, subscription, tier, plan
+params:
+  sidebar:
+    group: Platform
 grid_subscriptions:
 - title: Docker Core subscriptions and features
   description: Explore what you can do with your Docker subscription.
diff --git a/content/manuals/tcc.md b/content/manuals/tcc.md
index a89e26d125..242eb05bf6 100644
--- a/content/manuals/tcc.md
+++ b/content/manuals/tcc.md
@@ -1,7 +1,8 @@
 ---
 title: Testcontainers Cloud
-weight: 200
+weight: 70
 params:
   sidebar:
+    group: Products
     goto: "https://testcontainers.com/cloud/docs/"
 ---
diff --git a/content/manuals/trusted-content/_index.md b/content/manuals/trusted-content/_index.md
index cf8ffc177c..4fa05af442 100644
--- a/content/manuals/trusted-content/_index.md
+++ b/content/manuals/trusted-content/_index.md
@@ -1,8 +1,10 @@
 ---
 title: Trusted content
-weight: 200
 description: Optimize your development workflow with secure base images from our selection of trusted content
 keywords: doi, dvp, dsos, open source, security, base images
+params:
+  sidebar:
+    group: Platform
 grid:
 - title: Docker Official Images
   description: A curated set of Docker repositories hosted on Docker Hub.

From 0a08b21529cc0871333b131f61ba188ed6f4318c Mon Sep 17 00:00:00 2001
From: David Karlsson <35727626+dvdksn@users.noreply.github.com>
Date: Thu, 28 Nov 2024 14:54:03 +0100
Subject: [PATCH 3/3] site: align manuals landing page with new sidebar
 structure

Signed-off-by: David Karlsson <35727626+dvdksn@users.noreply.github.com>
---
 content/manuals/_index.md | 85 ++++++++++++++++++++++-----------------
 1 file changed, 49 insertions(+), 36 deletions(-)

diff --git a/content/manuals/_index.md b/content/manuals/_index.md
index ed9779d68d..7ef904dfb1 100644
--- a/content/manuals/_index.md
+++ b/content/manuals/_index.md
@@ -13,15 +13,7 @@ params:
       - Products
       - Platform
   notoc: true
-  development:
-  - title: Docker Desktop
-    description: Your command center for container development.
-    icon: /assets/icons/Whale.svg
-    link: /desktop/
-  - title: Docker Compose
-    description: Define and run multi-container applications.
-    icon: /assets/icons/Compose.svg
-    link: /compose/
+  open-source:
   - title: Docker Build
     description: Build and ship any application anywhere.
     icon: build
@@ -30,11 +22,19 @@ params:
     description: The industry-leading container runtime.
     icon: developer_board
     link: /engine/
-  - title: Docker Extensions
-    description: Customize your Docker Desktop workflow.
-    icon: extension
-    link: /extensions/
-  services:
+  - title: Docker Compose
+    description: Define and run multi-container applications.
+    icon: /assets/icons/Compose.svg
+    link: /compose/
+  products:
+  - title: Docker Desktop
+    description: Your command center for container development.
+    icon: /assets/icons/Whale.svg
+    link: /desktop/
+  - title: Build Cloud
+    description: Build your images faster in the cloud.
+    icon: /assets/images/logo-build-cloud.svg
+    link: /build-cloud/
   - title: Docker Hub
     description: Discover, share, and integrate container images.
     icon: hub
@@ -43,50 +43,63 @@ params:
     description: Image analysis and policy evaluation.
     icon: /assets/icons/Scout.svg
     link: /scout/
-  - title: Trusted content
-    description: Curated, high-quality content from trusted sources.
-    icon: verified
-    link: /trusted-content/
-  - title: Build Cloud
-    description: Build your images faster in the cloud.
-    icon: /assets/images/logo-build-cloud.svg
-    link: /build-cloud/
-  admin:
+  - title: Docker for GitHub Copilot
+    description: Integrate Docker's capabilities with GitHub Copilot.
+    icon: chat
+    link: /copilot/
+  - title: Docker Extensions
+    description: Customize your Docker Desktop workflow.
+    icon: extension
+    link: /extensions/
+  - title: Testcontainers cloud
+    description: Run integration tests, with real dependencies, in the cloud.
+    icon: package_2
+    link: https://testcontainers.com/cloud/docs/
+  platform:
   - title: Administration
     description: Centralized observability for companies and organizations.
     icon: admin_panel_settings
     link: /admin/
-  - title: Security
-    description: Security guardrails for both administrators and developers.
-    icon: lock
-    link: /security/
   - title: Billing
     description: Manage billing and payment methods.
     icon: payments
     link: /billing/
+  - title: Accounts
+    description: Manage your Docker account.
+    icon: account_circle
+    link: /accounts/
+  - title: Security
+    description: Security guardrails for both administrators and developers.
+    icon: lock
+    link: /security/
   - title: Subscription
     description: Commercial use licenses for Docker products.
     icon: card_membership
     link: /subscription/
+  - title: Trusted content
+    description: Curated, high-quality content from trusted sources.
+    icon: verified
+    link: /trusted-content/
 ---
 
 This section contains user guides on how to install, set up, configure, and use
 Docker products.
 
-## Developer tools
+## Open source
 
-Software development and containerization technologies.
+Open source development and containerization technologies.
 
-{{< grid items=development >}}
+{{< grid items=open-source >}}
 
-## Services
+## Products
 
-Artifact management and supply chain security.
+End-to-end developer solutions for innovative teams.
 
-{{< grid items=services >}}
+{{< grid items=products >}}
 
-## Administration and accounts
+## Platform
 
-Administration and subscription management for organizations.
+Documentation related to the Docker platform, such as administration and
+subscription management for organizations.
 
-{{< grid items=admin >}}
+{{< grid items=platform >}}