Merge branch 'develop'

# Conflicts:
#	CHANGELOG.md
#	npm-shrinkwrap.json
#	package.json

CHANGELOG.md

@@ -1,4 +1,39 @@
-## [0.2.8](https://git.lumeweb.com/LumeWeb/lumeweb.com/compare/v0.2.7...v0.2.8) (2023-08-18)
+# [0.3.0-develop.4](https://git.lumeweb.com/LumeWeb/lumeweb.com/compare/v0.3.0-develop.3...v0.3.0-develop.4) (2023-08-19)
+
+
+### Bug Fixes
+
+* meme headline and donate button ([917a818](https://git.lumeweb.com/LumeWeb/lumeweb.com/commit/917a818c8375c0c880e5c4b3bf5760698bc739f1))
+
+# [0.3.0-develop.3](https://git.lumeweb.com/LumeWeb/lumeweb.com/compare/v0.3.0-develop.2...v0.3.0-develop.3) (2023-08-19)
+
+
+### Features
+
+* add sitemap ([599bba5](https://git.lumeweb.com/LumeWeb/lumeweb.com/commit/599bba5c352ead5981732d68a5c83cc42a40cb65))
+
+# [0.3.0-develop.2](https://git.lumeweb.com/LumeWeb/lumeweb.com/compare/v0.3.0-develop.1...v0.3.0-develop.2) (2023-08-19)
+
+
+### Bug Fixes
+
+* grammar ([ff7b022](https://git.lumeweb.com/LumeWeb/lumeweb.com/commit/ff7b0227897db1a8a9eba3fcbe348e5b88d9c030))
+
+# [0.3.0-develop.1](https://git.lumeweb.com/LumeWeb/lumeweb.com/compare/v0.2.8-develop.2...v0.3.0-develop.1) (2023-08-19)
+
+
+### Features
+
+* add grid feature for NFT's ([14dad07](https://git.lumeweb.com/LumeWeb/lumeweb.com/commit/14dad07901eea31b97ce741d4a1ab19961d15c7c))
+
+## [0.2.8-develop.2](https://git.lumeweb.com/LumeWeb/lumeweb.com/compare/v0.2.8-develop.1...v0.2.8-develop.2) (2023-08-19)
+
+
+### Bug Fixes
+
+* add missing image ([0ebbc48](https://git.lumeweb.com/LumeWeb/lumeweb.com/commit/0ebbc48337ff81a2753f7f1ee01eff83168806c9))
+
+## [0.2.8-develop.1](https://git.lumeweb.com/LumeWeb/lumeweb.com/compare/v0.2.7...v0.2.8-develop.1) (2023-08-18)
 
 
 ### Bug Fixes

astro.config.mjs

@@ -1,10 +1,12 @@
 import { defineConfig } from 'astro/config'
 import tailwind from '@astrojs/tailwind'
 import react from '@astrojs/react'
+import sitemap from '@astrojs/sitemap';
 
 // https://astro.build/config
 export default defineConfig({
-    integrations: [tailwind({ config: { applyBaseStyles: false } }), react()],
+    site: 'https://lumeweb.com',
+    integrations: [tailwind({ config: { applyBaseStyles: false } }), react(), sitemap()],
     experimental: {
         assets: true
     }

npm-shrinkwrap.json

@@ -1,16 +1,18 @@
 {
     "name": "@lumeweb/lumeweb.com",
-    "version": "0.2.8",
+    "version": "0.3.0-develop.4",
     "lockfileVersion": 3,
     "requires": true,
     "packages": {
         "": {
             "name": "@lumeweb/lumeweb.com",
-            "version": "0.2.8",
+            "version": "0.3.0-develop.4",
             "dependencies": {
                 "@astrojs/react": "^2.1.1",
+                "@astrojs/sitemap": "^2.0.2",
                 "@astrojs/tailwind": "^3.1.1",
                 "@types/react": "^18.2.0",
+                "add": "^2.0.6",
                 "astro": "^2.3.2",
                 "autoprefixer": "^10.4.14",
                 "qrcode": "^1.5.3",
@@ -143,6 +145,15 @@
                 "react-dom": "^17.0.2 || ^18.0.0"
             }
         },
+        "node_modules/@astrojs/sitemap": {
+            "version": "2.0.2",
+            "resolved": "https://registry.npmjs.org/@astrojs/sitemap/-/sitemap-2.0.2.tgz",
+            "integrity": "sha512-dFWtdFwN8kxDiqIxF8T8ODqsUr6hG+EQlFEqm+3oQkhAkucF9QkYLM5Q72mEbYytkL4jvKyHbW1u10T5sWBZew==",
+            "dependencies": {
+                "sitemap": "^7.1.1",
+                "zod": "^3.17.3"
+            }
+        },
         "node_modules/@astrojs/tailwind": {
             "version": "3.1.3",
             "resolved": "https://registry.npmjs.org/@astrojs/tailwind/-/tailwind-3.1.3.tgz",
@@ -1900,6 +1911,11 @@
                 "@types/unist": "*"
             }
         },
+        "node_modules/@types/node": {
+            "version": "17.0.45",
+            "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.45.tgz",
+            "integrity": "sha512-w+tIMs3rq2afQdsPJlODhoUEKzFP1ayaoyl1CcnwtIlsVe7K7bA1NGm4s3PraqTLlXnbIN84zuBlxBWo1u9BLw=="
+        },
         "node_modules/@types/normalize-package-data": {
             "version": "2.4.1",
             "resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz",
@@ -1940,6 +1956,14 @@
             "resolved": "https://registry.npmjs.org/@types/resolve/-/resolve-1.20.2.tgz",
             "integrity": "sha512-60BCwRFOZCQhDncwQdxxeOEEkbc5dIMccYLwbxsS4TUNeVECQ/pBJ0j09mrHOl/JJvpRPGwO9SvE4nR2Nb/a4Q=="
         },
+        "node_modules/@types/sax": {
+            "version": "1.2.4",
+            "resolved": "https://registry.npmjs.org/@types/sax/-/sax-1.2.4.tgz",
+            "integrity": "sha512-pSAff4IAxJjfAXUG6tFkO7dsSbTmf8CtUpfhhZ5VhkRpC4628tJhh3+V6H1E+/Gs9piSzYKT5yzHO5M4GG9jkw==",
+            "dependencies": {
+                "@types/node": "*"
+            }
+        },
         "node_modules/@types/scheduler": {
             "version": "0.16.3",
             "resolved": "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.3.tgz",
@@ -1988,6 +2012,11 @@
                 "node": ">=0.4.0"
             }
         },
+        "node_modules/add": {
+            "version": "2.0.6",
+            "resolved": "https://registry.npmjs.org/add/-/add-2.0.6.tgz",
+            "integrity": "sha512-j5QzrmsokwWWp6kUcJQySpbG+xfOBqqKnup3OIk1pz+kB/80SLorZ9V8zHFLO92Lcd+hbvq8bT+zOGoPkmBV0Q=="
+        },
         "node_modules/agent-base": {
             "version": "7.1.0",
             "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.0.tgz",
@@ -11123,6 +11152,11 @@
                 "suf-log": "^2.5.3"
             }
         },
+        "node_modules/sax": {
+            "version": "1.2.4",
+            "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
+            "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="
+        },
         "node_modules/scheduler": {
             "version": "0.23.0",
             "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.23.0.tgz",
@@ -11833,6 +11867,24 @@
             "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz",
             "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg=="
         },
+        "node_modules/sitemap": {
+            "version": "7.1.1",
+            "resolved": "https://registry.npmjs.org/sitemap/-/sitemap-7.1.1.tgz",
+            "integrity": "sha512-mK3aFtjz4VdJN0igpIJrinf3EO8U8mxOPsTBzSsy06UtjZQJ3YY3o3Xa7zSc5nMqcMrRwlChHZ18Kxg0caiPBg==",
+            "dependencies": {
+                "@types/node": "^17.0.5",
+                "@types/sax": "^1.2.1",
+                "arg": "^5.0.0",
+                "sax": "^1.2.4"
+            },
+            "bin": {
+                "sitemap": "dist/cli.js"
+            },
+            "engines": {
+                "node": ">=12.0.0",
+                "npm": ">=5.6.0"
+            }
+        },
         "node_modules/slash": {
             "version": "4.0.0",
             "resolved": "https://registry.npmjs.org/slash/-/slash-4.0.0.tgz",

package.json

@@ -1,7 +1,7 @@
 {
     "name": "@lumeweb/lumeweb.com",
     "type": "module",
-    "version": "0.2.8",
+    "version": "0.3.0-develop.4",
     "private": true,
     "repository": {
         "type": "git",
@@ -17,8 +17,10 @@
     },
     "dependencies": {
         "@astrojs/react": "^2.1.1",
+        "@astrojs/sitemap": "^2.0.2",
         "@astrojs/tailwind": "^3.1.1",
         "@types/react": "^18.2.0",
+        "add": "^2.0.6",
         "astro": "^2.3.2",
         "autoprefixer": "^10.4.14",
         "qrcode": "^1.5.3",

public/robots.txt

@@ -1,2 +1,3 @@
 User-Agent: *
-Allow: /
+Allow: /
+Sitemap: sitemap-index.xml

src/components/Donate/Why.astro

@@ -12,7 +12,7 @@ import backgroud from "/src/assets/why-bg-2.png";
     src={backgroud.src}
     class="absolute xl:relative -z-10 min-w-[1000px] h-[750px] -mx-10 md:-mx-20 lg:-mx-40"
   />
-  <div>
+  <div class="py-5 px-2 lg:px-0">
     <FeaturedGroup
       subtitle="Why should I donate to Lume?"
       title="Help us break the pattern"

src/components/Home/Meme.astro

@@ -1,5 +1,5 @@
 ---
-import mulletMeme from "/src/assets/centralized-mullet-meme.png";
+import web3myth from "/src/assets/web3-myth.png";
 ---
 
 <section id="meme" class="tilted-bgs">
@@ -7,30 +7,25 @@ import mulletMeme from "/src/assets/centralized-mullet-meme.png";
     <div class="space-y-10">
       <h2
         class="font-display text-primary font-bold text-xl md:text-2xl uppercase"
-      >
+      >Busting the Web3 Myth: Embracing True Openness</h2>
-        Busting the Decentralized Web3 Myth
+        <h3 class="font-display text-4xl md:text-6xl font-bold">
-      </h2>
+          Time to Walk the Talk
-      <h3 class="font-display text-4xl md:text-6xl font-bold">
-        The Decentralized Mullet
       </h3>
       <p class="font-body text-xl md:text-3xl text-body">
-        Right now, despite many claims, a majority, <b>if not all</b>, the
-        services that build the legos of Web3 are actually centralized, both
-        with what you can <b>see</b> and what you <b>can't.</b>
-      </p>
-      <p class="font-body text-xl md:text-3xl text-body">
-        While some <b>blockchains</b> may be more <b>decentralized</b> than others,
-        access to nearly every blockchain is also
-        <b>centralized</b>.
-      </p>
 
-      <p class="font-body text-xl md:text-3xl text-body">
+          Let's have a heart-to-heart about Web3. There's a myth that needs to be cleared up. Some folks claim it's all about being wide open, but the reality is a bit more nuanced.
-        So consider this a call to action for our community to go back to ethos
-        and make Web3 <i>real</i>.
       </p>
+        <p class="font-body text-xl md:text-3xl text-body">
+           Not every Web3 service walks the talk. Censorship can actually find its way into blockchains too. It's a surprising twist, but it's something we need to fix.</p>
+      <p class="font-body text-xl md:text-3xl text-body">
+          But hold up – we're not here to point fingers. We're here to set things straight. It's about acknowledging the facts and rolling up our sleeves. Together, we're pushing for actual openness and the kind of decentralization that counts. It's not about fancy words; it's about action.
+      </p>
+        <p class="font-body text-xl md:text-3xl text-body">
+            So, let's dive in and make Web3 what it's meant to be – no myths, just reality. Join us – it's time to turn talk into a true, open web for all.
+        </p>
     </div>
     <img
-      src={mulletMeme.src}
+      src={web3myth.src}
       class="w-[500px] xl:w-[650px] max-h-[550px] self-center"
       alt="Web 1"
       style="padding-bottom: 3em"

src/components/Home/Vision.astro

@@ -1,24 +1,27 @@
 <section id="vision" class="bg-black/40 p-5 space-y-10 mx-10 sm:mx-20 xl:mx-40">
-  <h2 class="font-display text-primary font-bold text-xl md:text-2xl uppercase">
+    <h2 class="font-display text-primary font-bold text-xl md:text-2xl uppercase">
-    Our Vision
+        Our Vision
-  </h2>
+    </h2>
-  <h3 class="font-display text-4xl md:text-6xl font-bold">
+    <h3 class="font-display text-4xl md:text-6xl font-bold">
-    Enable an open, censorship-resistant web
+        Enable an open, censorship-resistant web
-  </h3>
+    </h3>
-  <p class="font-body text-xl md:text-3xl text-body">
+    <p class="font-body text-xl md:text-3xl text-body">
-    Web3 is the next evolution of the internet that combines many legos from
+        Web3 is the next evolution of the internet that combines many legos from
-    past decades.
+        past decades.
-  </p>
+    </p>
-  <p class="font-body text-xl md:text-3xl text-body">
+    <p class="font-body text-xl md:text-3xl text-body">
-    Benefits include internet <b>freedom</b>, <b>privacy</b>, and <b
+        Benefits include internet <b>freedom</b>, <b>privacy</b>, and <b
-      >ownership</b
+    >ownership</b
     > over your personal web.
-  </p>
+    </p>
-  <div class="pt-10 w-full">
+    <p class="font-body text-xl md:text-3xl text-body">
-    <a
+        Join us in shaping tomorrow's digital world. Unite with Web3 and lets connect.
-      href="https://web3extension.io"
+    </p>
-      class="text-2xl w-full block text-center md:max-w-[350px] rounded-md bg-primary py-3 px-10 text-black font-body"
+    <div class="pt-10 w-full">
-      >Download Extension</a
+        <a
-    >
+            href="https://web3extension.io"
-  </div>
+            class="text-2xl w-full block text-center md:max-w-[350px] rounded-md bg-primary py-3 px-10 text-black font-body"
+        >Connect to Web3</a
+        >
+    </div>
 </section>

src/components/Home/Web3.astro

@@ -3,40 +3,43 @@ import gfxLeft from "/src/assets/home-gfx-left.png";
 ---
 
 <section
-  id="web3"
+    id="web3"
-  class="flex flex-col lg:flex-row lg:bg-transparent lg:p-0 gap-10 mx-10 sm:mx-20 xl:mx-40"
+    class="flex flex-col lg:flex-row lg:bg-transparent lg:p-0 gap-10 mx-10 sm:mx-20 xl:mx-40"
 >
-  <div class="flex-1 max-w-[calc(100% + 20px)] overflow-hidden -mx-10">
+    <div class="flex-1 max-w-[calc(100% + 20px)] overflow-hidden -mx-10">
-    <div class="flex-1 -ml-10 -mr-10 lg:-ml-40 lg:mr-0">
+        <div class="flex-1 -ml-10 -mr-10 lg:-ml-40 lg:mr-0">
-      <img src={gfxLeft.src} class="w-full" />
+            <img src={gfxLeft.src} class="w-full"/>
+        </div>
     </div>
-  </div>
+    <div class="flex-1 -mt-40 space-y-10 flex flex-col justify-center">
-  <div class="flex-1 -mt-40 space-y-10 flex flex-col justify-center">
+        <h2
-    <h2
+            class="font-display text-primary font-bold text-xl md:text-2xl uppercase"
-      class="font-display text-primary font-bold text-xl md:text-2xl uppercase"
+        >
-    >
+            What is the Web?
-      What is the Web?
+        </h2>
-    </h2>
+        <h3 class="font-display text-4xl md:text-6xl font-bold">
-    <h3 class="font-display text-4xl md:text-6xl font-bold">
+            Why Web3 matters
-      Why Web3 matters
+        </h3>
-    </h3>
+        <p class="font-body text-xl md:text-3xl text-body">
-    <p class="font-body text-xl md:text-3xl text-body">
+            Web3 often gets mixed up with other terms/buzz words such as "crypto" or
-      Web3 often gets mixed up with other terms/buzz words such as "crypto" or
+            "defi". However, the current web you use now is often referred to insiders
-      "defi". However, the current web you use now is often referred to insiders
+            as "web2".
-      as "web2".
+        </p>
-    </p>
+        <p class="font-body text-xl md:text-3xl text-body">
-    <p class="font-body text-xl md:text-3xl text-body">
+            While Web3 can include many decentralized services, it symbolizes the
-      While Web3 can include many decentralized services, it symbolizes the
+            multiverse, or the entirety of all decentralized & P2P networks. Some may
-      multiverse, or the entirety of all decentralized & P2P networks. Some may
+            refer to this as the "metaverse", or even "dweb", but we can agree to
-      refer to this as the "metaverse", or even "dweb", but we can agree to
+            disagree 😉.
-      disagree 😉.
+        </p>
-    </p>
+        <p class="font-body text-xl md:text-3xl text-body">
-    <div class="pt-10 w-full">
+            Having access to web3 is important so you are in control of what you are able to do.
-      <a
+        </p>
-        href="/what-is-web3"
+        <div class="pt-10 w-full">
-        class="text-2xl w-full block text-center md:max-w-[250px] rounded-md bg-primary py-3 px-10 text-[black] font-body"
+            <a
-        >Learn More</a
+                href="/what-is-web3"
-      >
+                class="text-2xl w-full block text-center md:max-w-[250px] rounded-md bg-primary py-3 px-10 text-[black] font-body"
+            >Learn More</a
+            >
+        </div>
     </div>
-  </div>
 </section>

src/components/Home/WebComparison.astro

@@ -12,6 +12,11 @@ import meme4Small from "/src/assets/meme-4-small.png";
 <section
   class="flex flex-col w-full border-y border-dark-aquamarine divide-y divide-dark-aquamarine lg:h-[1200px]"
 >
+  <h3
+    class="font-display text-4xl md:text-6xl font-bold p-5 uppercase bg-dark-aquamarine text-primary"
+  >
+    Web3's Current Path
+  </h3>
   <!-- MEME GRID BIG -->
   <div
     class="hidden lg:flex flex-1 flex-row w-full divide-x divide-dark-aquamarine"

src/components/What/Grid.astro

@@ -3,40 +3,45 @@ import GridCell from "../ui/GridCell.astro";
 import GridContainer from "../ui/GridContainer.astro";
 
 const features = [
-  {
+    {
-    title: "Access the markets, aka DeFi",
+        title: "Access the markets, aka DeFi",
-    description:
+        description:
-      "Web3 commonly get mixed up with DeFi, however, while you should be able to access any decentralized website or network, access to DeFi to manage your money is critical as well.",
+            "Web3 commonly get mixed up with DeFi, however, while you should be able to access any decentralized website or network, access to DeFi to manage your money is critical as well.",
-  },
+    },
-  {
+    {
-    title: "Access any decentralized or P2P network",
+        title: "NFT's... Anywhere",
-    description:
+        description:
-      "The basics of Web3 is the sum of all the open networks and ecosystems. You should be able to access and visit any of these places. You can compare this to accessing things on Google, Facebook, Apple, or other networks/platforms that are generally walled gardens in the current web system.",
+            "You should be able to access your favorite NFT's anywhere, any time, any place. They are yours and no one should be able to tell you otherwise.",
-  },
+    },
-  {
+    {
-    title: "Publish Freely",
+        title: "Access any decentralized or P2P network",
-    description:
+        description:
-      'A core tenant of Web3 is censorship-resistance. You should be able to freely post controversial (or even things others just don\'t want to hear) information, such as news, blogging, or video. You should be allowed to openly debate, educate, inform, or entertain without getting "de-platformed".',
+            "The basics of Web3 is the sum of all the open networks and ecosystems. You should be able to access and visit any of these places. You can compare this to accessing things on Google, Facebook, Apple, or other networks/platforms that are generally walled gardens in the current web system.",
-  },
+    },
-  {
+    {
-    title: "Socialize and Discover Freely",
+        title: "Publish Freely",
-    description:
+        description:
-      "While you have the ability to post, you should also have the ability to read.",
+            'A core tenant of Web3 is censorship-resistance. You should be able to freely post controversial (or even things others just don\'t want to hear) information, such as news, blogging, or video. You should be allowed to openly debate, educate, inform, or entertain without getting "de-platformed".',
-  },
+    },
-  {
+    {
-    title: "Own your web. Own your identity.",
+        title: "Socialize and Discover Freely",
-    description:
+        description:
-      "You should be able to have your private data be and stay private unless you choose otherwise. This is achieved with your online web3 account, which serves as your identity and means of encrypting everything you do. If you want to share you can, but your data is yours, no one else's.",
+            "While you have the ability to post, you should also have the ability to read.",
-  },
+    },
+    {
+        title: "Own your web. Own your identity.",
+        description:
+            "You should be able to have your private data be and stay private unless you choose otherwise. This is achieved with your online web3 account, which serves as your identity and means of encrypting everything you do. If you want to share you can, but your data is yours, no one else's.",
+    },
 ];
 ---
 
 <section id="grid" class="mx-10 md:mx-20 lg:mx-40">
-  <GridContainer>
+    <GridContainer>
-    {
+        {
-      features.map((feature) => (
+            features.map((feature) => (
-        <GridCell description={feature.description} title={feature.title} />
+                <GridCell description={feature.description} title={feature.title}/>
-      ))
+            ))
-    }
+        }
-  </GridContainer>
+    </GridContainer>
 </section>

src/layouts/Layout.astro

@@ -43,7 +43,7 @@ const url = "https://lumeweb.com";
     <meta property="twitter:title" content={title} />
     <meta property="twitter:description" content={description} />
     <meta property="twitter:image" content={opengraph.src} />
-
+      <link rel="sitemap" href="/sitemap-index.xml" />
     <!-- Matomo -->
     <script is:inline>
       var _paq = (window._paq = window._paq || []);

src/pages/index.astro

@@ -26,8 +26,8 @@ import bgSmaller from "../assets/main-page-hero@0.5x.png";
   <Vision />
   <Web3 />
   <PoweredBy />
-  <Meme />
   <WebComparison />
+  <Meme />
   <Socials />
   <CTO />
   <Message />