Skip to content

Commit

Permalink
Merge pull request 'fix: website now is responsive and has the new de…
Browse files Browse the repository at this point in the history
…sign' (#1) from ditorodev/fix-website into master

Reviewed-on: https://git.lumeweb.com/LumeWeb/lumeweb.com/pulls/1
  • Loading branch information
pcfreak30 committed Aug 12, 2023
2 parents e3a1e48 + 7c48975 commit b7e30f8
Show file tree
Hide file tree
Showing 28 changed files with 377 additions and 463 deletions.
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
"autoprefixer": "^10.4.14",
"qrcode": "^1.5.3",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"sass": "^1.62.1",
"tailwindcss": "^3.3.2",
"typewriter-effect": "^2.19.0"
Expand Down
Binary file added src/assets/centralized-mullet-meme.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/assets/home-gfx-left.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/meme-1-small.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/assets/meme-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/meme-2-small.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/assets/meme-2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/meme-3-small.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/assets/meme-3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/meme-4-small.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/assets/meme-4.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
38 changes: 25 additions & 13 deletions src/components/Home/CTO/CTO.astro
Original file line number Diff line number Diff line change
@@ -1,21 +1,33 @@
---
import './CTO.scss';
import avatar from '/src/assets/cto-avatar.png';
import avatar from "/src/assets/cto-avatar.png";
import abstractBg from "/src/assets/single-brand-bg-1.png";
---

<section id="cto">
<div class="feature-group">
<h2>Community-Powered</h2>
<h3>Building the open, user-owned web you deserve</h3>
<p>
Right now, Lume has only one full-time developer, a few freelancers, and limited helper staff! We need help from developers, fundraisers, funders, and contributors to bring the new internet to the masses.
<section id="cto" class="w-full my-24 flex flex-row">
<div class="flex flex-col mx-10 sm:mx-20 xl:mx-40 lg:max-w-xl gap-y-10">
<h2
class="font-display text-primary font-bold text-xl md:text-2xl uppercase"
>
Community-Powered
</h2>
<h3 class="font-display text-4xl md:text-6xl font-bold">
Building a new world for your data
</h3>
<p class="font-body text-xl md:text-3xl text-body">
Right now, Lume has only one full-time developer and limited helper staff!
We need help from developers, fundraisers, funders, and contributors to
bring the new internet to the masses.
</p>
<div class="bio">
<img src={avatar.src} />
<div>
<strong>Derrick Hammer</strong><br />
CTO
<div class="flex flex-row items-center gap-6">
<img src={avatar.src} class="w-20 h-20" />
<div class="flex flex-col font-body">
<h6 class="text-xl">Derrick Hammer</h6>
<p class="text-lg text-body">CTO</p>
</div>
</div>
</div>
<img
src={abstractBg.src}
class="float-right -z-10 absolute right-0 w-[800px]"
/>
</section>
116 changes: 32 additions & 84 deletions src/components/Home/Meme/Meme.astro
Original file line number Diff line number Diff line change
@@ -1,90 +1,38 @@
---
import './Meme.scss';
import meme1 from '/src/assets/meme-1.png';
import meme2 from '/src/assets/meme-2.png';
import meme3 from '/src/assets/meme-3.png';
import meme4 from '/src/assets/meme-4.png';
import mulletMeme from '/src/assets/mullet-meme.jpg';
import mulletMeme from "/src/assets/centralized-mullet-meme.png";
---

