Skip to content

Commit

Permalink
fixes to wallet and roadmap
Browse files Browse the repository at this point in the history
  • Loading branch information
@glasgowm148
glasgowm148 committed Apr 5, 2023
1 parent ed3e051 commit 30e87d8
Show file tree
Hide file tree
Showing 12 changed files with 13,610 additions and 122 deletions.
4 changes: 2 additions & 2 deletions components/ecosystem/Roadmap.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ export default function Roadmap(props: Props) {
tag: 'so_far',
},
{
name: <FormattedMessage defaultMessage="UP NEXT" id="components.roadmap.section2.title" />,
name: <FormattedMessage defaultMessage="IN TESTING" id="components.roadmap.section2.title" />,
tag: 'up_next',
},
{
Expand All @@ -87,7 +87,7 @@ export default function Roadmap(props: Props) {
},
{
name: (
<FormattedMessage defaultMessage="2022 & BEYOND" id="components.roadmap.section3.title" />
<FormattedMessage defaultMessage="2023 & BEYOND" id="components.roadmap.section3.title" />
),
tag: 'this_year',
},
Expand Down
6 changes: 3 additions & 3 deletions components/getErg/GetErgHero.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ const cards = [
url: '/get-erg/#Mining',
},
{
title: <FormattedMessageFixed defaultMessage="Buy it" id="components.getErg.BuyIt.title" />,
title: <FormattedMessageFixed defaultMessage="Exchanges" id="components.getErg.BuyIt.title" />,
text: (
<FormattedMessageFixed
defaultMessage="Available across popular centralized and decentralized exchanges."
Expand All @@ -26,7 +26,7 @@ const cards = [
url: '/get-erg/#Exchanges',
},
{
title: <FormattedMessageFixed defaultMessage="Store it" id="components.getErg.StoreIt.title" />,
title: <FormattedMessageFixed defaultMessage="Wallets" id="components.getErg.StoreIt.title" />,
text: (
<FormattedMessageFixed
defaultMessage="Simple and secure non-custodial wallets to keep your ERG safe."
Expand All @@ -37,7 +37,7 @@ const cards = [
url: '/get-erg/#Wallets',
},
{
title: <FormattedMessageFixed defaultMessage="Use it" id="components.getErg.UseIt.title" />,
title: <FormattedMessageFixed defaultMessage="Ecosystem" id="components.getErg.UseIt.title" />,
text: (
<FormattedMessageFixed
defaultMessage="Put your ERG to use today in our growing ecosystem"
Expand Down
6 changes: 0 additions & 6 deletions components/getErg/Mining.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,6 @@ export default function Mining() {
),
url: 'https://woolypooly.com/#/coin/erg',
},
{
text: (
<FormattedMessageFixed defaultMessage="GETBLOK.IO" id="components.mining.miningPools.5" />
),
url: 'https://ergo.getblok.io/',
},
{
text: <FormattedMessageFixed defaultMessage="2MINERS" id="components.mining.miningPools.6" />,
url: 'https://2miners.com/erg-mining-pool',
Expand Down
175 changes: 72 additions & 103 deletions components/getErg/Wallets.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,45 +57,33 @@ export default function Wallets() {
Wallets
</p>
</div>
<p className="text-[11px] lg:text-[24px] w-1/5 my-auto text-center">Type</p>
<p className="text-[11px] lg:text-[24px] w-1/5 my-auto text-center">Ledger</p>
<p className="text-[11px] lg:text-[24px] w-1/5 my-auto text-center">Feature</p>
<p className="text-[11px] lg:text-[24px] w-1/5 my-auto text-center">Cold Storage</p>
<p className="text-[11px] lg:text-[24px] w-1/5 my-auto text-center">dApp Connector</p>
<p className="text-[11px] lg:text-[24px] w-1/5 my-auto text-center">ErgoPay</p>
</div>
<p className="font-roboto text-[14px] lg:text-[16px] text-[#807e7e] dark:text-[#807e7e]">
<br />
<Button
text="WHAT WALLET IS RIGHT FOR ME?"
url="#"
newTab={false}
underline={true}
textColor="brand-orange"
background={false}
icon="ArrowRight"
iconColor="orange"
customClass=" -ml-4 mb-8"
/>
</p>
<div className="flex flex-row border-x-[1px] border-[#585858] lg:border-0 lg:mt-8">
<div className="py-1 ml-2 text-[10px] lg:text-[16px] text-[#585858] lg:tracking-widest lg:uppercase">
<b>TEAM</b> WALLETS
<b>COMMUNITY</b> FAVOURITES
</div>
<div className="grow">
<div className="grow h-3 lg:h-4 my-auto border-b-[1px] border-[#585858] ml-2"></div>
</div>
</div>

<a
href="https://docs.ergoplatform.com/node/install/"
target="_blank"
rel="noreferrer"
className="flex flex-row h-28 border-x-[1px] border-[#585858] lg:border-0"
>
<div className="w-1/5 p-1 my-auto flex flex-col lg:flex-row lg:justify-start lg:gap-4 lg:ml-4">
<Logo className="w-6 h-6 mx-auto lg:mx-0 lg:w-12 lg:h-12" viewBox="0 0 82 82" />
<p className="text-center mt-2 lg:my-auto">Ergo Node</p>
</div>
<div className="w-1/5 p-1 my-auto">
<WalletDesktop className="w-4 h-4 mx-auto lg:hidden" viewBox="0 0 18 18" />
<p className="text-center mt-2 text-[12px]">Desktop</p>
</div>
<div className="w-1/5 p-1 my-auto">
<WalletX className="w-7 h-7 mx-auto lg:w-11 lg:h-11" viewBox="0 0 44 42" />
</div>
<div className="w-1/5 p-1 my-auto">
<WalletXGray className="w-7 h-7 mx-auto lg:w-11 lg:h-11" viewBox="0 0 44 42" />
</div>
<div className="w-1/5 p-1 my-auto">
<WalletX className="w-7 h-7 mx-auto lg:w-11 lg:h-11" viewBox="0 0 44 42" />
</div>
</a>

<Link href="/ergo-wallet-app">
<a
rel="noreferrer"
Expand All @@ -107,10 +95,10 @@ export default function Wallets() {
</div>
<div className="w-1/5 p-1 my-auto">
<WalletMobile className="w-4 h-4 mx-auto lg:hidden" viewBox="0 0 12 18" />
<p className="text-center mt-2 text-[12px]">Desktop, Mobile</p>
<p className="text-center mt-2 text-[12px]">Best for mobile</p>
</div>
<div className="w-1/5 p-1 my-auto">
<RoadmapInProgress className="w-8 h-8 mx-auto lg:w-12 lg:h-12" viewBox="0 0 33 32" />
<WalletCheck className="w-8 h-8 mx-auto lg:w-12 lg:h-12" viewBox="0 0 33 32" />
</div>
<div className="w-1/5 p-1 my-auto">
<WalletXGray className="w-7 h-7 mx-auto lg:w-11 lg:h-11" viewBox="0 0 44 42" />
Expand All @@ -120,57 +108,50 @@ export default function Wallets() {
</div>
</a>
</Link>

<a
href="https://ergopaperwallet.org/"
href="https://github.com/capt-nemo429/nautilus-wallet"
target="_blank"
rel="noreferrer"
className="flex flex-row h-28 border-x-[1px] border-[#585858] lg:border-0"
>
<div className="w-1/5 p-1 my-auto flex flex-col lg:flex-row lg:justify-start lg:gap-4 lg:ml-4">
<Logo className="w-6 h-6 mx-auto lg:mx-0 lg:w-12 lg:h-12" viewBox="0 0 82 82" />
<p className="text-center lg:my-auto">Paper Wallet</p>
<div className="w-1/5 p-1 my-auto flex flex-col lg:flex-row lg:justify-start lg:gap-4 lg:ml-4 lg:pl-2">
<WalletNautilus
className="w-6 h-6 mx-auto lg:mx-0 lg:w-10 lg:h-10"
viewBox="414.37 258.52 575.6 575.6"
/>
<p className="text-center mt-2 lg:my-auto lg:pl-2">Nautilus</p>
</div>

<div className="w-1/5 p-1 my-auto">
<WalletMobile className="w-4 h-4 mx-auto lg:hidden" viewBox="0 0 12 18" />
<p className="text-center mt-2 text-[12px]">Paper</p>
<WalletWeb className="w-6 h-6 mx-auto lg:hidden" viewBox="0 0 20 20" />
<p className="text-center mt-2 text-[12px]">Best for dApps</p>
</div>
<div className="w-1/5 p-1 my-auto">
<WalletXGray className="w-7 h-7 mx-auto lg:w-11 lg:h-11" viewBox="0 0 44 42" />
<WalletCheck className="w-8 h-8 mx-auto lg:w-12 lg:h-12" viewBox="0 0 33 32" />
</div>
<div className="w-1/5 p-1 my-auto">
<WalletXGray className="w-7 h-7 mx-auto lg:w-11 lg:h-11" viewBox="0 0 44 42" />
<WalletCheck className="w-8 h-8 mx-auto lg:w-12 lg:h-12" viewBox="0 0 33 32" />
</div>
<div className="w-1/5 p-1 my-auto">
<WalletXGray className="w-7 h-7 mx-auto lg:w-11 lg:h-11" viewBox="0 0 44 42" />
<WalletX className="w-7 h-7 mx-auto lg:w-11 lg:h-11" viewBox="0 0 44 42" />
</div>
</a>

<div className="flex flex-row border-x-[1px] border-[#585858] lg:border-0">
<div className="py-1 ml-2 text-[10px] lg:text-[16px] text-[#585858] lg:tracking-widest lg:uppercase">
<b>OTHER</b> WALLETS
</div>
<div className="grow">
<div className="grow h-3 lg:h-4 my-auto border-b-[1px] border-[#585858] ml-2"></div>
</div>
</div>

<a
href="https://github.com/minotaur-ergo/minotaur-wallet"
href="https://satergo.com/"
target="_blank"
rel="noreferrer"
className="flex flex-row h-28 border-x-[1px] border-[#585858] lg:border-0"
>
<div className="w-1/5 p-1 my-auto flex flex-col lg:flex-row lg:justify-start lg:gap-4 lg:ml-4">
<WalletMinotaur
className="w-6 h-6 mx-auto lg:mx-0 lg:w-12 lg:h-12"
viewBox="0 0 1337 1337"
<div className="w-1/5 p-1 my-auto flex flex-col lg:flex-row lg:justify-start lg:gap-4 lg:ml-4 lg:pl-2">
<WalletSatergo
className="w-6 h-6 mx-auto lg:mx-0 lg:w-10 lg:h-10"
viewBox="0 0 1080 1080"
/>
<p className="text-center lg:my-auto">Minotaur</p>
<p className="text-center mt-2 lg:my-auto lg:pl-2">Satergo</p>
</div>
<div className="w-1/5 p-1 my-auto">
<WalletMobile className="w-4 h-4 mx-auto lg:hidden" viewBox="0 0 12 18" />
<p className="text-center mt-2 text-[12px]">Multi Platform</p>
<WalletDesktop className="w-6 h-6 mx-auto lg:hidden" viewBox="0 0 18 18" />
<p className="text-center mt-2 text-[12px]">Desktop</p>
</div>
<div className="w-1/5 p-1 my-auto">
<RoadmapInProgress className="w-8 h-8 mx-auto lg:w-12 lg:h-12" viewBox="0 0 33 32" />
Expand All @@ -179,27 +160,26 @@ export default function Wallets() {
<WalletXGray className="w-7 h-7 mx-auto lg:w-11 lg:h-11" viewBox="0 0 44 42" />
</div>
<div className="w-1/5 p-1 my-auto">
<WalletCheck className="w-8 h-8 mx-auto lg:w-12 lg:h-12" viewBox="0 0 33 32" />
<WalletX className="w-7 h-7 mx-auto lg:w-11 lg:h-11" viewBox="0 0 44 42" />
</div>
</a>

<div className="py-1 ml-2 text-[10px] lg:text-[16px] text-[#585858] lg:tracking-widest lg:uppercase">
<b>EXTRA</b> FEATURES
</div>
<a
href="https://github.com/capt-nemo429/nautilus-wallet"
href="https://github.com/ThierryM1212/SAFEW"
target="_blank"
rel="noreferrer"
className="flex flex-row h-28 border-x-[1px] border-[#585858] lg:border-0"
>
<div className="w-1/5 p-1 my-auto flex flex-col lg:flex-row lg:justify-start lg:gap-4 lg:ml-4 lg:pl-2">
<WalletNautilus
className="w-6 h-6 mx-auto lg:mx-0 lg:w-10 lg:h-10"
viewBox="414.37 258.52 575.6 575.6"
/>
<p className="text-center mt-2 lg:my-auto lg:pl-2">Nautilus</p>
</div>
<WalletSafew className="w-6 h-6 mx-auto lg:mx-0 lg:w-10 lg:h-10" viewBox="0 0 28 28" />

<p className="text-center mt-2 lg:my-auto lg:pl-2">SAFEW</p>
</div>
<div className="w-1/5 p-1 my-auto">
<WalletWeb className="w-6 h-6 mx-auto lg:hidden" viewBox="0 0 20 20" />
<p className="text-center mt-2 text-[12px]">Web</p>
<p className="text-center mt-2 text-[12px]">Developer Tooling</p>
</div>
<div className="w-1/5 p-1 my-auto">
<RoadmapInProgress className="w-8 h-8 mx-auto lg:w-12 lg:h-12" viewBox="0 0 33 32" />
Expand All @@ -208,26 +188,25 @@ export default function Wallets() {
<WalletCheck className="w-8 h-8 mx-auto lg:w-12 lg:h-12" viewBox="0 0 33 32" />
</div>
<div className="w-1/5 p-1 my-auto">
<WalletX className="w-7 h-7 mx-auto lg:w-11 lg:h-11" viewBox="0 0 44 42" />
<WalletCheck className="w-8 h-8 mx-auto lg:w-12 lg:h-12" viewBox="0 0 33 32" />
</div>
</a>

<a
href="https://satergo.com/"
href="https://github.com/minotaur-ergo/minotaur-wallet"
target="_blank"
rel="noreferrer"
className="flex flex-row h-28 border-x-[1px] border-[#585858] lg:border-0"
>
<div className="w-1/5 p-1 my-auto flex flex-col lg:flex-row lg:justify-start lg:gap-4 lg:ml-4 lg:pl-2">
<WalletSatergo
className="w-6 h-6 mx-auto lg:mx-0 lg:w-10 lg:h-10"
viewBox="0 0 1080 1080"
<div className="w-1/5 p-1 my-auto flex flex-col lg:flex-row lg:justify-start lg:gap-4 lg:ml-4">
<WalletMinotaur
className="w-6 h-6 mx-auto lg:mx-0 lg:w-12 lg:h-12"
viewBox="0 0 1337 1337"
/>
<p className="text-center mt-2 lg:my-auto lg:pl-2">Satergo</p>
<p className="text-center lg:my-auto">Minotaur</p>
</div>
<div className="w-1/5 p-1 my-auto">
<WalletDesktop className="w-6 h-6 mx-auto lg:hidden" viewBox="0 0 18 18" />
<p className="text-center mt-2 text-[12px]">Desktop</p>
<WalletMobile className="w-4 h-4 mx-auto lg:hidden" viewBox="0 0 12 18" />
<p className="text-center mt-2 text-[12px]">Multi Platform</p>
</div>
<div className="w-1/5 p-1 my-auto">
<RoadmapInProgress className="w-8 h-8 mx-auto lg:w-12 lg:h-12" viewBox="0 0 33 32" />
Expand All @@ -236,48 +215,38 @@ export default function Wallets() {
<WalletXGray className="w-7 h-7 mx-auto lg:w-11 lg:h-11" viewBox="0 0 44 42" />
</div>
<div className="w-1/5 p-1 my-auto">
<WalletX className="w-7 h-7 mx-auto lg:w-11 lg:h-11" viewBox="0 0 44 42" />
<WalletCheck className="w-8 h-8 mx-auto lg:w-12 lg:h-12" viewBox="0 0 33 32" />
</div>
</a>
<div className="py-1 ml-2 text-[10px] lg:text-[16px] text-[#585858] lg:tracking-widest lg:uppercase">
<b>REFERENCE</b> CLIENT
</div>

<a
href="https://github.com/ThierryM1212/SAFEW"
href="https://docs.ergoplatform.com/node/install/"
target="_blank"
rel="noreferrer"
className="flex flex-row h-28 border-x-[1px] border-[#585858] lg:border-0"
>
<div className="w-1/5 p-1 my-auto flex flex-col lg:flex-row lg:justify-start lg:gap-4 lg:ml-4 lg:pl-2">
<WalletSafew className="w-6 h-6 mx-auto lg:mx-0 lg:w-10 lg:h-10" viewBox="0 0 28 28" />

<p className="text-center mt-2 lg:my-auto lg:pl-2">SAFEW</p>
<div className="w-1/5 p-1 my-auto flex flex-col lg:flex-row lg:justify-start lg:gap-4 lg:ml-4">
<Logo className="w-6 h-6 mx-auto lg:mx-0 lg:w-12 lg:h-12" viewBox="0 0 82 82" />
<p className="text-center mt-2 lg:my-auto">Ergo Node</p>
</div>
<div className="w-1/5 p-1 my-auto">
<WalletWeb className="w-6 h-6 mx-auto lg:hidden" viewBox="0 0 20 20" />
<p className="text-center mt-2 text-[12px]">Web</p>
<WalletDesktop className="w-4 h-4 mx-auto lg:hidden" viewBox="0 0 18 18" />
<p className="text-center mt-2 text-[12px]">Server</p>
</div>
<div className="w-1/5 p-1 my-auto">
<RoadmapInProgress className="w-8 h-8 mx-auto lg:w-12 lg:h-12" viewBox="0 0 33 32" />
<WalletX className="w-7 h-7 mx-auto lg:w-11 lg:h-11" viewBox="0 0 44 42" />
</div>
<div className="w-1/5 p-1 my-auto">
<WalletCheck className="w-8 h-8 mx-auto lg:w-12 lg:h-12" viewBox="0 0 33 32" />
<WalletXGray className="w-7 h-7 mx-auto lg:w-11 lg:h-11" viewBox="0 0 44 42" />
</div>
<div className="w-1/5 p-1 my-auto">
<WalletCheck className="w-8 h-8 mx-auto lg:w-12 lg:h-12" viewBox="0 0 33 32" />
<WalletX className="w-7 h-7 mx-auto lg:w-11 lg:h-11" viewBox="0 0 44 42" />
</div>
</a>
<p className="font-roboto text-[14px] lg:text-[16px] text-[#807e7e] dark:text-[#807e7e]">
<Button
text="EXPLORE TRANSACTIONS WITH THE ERGO EXPLORER"
url="/discover/#Explore"
newTab={false}
underline={true}
textColor="brand-orange"
background={false}
icon="ArrowRight"
iconColor="orange"
customClass=" -ml-4 mb-8"
/>
</p>

<div className="flex felx-row h-16 border-b-[1px] border-x-[1px] border-[#585858] rounded-b-3xl lg:border-0"></div>
</div>
</div>
Expand Down
8 changes: 5 additions & 3 deletions components/home/UsingErg.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@ const cards = [
url: '/get-erg/#Mining',
},
{
title: <FormattedMessageFixed defaultMessage="Buy it" id="components.usingErg.BuyIt.title" />,
title: (
<FormattedMessageFixed defaultMessage="Exchanges" id="components.usingErg.BuyIt.title" />
),
text: (
<FormattedMessageFixed
defaultMessage="Available across popular centralized and decentralized exchanges."
Expand All @@ -27,7 +29,7 @@ const cards = [
},
{
title: (
<FormattedMessageFixed defaultMessage="Store it" id="components.usingErg.StoreIt.title" />
<FormattedMessageFixed defaultMessage="Wallets" id="components.usingErg.StoreIt.title" />
),
text: (
<FormattedMessageFixed
Expand All @@ -39,7 +41,7 @@ const cards = [
url: '/get-erg/#Wallets',
},
{
title: <FormattedMessageFixed defaultMessage="Use it" id="components.getErg.UseIt.title" />,
title: <FormattedMessageFixed defaultMessage="Ecosystem" id="components.getErg.UseIt.title" />,
text: (
<FormattedMessageFixed
defaultMessage="Put your ERG to use today in our growing ecosystem"
Expand Down
4 changes: 2 additions & 2 deletions content/compiled-locales/en.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -622,13 +622,13 @@
"components.roadmap.section2.title": [
{
"type": 0,
"value": "UP NEXT"
"value": "IN TESTING"
}
],
"components.roadmap.section3.title": [
{
"type": 0,
"value": "2022 & BEYOND"
"value": "2023 & BEYOND"
}
],
"components.roadmap.title": [
Expand Down
Loading

0 comments on commit 30e87d8

Please sign in to comment.