From aff657358f94a7de2a1711010e1f2455b01a918d Mon Sep 17 00:00:00 2001 From: Luke Annison Date: Wed, 12 Jul 2023 18:32:11 +0100 Subject: [PATCH 1/5] chore: config setup --- app/package-lock.json | 14 +- app/package.json | 2 +- app/src/app/App.tsx | 6 +- app/src/components/atoms/Button/Button.tsx | 18 +- app/src/main.tsx | 44 +- app/src/providers/ArweaveProvider.tsx | 24 +- .../wallet/WalletConnect/WalletConnect.tsx | 16 +- app/vite.config.ts | 38 +- package-lock.json | 5495 ++++++++++++++++- package.json | 3 + 10 files changed, 5573 insertions(+), 87 deletions(-) diff --git a/app/package-lock.json b/app/package-lock.json index 5a1f97b..5343463 100644 --- a/app/package-lock.json +++ b/app/package-lock.json @@ -38,7 +38,7 @@ "eslint-plugin-simple-import-sort": "^10.0.0", "prettier": "^2.8.3", "typescript": "^4.9.3", - "vite": "^4.2.0" + "vite": "^4.3.9" } }, "node_modules/@ampproject/remapping": { @@ -8234,9 +8234,9 @@ "integrity": "sha512-AMqwWZaknLM77G+VPYNZLEruMGWGzyigPK3/Whg99B3S6vGHuqsyl5ZrOv1UUF3paGK1U6PM0cnayioaryg/fA==" }, "node_modules/vite": { - "version": "4.3.4", - "resolved": "https://registry.npmjs.org/vite/-/vite-4.3.4.tgz", - "integrity": "sha512-f90aqGBoxSFxWph2b39ae2uHAxm5jFBBdnfueNxZAT1FTpM13ccFQExCaKbR2xFW5atowjleRniQ7onjJ22QEg==", + "version": "4.3.9", + "resolved": "https://registry.npmjs.org/vite/-/vite-4.3.9.tgz", + "integrity": "sha512-qsTNZjO9NoJNW7KnOrgYwczm0WctJ8m/yqYAMAK9Lxt4SoySUfS5S8ia9K7JHpa3KEeMfyF8LoJ3c5NeBJy6pg==", "dev": true, "dependencies": { "esbuild": "^0.17.5", @@ -14530,9 +14530,9 @@ "integrity": "sha512-AMqwWZaknLM77G+VPYNZLEruMGWGzyigPK3/Whg99B3S6vGHuqsyl5ZrOv1UUF3paGK1U6PM0cnayioaryg/fA==" }, "vite": { - "version": "4.3.4", - "resolved": "https://registry.npmjs.org/vite/-/vite-4.3.4.tgz", - "integrity": "sha512-f90aqGBoxSFxWph2b39ae2uHAxm5jFBBdnfueNxZAT1FTpM13ccFQExCaKbR2xFW5atowjleRniQ7onjJ22QEg==", + "version": "4.3.9", + "resolved": "https://registry.npmjs.org/vite/-/vite-4.3.9.tgz", + "integrity": "sha512-qsTNZjO9NoJNW7KnOrgYwczm0WctJ8m/yqYAMAK9Lxt4SoySUfS5S8ia9K7JHpa3KEeMfyF8LoJ3c5NeBJy6pg==", "dev": true, "requires": { "esbuild": "^0.17.5", diff --git a/app/package.json b/app/package.json index 4ea4e03..8fd0232 100644 --- a/app/package.json +++ b/app/package.json @@ -45,6 +45,6 @@ "eslint-plugin-simple-import-sort": "^10.0.0", "prettier": "^2.8.3", "typescript": "^4.9.3", - "vite": "^4.2.0" + "vite": "^4.3.9" } } diff --git a/app/src/app/App.tsx b/app/src/app/App.tsx index 3c9ccbd..1f6037d 100644 --- a/app/src/app/App.tsx +++ b/app/src/app/App.tsx @@ -1,6 +1,6 @@ -import { DOM } from 'helpers/config'; -import { Header } from 'navigation/header'; -import { Routes } from 'routes'; +import { DOM, WALLET_PERMISSIONS } from "helpers/config"; +import { Header } from "navigation/header"; +import { Routes } from "routes"; export default function App() { return ( diff --git a/app/src/components/atoms/Button/Button.tsx b/app/src/components/atoms/Button/Button.tsx index 2eef5b6..c1d7d80 100644 --- a/app/src/components/atoms/Button/Button.tsx +++ b/app/src/components/atoms/Button/Button.tsx @@ -1,9 +1,9 @@ -import { ReactSVG } from 'react-svg'; +import { ReactSVG } from "react-svg"; -import { language } from 'helpers/language'; +import { language } from "helpers/language"; -import * as S from './styles'; -import { IProps } from './types'; +import * as S from "./styles"; +import { IProps } from "./types"; export default function Button(props: IProps) { const buttonStyle = getType(); @@ -16,25 +16,25 @@ export default function Button(props: IProps) { icon: any; }; switch (props.type) { - case 'alt1': + case "alt1": buttonObj = { wrapper: S.Alt1, icon: S.IconSecondary, }; return buttonObj; - case 'alt2': + case "alt2": buttonObj = { wrapper: S.Alt2, icon: S.IconAlt2, }; return buttonObj; - case 'success': + case "success": buttonObj = { wrapper: S.Success, icon: S.IconAlt2, }; return buttonObj; - case 'warning': + case "warning": buttonObj = { wrapper: S.Warning, icon: S.IconAlt2, @@ -83,7 +83,7 @@ export default function Button(props: IProps) { return ( - - - - - - + + + + + + + + ); diff --git a/app/src/providers/ArweaveProvider.tsx b/app/src/providers/ArweaveProvider.tsx index 2362d88..e8e82e6 100644 --- a/app/src/providers/ArweaveProvider.tsx +++ b/app/src/providers/ArweaveProvider.tsx @@ -1,13 +1,14 @@ -import React from 'react'; -import styled from 'styled-components'; +import React from "react"; +import styled from "styled-components"; -import Account from 'arweave-account'; +import Account from "arweave-account"; -import { Modal } from 'components/molecules/Modal'; -import { AR_WALLETS, WALLET_PERMISSIONS } from 'helpers/config'; -import { getBalanceEndpoint } from 'helpers/endpoints'; -import { language } from 'helpers/language'; -import { STYLING } from 'helpers/styling'; +import { Modal } from "components/molecules/Modal"; +import { AR_WALLETS, WALLET_PERMISSIONS } from "helpers/config"; +import { getBalanceEndpoint } from "helpers/endpoints"; +import { language } from "helpers/language"; +import { STYLING } from "helpers/styling"; +import { useConnection } from "arweave-wallet-kit"; export const WalletListContainer = styled.div` height: 100%; @@ -82,7 +83,7 @@ function WalletList(props: { handleConnect: () => void }) { {AR_WALLETS.map((wallet, index) => ( props.handleConnect()}> - {''} + {""} {wallet.name.charAt(0).toUpperCase() + wallet.name.slice(1)} @@ -94,6 +95,7 @@ function WalletList(props: { handleConnect: () => void }) { export function ArweaveProvider(props: ArweaveProviderProps) { const wallets = AR_WALLETS; + const { connect } = useConnection(); const [walletModalVisible, setWalletModalVisible] = React.useState(false); @@ -141,10 +143,10 @@ export function ArweaveProvider(props: ArweaveProviderProps) { handleWallet(); - window.addEventListener('arweaveWalletLoaded', handleWallet); + window.addEventListener("arweaveWalletLoaded", handleWallet); return () => { - window.removeEventListener('arweaveWalletLoaded', handleWallet); + window.removeEventListener("arweaveWalletLoaded", handleWallet); }; }); diff --git a/app/src/wallet/WalletConnect/WalletConnect.tsx b/app/src/wallet/WalletConnect/WalletConnect.tsx index 7772afb..78e3a98 100644 --- a/app/src/wallet/WalletConnect/WalletConnect.tsx +++ b/app/src/wallet/WalletConnect/WalletConnect.tsx @@ -1,12 +1,12 @@ -import React from 'react'; +import React from "react"; -import { Button } from 'components/atoms/Button'; -import { language } from 'helpers/language'; -import { formatAddress } from 'helpers/utils'; -import { useArweaveProvider } from 'providers/ArweaveProvider'; -import { CloseHandler } from 'wrappers/CloseHandler'; +import { Button } from "components/atoms/Button"; +import { language } from "helpers/language"; +import { formatAddress } from "helpers/utils"; +import { useArweaveProvider } from "providers/ArweaveProvider"; +import { CloseHandler } from "wrappers/CloseHandler"; -import * as S from './styles'; +import * as S from "./styles"; export default function WalletConnect(props: { callback?: () => void }) { const arProvider = useArweaveProvider(); @@ -71,7 +71,7 @@ export default function WalletConnect(props: { callback?: () => void }) { >