diff --git a/CHANGELOG.md b/CHANGELOG.md index 87bf18c..2d69b70 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,34 @@ +## [0.2.5-develop.6](https://git.lumeweb.com/LumeWeb/lumeweb.com/compare/v0.2.5-develop.5...v0.2.5-develop.6) (2023-08-15) + + +### Bug Fixes + +* update gitcoin url ([a95e913](https://git.lumeweb.com/LumeWeb/lumeweb.com/commit/a95e91389981afc7efac0398165a3cb184df564b)) + +## [0.2.5-develop.5](https://git.lumeweb.com/LumeWeb/lumeweb.com/compare/v0.2.5-develop.4...v0.2.5-develop.5) (2023-08-15) + + +### Bug Fixes + +* improved hero image ([a07e74f](https://git.lumeweb.com/LumeWeb/lumeweb.com/commit/a07e74f1901b22dc2f502699c8a96a9bda4a8cf3)) + +## [0.2.5-develop.4](https://git.lumeweb.com/LumeWeb/lumeweb.com/compare/v0.2.5-develop.3...v0.2.5-develop.4) (2023-08-15) + + +### Bug Fixes + +* last minute details ([63fb11e](https://git.lumeweb.com/LumeWeb/lumeweb.com/commit/63fb11e1b068a68f21c92343c53b9875e384b2a8)) +* layout shifting and showing overflow ([309d19c](https://git.lumeweb.com/LumeWeb/lumeweb.com/commit/309d19c73aa1a261081000f7396ec090549b3d64)) + +## [0.2.5-develop.3](https://git.lumeweb.com/LumeWeb/lumeweb.com/compare/v0.2.5-develop.2...v0.2.5-develop.3) (2023-08-15) + + +### Bug Fixes + +* wrong color on 'How.astro' Component ([02764ea](https://git.lumeweb.com/LumeWeb/lumeweb.com/commit/02764ea73cc27f0f5165cc10564a2fd6450a5cf4)) + +## [0.2.5-develop.2](https://git.lumeweb.com/LumeWeb/lumeweb.com/compare/v0.2.5-develop.1...v0.2.5-develop.2) (2023-08-15) + ## [0.2.5-develop.1](https://git.lumeweb.com/LumeWeb/lumeweb.com/compare/v0.2.4...v0.2.5-develop.1) (2023-08-15) diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index 55fc176..0eaa819 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -1,12 +1,12 @@ { "name": "@lumeweb/lumeweb.com", - "version": "0.2.5-develop.1", + "version": "0.2.5-develop.6", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@lumeweb/lumeweb.com", - "version": "0.2.5-develop.1", + "version": "0.2.5-develop.6", "dependencies": { "@astrojs/react": "^2.1.1", "@astrojs/tailwind": "^3.1.1", diff --git a/package.json b/package.json index af19c42..9bcc128 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "@lumeweb/lumeweb.com", "type": "module", - "version": "0.2.5-develop.1", + "version": "0.2.5-develop.6", "private": true, "repository": { "type": "git", diff --git a/src/assets/donate-jumbotron-bg.png b/src/assets/donate-jumbotron-bg.png new file mode 100644 index 0000000..c43b572 Binary files /dev/null and b/src/assets/donate-jumbotron-bg.png differ diff --git a/src/assets/main-page-hero.png b/src/assets/main-page-hero.png new file mode 100644 index 0000000..bbb4181 Binary files /dev/null and b/src/assets/main-page-hero.png differ diff --git a/src/assets/main-page-hero@0.5x.png b/src/assets/main-page-hero@0.5x.png new file mode 100644 index 0000000..145e61c Binary files /dev/null and b/src/assets/main-page-hero@0.5x.png differ diff --git a/src/assets/main-page-hero@0.75x.png b/src/assets/main-page-hero@0.75x.png new file mode 100644 index 0000000..38e14c2 Binary files /dev/null and b/src/assets/main-page-hero@0.75x.png differ diff --git a/src/assets/why-bg-2.png b/src/assets/why-bg-2.png new file mode 100644 index 0000000..0377b5f Binary files /dev/null and b/src/assets/why-bg-2.png differ diff --git a/src/components/Donate/How.astro b/src/components/Donate/How.astro new file mode 100644 index 0000000..912387f --- /dev/null +++ b/src/components/Donate/How.astro @@ -0,0 +1,53 @@ +--- +import Button from "../ui/Button.astro"; +import FeaturedGroup from "../ui/FeaturedGroup.astro"; +--- + + + +
+
+
+ +
+
diff --git a/src/components/Donate/How/How.astro b/src/components/Donate/How/How.astro deleted file mode 100644 index c0ffb73..0000000 --- a/src/components/Donate/How/How.astro +++ /dev/null @@ -1,18 +0,0 @@ ---- -import './How.scss'; ---- - -
-
-
-