<section id="meme" class="tilted-bg">
<div class="feature-group">
<h2>
Busting the Decentralized Web3 Myth
</h2>
<h3>
The Decentralized Mullet
</h3>
<img src={mulletMeme.src} alt="Web 1" style="padding-bottom: 3em"/>
<p>
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>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>
So consider this a call to action for our community to go back to ethos and make Web3 <i>real</i>
</p>
</div>
<div class="meme-items">
<div class="meme-item">
<div>
<img src={meme1.src} alt="Web 1"/>
<h2>Web1</h2>
</div>
<p>
Web1 is probably best remembered by geeks as chat rooms and IRC (which still exist to this day, but only to power users).
To normal users it was the age of AOL dial-up and similar networks where you got web, email, shopping, and chat all in one place.
</p>
</div>
<div class="meme-item">
<div>
<img src={meme2.src}/>
<h2>Web2</h2>
</div>
<p>
Web2 since evolved with the web browser and we got better gaming, online apps, video streaming and calling and much, much more. However, it also got quickly captured by Silicon Valley and what some refer to as the "tech bros".
<br /><br />
So <i>despite</i> the innovation that occurred, it has turned into a top-down system where only a few geeks/CEO's and their investors control your entire web.
<br /><br />
This also excludes the wider internet infrastructure of domains and ISP's (internet providers and hosting), who also play a part in controlling your web, be it for your "safety", or other reasons.
</p>
</div>
<div class="meme-item">
<div>
<img src={meme3.src}/>
<h2>Crypto &amp; Defi</h2>
</div>
<p>
We get the birth of Bitcoin and all of the innovation that followed. While BTC and a handful of other chains have remained decentralized both in operation, and access, the innovation over time has caused things to re-centralize.
<br /><br />

This is due to several factors including big money coming in, pushing greed, hype, and "FOMO". The invention of several new logos's causing this to only get worse, creating a classic "boom" and "bust". Human nature tends to be greedy, so over time, money overrode principles.

<br /><br />

Many development teams prioritized inventing new ideas and "shipping" them to users, while selling them "tokens" to exit at their expense, all while knowing none of what they created was <i>truly decentralized</i>.
<br /><br />

It became one large crypto casino.
</p>
</div>
<div class="meme-item">
<div>
<img src={meme4.src}/>
<h2>Web3</h2>
</div>
<p>
What to say about Web3? Honestly... upfront it appeared to get used as a new buzz word to replace "DeFi". Terms like "Web3" and "Metaverse" have many different meanings to many people. It is intended to include more than just money and trading, and yet every blockchain-based system that can be labeled "web3" still builds onto of the same centralized crypto/defi infrastructure.

<br /><br />

The end result is an ecosystem that promotes and <b><i>wants</i></b> to be decentralized, but where money overrules ideology, ethos, and principles. This is in part due to who's bankrolling it all, and thus the incentives to build make it more about the money then about freedom.

<br /><br />

There needs to be a balance here between free markets/money and public goods/infra, and so far things are way out of wack and need to be fixed.
</p>
</div>
<div class="flex flex-col-reverse lg:flex-row gap-10 mx-10 sm:mx-20 xl:mx-40">
<div class="space-y-10">
<h2
class="font-display text-primary font-bold text-xl md:text-2xl uppercase"
>
BUSTING THE DECENTERALIZED WEB3 MYTH
</h2>
<h3 class="font-display text-4xl md:text-6xl font-bold">
The Centralized Mullet
</h3>
<p class="font-body text-xl md:text-3xl text-body">
Right now, despite many claims, a majority, if not all, the services
that build the legos of Web3 are actually centralized, both with what
you can see and what you can't.
</p>

<p class="font-body text-xl md:text-3xl text-body">
While some blockchains may be more decentralized than others, access to
nearly every blockchain is also entralized.
</p>
<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
and make Web3 real.
</p>
</div>
<img
src={mulletMeme.src}
class="w-[500px] xl:w-[550px] max-h-[650px] self-center"
alt="Web 1"
style="padding-bottom: 3em"
/>
</div>
</section>
19 changes: 15 additions & 4 deletions src/components/Home/Typewriter/Typewriter.astro
Original file line number Diff line number Diff line change
@@ -1,10 +1,21 @@
---
import './Typewriter.scss';
import TypewriterContent from './TypewriterContent.jsx';
import TypewriterContent from "./TypewriterContent.jsx";
---

<section id="typewriter">
<h1>
<div class="absolute -z-10 -right-[250px] top-[250px] w-[1250px]">
<img
class="object-contain w-[1250px]"
src="/src/assets/video-placeholder.webp"
/>
</div>

