Merge remote-tracking branch 'documentation/main'

smartcontractkit · Oct 18, 2024 · a178c26 · a178c26
2 parents 1883739 + 2d540df
commit a178c26
Show file tree

Hide file tree

Showing 9 changed files with 50 additions and 49 deletions.
diff --git a/astro.config.ts b/astro.config.ts
@@ -11,6 +11,10 @@ import { RehypePlugins } from "@astrojs/markdown-remark"
 // https://astro.build/config
 export default defineConfig({
   site: "https://docs.chain.link",
+  redirects: {
+    "/getting-started": "/getting-started/conceptual-overview",
+    "/resources": "/resources/link-token-contracts",
+  },
   integrations: [
     preact({
       include: ["**/preact/*"],

diff --git a/src/assets/product-logos/default-logo.svg b/src/assets/product-logos/default-logo.svg
diff --git a/src/assets/product-logos/general-logo.svg b/src/assets/product-logos/general-logo.svg
diff --git a/src/assets/product-logos/node-logo.svg b/src/assets/product-logos/node-logo.svg
diff --git a/src/assets/product-logos/quickstart-logo.svg b/src/assets/product-logos/quickstart-logo.svg
diff --git a/src/components/DocsNavigation/DocsNavigationDesktop/DocsPickerDesktop.tsx b/src/components/DocsNavigation/DocsNavigationDesktop/DocsPickerDesktop.tsx
@@ -3,14 +3,15 @@ import { isMatchedPath } from "../../Header/Nav/isMatchedPath"
 import { getNavigationProps } from "../../Header/getNavigationProps"
 import styles from "./docsPickerDesktop.module.css"
 import { clsx } from "../../Header/Nav/utils"
+import defaultLogo from "../../../assets/product-logos/default-logo.svg"
 
 function DocsPickerDesktop({ pathname }: { pathname: string }) {
   const [productMenuOpen, setProductMenuOpen] = useState(false)
   const { subProductsNav } = getNavigationProps()
   const subProductTrigger = subProductsNav?.find(({ href }) => isMatchedPath(pathname, href))
 
   const label = subProductTrigger?.label || "Resources"
-  const icon = subProductTrigger?.label ? subProductTrigger.icon : undefined
+  const icon = subProductTrigger?.label ? subProductTrigger.icon : defaultLogo.src
 
   return (
     <div

diff --git a/src/components/DocsNavigation/DocsNavigationMobile/DocsPickerMobile.tsx b/src/components/DocsNavigation/DocsNavigationMobile/DocsPickerMobile.tsx
@@ -10,6 +10,7 @@ import { ProductContent } from "./ProductContent"
 import { SubProductContent } from "./SubProductContent"
 import styles from "./productNavigation.module.css"
 import { getNavigationProps } from "../../Header/getNavigationProps"
+import defaultLogo from "../../../assets/product-logos/default-logo.svg"
 
 type Props = {
   path: string
@@ -32,7 +33,7 @@ export function ProductNavigation({ path }: Props) {
   const subProductTrigger = subProductsNav?.find(({ href }) => isMatchedPath(path, href))
 
   const label = subProductTrigger?.label || "Resources"
-  const icon = subProductTrigger?.label ? subProductTrigger.icon : undefined
+  const icon = subProductTrigger?.label ? subProductTrigger.icon : defaultLogo.src
 
   useEffect(() => {
     const foundSubProduct = productsNav.categories.find((category) =>

diff --git a/src/components/Header/getNavigationProps.ts b/src/components/Header/getNavigationProps.ts
@@ -97,13 +97,25 @@ const desktopSubProductsNav = [
     icon: quickstartLogo.src,
     col: 2,
   },
-
   {
     label: "Documentation",
     href: "/",
     hideFromDropdown: true,
     col: 2,
   },
+  {
+    label: "General",
+    href: "/getting-started",
+    icon: generalLogo.src,
+    col: 2,
+  },
+  {
+    label: "General",
+    href: "/resources",
+    icon: generalLogo.src,
+    col: 2,
+    hideFromDropdown: true,
+  },
 ]
 
 const docsSections = [
@@ -147,29 +159,29 @@ const docsSections = [
         icon: automationLogo.src,
         subProducts: getSubProducts(sidebar.automation),
       },
+      {
+        label: "Chainlink Local",
+        href: "/chainlink-local",
+        icon: chainlinkLocal.src,
+        subProducts: getSubProducts(sidebar.chainlinkLocal),
+      },
       {
         label: "Nodes",
         href: "/chainlink-nodes",
         icon: nodesLogo.src,
         subProducts: getSubProducts(sidebar.nodeOperator),
       },
       {
-        label: "Chainlink Local",
-        href: "/chainlink-local",
+        label: "Quickstarts",
+        href: "/quickstarts",
         icon: quickstartLogo.src,
-        subProducts: getSubProducts(sidebar.chainlinkLocal),
       },
       {
         label: "General",
         href: "/resources",
         icon: generalLogo.src,
         subProducts: getSubProducts(sidebar.global),
       },
-      {
-        label: "Quickstarts",
-        href: "/quickstarts",
-        icon: quickstartLogo.src,
-      },
     ],
   },
 ]

diff --git a/src/pages/index.astro b/src/pages/index.astro
@@ -22,7 +22,8 @@ const formattedContentTitle = `${CONFIG.PAGE.titleFallback} | ${CONFIG.SITE.titl
       <h4>Recommended reading</h4>
       <h2>We think you'd love to explore</h2>
       <div>
-        <a href="/resources/link-token-contracts">LINK Token Contracts</a>
+        <a href="/getting-started/conceptual-overview">General</a>
+        <a href="/resources/link-token-contracts">Link Token Contracts</a>
         <a href="/ccip/getting-started">Getting Started with CCIP</a>
         <a href="/ccip/supported-networks">CCIP Supported Networks</a>
         <a href="/data-feeds/price-feeds/addresses">Data Feed Addresses</a>