Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: embed testnet faucet in create-fuels template #3036

Merged
merged 4 commits into from
Aug 29, 2024
Merged

feat: embed testnet faucet in create-fuels template #3036

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6b55cd1
feat: embed testnet faucet in `create-fuels` template
Dhaiwat10 Aug 26, 2024
001eba8
fix problems
Dhaiwat10 Aug 28, 2024
94b0f2c
Merge branch 'master' into dp/faucet-iframe
Dhaiwat10 Aug 28, 2024
5c136bb
Merge branch 'master' into dp/faucet-iframe
Dhaiwat10 Aug 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/stupid-books-pull.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"create-fuels": patch
---

feat: embed testnet faucet in `create-fuels` template
79 changes: 49 additions & 30 deletions templates/nextjs/src/app/faucet/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { Button } from "@/components/Button";
import { Input } from "@/components/Input";
import { useActiveWallet } from "@/hooks/useActiveWallet";
import { useFaucet } from "@/hooks/useFaucet";
import { CURRENT_ENVIRONMENT, Environments, TESTNET_FAUCET_LINK } from "@/lib";
import { bn } from "fuels";
import { useEffect, useState } from "react";
import toast from "react-hot-toast";
Expand Down Expand Up @@ -50,36 +51,54 @@ export default function Faucet() {

return (
<>
<h3 className="text-2xl font-semibold">Local Faucet</h3>

<div className="flex gap-4 items-center">
<label htmlFor="receiver-address-input" className="text-gray-400">
Receiving address:
</label>
<Input
className="w-full"
value={receiverAddress}
onChange={(e) => setReceiverAddress(e.target.value)}
placeholder="0x..."
id="receiver-address-input"
/>
</div>

<div className="flex gap-4 items-center">
<label htmlFor="amount-input" className="text-gray-400">
Amount (ETH):
</label>
<Input
className="w-full"
value={amountToSend}
onChange={(e) => setAmountToSend(e.target.value)}
placeholder="5"
type="number"
id="amount-input"
/>
</div>

<Button onClick={sendFunds}>Send Funds</Button>
{CURRENT_ENVIRONMENT === Environments.LOCAL && (
<>
<h3 className="text-2xl font-semibold">Local Faucet</h3>

<div className="flex gap-4 items-center">
<label htmlFor="receiver-address-input" className="text-gray-400">
Receiving address:
</label>
<Input
className="w-full"
value={receiverAddress}
onChange={(e) => setReceiverAddress(e.target.value)}
placeholder="0x..."
id="receiver-address-input"
/>
</div>

<div className="flex gap-4 items-center">
<label htmlFor="amount-input" className="text-gray-400">
Amount (ETH):
</label>
<Input
className="w-full"
value={amountToSend}
onChange={(e) => setAmountToSend(e.target.value)}
placeholder="5"
type="number"
id="amount-input"
/>
</div>

<Button onClick={sendFunds}>Send Funds</Button>
</>
)}

{CURRENT_ENVIRONMENT === Environments.TESTNET && (
<>
<iframe
src={
wallet
? `${TESTNET_FAUCET_LINK}?address=${wallet.address.toB256()}`
: TESTNET_FAUCET_LINK
}
title="faucet"
className="w-full h-screen overflow-scroll"
/>
</>
)}
</>
);
}
18 changes: 5 additions & 13 deletions templates/nextjs/src/components/Layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,11 @@ import { useActiveWallet } from "@/hooks/useActiveWallet";
import { useFaucet } from "@/hooks/useFaucet";
import Head from "next/head";
import { bn } from "fuels";
import { useRouter } from "next/navigation";

