Merge pull request #28097 from aramissennyeydd/sennyeya/adjust-overview-section

chore: more sidebar consolidation

docs/faq/product.md

@@ -1,6 +1,6 @@
 ---
 id: product
-title: Product FAQ
+title: Non-technical FAQ
 description: Questions related to product and design.
 ---
 

docs/overview/logos.md

@@ -7,36 +7,5 @@ description: Guidelines for how to use the Backstage logos and icons
 
 Guidelines for how to use the Backstage logo and icon can be found
 [here](https://backstage.io/logo_assets/Backstage_Identity_Assets_Overview.pdf).
-The assets below are all in `.svg` format. Other formats are available in the
-[repository](https://github.com/backstage/backstage/tree/master/microsite/static/logo_assets).
 
-## Backstage logo
-
-<a href="https://backstage.io/logo_assets/svg/Logo_White.svg" aria-label='Link to Backstage White logo svg'>
-  <img src="https://backstage.io/logo_assets/svg/Logo_White.svg" alt='Backstage White logo' width="600" />
-</a>
-
-<a href="https://backstage.io/logo_assets/svg/Logo_Teal.svg" aria-label='Link to Backstage Teal logo svg'>
-  <img src="https://backstage.io/logo_assets/svg/Logo_Teal.svg" alt='Backstage Teal logo' width="600" />
-</a>
-
-<a href="https://backstage.io/logo_assets/svg/Logo_Black.svg" aria-label='Link to Backstage Black logo svg'>
-  <img src="https://backstage.io/logo_assets/svg/Logo_Black.svg" alt='Backstage Black logo' width="600" className="logoWhite" class="logoWhite" />
-</a>
-
-## Backstage icon
-
-<div>
-  <a href="https://backstage.io/logo_assets/svg/Icon_White.svg" aria-label='Link to Backstage White icon'>
-    <img src="https://backstage.io/logo_assets/svg/Icon_White.svg" alt='Backstage White Icon' width="180" height="180" />
-  </a>
-  <a href="https://backstage.io/logo_assets/svg/Icon_Teal.svg" aria-label='Link to Backstage Teal icon'>
-    <img src="https://backstage.io/logo_assets/svg/Icon_Teal.svg" alt='Backstage Teal Icon' width="180" height="180" />
-  </a>
-  <a href="https://backstage.io/logo_assets/svg/Icon_Gradient.svg" aria-label='Link to Backstage Gradient icon'>
-    <img src="https://backstage.io/logo_assets/svg/Icon_Gradient.svg" alt='Backstage Gradient Icon' width="180" height="180" />
-  </a>
-  <a href="https://backstage.io/logo_assets/svg/Icon_Black.svg" aria-label='Link to Backstage Black icon'>
-    <img src="https://backstage.io/logo_assets/svg/Icon_Black.svg" alt='Backstage Black Icon' width="180" height="180" className="logoWhite" class="logoWhite" />
-  </a>
-</div>
+You can find the assets at https://github.com/cncf/artwork/tree/main/projects/backstage.

docs/overview/threat-model.md

@@ -1,6 +1,7 @@
 ---
 id: threat-model
 title: Backstage Threat Model
+sidebar_label: Security & Thread Model
 description: A document describing the threat model for Backstage.
 ---
 

microsite/docusaurus.config.ts

@@ -405,6 +405,10 @@ const config: Config = {
               label: 'GitHub',
               to: 'https://github.com/backstage/',
             },
+            {
+              label: 'Assets',
+              to: 'https://github.com/cncf/artwork/tree/main/projects/backstage',
+            },
           ],
         },
       ],

microsite/sidebars.js

@@ -5,14 +5,11 @@ module.exports = {
     Overview: [
       'overview/what-is-backstage',
       'overview/architecture-overview',
-      'overview/roadmap',
-      'overview/vision',
       'overview/background',
-      'overview/adopting',
-      'overview/versioning-policy',
+      'overview/vision',
+      'overview/roadmap',
       'overview/threat-model',
-      'overview/support',
-      'overview/logos',
+      'overview/versioning-policy',
     ],
     'Getting Started': [
       'getting-started/index',
@@ -46,6 +43,7 @@ module.exports = {
           'getting-started/create-a-component',
         ],
       },
+      'overview/support',
       'getting-started/keeping-backstage-updated',
     ],
     'Core Features': [
@@ -494,36 +492,46 @@ module.exports = {
         ],
       },
     ],
-    'Designing for Backstage': [
-      'dls/design',
-      'dls/component-design-guidelines',
-      'dls/contributing-to-storybook',
-      'dls/figma',
-    ],
     Tutorials: [
-      'tutorials/quickstart-app-plugin',
-      'tutorials/react-router-stable-migration',
-      'tutorials/react18-migration',
-      'tutorials/package-role-migration',
-      'tutorials/migrating-away-from-core',
-      'tutorials/configuring-plugin-databases',
-      'tutorials/switching-sqlite-postgres',
-      'tutorials/using-backstage-proxy-within-plugin',
-      'tutorials/yarn-migration',
-      'tutorials/migrate-to-mui5',
-      'tutorials/auth-service-migration',
-      'tutorials/enable-public-entry',
-      'tutorials/setup-opentelemetry',
+      { 'Non-technical': ['overview/adopting'] },
+      {
+        Techical: [
+          'tutorials/quickstart-app-plugin',
+          'tutorials/configuring-plugin-databases',
+          'tutorials/switching-sqlite-postgres',
+          'tutorials/using-backstage-proxy-within-plugin',
+          'tutorials/enable-public-entry',
+          'tutorials/setup-opentelemetry',
+          'accessibility/index',
+        ],
+      },
+      {
+        Migrations: [
+          'tutorials/react-router-stable-migration',
+          'tutorials/react18-migration',
+          'tutorials/package-role-migration',
+          'tutorials/migrating-away-from-core',
+          'tutorials/yarn-migration',
+          'tutorials/migrate-to-mui5',
+          'tutorials/auth-service-migration',
+        ],
+      },
     ],
-
     FAQ: ['faq/index', 'faq/product', 'faq/technical'],
-    Accessibility: ['accessibility/index'],
     Contribute: [
       'contribute/index',
       'contribute/getting-involved',
       'contribute/project-structure',
     ],
     References: [
+      {
+        'Designing for Backstage': [
+          'dls/design',
+          'dls/component-design-guidelines',
+          'dls/contributing-to-storybook',
+          'dls/figma',
+        ],
+      },
       {
         type: 'category',
         label: 'Architecture Decision Records (ADRs)',