[issue-104] Move block help promote

netlify.toml

@@ -69,3 +69,15 @@
   to = "/docs/qvs-policy"
   status = 301
   force = true
+
+[[redirects]]
+  from = "/:locale/support-us"
+  to = "/:locale/join-us"
+  status = 301
+  force = true
+
+[[redirects]]
+  from = "/support-us"
+  to = "/join-us"
+  status = 301
+  force = true

src/app/[locale]/docs/__tests__/__snapshots__/page.test.tsx.snap

@@ -979,9 +979,9 @@ exports[`Docs page > renders correctly 1`] = `
                     </a>
                     <a
                       class="block px-4 py-3 text-white/80 hover:text-white hover:bg-white/10 rounded-lg my-1 transition-all duration-200"
-                      href="/support-us"
+                      href="/join-us"
                     >
-                      Support Us
+                      Join Us
                     </a>
                   </div>
                 </div>

src/app/[locale]/docs/page.tsx

@@ -224,8 +224,8 @@ export default function DocumentationPage() {
                                         link: "/news",
                                     },
                                     {
-                                        name: "Support Us",
-                                        link: "/support-us",
+                                        name: "Join Us",
+                                        link: "/join-us",
                                     },
                                 ]}
                             />

src/app/[locale]/support-us/__tests__/__snapshots__/page.test.tsx.snap → src/app/[locale]/join-us/__tests__/__snapshots__/page.test.tsx.snap

@@ -59,19 +59,19 @@ exports[`Support Us page > renders correctly 1`] = `
             <div
               class="text-rose-600 text-base font-bold leading-normal"
             >
-              Support Us
+              Join Us
             </div>
           </div>
           <div
             class="self-stretch text-center text-white text-[56px] lg:text-[80px] leading-[114.286%] md:leading-[120%] font-semibold"
           >
-            What we’re trying to achieve
+            Join us in shaping the future of open source Java
           </div>
         </div>
         <div
           class="self-stretch text-center text-lightgrey text-[20px] font-normal leading-[140%] max-w-[860px] mx-auto"
         >
-          Eclipse Temurin offers high-performance, cross-platform, open-source Java runtime binaries that are enterprise-ready and Java SE TCK-tested for general use in the Java ecosystem.
+          Eclipse Adoptium is building the next generation of open, enterprise-ready Java runtimes. By joining our community, you will drive the evolution of Eclipse Temurin, ensuring it remains secure, high-performance, and freely accessible for millions of Java developers worldwide.
         </div>
       </div>
     </div>
@@ -85,12 +85,12 @@ exports[`Support Us page > renders correctly 1`] = `
       <h2
         class="text-4xl leading-[122%] md:text-5xl md:[116%] text-white font-semibold"
       >
-        Ways to support us
+        Power the evolution of open Java runtimes
       </h2>
       <p
         class="text-grey mt-6 font-normal text-base"
       >
-        If you value Eclipse technologies, please consider becoming a sponsor through the Eclipse Foundation. Contributions from users like you help fund the operations of the Adoptium working group. All money contributed to the Eclipse Foundation will be used to support the Eclipse community through the Adoptium working group
+        Your involvement keeps Eclipse Temurin enterprise-ready, secure, and accessible for all. Whether through contributions, sponsorship, or membership, together we can drive the evolution of Adoptium and strengthen the Java ecosystem for years to come.
       </p>
     </div>
     <div
@@ -109,12 +109,12 @@ exports[`Support Us page > renders correctly 1`] = `
             <h3
               class="text-white text-[30px] font-semibold whitespace-nowrap md:whitespace-normal leading-[120%] md:text-[40px]"
             >
-              How to contribute
+              Contribute to Adoptium Projects
             </h3>
             <p
               class="mt-6 text-xl text-grey font-normal"
             >
-              Contribute to our projects with technical and non-technical development
+              Contribute to our projects with technical and non-technical development.
             </p>
           </div>
           <a
@@ -146,7 +146,7 @@ exports[`Support Us page > renders correctly 1`] = `
             <p
               class="mt-6 text-xl text-grey font-normal"
             >
-              Join us in strengthening the future of Eclipse Temurin
+              Help ensure Temurin remains a trusted, high-performance runtime for developers everywhere.
             </p>
           </div>
           <a
@@ -178,11 +178,11 @@ exports[`Support Us page > renders correctly 1`] = `
             <p
               class="mt-6 text-xl text-grey font-normal"
             >