How should I donate?

-

Donate via Gitcoin during funding rounds

-

- When Gitcoin is doing funding rounds, donating through their website will give a matching bonus of up to - 150%. This means that your donation will have a bigger impact on the project during this time period. -

-
- Gitcoin -
-
-
diff --git a/src/components/Donate/How/How.scss b/src/components/Donate/How/How.scss deleted file mode 100644 index acb703b..0000000 --- a/src/components/Donate/How/How.scss +++ /dev/null @@ -1,50 +0,0 @@ -@import "/src/styles/vars.scss"; - -#how { - position: relative; - display: flex; - flex-direction: column; - justify-content: center; - margin-top: 8em; - padding: 14em 7.5% 16em; - - .custom-bg { - position: absolute; - top: 0; - right: -12.5%; - bottom: 0; - left: -12.5%; - margin: 2% 0; - background: $color-blue-charcoal; - transform: matrix(1, 0.04, -0.04, 1, 0, 0); - z-index: -1; - overflow: hidden; - - &::after { - content: ""; - position: absolute; - top: 3%; - bottom: -9%; - left: 10%; - right: 10%; - background-image: url("/src/assets/donate-gfx-right.png"); - background-position: 100% 100%; - background-repeat: no-repeat; - background-size: contain; - transform: rotate(-2.25deg); - } - } - - .feature-group { - max-width: 64em; - } - - @media screen and (max-width: 80rem) { - p { - background: rgba($color-blue-charcoal, 0.75); - border-radius: 0.5em; - padding: 0.3em 0.5em; - margin: -0.3em -0.5em; - } - } -} diff --git a/src/components/Donate/Jumbotron.astro b/src/components/Donate/Jumbotron.astro new file mode 100644 index 0000000..88b03f0 --- /dev/null +++ b/src/components/Donate/Jumbotron.astro @@ -0,0 +1,18 @@ +--- +import backgroundSrc from "/src/assets/donate-jumbotron-bg.png"; +--- + +
+ +

+ Lume is
people-powered. +

+
diff --git a/src/components/Donate/Jumbotron/Jumbotron.astro b/src/components/Donate/Jumbotron/Jumbotron.astro deleted file mode 100644 index 5a0c0f3..0000000 --- a/src/components/Donate/Jumbotron/Jumbotron.astro +++ /dev/null @@ -1,9 +0,0 @@ ---- -import '../../../styles/jumbotron.scss'; ---- - -
-

- Lume is people-powered. -

