Merge pull request #56 from cardano-foundation/staging

Merge pull request #48, #54, #45, #55, #57 into main
cardano-foundation · May 6, 2024 · e8af8aa · e8af8aa
2 parents 751c0f4 + 250263e
commit e8af8aa
Show file tree

Hide file tree

Showing 46 changed files with 206 additions and 44 deletions.
diff --git a/README.md b/README.md
@@ -10,13 +10,13 @@ To achieve this, the entire site was rewritten, focusing on the technology stack
 
 - Rewritten using the Docusaurus stack (the same as developers.cardano.org).
 - The staging branch deploys at https://new-cardano-org-staging.netlify.app/, and the main branch deploys at https://cardano.org/.
-- Documentation on adding content can be found at https://new-cardano-org-staging.netlify.app/docs/tutorial/create-a-page (work in progress).
-- Added Cardano-relevant research papers and specifications at https://new-cardano-org-staging.netlify.app/research.
+- Documentation on adding content can be found at https://cardano.org/docs/tutorial/create-a-page (work in progress).
+- Added Cardano-relevant research papers and specifications at https://cardano.org/research.
 - Replaced the unclear and confusing black overlay menu according to feedback. Ensured that every page is accessible through the new menus above, addressing a previous navigation issue.
 - Improved the news section, increasing visibility for many entities, now with tags, an RSS feed, collaborative features for news articles, embedded videos, and other enhancements.
-- Created a dedicated page for the Cardano code of conduct at https://new-cardano-org-staging.netlify.app/community-code-of-conduct.
-- Reworked the Ambassador Program page at https://new-cardano-org-staging.netlify.app/ambassadors.
-- The Genesis page no longer relies on external sites and can be accessed at https://new-cardano-org-staging.netlify.app/genesis.
+- Created a dedicated page for the Cardano code of conduct at https://cardano.org/community-code-of-conduct.
+- Reworked the Ambassador Program page at https://cardano.org/ambassadors. (not all have yet agreed to be listed there)
+- The Genesis page no longer relies on external sites and can be accessed at https://cardano.org/genesis.
 - Added 'Intersect' the member based organisation.
 - Additionally, dark mode is now available.
 