-              Join us shaping the future of Eclipse Adoptium
+              Membership connects you with industry leaders and the vibrant Adoptium ecosystem, shaping the future of Java. Take an active role in driving innovation, gaining access to strategic and technical resources, and raising your organisation’s visibility.
             </p>
           </div>
           <a
-            href="/join"
+            href="/members"
           >
             <button
               class="bg-transparent border-2 border-pink-500/0 text-white text-base leading-6 font-normal w-[180px] h-[48px] rounded-[80px] gradient-border"

src/app/[locale]/support-us/page.tsx → src/app/[locale]/join-us/page.tsx

@@ -10,13 +10,13 @@ export const metadata: Metadata = {
     description: "Learn how you can support the Eclipse Adoptium community.",
 }
 
-export default function SupportUsPage() {
+export default function JoinUsPage() {
     return (
         <div>
             <PageHeader
-                title="What we’re trying to achieve"
-                subtitle="Support Us"
-                description="Eclipse Temurin offers high-performance, cross-platform, open-source Java runtime binaries that are enterprise-ready and Java SE TCK-tested for general use in the Java ecosystem."
+                title="Join us in shaping the future of open source Java"
+                subtitle="Join Us"
+                description="Eclipse Adoptium is building the next generation of open, enterprise-ready Java runtimes. By joining our community, you will drive the evolution of Eclipse Temurin, ensuring it remains secure, high-performance, and freely accessible for millions of Java developers worldwide."
                 className={"max-w-[860px] mx-auto"}
             />
             <WaysToSupport />

src/app/[locale]/what-we-do/page.tsx

@@ -8,6 +8,7 @@ import Testimonials from "@/components/Testimonials"
 import LatestNews from '@/components/News/LatestNews'
 import License from "@/components/License"
 import GetOtherPlatformsAndVersions from "@/components/GetOtherPlatformsAndVersions"
+import MediaAndPromotion from "@/components/Support/MediaAndPromotion"
 
 export const metadata: Metadata = {
   title: "What We Do",
@@ -54,15 +55,16 @@ export default function WhatWeDoPage() {
       <WGProjects />
       <GetOtherPlatformsAndVersions />
       <License />
-      <WaysToSupport />
+      {/* <WaysToSupport />
+      <MediaAndPromotion />
       <ContactUs
         title="Connect with the community"
         buttontitle="Learn More"
         description="Join our Slack channel to discuss work and reach out to project maintainers."
         linkTo="/slack"
       />
       <Testimonials />
-      <LatestNews />
+      <LatestNews /> */}
     </>
   )
 }

src/components/NavBar/__tests__/__snapshots__/NavBar.test.tsx.snap

@@ -32,38 +32,12 @@ exports[`NavBar > should match the snapshot 1`] = `
         <div
           class="hidden lg:flex lg:gap-6 xl:gap-x-12"
         >
-          <div
-            class="relative inline-block text-left"
-            data-headlessui-state=""
+          <a
+            class="text-sm font-semibold leading-6 text-white-900"
+            href="/join-us"
           >
-            <div>
-              <button
-                aria-expanded="false"
-                aria-haspopup="menu"
-                class="inline-flex w-full gap-2 justify-center rounded-md text-sm font-semibold text-white-900 hover:bg-white-50 cursor-pointer"
-                data-headlessui-state=""
-                id="headlessui-menu-button-_r_2_"
-                type="button"
-              >
-                About Us
-                <svg
-                  aria-hidden="true"
-                  class="-mr-1 mt-1"
-                  fill="currentColor"
-                  height="1em"
-                  stroke="currentColor"
-                  stroke-width="0"
-                  viewBox="0 0 448 512"
-                  width="1em"
-                  xmlns="http://www.w3.org/2000/svg"
-                >
-                  <path
-                    d="M207.029 381.476L12.686 187.132c-9.373-9.373-9.373-24.569 0-33.941l22.667-22.667c9.357-9.357 24.522-9.375 33.901-.04L224 284.505l154.745-154.021c9.379-9.335 24.544-9.317 33.901.04l22.667 22.667c9.373 9.373 9.373 24.569 0 33.941L240.971 381.476c-9.373 9.372-24.569 9.372-33.942 0z"
-                  />
-                </svg>
-              </button>
-            </div>
-          </div>
+            Join Us
+          </a>
           <a
             class="text-sm font-semibold leading-6 text-white-900"
             href="/temurin/releases"
@@ -86,7 +60,7 @@ exports[`NavBar > should match the snapshot 1`] = `
                 aria-haspopup="menu"
                 class="inline-flex w-full gap-2 justify-center rounded-md text-sm font-semibold text-white-900 hover:bg-white-50 cursor-pointer"
                 data-headlessui-state=""
-                id="headlessui-menu-button-_r_5_"
+                id="headlessui-menu-button-_r_2_"
                 type="button"
               >
                 Projects
@@ -118,7 +92,7 @@ exports[`NavBar > should match the snapshot 1`] = `
                 aria-haspopup="menu"
                 class="inline-flex w-full gap-2 justify-center rounded-md text-sm font-semibold text-white-900 hover:bg-white-50 cursor-pointer"
                 data-headlessui-state=""
-                id="headlessui-menu-button-_r_8_"
+                id="headlessui-menu-button-_r_5_"
                 type="button"
               >
                 Resources
@@ -150,7 +124,7 @@ exports[`NavBar > should match the snapshot 1`] = `
                 aria-haspopup="menu"
                 class="inline-flex w-full gap-2 justify-center rounded-md text-sm font-semibold text-white-900 hover:bg-white-50 cursor-pointer"
                 data-headlessui-state=""
-                id="headlessui-menu-button-_r_b_"
+                id="headlessui-menu-button-_r_8_"
                 type="button"
               >
                 Community
@@ -189,7 +163,7 @@ exports[`NavBar > should match the snapshot 1`] = `
                   aria-haspopup="menu"
                   class="inline-flex w-full justify-center gap-3 rounded-3xl bg-transparent h-full px-4 py-3 text-sm text-white shadow-xs border-2 border-gray-700"
                   data-headlessui-state=""
-                  id="headlessui-menu-button-_r_e_"
+                  id="headlessui-menu-button-_r_b_"
                   type="button"
                 >
                   <img

src/components/NavBar/index.tsx

@@ -31,22 +31,13 @@ function classNames(...classes: string[]) {
 }
 
 const navigation: NavItem[] = [
-  {
-    name: "About Us",
-    children: [
-      { name: "What We do", href: "/what-we-do" },
-      { name: "Business Benefits", href: "/business-benefits" },
-      { name: "Our Members", href: "/members" },
-      { name: "Our Sustainers", href: "/sustainers" },
-      { name: "Our Adopters", href: "/adopters" },
-      { name: "Support Us", href: "/support-us" },
-    ],
-  },
+  { name: "Join Us", href: "/join-us" },
   { name: "Latest Releases", href: "/temurin/releases" },
   { name: "Marketplace", href: "/marketplace" },
   {
     name: "Projects",
     children: [
+      { name: "What We Do", href: "/what-we-do" },
       { name: "Eclipse Temurin", href: "/temurin" },
       { name: "Eclipse AQAvit", href: "/aqavit" },
       { name: "Eclipse Mission Control", href: "/jmc" },

src/components/Support/WaysToSupport/index.tsx

@@ -4,32 +4,32 @@ import CommonCard from "@/components/Common/CommonCard"
 const WaysToSupport = () => {
     const data = [
         {
-            title: "How to contribute",
+            title: "Contribute to Adoptium Projects",
             description:
-                "Contribute to our projects with technical and non-technical development",
+                "Contribute to our projects with technical and non-technical development.",
             button: "How to contribute",
             href: "/contributing/",
         },
         {
             title: "Become a sustainer",
-            description: "Join us in strengthening the future of Eclipse Temurin",
+            description: "Help ensure Temurin remains a trusted, high-performance runtime for developers everywhere.",
             button: "Become a sustainer",
             href: "/sustainers",
         },
         {
             title: "Become a member",
-            description: "Join us shaping the future of Eclipse Adoptium",
+            description: "Membership connects you with industry leaders and the vibrant Adoptium ecosystem, shaping the future of Java. Take an active role in driving innovation, gaining access to strategic and technical resources, and raising your organisation’s visibility.",
             button: "Become a member",
-            href: "/join",
+            href: "/members",
         },
     ]
     return (
         <section className="py-16 md:py-32 mx-auto bg-[#14003C] max-w-[1264px] w-full lg:px-2   xl:px-0 px-8">
             <CommonHeading
                 className="text-center"
-                title={"Ways to support us"}
+                title={"Power the evolution of open Java runtimes"}
                 description={
-                    "If you value Eclipse technologies, please consider becoming a sponsor through the Eclipse Foundation. Contributions from users like you help fund the operations of the Adoptium working group. All money contributed to the Eclipse Foundation will be used to support the Eclipse community through the Adoptium working group"
+                    "Your involvement keeps Eclipse Temurin enterprise-ready, secure, and accessible for all. Whether through contributions, sponsorship, or membership, together we can drive the evolution of Adoptium and strengthen the Java ecosystem for years to come."
                 }
             />