-
diff --git a/src/components/Donate/Legal.astro b/src/components/Donate/Legal.astro new file mode 100644 index 0000000..30adf84 --- /dev/null +++ b/src/components/Donate/Legal.astro @@ -0,0 +1,19 @@ + diff --git a/src/components/Donate/Legal/Legal.astro b/src/components/Donate/Legal/Legal.astro deleted file mode 100644 index 4182199..0000000 --- a/src/components/Donate/Legal/Legal.astro +++ /dev/null @@ -1,18 +0,0 @@ ---- -import './Legal.scss'; ---- - - diff --git a/src/components/Donate/Legal/Legal.scss b/src/components/Donate/Legal/Legal.scss deleted file mode 100644 index 1480cdd..0000000 --- a/src/components/Donate/Legal/Legal.scss +++ /dev/null @@ -1,31 +0,0 @@ -@import "/src/styles/mixins.scss"; -@import "/src/styles/vars.scss"; - -#legal { - display: flex; - flex-direction: column; - justify-content: center; - padding: 11em 7.5% 9em; - - h2 { - margin-bottom: 1em; - @include fluid-font-size(2.8125rem); - line-height: 122%; - } - - p { - margin-top: 1.5em; - font-family: $font-family-jaldi; - @include fluid-font-size(1.375rem); - line-height: 157%; - color: $color-cloud; - } - - strong { - @include fluid-font-size(1.625rem); - } - - &::before { - bottom: -12%; - } -} diff --git a/src/components/Donate/Methods/Methods.astro b/src/components/Donate/Methods/Methods.astro index 1695d40..e59909b 100644 --- a/src/components/Donate/Methods/Methods.astro +++ b/src/components/Donate/Methods/Methods.astro @@ -1,150 +1,379 @@ --- -import './Methods.scss'; -import QRCode from 'qrcode'; +import QRCode from "qrcode"; const currencies = []; -const addCurrency = async (id, title, address) => { +const addCurrency = async (id, title, address, mainColor) => { currencies.push({ id: id, title: title, address: address, + mainColor, svgLogo: await import(`./icons/${id}.svg?raw`), - qrSmall: await QRCode.toDataURL(address, { version: 6, scale: 1, margin: 1 }), - qrLarge: await QRCode.toDataURL(address, { version: 6, scale: 7, margin: 2 }) + qrSmall: await QRCode.toDataURL(address, { + version: 6, + scale: 1, + margin: 1, + }), + qrLarge: await QRCode.toDataURL(address, { + version: 6, + scale: 7, + margin: 2, + }), }); }; -await addCurrency('bitcoin', 'Bitcoin (BTC)', 'bc1q9xq2w4w2hjc240rs6mf0g8gpzz3rmcz4h77a2a'); -await addCurrency('litecoin', 'Litecoin (LTC)', 'ltc1qgk6fc4u6grqyhfzw208477ze35vrr5tcwhq8zq'); -await addCurrency('ethereum', 'Ethereum (ETH, USDT/USDC, ERC20)', '0x63cd2C691632720Ff2ABDD0b6AABA2466D3Fe468'); -await addCurrency('polygon', 'Polygon (MATIC)', '0x63cd2C691632720Ff2ABDD0b6AABA2466D3Fe468'); -await addCurrency('solana', 'Solana (SOL)', '4nMRucCuqttipwQXm31vBgoaxDW6o25TnD8fj1imviCu'); -await addCurrency('cardano', 'Cardano (ADA)', 'addr1q9jd69s53pdy9j567a27ac6uvc2966x0rjz2l9sxy4y5w8383jl87mrdf6uuk9ja7lmagm2p4vw30sa42kjylxxrdufqucgst6'); -await addCurrency('siacoin', 'Siacoin (SC)', '7506caa950cdddbaec8f465937b50324e942ac6f5280a053662e58e3cc8bdb543ab88ccd5c23'); -await addCurrency('monero', 'Monero (XMR)', '48A33fSyFo9YAiux3KHKVBagPGvqmcr2h4oy5pufJn6NUWyZsPF6PAufmrET3gLJjsLwxfU7HU9xe8mEeCqtHqvZN3Ly12h'); -await addCurrency('handshake', 'Handshake (HNS)', 'hs1qe67ak3j2u4yrq0qnfs2hmycxqdvaf9v5rjsxzy'); -await addCurrency('cosmos', 'Cosmos (ATOM)', 'cosmos1pvy8zyzqwz2r2jl9j9d3zrfmg6dqc5hyhj6d5z'); -await addCurrency('secret', 'Secret (SCRT)', 'secret18377vc3af588ggauhrpuyfd954lmmu05xqhf0y'); -await addCurrency('algorand', 'Algorand (ALGO)', '3QBE5TZ63TF5W7V2QRJWRB72M7INQLA3RZW4XHD3ISRE7CRYCVNU4EEVAE'); +await addCurrency( + "bitcoin", + "Bitcoin (BTC)", + "bc1q9xq2w4w2hjc240rs6mf0g8gpzz3rmcz4h77a2a", + "#f7931a" +); +await addCurrency( + "litecoin", + "Litecoin (LTC)", + "ltc1qgk6fc4u6grqyhfzw208477ze35vrr5tcwhq8zq", + "#345d9d" +); +await addCurrency( + "ethereum", + "Ethereum (ETH, USDT/USDC, ERC20)", + "0x63cd2C691632720Ff2ABDD0b6AABA2466D3Fe468", + "#8c8c8c" +); +await addCurrency( + "polygon", + "Polygon (MATIC)", + "0x63cd2C691632720Ff2ABDD0b6AABA2466D3Fe468", + "#8247e5" +); +await addCurrency( + "solana", + "Solana (SOL)", + "4nMRucCuqttipwQXm31vBgoaxDW6o25TnD8fj1imviCu", + "#dc1fff" +); +await addCurrency( + "cardano", + "Cardano (ADA)", + "addr1q9jd69s53pdy9j567a27ac6uvc2966x0rjz2l9sxy4y5w8383jl87mrdf6uuk9ja7lmagm2p4vw30sa42kjylxxrdufqucgst6", + "#0033ad" +); +await addCurrency( + "siacoin", + "Siacoin (SC)", + "7506caa950cdddbaec8f465937b50324e942ac6f5280a053662e58e3cc8bdb543ab88ccd5c23", + "#20ee82" +); +await addCurrency( + "monero", + "Monero (XMR)", + "48A33fSyFo9YAiux3KHKVBagPGvqmcr2h4oy5pufJn6NUWyZsPF6PAufmrET3gLJjsLwxfU7HU9xe8mEeCqtHqvZN3Ly12h", + "#f26822" +); +await addCurrency( + "handshake", + "Handshake (HNS)", + "hs1qe67ak3j2u4yrq0qnfs2hmycxqdvaf9v5rjsxzy", + "#fff" +); +await addCurrency( + "cosmos", + "Cosmos (ATOM)", + "cosmos1pvy8zyzqwz2r2jl9j9d3zrfmg6dqc5hyhj6d5z", + "#6f7390" +); +await addCurrency( + "secret", + "Secret (SCRT)", + "secret18377vc3af588ggauhrpuyfd954lmmu05xqhf0y", + "#fff" +); +await addCurrency( + "algorand", + "Algorand (ALGO)", + "3QBE5TZ63TF5W7V2QRJWRB72M7INQLA3RZW4XHD3ISRE7CRYCVNU4EEVAE", + "#fff" +); --- +
-
-