diff --git a/docusaurus.config.js b/docusaurus.config.js
@@ -73,7 +73,7 @@ const config = {
     /** @type {import('@docusaurus/preset-classic').ThemeConfig} */
     ({
       // The project's social card
-      image: 'img/og-default.jpg',
+      image: 'img/og/default.jpg',
       navbar: {
         logo: {
           alt: "Cardano Logo",
@@ -122,7 +122,8 @@ const config = {
               {href: 'https://developers.cardano.org/tools', label: 'Builder Tools'},  
               {href: 'https://developers.cardano.org/showcase', label: 'Project Showcase'},  
               {href: 'https://docs.cardano.org', label: 'Cardano Docs'}, 
-              {href: 'https://cardanoupdates.com', label: 'Developer Updates'},   
+              {href: 'https://cardanoupdates.com', label: 'Developer Updates'},
+              {href: 'https://cardano.stackexchange.com/', label: 'Stack Exchange'},   
             ],
           },
           {
@@ -258,6 +259,14 @@ const config = {
         },
       ],
     }),
+
+    // Custom JavaScript that will be injected into the <head> section of every page
+    scripts: [
+      { 
+        src: '/scripts/deactivateServiceWorker.js', 
+        async: true 
+      }
+    ],
 };
 
 export default config;
diff --git a/src/components/Layout/OpenGraphImage/index.js b/src/components/Layout/OpenGraphImage/index.js
@@ -0,0 +1,19 @@
+import React from 'react';
+import Head from '@docusaurus/Head';
+
+const OpenGraphImage = ({ pageName }) => {
+
+  // open graph images needs to be in the "og" folder + .jpg
+  // we currently do not distinguish between og:image and twitter:image
+
+  const imageUrl = `https://cardano.org/img/og/${pageName}.jpg`;
+
+  return (
+    <Head>
+      <meta property="og:image" content={imageUrl} />
+      <meta property="twitter:image" content={imageUrl} />
+    </Head>
+  );
+};
+
+export default OpenGraphImage;
diff --git a/src/components/WalletSection/index.js b/src/components/WalletSection/index.js
@@ -8,7 +8,7 @@ import DottedImageWithText from "@site/src/components/Layout/DottedImageWithText
 import SpacerBox from "@site/src/components/Layout/SpacerBox";
 
 // Wallets ranked based on (but not exclusively) https://cardano-community.github.io/support-faq/Wallets/list/
-// Don't send pull requests for wallets that are not listed for a longer time on https://developers.cardano.org/showcase?tags=wallet
+// Don't send pull requests for wallets that are not listed for at least 6 months on https://developers.cardano.org/showcase?tags=wallet
 const WalletItemList = [
   {
     title: "Typhon Wallet",
@@ -42,6 +42,22 @@ const WalletItemList = [
     label: "Get Eternl",
     link: "https://eternl.io",
   },
+  {
+    title: "VESPR Wallet",
+    imageName: "vespr-ada",
+    text: "VESPR is a non-custodial mobile light wallet for the Cardano network, prioritizing the security and safety of your digital assets while ensuring exceptional ease-of-use.",
+    subtext: "App for iOS and Android",
+    label: "Get VESPR",
+    link: "https://vespr.xyz",
+  },
+  {
+    title: "Lace Wallet",
+    imageName: "lace-ada",
+    text: "An [open-source](https://github.com/input-output-hk/lace) light wallet platform from IOG, one of the creators of Cardano. Manually verified by an independent auditor, Lace lets you quickly, easily, and securely manage your digital assets and enjoy Web3.",
+    subtext: "Browser extension for Chrome, Brave",
+    label: "Get Lace",
+    link: "https://www.lace.io",
+  },
 ];
 
 function WalletItem({ title, imageName, text, subtext, label, link }) {

diff --git a/src/pages/ambassadors.js b/src/pages/ambassadors.js
@@ -7,6 +7,7 @@ import AmbassadorRolesSection from "@site/src/components/AmbassadorRolesSection"
 import AmbassadorOverviewSection from "@site/src/components/AmbassadorOverviewSection";
 import AmbassadorBenefitsSection from "@site/src/components/AmbassadorBenefitsSection";
 import BoundaryBox from "@site/src/components/Layout/BoundaryBox";
+import OpenGraphImage from "@site/src/components/Layout/OpenGraphImage";
 
 function HomepageHeader() {
   const { siteTitle } = "useDocusaurusContext()";
@@ -25,9 +26,10 @@ export default function Home() {
 
   return (
     <Layout
-    title="Cardano - making the world work better for all"
-    description="An open platform designed to empower billions without economic identity by offering decentralized applications for managing identity, value, and governance."
+    title="Ambassador Program | cardano.org"
+    description="The Ambassador Program is designed to promote awareness and educate the wider community to drive the adoption of Cardano for better use cases."
     >
+      <OpenGraphImage pageName="ambassadors" />
       <HomepageHeader />
       <main>
         <BoundaryBox>

diff --git a/src/pages/brand-assets.js b/src/pages/brand-assets.js
@@ -2,6 +2,7 @@ import Layout from "@theme/Layout";
 import SiteHero from "@site/src/components/Layout/SiteHero";
 import BoundaryBox from "@site/src/components/Layout/BoundaryBox";
 import BrandAssetsSection from "../components/BrandAssetsSection";
+import OpenGraphImage from "@site/src/components/Layout/OpenGraphImage";
 
 function HomepageHeader() {
   const { siteTitle } = "useDocusaurusContext()";
@@ -18,9 +19,10 @@ function HomepageHeader() {
 export default function Home() {
   return (
     <Layout
-    title="Cardano - making the world work better for all"
-    description="An open platform designed to empower billions without economic identity by offering decentralized applications for managing identity, value, and governance."
+    title="Brand Assets | cardano.org"
+    description="Our brand is a reflection of everything that we create. Here are some of the things that make up our brand and how you can use them."
     >
+      <OpenGraphImage pageName="brand-assets" />
       <HomepageHeader />
       <main>
         <BoundaryBox>

diff --git a/src/pages/calculator.js b/src/pages/calculator.js
@@ -2,6 +2,7 @@ import Layout from "@theme/Layout";
 import SiteHero from "@site/src/components/Layout/SiteHero";
 import BoundaryBox from "@site/src/components/Layout/BoundaryBox";
 import TitleWithText from "@site/src/components/Layout/TitleWithText";
+import OpenGraphImage from "@site/src/components/Layout/OpenGraphImage";
 
 function HomepageHeader() {
   const { siteTitle } = "useDocusaurusContext()";
@@ -18,9 +19,10 @@ export default function Home() {
 
   return (
     <Layout
-    title="Cardano - making the world work better for all"
-    description="An open platform designed to empower billions without economic identity by offering decentralized applications for managing identity, value, and governance."
+    title="Staking Calculator | cardano.org"
+    description="See how much rewards you can possibly earn by staking ada."
     >
+      <OpenGraphImage pageName="calculator" />
       <HomepageHeader />
       <main>
         <BoundaryBox>

diff --git a/src/pages/community-code-of-conduct.js b/src/pages/community-code-of-conduct.js
@@ -4,6 +4,7 @@ import SiteHero from "@site/src/components/Layout/SiteHero";
 import BoundaryBox from "@site/src/components/Layout/BoundaryBox";
 import TitleWithText from "@site/src/components/Layout/TitleWithText";
 import SpacerBox from "@site/src/components/Layout/SpacerBox";
+import OpenGraphImage from "@site/src/components/Layout/OpenGraphImage";
 
 function HomepageHeader() {
   const { siteTitle } = "useDocusaurusContext()";
@@ -20,9 +21,10 @@ export default function Home() {
 
   return (
     <Layout
-    title="Cardano - making the world work better for all"
-    description="An open platform designed to empower billions without economic identity by offering decentralized applications for managing identity, value, and governance."
+    title="Community Code of Conduct | cardano.org"
+    description="The Cardano community consists of people from all over the world, who have come together to grow and safeguard the spirit and the future of Cardano."
     >
+      <OpenGraphImage pageName="community-code-of-conduct" />
       <HomepageHeader />
       <main>
         <BoundaryBox>

diff --git a/src/pages/contact.js b/src/pages/contact.js
@@ -9,6 +9,7 @@ import Divider from "@site/src/components/Layout/Divider";
 import TitleWithText from "@site/src/components/Layout/TitleWithText";
 import ContactFormHS from "@site/src/components/ContactFormHS";
 import SpacerBox from "@site/src/components/Layout/SpacerBox";
+import OpenGraphImage from "@site/src/components/Layout/OpenGraphImage";
 
 // Hint: You can preselect a topic with http://localhost:3000/contact?topic=iog 
 // or http://localhost:3000/contact?topic=sponsor etc
@@ -17,7 +18,7 @@ function HomepageHeader() {
   const { siteTitle } = "useDocusaurusContext()";
   return (
     <SiteHero
-      title="Contact Cardano"
+      title="Contact | cardano.org"
       description="Cardano is supported by the Cardano Foundation, IOHK, and EMURGO. Fill out the contact form below and we will put you in touch with the team best placed to assist you."
       bannerType="fluid"
     />
@@ -120,6 +121,7 @@ export default function Home() {
     title="Cardano - making the world work better for all"
     description="An open platform designed to empower billions without economic identity by offering decentralized applications for managing identity, value, and governance."
     >
+      <OpenGraphImage pageName="contact" />
       <HomepageHeader />
       <main>
         <BoundaryBox>

diff --git a/src/pages/discover-cardano.js b/src/pages/discover-cardano.js
@@ -5,6 +5,7 @@ import DiscoverUsSection from "@site/src/components/DiscoverUsSection";
 import BackgroundWrapper from "@site/src/components/Layout/BackgroundWrapper";
 import BoundaryBox from "../components/Layout/BoundaryBox";
 import SpacerBox from "../components/Layout/SpacerBox";
+import OpenGraphImage from "@site/src/components/Layout/OpenGraphImage";
 
 function HomepageHeader() {
   const { siteTitle } = "useDocusaurusContext()";
@@ -22,9 +23,10 @@ export default function Home() {
 
   return (
     <Layout
-    title="Cardano - making the world work better for all"
-    description="An open platform designed to empower billions without economic identity by offering decentralized applications for managing identity, value, and governance."
+    title="Discover Cardano | cardano.org"
+    description="Cardano is the nexus of five principles: People, purpose, technology, research, and opportunity. Explore and learn this new constellation of knowledge."
     >
+      <OpenGraphImage pageName="discover-cardano" />
       <HomepageHeader />
       <main>
         <BoundaryBox>

diff --git a/src/pages/enterprise.js b/src/pages/enterprise.js
@@ -2,7 +2,7 @@ import Layout from "@theme/Layout";
 import SiteHero from "@site/src/components/Layout/SiteHero";
 import EnterpriseSection from "@site/src/components/EnterpriseSection";
 import BoundaryBox from "@site/src/components/Layout/BoundaryBox";
-
+import OpenGraphImage from "@site/src/components/Layout/OpenGraphImage";
 
 function HomepageHeader() {
   const { siteTitle } = "useDocusaurusContext()";
@@ -21,9 +21,10 @@ export default function Home() {
 
   return (
     <Layout
-    title="Cardano - making the world work better for all"
+    title="Use cases for enterprise | cardano.org"
     description="An open platform designed to empower billions without economic identity by offering decentralized applications for managing identity, value, and governance."
     >
+      <OpenGraphImage pageName="use-cases-for-enterprise" />
       <HomepageHeader />
       <main>
         <BoundaryBox>

diff --git a/src/pages/exchanges.js b/src/pages/exchanges.js
@@ -9,6 +9,7 @@ import BackgroundWrapper from "@site/src/components/Layout/BackgroundWrapper";
 import CtaOneColumn from "@site/src/components/Layout/CtaOneColumn";
 import CtaTwoColumn from "@site/src/components/Layout/CtaTwoColumn";
 import DottedImageWithText from "@site/src/components/Layout/DottedImageWithText";
+import OpenGraphImage from "@site/src/components/Layout/OpenGraphImage";
 
 /* FIXME: shouldn't this file be named "Cardano Integration"? */
 
@@ -27,9 +28,10 @@ export default function Home() {
 
   return (
     <Layout
-    title="Cardano - making the world work better for all"
-    description="An open platform designed to empower billions without economic identity by offering decentralized applications for managing identity, value, and governance."
+    title="Integrate Cardano | cardano.org"
+    description="Easy integration with Cardano. All of the upgrades. None of the maintenance."
     >
+      <OpenGraphImage pageName="integrate-cardano" />
       <HomepageHeader />
       <main>
         <BoundaryBox>

diff --git a/src/pages/genesis.js b/src/pages/genesis.js
@@ -5,6 +5,7 @@ import Divider from "@site/src/components/Layout/Divider";
 import TitleWithText from "@site/src/components/Layout/TitleWithText";
 import BackgroundWrapper from "@site/src/components/Layout/BackgroundWrapper";
 import GenesisStats from "@site/src/components/GenesisStats";
+import OpenGraphImage from "@site/src/components/Layout/OpenGraphImage";
 
 function HomepageHeader() {
   const { siteTitle } = "useDocusaurusContext()";
@@ -22,9 +23,10 @@ export default function Home() {
 
   return (
     <Layout
-    title="Cardano - making the world work better for all"
-    description="An open platform designed to empower billions without economic identity by offering decentralized applications for managing identity, value, and governance."
+    title="Genesis Distribution | cardano.org"
+    description="Distribution of ada token vouchers, which are part of the Cardano settlement layer, took place in Asia in four stages between October 2015 and the start of January 2017."
     >
+      <OpenGraphImage pageName="genesis" />
       <HomepageHeader />
       <main>
         <BoundaryBox>

diff --git a/src/pages/governance.js b/src/pages/governance.js
@@ -7,6 +7,7 @@ import GovernanceWithinCardanoSection from "@site/src/components/GovernanceWithi
 import GovernanceWhyVoltaireSection from "@site/src/components/GovernanceWhyVoltaireSection";
 import GovernanceProposalsSection from "@site/src/components/GovernanceProposalsSection";
 import BoundaryBox from "@site/src/components/Layout/BoundaryBox";
+import OpenGraphImage from "@site/src/components/Layout/OpenGraphImage";
 
 function HomepageHeader() {
   const { siteTitle } = "useDocusaurusContext()";
@@ -27,9 +28,10 @@ export default function Home() {
 
   return (
     <Layout
-    title="Cardano - making the world work better for all"
-    description="An open platform designed to empower billions without economic identity by offering decentralized applications for managing identity, value, and governance."
+    title="Governance | cardano.org"
+    description="Cardano is developing the most secure and decentralized governance model in the world. A model to give everybody a voice, and control over the future development of the platform and the applications and services that emerge from it."
     >
+      <OpenGraphImage pageName="governance" />
       <HomepageHeader />
       <main>
         <BackgroundWrapper backgroundType={"solidBlue"}>

diff --git a/src/pages/index.js b/src/pages/index.js
@@ -28,7 +28,7 @@ export default function Home() {
 
   return (
     <Layout
-      title="Cardano - making the world work better for all"
+      title="Home | cardano.org"
       description="An open platform designed to empower billions without economic identity by offering decentralized applications for managing identity, value, and governance."
     >
       <HomepageHeader />

diff --git a/src/pages/learn.js b/src/pages/learn.js
@@ -17,7 +17,7 @@ export default function Home() {
 
   return (
     <Layout
-    title="Cardano - making the world work better for all"
+    title="Learn | cardano.org"
     description="An open platform designed to empower billions without economic identity by offering decentralized applications for managing identity, value, and governance."
     >
       <HomepageHeader />

diff --git a/src/pages/newsletter.js b/src/pages/newsletter.js
@@ -7,6 +7,7 @@ import TitleWithText from "@site/src/components/Layout/TitleWithText";
 import CommunityDigestForm from "@site/src/components/CommunityDigestFormHS";
 import SpacerBox from "@site/src/components/Layout/SpacerBox";
 import FollowCardanoSection from "@site/src/components/FollowCardanoSection";
+import OpenGraphImage from "@site/src/components/Layout/OpenGraphImage";
 
 function HomepageHeader() {
   const { siteTitle } = "useDocusaurusContext()";
@@ -23,9 +24,10 @@ export default function Home() {
 
   return (
     <Layout
-    title="Cardano - making the world work better for all"
-    description="An open platform designed to empower billions without economic identity by offering decentralized applications for managing identity, value, and governance."
+    title="Cardano Community Digest | cardano.org"
+    description="Get access to the latest Cardano news and content, and the hottest topics happening around the Cardano ecosystem."
     >
+      <OpenGraphImage pageName="newsletter" />
       <HomepageHeader />
       <BoundaryBox>
           <Divider text="Stay informed" />

diff --git a/src/pages/ouroboros.js b/src/pages/ouroboros.js
@@ -10,7 +10,7 @@ import FeaturedTitleWithText from "@site/src/components/Layout/FeaturedTitleWith
 import DottedImageWithText  from "@site/src/components/Layout/DottedImageWithText";
 import SpacerBox  from "@site/src/components/Layout/SpacerBox";
 import ProofOfStakeSection from "@site/src/components/ProofOfStakeSection";
-
+import OpenGraphImage from "@site/src/components/Layout/OpenGraphImage";
 
 function HomepageHeader() {
   const { siteTitle } = "useDocusaurusContext()";
@@ -27,9 +27,10 @@ export default function Home() {
 
   return (
     <Layout
-    title="Cardano - making the world work better for all"
-    description="An open platform designed to empower billions without economic identity by offering decentralized applications for managing identity, value, and governance."
+    title="What is Ouroboros? | cardano.org"
+    description="An environmentally sustainable, verifiably secure proof-of-stake protocol with rigorous security guarantees."
     >
+      <OpenGraphImage pageName="ouroboros" />
       <HomepageHeader />
 
       <BackgroundWrapper backgroundType={"zoom"}>