Re-organize & cleanup menus

rocky-linux · Mar 11, 2024 · b96fcca · b96fcca
1 parent ccfdd68
commit b96fcca
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 38 deletions.
diff --git a/app/[locale]/Header.tsx b/app/[locale]/Header.tsx
@@ -18,7 +18,6 @@ export default function Header() {
   const navigationTranslations: NavigationMenuItems = {
     newsName: tNav("newsName"),
     aboutName: tNav("aboutName"),
-    resourcesName: tNav("resourcesName"),
     communityName: tNav("communityName"),
     supportName: tNav("supportName"),
     contributeName: tNav("contributeName"),
@@ -29,10 +28,6 @@ export default function Header() {
       partners: tNav("about.partners"),
       sponsors: tNav("about.sponsors"),
     },
-    resources: {
-      docs: tNav("resources.docs"),
-      gpgKeyInfo: tNav("resources.gpgKeyInfo"),
-    },
     community: {
       forums: tNav("community.forums"),
       mailing: tNav("community.mailing"),
@@ -41,8 +36,9 @@ export default function Header() {
       calendar: tNav("community.calendar"),
     },
     support: {
-      supportProviders: tNav("support.supportProviders"),
+      docs: tNav("support.docs"),
       submitBug: tNav("support.submitBug"),
+      supportProviders: tNav("support.supportProviders"),
     },
     contribute: {
       contribute: tNav("contribute.contribute"),

diff --git a/app/[locale]/components/header/DesktopNavigation.tsx b/app/[locale]/components/header/DesktopNavigation.tsx
@@ -45,16 +45,6 @@ const DesktopNavigation = ({ translations: t }: DesktopNavigationProps) => {
             href="/about/partners"
           />
         </NavList>
-        <NavList name={t.resourcesName}>
-          <NavListItem
-            title={t.resources.docs}
-            href="https://docs.rockylinux.org"
-          />
-          <NavListItem
-            title={t.resources.gpgKeyInfo}
-            href="/resources/gpg-key-info"
-          />
-        </NavList>
         <NavList name={t.communityName}>
           <NavListItem
             title={t.community.forums}
@@ -79,13 +69,17 @@ const DesktopNavigation = ({ translations: t }: DesktopNavigationProps) => {
         </NavList>
         <NavList name={t.supportName}>
           <NavListItem
-            title={t.support.supportProviders}
+            title={t.support.docs}
             href="/support/support-providers"
           />
           <NavListItem
             title={t.support.submitBug}
             href="https://bugs.rockylinux.org"
           />
+          <NavListItem
+            title={t.support.supportProviders}
+            href="/support/support-providers"
+          />
         </NavList>
         <NavList name={t.contributeName}>
           <NavListItem

diff --git a/app/[locale]/components/header/MobileNavigation.tsx b/app/[locale]/components/header/MobileNavigation.tsx
@@ -84,16 +84,6 @@ const MobileNavigation = ({
                 href="/about/partners"
               />
             </NavList>
-            <NavList name={t.resourcesName}>
-              <NavListItem
-                title={t.resources.docs}
-                href="https://docs.rockylinux.org"
-              />
-              <NavListItem
-                title={t.resources.gpgKeyInfo}
-                href="/resources/gpg-key-info"
-              />
-            </NavList>
             <NavList name={t.communityName}>
               <NavListItem
                 title={t.community.forums}
@@ -118,13 +108,17 @@ const MobileNavigation = ({
             </NavList>
             <NavList name={t.supportName}>
               <NavListItem
-                title={t.support.supportProviders}
-                href="/support/support-providers"
+                title={t.support.docs}
+                href="https://docs.rockylinux.org"
               />
               <NavListItem
                 title={t.support.submitBug}
                 href="https://bugs.rockylinux.org"
               />
+              <NavListItem
+                title={t.support.supportProviders}
+                href="/support/support-providers"
+              />
             </NavList>
             <NavList name={t.contributeName}>
               <NavListItem

diff --git a/app/[locale]/components/header/NavigationTypes.ts b/app/[locale]/components/header/NavigationTypes.ts
@@ -1,7 +1,6 @@
 export interface NavigationMenuItems {
   newsName: string;
   aboutName: string;
-  resourcesName: string;
   communityName: string;
   supportName: string;
   contributeName: string;
@@ -12,10 +11,6 @@ export interface NavigationMenuItems {
     sponsors: string;
     partners: string;
   };
-  resources: {
-    docs: string;
-    gpgKeyInfo: string;
-  };
   community: {
     forums: string;
     mailing: string;
@@ -24,8 +19,9 @@ export interface NavigationMenuItems {
     calendar: string;
   };
   support: {
-    supportProviders: string;
+    docs: string;
     submitBug: string;
+    supportProviders: string;
   };
   contribute: {
     contribute: string;

diff --git a/messages/en.json b/messages/en.json
@@ -25,7 +25,6 @@
         "partners": "Partners"
       },
       "resources": {
-        "docs": "Documentation",
         "gpgKeyInfo": "GPG Key Info"
       },
       "community": {
@@ -36,8 +35,9 @@
         "calendar": "Calendar"
       },
       "support": {
-        "supportProviders": "Commercial Support",
-        "submitBug": "Submit Bug"
+        "docs": "Documentation",
+        "submitBug": "Submit Bug",
+        "supportProviders": "Commercial Support"
       },
       "contribute": {
         "contribute": "Contributing Guide",