Donate Cryptocurrency

-
- {currencies.map(currency => ( -
-
- -

{currency.title}

- +
+

Donate Cryptocurrency

+
+ { + currencies.map((currency) => ( +
+
+
+ +
+

{currency.title}

+ +
+
+
-
- -
{currency.address}
-
-
- ))} + )) + }
-

Donate Fiat

-
- - - - -
-

- If you are interested in donating through other means, please get in touch with us to discuss. If there is a cryptocurrency you wish to contribute with that we have not listed, please let me know! -

- - +
+

Donate Fiat

+
+ + + + +
+
+

+ If you are interested in donating through other means, please get in touch + with us to discuss. If there is a cryptocurrency you wish to contribute with + that we have not listed, please let me know! +

+ + + + diff --git a/src/components/Donate/Methods/Methods.scss b/src/components/Donate/Methods/Methods.scss deleted file mode 100644 index 19fc7ab..0000000 --- a/src/components/Donate/Methods/Methods.scss +++ /dev/null @@ -1,291 +0,0 @@ -@import "/src/styles/mixins.scss"; -@import "/src/styles/vars.scss"; - -#methods { - display: flex; - flex-direction: column; - justify-content: center; - margin: 2em 7.5% 6em; - padding-top: 3em; - font-family: $font-family-jaldi; - - h2 { - margin: 1.25em 0 1em; - @include fluid-font-size(2.8125rem); - line-height: 122%; - - &:first-child { - margin-top: 0; - } - } - - .method-grid { - display: grid; - grid-template-columns: repeat(1, 1fr); - gap: 2em; - margin-bottom: 4em; - - @media screen and (min-width: 48rem) { - grid-template-columns: repeat(2, 1fr); - } - - > div { - display: flex; - flex-direction: column; - padding: 4em 4em 1em; - background: $color-blue-charcoal; - border: 0.1em solid transparent; - border-radius: 1em; - transition: border-color 200ms; - - &:hover { - border-color: $color-aquamarine; - } - - > div:first-child { - display: flex; - align-items: center; - gap: 2em; - margin-bottom: 3em; - - svg { - flex-shrink: 0; - @include fluid-max-width-height(3.4375rem, 3.4375rem); - } - - h3 { - flex-grow: 1; - font-family: $font-family-jetbrains-mono; - @include fluid-font-size(1.5rem); - } - - img { - @include fluid-width-height(3.4375rem, 3.4375rem); - image-rendering: pixelated; - cursor: zoom-in; - } - } - } - - .address { - display: flex; - margin-bottom: 3em; - color: $color-cloud; - - div { - order: 1; - flex-grow: 1; - position: relative; - @include fluid-font-size(1.375rem); - word-break: break-all; - user-select: all; - } - - button { - order: 2; - flex-shrink: 0; - @include fluid-width-height(1.875rem, 1.875rem); - @include fluid-margin-lr-rem(0.78125rem); - mask-image: url('data:image/svg+xml,'); - background: $color-cloud; - transition: background $transition-duration; - - &:hover { - background: $color-white; - } - - &.success { - mask-image: url('data:image/svg+xml,'); - background: $color-aquamarine; - } - } - - button:hover + div, button.success + div { - &::before { - content: ""; - position: absolute; - inset: -0.5em; - padding: 0.5em; - background: $color-blue-charcoal; - animation: $transition-duration overlay-opacity forwards; - } - - &::after { - content: "Copy to Clipboard"; - position: absolute; - top: 0; - right: -0.5em; - padding: 0 0.5em; - background: rgba($color-blue-charcoal, 0.75); - text-align: center; - white-space: nowrap; - color: $color-white; - border-radius: 0.5em 0 0 0.5em; - animation: $transition-duration hint-opacity forwards; - transition: color $transition-duration; - } - } - - button.success + div { - &::after { - content: "Copied to Clipboard"; - color: $color-aquamarine; - } - } - } - } - - p { - margin-top: 1em; - @include fluid-font-size(1.25rem); - font-style: italic; - line-height: 157%; - color: $color-cloud; - } - - .btn-main { - @include fluid-font-size(1.5rem); - } - - #donate-bitcoin:hover { - border-color: #f7931a; - } - - #donate-litecoin:hover { - border-color: #345d9d; - } - - #donate-ethereum:hover { - border-color: #8c8c8c; - } - - #donate-polygon:hover { - border-color: #8247e5; - } - - #donate-solana:hover { - border-color: #dc1fff; - } - - #donate-cardano:hover { - border-color: #0033ad; - } - - #donate-siacoin:hover { - border-color: #20ee82; - } - - #donate-monero:hover { - border-color: #f26822; - } - - #donate-handshake:hover { - border-color: #fff; - } - - #donate-cosmos:hover { - border-color: #6f7390; - } - - #donate-secret:hover { - border-color: #fff; - } - - #donate-algorand:hover { - border-color: #fff; - } - - #donate-paypal { - &:hover { - border-color: #0070e0; - } - - .btn-main { - color: #fff; - background: #0070e0; - border-color: #0070e0; - - &:hover { - background: inherit; - } - } - } - - #donate-patreon { - &:hover { - border-color: #ff424d; - } - - .btn-main { - color: #fff; - background: #ff424d; - border-color: #ff424d; - - &:hover { - background: inherit; - } - } - } - - #donate-liberapay { - &:hover { - border-color: #f6c915; - } - - .btn-main { - color: #000; - background: #f6c915; - border-color: #f6c915; - - &:hover { - color: inherit; - background: inherit; - } - } - } - - #donate-github { - &:hover { - border-color: #fff; - } - - .btn-main { - color: #000; - background: #fff; - border-color: #fff; - - &:hover { - color: inherit; - background: inherit; - } - } - } -} - -#qr-dialog { - padding: 0; - - &::backdrop { - background: rgba($color-black, 0.85); - } -} - -@keyframes overlay-opacity { - 0% { - opacity: 0; - } - - 100% { - opacity: 0.75; - } -} - -@keyframes hint-opacity { - 0% { - opacity: 0; - } - - 100% { - opacity: 1; - } -} diff --git a/src/components/Donate/Why.astro b/src/components/Donate/Why.astro new file mode 100644 index 0000000..d8164e6 --- /dev/null +++ b/src/components/Donate/Why.astro @@ -0,0 +1,33 @@ +--- +import Button from "../ui/Button.astro"; +import FeaturedGroup from "../ui/FeaturedGroup.astro"; +import backgroud from "/src/assets/why-bg-2.png"; +--- + +
+ +
+ +
  • You believe the internet should be free and open for everyone, regardless of political beliefs.
  • +
  • You want a neutral web accessible to everyday people.
  • +
  • You believe your data should be private and secure unless you choose to share it.
  • +
  • You want to ensure that you or someone else can’t be censored or “de-platformed.”
  • +
  • You think people should have free access to information no matter how they choose to access it.
  • +
  • You believe in handling web abuse using legal and social means instead of censorship and restriction.
  • + `, + `Every single day you use the Internet, your data is sold to companies to pay for your usage. Help us break the pattern by funding the creation of free and open-source Web3 tools.`, + ]} + /> +
    +
    diff --git a/src/components/Donate/Why/Why.astro b/src/components/Donate/Why/Why.astro deleted file mode 100644 index ef37440..0000000 --- a/src/components/Donate/Why/Why.astro +++ /dev/null @@ -1,24 +0,0 @@ ---- -import './Why.scss'; ---- - -
    -
    -

    Help us break the pattern

    -

    Why should I donate to Lume?

    - -

    - Every single day you use the Internet, your data is sold to companies to pay for your usage. Help us break the pattern by funding the creation of free and open-source Web3 tools. -

    -
    - Donate -
    -
    -
    diff --git a/src/components/Donate/Why/Why.scss b/src/components/Donate/Why/Why.scss deleted file mode 100644 index 6453b96..0000000 --- a/src/components/Donate/Why/Why.scss +++ /dev/null @@ -1,50 +0,0 @@ -@import "/src/styles/vars.scss"; - -#why { - position: relative; - display: flex; - justify-content: flex-end; - align-items: center; - max-width: 185.6em; - min-height: 58.8em; - margin: 0 auto; - - &::before { - content: ""; - position: absolute; - top: 0; - bottom: 0; - left: min(0em, calc((100% - 92.2em) / 2)); - width: calc(100% - 64em - 7.5%); - min-width: 92.2em; - background-image: url("/src/assets/single-brand-bg-2.png"); - background-position: 50% 0; - background-repeat: no-repeat; - background-size: contain; - z-index: -1; - } - - .feature-group { - box-sizing: content-box; - margin: 2em 7.5%; - max-width: 64em; - } - - @media screen and (max-width: 80rem) { - ul, p { - background: rgba($color-blue-charcoal-2, 0.75); - } - - ul { - border-radius: 0.5em 0.5em 0 0; - padding: 0.3em 0.5em 0.3em 1.5em; - margin: -0.3em -0.5em 0.28em; - } - - p { - border-radius: 0 0 0.5em 0.5em; - padding: 0.3em 0.5em; - margin: -0.3em -0.5em; - } - } -} diff --git a/src/components/Home/CTO/CTO.astro b/src/components/Home/CTO.astro similarity index 100% rename from src/components/Home/CTO/CTO.astro rename to src/components/Home/CTO.astro diff --git a/src/components/Home/Meme/Meme.astro b/src/components/Home/Meme.astro similarity index 100% rename from src/components/Home/Meme/Meme.astro rename to src/components/Home/Meme.astro diff --git a/src/components/Home/Message/Message.astro b/src/components/Home/Message.astro similarity index 100% rename from src/components/Home/Message/Message.astro rename to src/components/Home/Message.astro diff --git a/src/components/Home/PoweredBy/PoweredBy.astro b/src/components/Home/PoweredBy.astro similarity index 100% rename from src/components/Home/PoweredBy/PoweredBy.astro rename to src/components/Home/PoweredBy.astro diff --git a/src/components/Home/Socials/Socials.astro b/src/components/Home/Socials.astro similarity index 100% rename from src/components/Home/Socials/Socials.astro rename to src/components/Home/Socials.astro diff --git a/src/components/Home/Socials/Socials.scss b/src/components/Home/Socials/Socials.scss deleted file mode 100644 index c0223eb..0000000 --- a/src/components/Home/Socials/Socials.scss +++ /dev/null @@ -1,50 +0,0 @@ -@import "/src/styles/mixins.scss"; -@import "/src/styles/vars.scss"; - -#socials { - display: flex; - flex-direction: column; - align-items: center; - justify-content: center; - gap: 3em; - margin: 12em 7.5% 8em; - - div { - display: flex; - align-items: center; - gap: 2.5em; - } - - h2 { - @include fluid-font-size(1.5625rem); - font-weight: 700; - line-height: 100%; - text-transform: uppercase; - color: $color-aquamarine; - } - - a { - padding: 0.5em; - color: $color-alto; - - &:hover { - color: $color-white; - } - } - - .github-logo svg { - @include fluid-width(3.5rem); - } - - .git-logo svg { - @include fluid-width(3.5rem); - } - - .discord-logo svg { - @include fluid-width(3.5rem); - } - - .twitter-logo svg { - @include fluid-width(3.5rem); - } -} diff --git a/src/components/Home/Vision/Vision.astro b/src/components/Home/Vision.astro similarity index 100% rename from src/components/Home/Vision/Vision.astro rename to src/components/Home/Vision.astro diff --git a/src/components/Home/Web3/Web3.astro b/src/components/Home/Web3.astro similarity index 96% rename from src/components/Home/Web3/Web3.astro rename to src/components/Home/Web3.astro index bac4169..8bc82c5 100644 --- a/src/components/Home/Web3/Web3.astro +++ b/src/components/Home/Web3.astro @@ -1,5 +1,5 @@ --- -import gfxLeft from "../../../assets/home-gfx-left.png"; +import gfxLeft from "/src/assets/home-gfx-left.png"; ---
    +
    +

    + Join our community, lend a hand. +

    +

    + Web3 gives people control over their data, privacy, and ownership. +

    +
    +
    + + + + + + + + + + + + + + + +
    +
    diff --git a/src/components/Layout/JoinCommunity/JoinCommunity.astro b/src/components/Layout/JoinCommunity/JoinCommunity.astro deleted file mode 100644 index 4b05f99..0000000 --- a/src/components/Layout/JoinCommunity/JoinCommunity.astro +++ /dev/null @@ -1,39 +0,0 @@ ---- -import './JoinCommunity.scss'; - -import svgGit from '/src/assets/icons/git.svg?raw'; -import svgGithub from '/src/assets/icons/github.svg?raw'; -import svgDiscord from '/src/assets/icons/discord.svg?raw'; -import svgTwitter from '/src/assets/icons/twitter.svg?raw'; ---- - -
    -
    -

    - Join our community, lend a hand. -

    -

    - Web3 gives people control over their data, privacy, and ownership. -

    -
    -
    - -
    -
    - -
    -
    - -
    -
    - -
    -
    diff --git a/src/components/Layout/JoinCommunity/JoinCommunity.scss b/src/components/Layout/JoinCommunity/JoinCommunity.scss deleted file mode 100644 index 63603e7..0000000 --- a/src/components/Layout/JoinCommunity/JoinCommunity.scss +++ /dev/null @@ -1,80 +0,0 @@ -@import "/src/styles/mixins.scss"; -@import "/src/styles/vars.scss"; - -#join-community { - display: flex; - align-items: center; - justify-content: space-between; - gap: 2em; - padding: 5em 7.5%; - background: $color-aquamarine; - color: $color-blue-charcoal-2; - @include fluid-font-size(0.625rem); - - div { - flex-grow: 1; - - &:first-child { - flex-grow: 10; - } - - &:last-child { - flex-grow: 0; - } - } - - @media screen and (max-width: 56rem) { - flex-wrap: wrap; - justify-content: center; - - div:first-child { - flex-basis: 100%; - margin-bottom: 2em; - text-align: center; - } - - div { - flex-grow: 0; - } - } - - h2 { - margin-bottom: 0.25em; - @include fluid-font-size(2rem); - font-weight: 700; - line-height: 153%; - text-transform: none; - color: inherit; - } - - p { - font-family: $font-family-jaldi; - @include fluid-font-size(1.5rem); - line-height: 157%; - } - - a { - display: block; - color: #0B3F48; - - &:hover { - color: inherit; - } - } - - .github-logo svg { - @include fluid-width(3.625rem); - } - - .git-logo svg { - @include fluid-width(3.625rem); - } - - .discord-logo svg { - @include fluid-width(3.625rem); - } - - .twitter-logo svg { - @include fluid-width(3.625rem); - } -} diff --git a/src/components/Layout/Navbar/Navbar.astro b/src/components/Layout/Navbar.astro similarity index 98% rename from src/components/Layout/Navbar/Navbar.astro rename to src/components/Layout/Navbar.astro index 16ef1cc..38f4252 100644 --- a/src/components/Layout/Navbar/Navbar.astro +++ b/src/components/Layout/Navbar.astro @@ -1,5 +1,5 @@ --- -import logo from "../../../assets/lume-logo.png"; +import logo from "/src/assets/lume-logo.png"; const { view } = Astro.props; function getActiveClass(linkView) { diff --git a/src/components/Vision/Grid/Grid.astro b/src/components/Vision/Grid.astro similarity index 93% rename from src/components/Vision/Grid/Grid.astro rename to src/components/Vision/Grid.astro index 916ed79..7403e86 100644 --- a/src/components/Vision/Grid/Grid.astro +++ b/src/components/Vision/Grid.astro @@ -1,6 +1,6 @@ --- -import GridCell from "../../ui/GridCell.astro"; -import GridContainer from "../../ui/GridContainer.astro"; +import GridCell from "../ui/GridCell.astro"; +import GridContainer from "../ui/GridContainer.astro"; const features = [ { diff --git a/src/components/Vision/Grid/Grid.scss b/src/components/Vision/Grid/Grid.scss deleted file mode 100644 index d6e5532..0000000 --- a/src/components/Vision/Grid/Grid.scss +++ /dev/null @@ -1,20 +0,0 @@ -@import "/src/styles/mixins.scss"; -@import "/src/styles/vars.scss"; - -#grid { - padding-top: 2.05em; - padding-bottom: 2.05em; - - div:first-child { - background: inherit; - border: none - } - - h2 { - font-family: $font-family-jetbrains-mono; - @include fluid-font-size(2.75rem); - font-weight: 700; - line-height: 129.55%; - color: $color-aquamarine; - } -} diff --git a/src/components/Vision/Jumbotron/Jumbotron.astro b/src/components/Vision/Jumbotron.astro similarity index 78% rename from src/components/Vision/Jumbotron/Jumbotron.astro rename to src/components/Vision/Jumbotron.astro index c8aad7f..230b88a 100644 --- a/src/components/Vision/Jumbotron/Jumbotron.astro +++ b/src/components/Vision/Jumbotron.astro @@ -10,7 +10,9 @@ import backgroundSrc from "/src/assets/vision-jumbotron-bg.png"; src={backgroundSrc.src} class="-z-10 absolute top-[10px] left-1/2 -translate-x-1/2 w-[100em] max-w-none" /> -

    +

    Easy access to an open, user-owned web.

    diff --git a/src/components/Vision/NoVc/NoVc.astro b/src/components/Vision/NoVc.astro similarity index 93% rename from src/components/Vision/NoVc/NoVc.astro rename to src/components/Vision/NoVc.astro index 84f5aa4..82a7d34 100644 --- a/src/components/Vision/NoVc/NoVc.astro +++ b/src/components/Vision/NoVc.astro @@ -1,6 +1,6 @@ --- -import Button from "../../ui/Button.astro"; -import FeaturedGroup from "../../ui/FeaturedGroup.astro"; +import Button from "../ui/Button.astro"; +import FeaturedGroup from "../ui/FeaturedGroup.astro"; import background from "/src/assets/double-brand-bg.png"; --- diff --git a/src/components/Vision/NoVc/NoVc.scss b/src/components/Vision/NoVc/NoVc.scss deleted file mode 100644 index 1b96f28..0000000 --- a/src/components/Vision/NoVc/NoVc.scss +++ /dev/null @@ -1,45 +0,0 @@ -@import "/src/styles/vars.scss"; - -#no-vc { - position: relative; - display: flex; - justify-content: flex-end; - align-items: center; - max-width: 185.6em; - min-height: 78.4em; - margin: 0 auto; - - &::before { - content: ""; - position: absolute; - top: 0; - bottom: 0; - left: min(0em, calc((100% - 95em) / 2)); - width: calc(100% - 64em - 7.5%); - min-width: 95em; - background-image: url("/src/assets/double-brand-bg.png"); - background-position: 50% 100%; - background-repeat: no-repeat; - background-size: contain; - z-index: -1; - } - - .feature-group { - box-sizing: content-box; - padding: 9em 7.5%; - max-width: 64em; - } - - @media screen and (max-width: 80rem) { - p { - background: rgba($color-blue-charcoal-2, 0.75); - border-radius: 0.5em; - padding: 0.3em 0.5em; - margin: -0.3em -0.5em; - } - - p + p { - margin-top: 0.48em; - } - } -} diff --git a/src/components/Vision/Unify/Unify.astro b/src/components/Vision/Unify.astro similarity index 94% rename from src/components/Vision/Unify/Unify.astro rename to src/components/Vision/Unify.astro index ba50abb..67821a5 100644 --- a/src/components/Vision/Unify/Unify.astro +++ b/src/components/Vision/Unify.astro @@ -1,6 +1,6 @@ --- import unifyBg from "/src/assets/unifying-bg.png"; -import FeaturedGroup from "../../ui/FeaturedGroup.astro"; +import FeaturedGroup from "../ui/FeaturedGroup.astro"; ---
    -

    +

    An evolved, user-owned web where you have access to the world in a way only you control.

    diff --git a/src/components/What/NewWorld/NewWorld.astro b/src/components/What/NewWorld.astro similarity index 80% rename from src/components/What/NewWorld/NewWorld.astro rename to src/components/What/NewWorld.astro index 5e5b473..1f40d98 100644 --- a/src/components/What/NewWorld/NewWorld.astro +++ b/src/components/What/NewWorld.astro @@ -1,9 +1,12 @@ --- -import FeaturedGroup from "../../ui/FeaturedGroup.astro"; +import FeaturedGroup from "../ui/FeaturedGroup.astro"; import backgroundSrc from "/src/assets/new-world-bg.png"; --- -
    +
    diff --git a/src/components/ui/Button.astro b/src/components/ui/Button.astro index f27ee01..f97788d 100644 --- a/src/components/ui/Button.astro +++ b/src/components/ui/Button.astro @@ -1,16 +1,27 @@ --- export interface Props { label: string; - href: string; + href?: string; + type?: "submit" | "button"; + color?: string; + class?: string; } -const { label, href } = Astro.props; +const { label, class: customClass, type, color, href } = Astro.props; +const className = `text-2xl w-full block text-center md:max-w-[350px] rounded-md text-black font-body bg-${ + color ?? "primary" +} hover:ring-2 ring-${ + color ?? "primary" +} hover:bg-transparent hover:text-white transition-[background-color] duration-150`; --- -
    - {label} -
    + diff --git a/src/components/ui/FeaturedGroup.astro b/src/components/ui/FeaturedGroup.astro index 6331902..d10ce95 100644 --- a/src/components/ui/FeaturedGroup.astro +++ b/src/components/ui/FeaturedGroup.astro @@ -20,7 +20,7 @@ const { title, subtitle, text } = Astro.props; { text.map((paragraph) => ( -

    +

    )) diff --git a/src/layouts/Layout.astro b/src/layouts/Layout.astro index 78e4087..fd31d86 100644 --- a/src/layouts/Layout.astro +++ b/src/layouts/Layout.astro @@ -1,78 +1,75 @@ --- import "../styles/global.scss"; import opengraph from "/src/assets/opengraph.png"; -import Navbar from "../components/Layout/Navbar/Navbar.astro"; -import Footer from "../components/Layout/Footer/Footer.astro"; -import JoinCommunity from "../components/Layout/JoinCommunity/JoinCommunity.astro"; +import Navbar from "../components/Layout/Navbar.astro"; +import Footer from "../components/Layout/Footer.astro"; +import JoinCommunity from "../components/Layout/JoinCommunity.astro"; export interface Props { - view: string; - title: string; + view: string; + title: string; } -const {view, title} = Astro.props; -const description = "A platform, network and experience that allows you to control and own your online web, and access all of the possibilities Web3 has to offer. Join the open web."; +const { view, title } = Astro.props; +const description = + "A platform, network and experience that allows you to control and own your online web, and access all of the possibilities Web3 has to offer. Join the open web."; const url = "https://lumeweb.com"; --- - + {title} - + + - - - - - - + + + + + - - - - - + + + + + - - - -
    - -
    -{view !== "home" && - } -