export const Layout = ({ children }: { children: React.ReactNode }) => {
const { faucetWallet } = useFaucet();
const router = useRouter();
Dhaiwat10 marked this conversation as resolved.
Show resolved Hide resolved

const {
wallet: browserWallet,
Expand Down Expand Up @@ -49,12 +51,9 @@ export const Layout = ({ children }: { children: React.ReactNode }) => {
return await refreshWalletBalance?.();
}

// If the current environment is testnet, open the testnet faucet link in a new tab
// If the current environment is testnet, open the faucet page
if (CURRENT_ENVIRONMENT === "testnet") {
return window.open(
`${TESTNET_FAUCET_LINK}?address=${wallet.address.toAddress()}`,
"_blank",
);
return router.push("/faucet");
}
};

Expand Down Expand Up @@ -82,14 +81,7 @@ export const Layout = ({ children }: { children: React.ReactNode }) => {
<nav className="flex justify-between items-center p-4 bg-black text-white gap-6">
<Link href="/">Home</Link>

<Link
href={
CURRENT_ENVIRONMENT === "local" ? "/faucet" : TESTNET_FAUCET_LINK
}
target={CURRENT_ENVIRONMENT === "local" ? "_self" : "_blank"}
>
Faucet
</Link>
<Link href="/faucet">Faucet</Link>

{isBrowserWalletConnected && (
<Button onClick={disconnect}>Disconnect Wallet</Button>
Expand Down
23 changes: 9 additions & 14 deletions templates/vite/src/components/Layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,20 @@
import toast, { Toaster } from "react-hot-toast";
import { Link } from "./Link";
import { Button } from "./Button";
import { CURRENT_ENVIRONMENT, NODE_URL, TESTNET_FAUCET_LINK } from "../lib";
import { CURRENT_ENVIRONMENT, NODE_URL } from "../lib";
import { useConnectUI, useDisconnect } from "@fuels/react";
import { WalletDisplay } from "./WalletDisplay";
import { useBrowserWallet } from "../hooks/useBrowserWallet";
import { useActiveWallet } from "../hooks/useActiveWallet";
import { useFaucet } from "../hooks/useFaucet";
import { bn } from "fuels";
import { useRouter } from "@tanstack/react-router";

export const Layout = ({ children }: { children: React.ReactNode }) => {
const { faucetWallet } = useFaucet();

const { navigate } = useRouter();

const {
wallet: browserWallet,
isConnected: isBrowserWalletConnected,
Expand Down Expand Up @@ -48,12 +51,11 @@ export const Layout = ({ children }: { children: React.ReactNode }) => {
return await refreshWalletBalance?.();
}

// If the current environment is testnet, open the testnet faucet link in a new tab
// If the current environment is testnet, open the faucet page
if (CURRENT_ENVIRONMENT === "testnet") {
return window.open(
`${TESTNET_FAUCET_LINK}?address=${wallet.address.toAddress()}`,
"_blank",
);
return navigate({
to: "/faucet",
});
}
};

Expand All @@ -77,14 +79,7 @@ export const Layout = ({ children }: { children: React.ReactNode }) => {
<nav className="flex justify-between items-center p-4 bg-black text-white gap-6">
<Link href="/">Home</Link>

<Link
href={
CURRENT_ENVIRONMENT === "local" ? "/faucet" : TESTNET_FAUCET_LINK
}
target={CURRENT_ENVIRONMENT === "local" ? "_self" : "_blank"}
>
Faucet
</Link>
<Link href="/faucet">Faucet</Link>

{isBrowserWalletConnected && (
<Button onClick={disconnect}>Disconnect Wallet</Button>
Expand Down
79 changes: 49 additions & 30 deletions templates/vite/src/routes/faucet.lazy.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import { useFaucet } from "../hooks/useFaucet";
import { bn } from "fuels";
import { useEffect, useState } from "react";
import toast from "react-hot-toast";
import { CURRENT_ENVIRONMENT, Environments, TESTNET_FAUCET_LINK } from "../lib";

export const Route = createLazyFileRoute("/faucet")({
component: Index,
Expand Down Expand Up @@ -53,36 +54,54 @@ function Index() {

return (
<>
<h3 className="text-2xl font-semibold">Local Faucet</h3>

<div className="flex gap-4 items-center">
<label htmlFor="receiver-address-input" className="text-gray-400">
Receiving address:
</label>
<Input
className="w-full"
value={receiverAddress}
onChange={(e) => setReceiverAddress(e.target.value)}
placeholder="0x..."
id="receiver-address-input"
/>
</div>

<div className="flex gap-4 items-center">
<label htmlFor="amount-input" className="text-gray-400">
Amount (ETH):
</label>
<Input
className="w-full"
value={amountToSend}
onChange={(e) => setAmountToSend(e.target.value)}
placeholder="5"
type="number"
id="amount-input"
/>
</div>

<Button onClick={sendFunds}>Send Funds</Button>
{CURRENT_ENVIRONMENT === Environments.LOCAL && (
<>
<h3 className="text-2xl font-semibold">Local Faucet</h3>

<div className="flex gap-4 items-center">
<label htmlFor="receiver-address-input" className="text-gray-400">
Receiving address:
</label>
<Input
className="w-full"
value={receiverAddress}
onChange={(e) => setReceiverAddress(e.target.value)}
placeholder="0x..."
id="receiver-address-input"
/>
</div>

<div className="flex gap-4 items-center">
<label htmlFor="amount-input" className="text-gray-400">
Amount (ETH):
</label>
<Input
className="w-full"
value={amountToSend}
onChange={(e) => setAmountToSend(e.target.value)}
placeholder="5"
type="number"
id="amount-input"
/>
</div>

<Button onClick={sendFunds}>Send Funds</Button>
</>
)}

{CURRENT_ENVIRONMENT === Environments.TESTNET && (
<>
<iframe
src={
wallet
? `${TESTNET_FAUCET_LINK}?address=${wallet.address.toB256()}`
: TESTNET_FAUCET_LINK
}
title="faucet"
className="w-full h-screen overflow-scroll"
/>
</>
)}
</>
);
}