From 08af983adb488e38cd2a06d0a99723691671c5fc Mon Sep 17 00:00:00 2001 From: Giacomo Licari Date: Mon, 25 Mar 2024 14:23:29 +0100 Subject: [PATCH 1/3] add time lock period to info route --- api/api/routes.py | 4 +++- api/api/services/validator.py | 1 - 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/api/api/routes.py b/api/api/routes.py index 4fae7dc..aa1b1c8 100644 --- a/api/api/routes.py +++ b/api/api/routes.py @@ -17,12 +17,14 @@ def status(): @apiv1.route("/info") def info(): enabled_tokens = Token.enabled_tokens() + rate_limit_days = current_app.config['FAUCET_RATE_LIMIT_TIME_LIMIT_SECONDS'] / (24*60*60) enabled_tokens_json = [ { 'address': t.address, 'name': t.name, 'maximumAmount': t.max_amount_day, - 'type': t.type + 'type': t.type, + 'rateLimitDays': round(rate_limit_days, 2) } for t in enabled_tokens ] return jsonify( diff --git a/api/api/services/validator.py b/api/api/services/validator.py index 9c61252..b7342f2 100644 --- a/api/api/services/validator.py +++ b/api/api/services/validator.py @@ -1,5 +1,4 @@ import datetime -import pdb from flask import current_app, request from web3 import Web3 From 83637ecc936ae70be88ea3fb20e2a71011ea722e Mon Sep 17 00:00:00 2001 From: "ilge.ustun" Date: Mon, 25 Mar 2024 15:14:32 +0100 Subject: [PATCH 2/3] add rateLimitDays in UI --- app/src/components/FaucetForm/Faucet.tsx | 9 ++++++--- app/src/components/TokenSelect/TokenSelect.tsx | 11 +++++++---- app/src/utils.ts | 5 +++++ 3 files changed, 18 insertions(+), 7 deletions(-) create mode 100644 app/src/utils.ts diff --git a/app/src/components/FaucetForm/Faucet.tsx b/app/src/components/FaucetForm/Faucet.tsx index 6a9dd74..df891f9 100644 --- a/app/src/components/FaucetForm/Faucet.tsx +++ b/app/src/components/FaucetForm/Faucet.tsx @@ -5,6 +5,7 @@ import axios from "axios" import Captcha from "../Captcha/Captcha" import TokenSelect, { Token } from "../TokenSelect/TokenSelect" import HCaptcha from "@hcaptcha/react-hcaptcha" +import { formatLimit } from "../../utils" interface FaucetProps { enabledTokens: Token[], @@ -45,7 +46,8 @@ function Faucet({ enabledTokens, chainId, setLoading }: FaucetProps): JSX.Elemen setToken({ address: enabledTokens[0].address, name: enabledTokens[0].name, - maximumAmount: Number(enabledTokens[0].maximumAmount) + maximumAmount: Number(enabledTokens[0].maximumAmount), + rateLimitDays: enabledTokens[0].rateLimitDays }) } else { const defaultToken = enabledTokens.find(token => token.address === "0x0000000000000000000000000000000000000000") @@ -53,7 +55,8 @@ function Faucet({ enabledTokens, chainId, setLoading }: FaucetProps): JSX.Elemen setToken({ address: defaultToken.address, name: defaultToken.name, - maximumAmount: Number(defaultToken.maximumAmount) + maximumAmount: Number(defaultToken.maximumAmount), + rateLimitDays: defaultToken.rateLimitDays }) } } @@ -142,7 +145,7 @@ function Faucet({ enabledTokens, chainId, setLoading }: FaucetProps): JSX.Elemen <>
- {token.name} {token.maximumAmount} / day + {token.name} {token.maximumAmount} / {formatLimit(token.rateLimitDays)}
: <> diff --git a/app/src/components/TokenSelect/TokenSelect.tsx b/app/src/components/TokenSelect/TokenSelect.tsx index c4ce424..79e47c2 100644 --- a/app/src/components/TokenSelect/TokenSelect.tsx +++ b/app/src/components/TokenSelect/TokenSelect.tsx @@ -1,10 +1,12 @@ import { Dispatch, SetStateAction } from "react" import Select, { StylesConfig } from "react-select" +import { formatLimit } from "../../utils" export interface Token { address: string name: string - maximumAmount: number + maximumAmount: number, + rateLimitDays: number } interface TokenSelectProps { @@ -14,10 +16,10 @@ interface TokenSelectProps { windowWidth: number } -const formatOptionLabel = ({ name, maximumAmount }: Token) => { +const formatOptionLabel = ({ name, maximumAmount, rateLimitDays }: Token) => { return (
- {name} {maximumAmount} / day + {name} {maximumAmount} / {formatLimit(rateLimitDays)}
) } @@ -33,7 +35,8 @@ function TokenSelect ({ enabledTokens, token, setToken, windowWidth }: TokenSele setToken({ address: option.address, name: option.name, - maximumAmount: Number(enabledTokens[idx].maximumAmount) + maximumAmount: Number(enabledTokens[idx].maximumAmount), + rateLimitDays: option.rateLimitDays }) break } diff --git a/app/src/utils.ts b/app/src/utils.ts new file mode 100644 index 0000000..33eda5b --- /dev/null +++ b/app/src/utils.ts @@ -0,0 +1,5 @@ +export function formatLimit(days: number): string { + if (days === 1) return "day" + if (days === 7) return "week" + return `${String(days)} days` +} From 79abdb026e7bbf1b421924fb6be1714e87b948ee Mon Sep 17 00:00:00 2001 From: "ilge.ustun" Date: Mon, 25 Mar 2024 15:47:22 +0100 Subject: [PATCH 3/3] footer links --- app/src/App.tsx | 5 +++++ app/src/css/App.css | 25 +++++++++++++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/app/src/App.tsx b/app/src/App.tsx index f2c2305..1c6eddd 100644 --- a/app/src/App.tsx +++ b/app/src/App.tsx @@ -68,6 +68,11 @@ function App(): JSX.Element { enabledTokens={enabledTokens} setLoading={setLoading} /> +

Want more{chainId === 100 ? '?' : ' on Gnosis Chain?'}

+ {loading && } diff --git a/app/src/css/App.css b/app/src/css/App.css index 4b54bcb..67530e4 100644 --- a/app/src/css/App.css +++ b/app/src/css/App.css @@ -93,4 +93,29 @@ .title h2 { font-size: 2rem; } +} + +h3 { + /* font-family: "Maxi Round", sans-serif; */ + font-size: 1.6rem; + color: white; + color: #F0EBDE; + font-weight: normal; + margin-top: 3rem; + margin-bottom: 1rem; +} + +ul { + color: white; + font-size: 1rem; + margin-top: 0; + list-style: circle; +} + +li { + padding-bottom: 0.5rem; +} + +li a { + color: white; } \ No newline at end of file