Where to get ada?

docusaurus.config.js

@@ -89,6 +89,7 @@ const config = {
               {to: '/discover-cardano', label: 'Discover Cardano'}, 
               {to: '/what-is-ada', label: 'What is ada?'}, 
               {to: '/what-is-ada#wallets', label: 'Find Cardano wallets'}, 
+              {to: '/where-to-get-ada', label: 'Where to get ada?'}, 
               {to: '/stake-pool-delegation', label: 'Delegate your stake'}, 
               {to: '/stake-pool-operation', label: 'Operate a stake pool'}, 
               {to: '/governance', label: 'Participate in governance'}, 

src/components/GovernanceWhyVoltaireSection/index.js

@@ -25,8 +25,8 @@ export default function GovernanceWhyVoltaireSection({}) {
           <p>
             Voltaire adds the ability for the Cardano community to make
             impactful decisions about software updates, technical improvements
-            and funding decisions. Known as Cardano Improvement Proposals (CIPs)
-            and Funding Proposals (FP's) together, these allow the future of
+            and funding decisions. Known as <Link href="https://developers.cardano.org/docs/governance/cardano-governance/governance-actions/">Governance Actions</Link>, 
+            these allow the future of
             Cardano to be determined by its community and funded from the
             platform's treasury.
           </p>
@@ -35,7 +35,7 @@ export default function GovernanceWhyVoltaireSection({}) {
             The era will also play host to a series of experiments, as we
             discuss topics such as decentralised governance, the dynamics of
             democracy and consent, evolving Voltaire from research to reality.
-            If Shelley is the foundation of a globally coordinated network
+            If Shelley was the foundation of a globally coordinated network
             without a central authority, then Voltaire will explore the
             apparatus for shared decision making: the language of
             decentralization.

src/components/GovernanceWithinCardanoSection/index.js

@@ -32,7 +32,7 @@ export default function GovernanceWithinCardanoSection({}) {
 
           <div className={styles.buttonWrap}>
             <Link
-              to="https://forum.cardano.org/c/governance/140"
+              to="https://developers.cardano.org/docs/governance/cardano-governance/governance-model"
               className={clsx(
                 "button button--primary button--lg",
                 styles.buttonLink

src/components/HowToBuyAdaSection/index.js

@@ -16,10 +16,8 @@ export default function HowToBuyAdaSection() {
             </div>
             <div className={clsx("col col--6", styles.rightColumn)}>
               <p>
-                You can buy or sell ada for fiat or other cryptocurrencies using
-                cryptocurrency exchanges. Visit{" "}
-                <Link href="https://coinmarketcap.com/">coinmarketcap</Link> to see
-                the list of exchanges that support ada.
+               There are many ways to obtain ada to use the Cardano blockchain. 
+                Find out on <Link to="where-to-get-ada">where to get ada?</Link>
               </p>
               <p>
                 As an ada holder, it is important to keep your funds secure, and

src/components/HowToBuyAdaSection/styles.module.css

@@ -26,8 +26,8 @@
   background-size: cover;
   background-repeat: no-repeat;
   background-position: center;
-  width: 100%;
-  min-height: 45rem;
+  width: 90%;
+  min-height: 35rem;
 }
 
 /* FeaturedTitleWithText */

src/components/Layout/DottedImageWithText/index.js

@@ -10,8 +10,8 @@ import { parseMarkdownLikeText } from "@site/src/utils/textUtils";
 // shows a dotted image and some text to the right, title is optional
 
 export default function DottedImageWithText({ imageName, title, text, headingDot }) {
-  // Construct the image URL using the imageName prop, we may want to handle image load errors in the future
-  const imageUrl = useBaseUrl(`/img/dotted-icons/${imageName}.svg`);
+  // Construct the image URL using the imageName prop (if there is one), we may want to handle image load errors in the future
+  const imageUrl = imageName ? useBaseUrl(`/img/dotted-icons/${imageName}.svg`) : null;
 
   // Function to render text content
   const renderTextContent = (content) => {
@@ -49,9 +49,11 @@ export default function DottedImageWithText({ imageName, title, text, headingDot
 
   return (
     <div className={styles.container}>
-      <div className={styles.imageWrap}>
-        <img src={imageUrl} alt={imageName} />
-      </div>
+      {imageUrl && (
+        <div className={styles.imageWrap}>
+          <img src={imageUrl} alt={imageName} />
+        </div>
+      )}
       <div className={styles.textWrap}>
         {title && <h2 className={clsx({ headingDot: headingDot }, styles.title)}>{title}</h2>}
         {renderTextContent(text)}

src/components/TermExplainer/index.js

@@ -0,0 +1,30 @@
+import React, { useEffect, useState } from "react";
+import styles from "./styles.module.css";
+import Divider from "@site/src/components/Layout/Divider";
+import termsData from "@site/src/data/termsForTermExplainer.json"; // Import all the terms
+
+export default function TermExplainer({ category }) {
+  const [terms, setTerms] = useState([]);
+
+  useEffect(() => {
+    if (category && termsData.categories[category]) {
+      const categoryTerms = termsData.categories[category];
+      const randomTerms = categoryTerms.sort(() => 0.5 - Math.random()).slice(0, 2);
+      setTerms(randomTerms);
+    }
+  }, [category]);
+
+  return (
+    <div className={styles.sectionWrap}>
+      <Divider text={`${category} Terms you should know`} white={true} />
+      <div className={styles.flexBox}>
+        {terms.map((term, index) => (
+          <div key={index} className={index % 2 === 0 ? styles.leftTextWrap : styles.rightTextWrap}>
+            <h2>{term.term}</h2>
+            <p>{term.description}</p>
+          </div>
+        ))}
+      </div>
+    </div>
+  );
+}

src/data/termsForTermExplainer.json

@@ -0,0 +1,64 @@
+{
+  "categories": {
+    "staking": [
+      {
+        "term": "Delegation",
+        "description": "Delegation is the process by which ada holders delegate the stake associated with their ada to a stake pool. It allows ada holders that do not have the skills or desire to run a node to participate in the network and be rewarded in proportion to the amount of stake delegated."
+      },
+      {
+        "term": "Stake Pool",
+        "description": "A network node with a public address that ada holders can delegate to for earning rewards."
+      },
+      {
+        "term": "Epoch",
+        "description": "A period of time in the Cardano network after which staking rewards are calculated and distributed. One epoch are 5 days."
+      },
+      {
+        "term": "Staking",
+        "description": "Staking refers to the entire process of both delegating and setting up a pool. It is often confused with `delegating`."
+      }
+    ],
+    "catalyst": [
+      {
+        "term": "Funding Proposal",
+        "description": "A formal request or proposal to build something that is not yet covered by the Cardano protocol."
+      },
+      {
+        "term": "Voting Power",
+        "description": "The influence an ada holder has in Project Catalyst, determined by the amount of ada they hold."
+      },
+      {
+        "term": "Evidence of milestone completion",
+        "description": "The evidence clearly and visibly shows that the milestone has been completed."
+      },
+      {
+        "term": "Statement of Milestones (SoM)",
+        "description": "A list of milestones in the project created by Funded Project in the Milestone Module with the schedule, deliverables, milestone achievement dates, milestone funding amounts, and the expected PoA."
+      }
+    ],
+    "governance": [
+      {
+        "term": "CIP-1694",
+        "description": "CIP-1694 introduces a new on-chain governance model for Cardano, aiming to give every ada holder a voice in governance. It proposes a tricameral system with three groups: stake pool operators (SPOs), Delegated Representatives (DReps), and a Constitutional Committee (CC), each with distinct roles."
+      },
+      {
+        "term": "Constitution",
+        "description": "A constitution establishes rules for creating, managing, and interpreting laws, defining government structure, and outlining the powers of different branches. Historically, constitutions have structured governments and reduced decision-making costs. For Cardano, a community-led ecosystem, enacting a constitution is crucial for its benefit and protection. It will guide collective decision-making, define participants' rights and principles, and provide a foundation to address the evolving needs of the ecosystem."
+      },
+      {
+        "term": "Governance Action",
+        "description": "A Governance Action is an on-chain proposal for voting, triggered by a transaction, with an expiration period after which it can’t be enacted. Any ada holder can submit a Governance Action, and voters then submit voting transactions. CIP-1694 describes seven types of Governance Actions: Motion of no-confidence, New constitutional committee or Quorum size, Updates to Constitution, Hard-Fork Initiation, Protocol Parameter Changes, Treasury Withdrawals, and Info."
+      }
+    ],
+    "cip": [
+      {
+        "term": "Cardano Improvement Proposal (CIP)",
+        "description": "CIPs are a way of formally proposing ideas in an agreed-upon fashion. However, they are often used for more than just finding standards. They are not binding in any way. CIPs are publicly visible to the community for discussion, and are located in the Cardano Foundation GitHub CIP repository."
+      },
+      {
+        "term": "CIP Editors",
+        "description": "CIP Editors safeguard the CIP process: they form a group enforcing the process described in this document and facilitating conversations between community actors. CIP editors should strive to keep up to date with general technical discussions and Cardano proposals."
+      }
+    ]
+  }
+}

src/pages/governance.js

@@ -5,8 +5,9 @@ import Divider from "@site/src/components/Layout/Divider";
 import GovernanceBlueSection from "@site/src/components/GovernanceBlueSection";
 import GovernanceWithinCardanoSection from "@site/src/components/GovernanceWithinCardanoSection";
 import GovernanceWhyVoltaireSection from "@site/src/components/GovernanceWhyVoltaireSection";
-import GovernanceProposalsSection from "@site/src/components/GovernanceProposalsSection";
+import TermExplainer from "@site/src/components/TermExplainer";
 import BoundaryBox from "@site/src/components/Layout/BoundaryBox";
+import SpacerBox from "@site/src/components/Layout/SpacerBox"; 
 import OpenGraphImage from "@site/src/components/Layout/OpenGraphImage";
 
 function HomepageHeader() {
@@ -34,25 +35,32 @@ export default function Home() {
       <OpenGraphImage pageName="governance" />
       <HomepageHeader />
       <main>
-        <BackgroundWrapper backgroundType={"solidBlue"}>
-          <BoundaryBox>
-            <GovernanceBlueSection />
-          </BoundaryBox>
-        </BackgroundWrapper>
-
+
         <BackgroundWrapper backgroundType={"zoom"}>
           <BoundaryBox>
             <Divider text="Governance Within Cardano" />
             <GovernanceWithinCardanoSection />
-            <Divider text="Why Voltaire" />
-            <GovernanceWhyVoltaireSection />
           </BoundaryBox>
         </BackgroundWrapper>
 
+        <BackgroundWrapper backgroundType={"solidBlue"}>
+          <BoundaryBox>
+            <GovernanceBlueSection />
+          </BoundaryBox>
+      </BackgroundWrapper>
+
+
+      <BoundaryBox>
+        <Divider text="Why Voltaire" />
+        <GovernanceWhyVoltaireSection />
+
+        <SpacerBox size="medium" />
+      </BoundaryBox>
+
 
         <BackgroundWrapper backgroundType={"gradientLight"}>
           <BoundaryBox>
-            <GovernanceProposalsSection />
+            <TermExplainer category="governance" />
           </BoundaryBox>
         </BackgroundWrapper>
 

src/pages/hardforks.js

@@ -102,6 +102,16 @@ const timelineItems = [
       "Transaction ID: a83f479c5635e1e563a19f6e72a1be59fb082bbf31de90cc176850ee799b08ac",
     ],
   },
+  {
+    title: "Conway Era",
+    cardTitle: "August/September, depending on operators",
+    cardSubtitle: "Name: Chang 1",
+    cardDetailedText: [
+      "Introducing the first batch of decentralized governance features of CIP-1694. Enabling only parameter changes and hard fork initiations.",
+      "Protocol Version: 9.0",
+      "Transaction ID: not yet available",
+    ],
+  },
 ];
 
 function HomepageHeader() {