<section
id="typewriter"
class="w-full overflow-hidden flex flex-row items-center justify-center"
>
<h1
class="text-7xl md:text-9xl mt-10 mb-10 min-h-[375px] max-w-full px-10 text-center"
>
<TypewriterContent client:load />
</h1>
</section>
24 changes: 0 additions & 24 deletions src/components/Home/Typewriter/Typewriter.scss

This file was deleted.

6 changes: 3 additions & 3 deletions src/components/Home/Typewriter/TypewriterContent.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@ const HeaderContent = () => {
words = randomString.split(' ');

return (
<Typewriter options={{ cursor: '<span class="highlight">_</span>' }} onInit={ (typewriter) => {
<Typewriter options={{ cursor: '<span class="text-primary">_</span>' }} onInit={(typewriter) => {
typewriter
.changeDelay(50)
.typeString(randomString.substring(0, randomString.lastIndexOf(' ')) + ' ')
.start();
typewriter
.typeString('<span class="highlight">' + words[words.length - 1] + '</span>')
} }/>
.typeString('<span class="text-primary">' + words[words.length - 1] + '</span>')
}} />
);
};

Expand Down
36 changes: 22 additions & 14 deletions src/components/Home/Vision/Vision.astro
Original file line number Diff line number Diff line change
@@ -1,15 +1,23 @@
---
import './Vision.scss';
---

<section id="vision">
<div class="feature-group">
<h2>Our Vision</h2>
<h3>Enable an open, censorship-resistant web</h3>
<p>Web3 is the next evolution of the internet that combines many legos from past decades.</p>
<p>Benefits include internet <b>freedom</b>, <b>privacy</b>, and <b>ownership</b> over your personal web.</p>
<div>
<a href="#" class="btn-main">Download Extension</a>
</div>
</div>
<section
id="vision"
class="bg-black/40 p-5 lg:bg-transparent lg:p-0 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">
Our Vision
</h2>
<h3 class="font-display text-4xl md:text-6xl font-bold">
Make Web3 easy for everyone
</h3>
<p class="font-body text-xl md:text-3xl text-body">
Web3 offers freedom of speech, data sovereignty, and privacy. We simplify
Web3 by bridging the gap between the two webs, enabling easy usage without
censorship or backdoors.over your personal web.
</p>
<div class="pt-10 w-full">
<a
href="#"
class="text-2xl w-full block text-center sm:w-auto rounded-md bg-primary py-3 px-10 text-[black] font-body"
>Download Extension</a
>
</div>
</section>
40 changes: 0 additions & 40 deletions src/components/Home/Vision/Vision.scss

This file was deleted.

51 changes: 28 additions & 23 deletions src/components/Home/Web3/Web3.astro
Original file line number Diff line number Diff line change
@@ -1,25 +1,30 @@
---
import './Web3.scss';
---

<section id="web3" class="tilted-bg">
<div class="feature-group">
<h2>
What is the Web?
</h2>
<h3>
Why Web3 matters
</h3>
<p>
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 as "web2".
</p>
<p>
While Web3 can include many decentralized services, it symbolizes the 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 disagree 😉.
</p>
<div>
<a href="/what-is-web3" class="btn-main">Learn More</a>
</div>
<section
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"
>
<div class="flex-1 -ml-10 -mr-20 lg:-ml-40 lg:mr-0">
<img src="/src/assets/home-gfx-left.png" class="w-full" />
</div>
<div class="flex-1 -mt-40 space-y-10 flex flex-col justify-center">
<h2
class="font-display text-primary font-bold text-xl md:text-2xl uppercase"
>
What is the Web?
</h2>
<h3 class="font-display text-4xl md:text-6xl font-bold">
Why Web3 matters
</h3>
<p class="font-body text-xl md:text-3xl text-body">
Web3 gives people control over their data, privacy, and ownership. Lume's
affordable Web3 tech aims to speed up the transition from Web2 to Web3,
which matters for privacy and security.
</p>
<div class="pt-10 w-full">
<a
href="#"
class="text-2xl w-full block text-center sm:w-auto rounded-md bg-primary py-3 px-10 text-[black] font-body"
>Learn More</a
>
</div>
</div>
</section>
Loading

0 comments on commit b7e30f8

Please sign in to comment.