Skip to content

Commit 8b51c58

Browse files
raducristianpopaTymmmydragosp1011golobitchdomin191013
authored
feat(wallet/frontend): new design; revamp (#1400)
* chore: update tailwind config (#1397) * Update Tailwind config * Format * fix: Menu improvements (#1393) Menu improvements * feat: add theme switcher (#1398) * Update colors * Add glows * Update config * Add theme switcher * Disable prettier tailwind plugin for now and format * Remove unwanted changes * Add `useIsMounted` hook * Dynamic import for theme switcher * Format * Show theme switcher on mobile * feat: update sidebar and mobile menu (#1399) * Update colors * Add glows * Update config * Update Tailwind config * Update menu and main layout * Add theme switcher * Disable prettier tailwind plugin for now and format * Remove unwanted changes * Add `useIsMounted` hook * Dynamic import for theme switcher * Format * Update logo * Show theme switcher on mobile * Format * Update menus, icons and fix purple color * Refactor * Move logout button to separate component and fix navlink not closing sidebar on click * fix: Update Account details page (#1391) * Update [accountId].tsx * Menu updates * Revert "Menu updates" This reverts commit be4ba69. * fix: Update Grant Badges (#1394) Update Grant Badges * chore: update wallet font (#1401) Update font * feat: update accounts page and related components (#1402) * Remove bubbles and accounts page buttons * Update accounts page * Format homepage * Remove dead code * Remove bubbles from settings page * Fix back button on dark mode * feat: upgrade rafiki to alpha 13 (#1419) * feat: upgrade rafiki to alpha 13 * fix: change RevokeGrantMutationResponse * feat(docker): install and configure kratos * build: fix prod dockerfile for wallet backend * build: fix wallet frontend docker file * fix(kratos): admin url --------- Co-authored-by: golobitch <tadej.golobic@icloud.com> * feat: fix grant message fix when it is NOT withdraw (#1406) * Fix grant message fix when it is NOT withdraw * Fix wallet frontend * Fix wallet grant test * fix format * fix fetch grant types * Change back separation of one click payment, and add universal message for ACCESS to account * Update use-setup-one-click-mutation.ts --------- Co-authored-by: Tymmmy <117268143+Tymmmy@users.noreply.github.com> * fix(docker): dev docker compose + kratos configuration (#1429) * fix(docker): dev docker compose + kratos configuration * feat: upgrade to alpha 14 --------- Co-authored-by: dragosp1011 <dragosh1011@gmail.com> * feat: Add dark & light images to new design (#1425) * Add dark and light images * Play button dark-light * removed styling * feat: update account details page; related components (#1410) * Account details progress and remove exchange/withdraw * Remove exchange page * Progress * Finish account details (normal + WM) * Fix broken layout from previously merged PR * Format * Fix table border on light mode * feat: Table changes for new design (#1436) * Table changes for new design * PR comments fix * feat: update dialogs; parts of ui/form elements (#1432) * Dialogs progress * prettier fix * Updated dialogs * Format & fixes * Fix dialog --------- Co-authored-by: Tymmmy <117268143+Tymmmy@users.noreply.github.com> * feat: update form elements; fix ui components; fix layouts; update send/request (#1437) * Form fields new design * tooltip fixes * Merge fixes * Update Checkbox.tsx * Merge fixes * Fixes: UI, Forms, Pages, Layouts - removed tooltip from transactions since it was causing an overflow * Format --------- Co-authored-by: Radu-Cristian Popa <radu.popa@breakpointit.eu> * fix colors * fix for badges * redo code, to be done on pr * fix: badge update for transfer pages (#1443) Badge update for transfer pages * Update pnpm-lock.yaml * feat: New design transfer pages (#1451) * added badge changes for transfer pages * Quote fixes for payments * feat: New design grants pages (#1452) * Grant list and Grant details changes * update grant interaction * feat: New design setting pages (#1479) * Update Dev Keys * Update DeveloperKeys.tsx * Update tabs * Update pnpm-lock.yaml * feat: New design Auth/KYC pages (#1448) * KYC pages fixes, also some auth page fixes, emails in new design * email images heights * fix layout * fix layouts * PR comments addressed * Some more fixes from PR comments * Colors added * Update pnpm-lock.yaml * fix sidebar menu * feat: test wallet new design onboarding update (#1426) * Onboarding dark-light fixes icons * KYC pages fixes, also some auth page fixes, emails in new design * email images heights * fix layout * fix layouts * Update [accountId].tsx * Color changes * Remove Light Dark svgs- use css colors for currentColor * Onboarding fixes * Some more layout fixes * Update Onboarding.tsx * Update transactions.tsx * Update next for fixes * Update Onboarding.tsx * Developer ley fixes * Fix onboarding for dev keys * Fix for mobile onboarding - send part * Button placement fixes * Update Onboarding.tsx * Update Onboarding.tsx * add request mobile step * Update OnboardingTooltip.tsx * Update SettingsTabs.tsx * small fixes * other fixes * feat: new design readd withdraw button (#1501) add Withdraw back --------- Co-authored-by: Timea <117268143+Tymmmy@users.noreply.github.com> Co-authored-by: dragosp1011 <109967337+dragosp1011@users.noreply.github.com> Co-authored-by: golobitch <tadej.golobic@icloud.com> Co-authored-by: Rico Gonzalez <101926344+rico191013@users.noreply.github.com> Co-authored-by: Tadej Golobic <tadej@interledger.org> Co-authored-by: dragosp1011 <dragosh1011@gmail.com>
1 parent 7b629d8 commit 8b51c58

File tree

150 files changed

+4435
-7186
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

150 files changed

+4435
-7186
lines changed

.prettierrc.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
/** @type {import("prettier").Config} */
2+
// TODO: Re-enable tailwind prettier plugin
23
module.exports = {
34
printWidth: 80,
45
tabWidth: 2,
56
semi: false,
67
singleQuote: true,
78
quoteProps: 'consistent',
89
jsxSingleQuote: false,
9-
trailingComma: 'none',
10-
plugins: ['prettier-plugin-tailwindcss'],
11-
tailwindConfig: './packages/wallet/frontend/tailwind.config.js'
10+
trailingComma: 'none'
1211
}

packages/wallet/backend/src/email/templates/forgotPassword.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,28 +3,28 @@ export const getForgotPasswordEmailTemplate = (url: string): string => {
33
<meta http-equiv="Content-Type" content="text/html charset=UTF-8" />
44
<html lang="en">
55
<head></head>
6-
<body style="background-color:rgb(121, 200, 188);margin:0 auto;font-family:-apple-system, BlinkMacSystemFont, &#x27;Segoe UI&#x27;, &#x27;Roboto&#x27;, &#x27;Oxygen&#x27;, &#x27;Ubuntu&#x27;, &#x27;Cantarell&#x27;, &#x27;Fira Sans&#x27;, &#x27;Droid Sans&#x27;, &#x27;Helvetica Neue&#x27;, sans-serif">
6+
<body style="background-color:#eefee5;margin:0 auto;font-family:-apple-system, BlinkMacSystemFont, &#x27;Segoe UI&#x27;, &#x27;Roboto&#x27;, &#x27;Oxygen&#x27;, &#x27;Ubuntu&#x27;, &#x27;Cantarell&#x27;, &#x27;Fira Sans&#x27;, &#x27;Droid Sans&#x27;, &#x27;Helvetica Neue&#x27;, sans-serif">
77
<table align="center" role="presentation" cellSpacing="0" cellPadding="0" border="0" width="100%" style="max-width:600px;margin:0 auto">
88
<tr style="width:100%">
99
<td>
1010
<table style="margin-top:32px;text-align:center;" align="center" border="0" cellPadding="0" cellSpacing="0" role="presentation" width="100%">
1111
<tbody>
1212
<tr>
13-
<td><a href="https://rafiki.money" target="_blank"><img alt="Interledger Test Wallet" src="https://raw.githubusercontent.com/interledger/testnet/60ca629046f50e3ed47406fa2cb20c6abd34be2f/packages/wallet/backend/src/emailTemplates/images/InterledgerTestnet.png" width="160" height="57" style="outline:none;border:none;text-decoration:none" /></a></td>
13+
<td><a href="https://rafiki.money" target="_blank"><img alt="Interledger Test Wallet" src="https://raw.githubusercontent.com/interledger/testnet/1387-test-wallet-new-design-authkyc-pages/packages/wallet/backend/src/email/templates/images/InterledgerTestWallet.png" width="250" height="80" style="outline:none;border:none;text-decoration:none" /></a></td>
1414
</tr>
1515
</tbody>
1616
</table>
1717
18-
<table style="background:#ffffff;margin:30px 50px 30px 0;padding:23px;text-align:center; border:solid 10px rgb(121, 200, 188);" align="center" border="0" cellPadding="0" cellSpacing="0" role="presentation" width="100%">
18+
<table style="background:#ffffff;margin:30px 50px 30px 0;padding:23px;text-align:center; border:solid 10px #0e7b31;" align="center" border="0" cellPadding="0" cellSpacing="0" role="presentation" width="100%">
1919
<tbody>
2020
<tr>
2121
<td>
22-
<img alt="Test Wallet Password" src="https://raw.githubusercontent.com/interledger/testnet/60ca629046f50e3ed47406fa2cb20c6abd34be2f/packages/wallet/backend/src/emailTemplates/images/KeyBird.png" width="120" height="96" style="outline:none;border:none;text-decoration:none" />
22+
<img alt="Test Wallet Password" src="https://raw.githubusercontent.com/interledger/testnet/1387-test-wallet-new-design-authkyc-pages/packages/wallet/backend/src/email/templates/images/EnvelopeBird.png" width="120" height="96" style="outline:none;border:none;text-decoration:none" />
2323
</td>
2424
</tr>
2525
<tr>
2626
<td>
27-
<h1 style="color:#4CBDBB;font-size:36px;font-weight:500;margin:30px 0;padding:0;line-height:42px">Forgot your password?</h1>
27+
<h1 style="color:#0e7b31;font-size:36px;font-weight:500;margin:30px 0;padding:0;line-height:42px">Forgot your password?</h1>
2828
</td>
2929
</tr>
3030
<tr>
@@ -35,7 +35,7 @@ export const getForgotPasswordEmailTemplate = (url: string): string => {
3535
<tr>
3636
<td>
3737
<a href="${url}" target="_blank">
38-
<span style="background-color:#4CBDBB;border-radius:4px;color:#fff;font-size:15px;text-decoration:none;text-align:center;display:inline-block;width:210px;padding:10px 3px;max-width:100%;line-height:120%;text-transform:none;">Reset password</span>
38+
<span style="background-color:#0e7b31;border-radius:4px;color:#fff;font-size:15px;text-decoration:none;text-align:center;display:inline-block;width:210px;padding:10px 3px;max-width:100%;line-height:120%;text-transform:none;">Reset password</span>
3939
</a>
4040
</td>
4141
</tr>
5.39 KB
Loading
17 KB
Loading
Binary file not shown.
-4.73 KB
Binary file not shown.
-9.94 KB
Loading

packages/wallet/backend/src/email/templates/verifyEmail.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,28 +3,28 @@ export const getVerifyEmailTemplate = (url: string): string => {
33
<meta http-equiv="Content-Type" content="text/html charset=UTF-8" />
44
<html lang="en">
55
<head></head>
6-
<body style="background-color:rgb(121, 200, 188);margin:0 auto;font-family:-apple-system, BlinkMacSystemFont, &#x27;Segoe UI&#x27;, &#x27;Roboto&#x27;, &#x27;Oxygen&#x27;, &#x27;Ubuntu&#x27;, &#x27;Cantarell&#x27;, &#x27;Fira Sans&#x27;, &#x27;Droid Sans&#x27;, &#x27;Helvetica Neue&#x27;, sans-serif">
6+
<body style="background-color:#eefee5;margin:0 auto;font-family:-apple-system, BlinkMacSystemFont, &#x27;Segoe UI&#x27;, &#x27;Roboto&#x27;, &#x27;Oxygen&#x27;, &#x27;Ubuntu&#x27;, &#x27;Cantarell&#x27;, &#x27;Fira Sans&#x27;, &#x27;Droid Sans&#x27;, &#x27;Helvetica Neue&#x27;, sans-serif">
77
<table align="center" role="presentation" cellSpacing="0" cellPadding="0" border="0" width="100%" style="max-width:600px;margin:0 auto">
88
<tr style="width:100%">
99
<td>
1010
<table style="margin-top:32px;text-align:center;" align="center" border="0" cellPadding="0" cellSpacing="0" role="presentation" width="100%">
1111
<tbody>
1212
<tr>
13-
<td><a href="https://rafiki.money" target="_blank"><img alt="Interledger Test Wallet" src="https://raw.githubusercontent.com/interledger/testnet/60ca629046f50e3ed47406fa2cb20c6abd34be2f/packages/wallet/backend/src/emailTemplates/images/InterledgerTestnet.png" width="160" height="57" style="outline:none;border:none;text-decoration:none" /></a></td>
13+
<td><a href="https://rafiki.money" target="_blank"><img alt="Interledger Test Wallet" src="https://raw.githubusercontent.com/interledger/testnet/1387-test-wallet-new-design-authkyc-pages/packages/wallet/backend/src/email/templates/images/InterledgerTestWallet.png" width="250" height="80" style="outline:none;border:none;text-decoration:none" /></a></td>
1414
</tr>
1515
</tbody>
1616
</table>
1717
18-
<table style="background:#ffffff;margin:30px 50px 30px 0;padding:23px;text-align:center; border:solid 10px rgb(121, 200, 188);" align="center" border="0" cellPadding="0" cellSpacing="0" role="presentation" width="100%">
18+
<table style="background:#ffffff;margin:30px 50px 30px 0;padding:23px;text-align:center; border:solid 10px #0e7b31;" align="center" border="0" cellPadding="0" cellSpacing="0" role="presentation" width="100%">
1919
<tbody>
2020
<tr>
2121
<td>
22-
<img alt="Verify Email" src="https://raw.githubusercontent.com/interledger/testnet/136572c9cd3b821392d89e4678d64d492e283265/packages/wallet/backend/src/email/templates/images/Verify.png" width="120" height="140" style="outline:none;border:none;text-decoration:none" />
22+
<img alt="Verify Email" src="https://raw.githubusercontent.com/interledger/testnet/1387-test-wallet-new-design-authkyc-pages/packages/wallet/backend/src/email/templates/images/Verify.png" width="140" height="80" style="outline:none;border:none;text-decoration:none" />
2323
</td>
2424
</tr>
2525
<tr>
2626
<td>
27-
<h1 style="color:#4CBDBB;font-size:36px;font-weight:500;margin:30px 0;padding:0;line-height:42px">Verify your account</h1>
27+
<h1 style="color:#0e7b31;font-size:36px;font-weight:500;margin:30px 0;padding:0;line-height:42px">Verify your account</h1>
2828
</td>
2929
</tr>
3030
<tr>
@@ -35,7 +35,7 @@ export const getVerifyEmailTemplate = (url: string): string => {
3535
<tr>
3636
<td>
3737
<a href="${url}" target="_blank">
38-
<span style="background-color:#4CBDBB;border-radius:4px;color:#fff;font-size:15px;text-decoration:none;text-align:center;display:inline-block;width:210px;padding:10px 3px;max-width:100%;line-height:120%;text-transform:none;">Confirm my email address</span>
38+
<span style="background-color:#0e7b31;border-radius:4px;color:#fff;font-size:15px;text-decoration:none;text-align:center;display:inline-block;width:210px;padding:10px 3px;max-width:100%;line-height:120%;text-transform:none;">Confirm my email address</span>
3939
</a>
4040
</td>
4141
</tr>

packages/wallet/frontend/package.json

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,17 @@
1010
"@headlessui/react": "^1.7.19",
1111
"@hookform/resolvers": "^3.9.0",
1212
"@radix-ui/react-toast": "^1.2.1",
13-
"class-variance-authority": "^0.7.0",
13+
"@radix-ui/react-tooltip": "^1.1.2",
1414
"@wallet/shared": "workspace:*",
15+
"class-variance-authority": "^0.7.0",
1516
"ky": "^1.5.0",
16-
"next": "14.1.1",
17+
"next": "14.2.5",
18+
"next-themes": "^0.3.0",
1719
"nprogress": "^0.2.0",
1820
"react": "18.3.1",
1921
"react-dom": "18.3.1",
2022
"react-hook-form": "^7.52.2",
21-
"react-joyride": "^2.5.4",
23+
"react-joyride": "^2.8.2",
2224
"react-select": "^5.8.0",
2325
"sharp": "^0.33.4",
2426
"socket.io-client": "^4.7.5",
-11.4 KB
Binary file not shown.

0 commit comments

Comments
 (0)