Merge branch 'develop'

# Conflicts:
#	CHANGELOG.md
#	npm-shrinkwrap.json
#	package.json
This commit is contained in:
Derrick Hammer 2023-08-19 11:10:36 -04:00
commit e2a182cc83
Signed by: pcfreak30
GPG Key ID: C997C339BE476FF2
16 changed files with 217 additions and 114 deletions

View File

@ -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 ### Bug Fixes

View File

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

56
npm-shrinkwrap.json generated
View File

@ -1,16 +1,18 @@
{ {
"name": "@lumeweb/lumeweb.com", "name": "@lumeweb/lumeweb.com",
"version": "0.2.8", "version": "0.3.0-develop.4",
"lockfileVersion": 3, "lockfileVersion": 3,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "@lumeweb/lumeweb.com", "name": "@lumeweb/lumeweb.com",
"version": "0.2.8", "version": "0.3.0-develop.4",
"dependencies": { "dependencies": {
"@astrojs/react": "^2.1.1", "@astrojs/react": "^2.1.1",
"@astrojs/sitemap": "^2.0.2",
"@astrojs/tailwind": "^3.1.1", "@astrojs/tailwind": "^3.1.1",
"@types/react": "^18.2.0", "@types/react": "^18.2.0",
"add": "^2.0.6",
"astro": "^2.3.2", "astro": "^2.3.2",
"autoprefixer": "^10.4.14", "autoprefixer": "^10.4.14",
"qrcode": "^1.5.3", "qrcode": "^1.5.3",
@ -143,6 +145,15 @@
"react-dom": "^17.0.2 || ^18.0.0" "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": { "node_modules/@astrojs/tailwind": {
"version": "3.1.3", "version": "3.1.3",
"resolved": "https://registry.npmjs.org/@astrojs/tailwind/-/tailwind-3.1.3.tgz", "resolved": "https://registry.npmjs.org/@astrojs/tailwind/-/tailwind-3.1.3.tgz",
@ -1900,6 +1911,11 @@
"@types/unist": "*" "@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": { "node_modules/@types/normalize-package-data": {
"version": "2.4.1", "version": "2.4.1",
"resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz", "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", "resolved": "https://registry.npmjs.org/@types/resolve/-/resolve-1.20.2.tgz",
"integrity": "sha512-60BCwRFOZCQhDncwQdxxeOEEkbc5dIMccYLwbxsS4TUNeVECQ/pBJ0j09mrHOl/JJvpRPGwO9SvE4nR2Nb/a4Q==" "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": { "node_modules/@types/scheduler": {
"version": "0.16.3", "version": "0.16.3",
"resolved": "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.3.tgz", "resolved": "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.3.tgz",
@ -1988,6 +2012,11 @@
"node": ">=0.4.0" "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": { "node_modules/agent-base": {
"version": "7.1.0", "version": "7.1.0",
"resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.0.tgz", "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.0.tgz",
@ -11123,6 +11152,11 @@
"suf-log": "^2.5.3" "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": { "node_modules/scheduler": {
"version": "0.23.0", "version": "0.23.0",
"resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.23.0.tgz", "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", "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz",
"integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==" "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": { "node_modules/slash": {
"version": "4.0.0", "version": "4.0.0",
"resolved": "https://registry.npmjs.org/slash/-/slash-4.0.0.tgz", "resolved": "https://registry.npmjs.org/slash/-/slash-4.0.0.tgz",

View File

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

View File

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

Binary file not shown.

Before

Width:  |  Height:  |  Size: 406 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 35 KiB

BIN
src/assets/web3-myth.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 MiB

View File

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

View File

@ -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"> <section id="meme" class="tilted-bgs">
@ -7,30 +7,25 @@ import mulletMeme from "/src/assets/centralized-mullet-meme.png";
<div class="space-y-10"> <div class="space-y-10">
<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"
> >Busting the Web3 Myth: Embracing True Openness</h2>
Busting the Decentralized Web3 Myth
</h2>
<h3 class="font-display text-4xl md:text-6xl font-bold"> <h3 class="font-display text-4xl md:text-6xl font-bold">
The Decentralized Mullet Time to Walk the Talk
</h3> </h3>
<p class="font-body text-xl md:text-3xl text-body"> <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>
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.
</p>
<p class="font-body text-xl md:text-3xl text-body"> <p class="font-body text-xl md:text-3xl text-body">
So consider this a call to action for our community to go back to ethos 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>
and make Web3 <i>real</i>. <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> </p>
</div> </div>
<img <img
src={mulletMeme.src} src={web3myth.src}
class="w-[500px] xl:w-[650px] max-h-[550px] self-center" class="w-[500px] xl:w-[650px] max-h-[550px] self-center"
alt="Web 1" alt="Web 1"
style="padding-bottom: 3em" style="padding-bottom: 3em"

View File

@ -14,11 +14,14 @@
>ownership</b >ownership</b
> over your personal web. > over your personal web.
</p> </p>
<p class="font-body text-xl md:text-3xl text-body">
Join us in shaping tomorrow's digital world. Unite with Web3 and lets connect.
</p>
<div class="pt-10 w-full"> <div class="pt-10 w-full">
<a <a
href="https://web3extension.io" href="https://web3extension.io"
class="text-2xl w-full block text-center md:max-w-[350px] rounded-md bg-primary py-3 px-10 text-black font-body" class="text-2xl w-full block text-center md:max-w-[350px] rounded-md bg-primary py-3 px-10 text-black font-body"
>Download Extension</a >Connect to Web3</a
> >
</div> </div>
</section> </section>

View File

@ -31,6 +31,9 @@ import gfxLeft from "/src/assets/home-gfx-left.png";
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">
Having access to web3 is important so you are in control of what you are able to do.
</p>
<div class="pt-10 w-full"> <div class="pt-10 w-full">
<a <a
href="/what-is-web3" href="/what-is-web3"

View File

@ -12,6 +12,11 @@ import meme4Small from "/src/assets/meme-4-small.png";
<section <section
class="flex flex-col w-full border-y border-dark-aquamarine divide-y divide-dark-aquamarine lg:h-[1200px]" 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 --> <!-- MEME GRID BIG -->
<div <div
class="hidden lg:flex flex-1 flex-row w-full divide-x divide-dark-aquamarine" class="hidden lg:flex flex-1 flex-row w-full divide-x divide-dark-aquamarine"

View File

@ -8,6 +8,11 @@ const features = [
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: "NFT's... Anywhere",
description:
"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: "Access any decentralized or P2P network", title: "Access any decentralized or P2P network",
description: description:

View File

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

View File

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