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

Add dark theme to web3 modal #316

Merged
merged 18 commits into from
Sep 28, 2024
Merged

Add dark theme to web3 modal #316

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
f0fbc56
update with new install
amochuko Aug 27, 2024
6065c23
add dark theme to web3 modal
amochuko Aug 27, 2024
60d04de
remove border
amochuko Aug 27, 2024
f2c4f0c
Update ui/components/Layout.tsx
amochuko Aug 28, 2024
3ae177b
Update ui/components/Layout.tsx
amochuko Aug 28, 2024
7857727
remove duplicate class
amochuko Aug 28, 2024
91f4cb7
remove border
amochuko Aug 28, 2024
b8e3f06
Update ui/components/Layout.tsx
amochuko Sep 2, 2024
06d7d22
Update ui/components/Layout.tsx
amochuko Sep 2, 2024
edadb3b
Update ui/components/Layout.tsx
amochuko Sep 2, 2024
a8f3d3f
Merge branch 'main' of https://github.com/amochuko/citizen-app into a…
amochuko Sep 2, 2024
e990ea5
Revert "Merge branch 'main' of https://github.com/amochuko/citizen-ap…
amochuko Sep 2, 2024
17aad03
chore(deps): bump jest and @types/jest in /ui
dependabot[bot] Sep 2, 2024
694f4b9
Merge pull request #320 from nation3/dependabot/npm_and_yarn/ui/multi…
aahna-ashina Sep 5, 2024
5cbdf27
chore(deps): bump next from 14.2.7 to 14.2.13 in /ui
dependabot[bot] Sep 20, 2024
cbff3ce
Merge pull request #326 from nation3/dependabot/npm_and_yarn/ui/next-…
aahna-ashina Sep 21, 2024
470f732
Merge branch 'add-dark-theme-to-modal' into main-two to resolve confl…
amochuko Sep 23, 2024
3994bdf
fix: add mb-0.5 for visuals
amochuko Sep 23, 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
39 changes: 27 additions & 12 deletions ui/components/Layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,25 @@
import {
ArrowRightOnRectangleIcon,
ArrowTopRightOnSquareIcon,
BanknotesIcon,
Bars3Icon,
ChevronDownIcon,
ChevronRightIcon,
CurrencyDollarIcon,
ArrowTopRightOnSquareIcon,
HomeIcon,
KeyIcon,
LockClosedIcon,
ArrowRightOnRectangleIcon,
Bars3Icon,
NewspaperIcon,
PlusIcon,
UserPlusIcon,
Squares2X2Icon,
UserIcon,
UserPlusIcon,
UsersIcon,
Squares2X2Icon,
XCircleIcon,
} from '@heroicons/react/24/outline'
import Image from 'next/image'
import Link from 'next/link'
import { useRouter } from 'next/router'
import Script from 'next/script'
import { useState } from 'react'
// @ts-expect-error ts-migrate(7016) FIXME: Could not find a declaration file for module 'reac... Remove this comment to see the full error message
import Blockies from 'react-blockies'
Expand Down Expand Up @@ -182,7 +181,10 @@ export default function Layout({ children }: any) {
key={item.href}
>
{item.href.charAt(0) === '/' ? (
<Link href={item.href} className={`py-4 ${router.pathname == item.href ? 'active' : ''} ${router.pathname !== item.href ? 'dark:hover:bg-slate-700' : ''}`}>
<Link
href={item.href}
className={`py-4 ${router.pathname == item.href ? 'active' : ''} ${router.pathname !== item.href ? 'dark:hover:bg-slate-700' : ''}`}
>
{item.icon}
{item.name}
<ChevronRightIcon className="h-5 w-5 absolute right-4 opacity-50" />
Expand Down Expand Up @@ -240,7 +242,10 @@ export default function Layout({ children }: any) {
<input type="checkbox" id="web3-modal" className="modal-toggle" />

<label htmlFor="web3-modal" className="modal cursor-pointer z-10">
<label className="modal-box relative" htmlFor="">
<label
className="modal-box relative dark:bg-slate-800 dark:text-slate-300"
htmlFor=""
>
<label
htmlFor="web3-modal"
className="btn btn-sm btn-circle btn-ghost absolute right-6 top-5"
Expand All @@ -254,8 +259,12 @@ export default function Layout({ children }: any) {

<p className="p-4">Connected to {connectData?.connector?.name}</p>

<ul className="menu bg-base-100 p-2 -m-2 rounded-box">
<li key="address">
<ul className="menu bg-base-100 p-2 -m-2 rounded-box dark:bg-slate-800">
<li
key="address"
className="dark:bg-slate-700
dark:hover:bg-slate-600"
>
<a
href={`${etherscanDomain}/address/${address}`}
rel="noreferrer noopener"
Expand All @@ -271,7 +280,11 @@ export default function Layout({ children }: any) {
</a>
</li>

<li key="logout">
<li
key="logout"
className="dark:bg-slate-700
dark:hover:bg-slate-600"
>
<a onClick={() => disconnect()}>
<ArrowRightOnRectangleIcon className="h-5 w-5" />
Log out
Expand All @@ -297,12 +310,14 @@ export default function Layout({ children }: any) {
''
)}

<ul className="menu bg-base-100 p-2 -m-2 rounded-box">
<ul className="menu bg-base-100 p-2 -m-2 rounded-box dark:bg-slate-800">
{connectors.map((connector) => (
<li key={connector.id}>
<button
disabled={!connector.ready}
onClick={() => connect({ connector })}
className="dark:bg-slate-700
dark:hover:bg-slate-600 mb-0.5"
>
{(connectorIcons as Indexable)[connector.name] ? (
<div className="h-5 w-5">
Expand Down
6 changes: 3 additions & 3 deletions ui/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@
"@heroicons/react": "^2.0.11",
"@metamask/eth-sig-util": "^7.0.1",
"@trivago/prettier-plugin-sort-imports": "^4.3.0",
"@types/jest": "^28.1.8",
"@types/jest": "^29.5.12",
"@types/node": "^20.12.11",
"@types/react": "18.3.5",
"@types/react": "18.0.1",
"@types/react-dom": "^18.0.4",
"autoprefixer": "^10.4.0",
"cypress": "^13.13.3",
Expand All @@ -28,7 +28,7 @@
"eslint-config-next": "13",
"eslint-config-prettier": "^9.1.0",
"ethers": "^5.7.1",
"jest": "^28.1.3",
"jest": "^29.7.0",
"next": "14",
aahna-ashina marked this conversation as resolved.
Show resolved Hide resolved
"nft.storage": "^7.1.1",
"postcss": "^8.4.38",
Expand Down
Loading
Loading