diff --git a/.prettierrc.yaml b/.prettierrc.yaml index 35893b3..dabdd95 100644 --- a/.prettierrc.yaml +++ b/.prettierrc.yaml @@ -2,3 +2,4 @@ singleQuote: true semi: false printWidth: 100 trailingComma: none +plugins: [prettier-plugin-tailwindcss] diff --git a/package-lock.json b/package-lock.json index 4f77f74..0f21091 100644 --- a/package-lock.json +++ b/package-lock.json @@ -95,6 +95,7 @@ "globals": "^15.13.0", "postcss": "^8.4.49", "prettier": "3.4.2", + "prettier-plugin-tailwindcss": "^0.7.2", "tailwindcss": "^3.4.17", "typescript": "~5.6.2", "typescript-eslint": "^8.18.1", @@ -10392,6 +10393,85 @@ "url": "https://github.com/prettier/prettier?sponsor=1" } }, + "node_modules/prettier-plugin-tailwindcss": { + "version": "0.7.2", + "resolved": "https://registry.npmjs.org/prettier-plugin-tailwindcss/-/prettier-plugin-tailwindcss-0.7.2.tgz", + "integrity": "sha512-LkphyK3Fw+q2HdMOoiEHWf93fNtYJwfamoKPl7UwtjFQdei/iIBoX11G6j706FzN3ymX9mPVi97qIY8328vdnA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=20.19" + }, + "peerDependencies": { + "@ianvs/prettier-plugin-sort-imports": "*", + "@prettier/plugin-hermes": "*", + "@prettier/plugin-oxc": "*", + "@prettier/plugin-pug": "*", + "@shopify/prettier-plugin-liquid": "*", + "@trivago/prettier-plugin-sort-imports": "*", + "@zackad/prettier-plugin-twig": "*", + "prettier": "^3.0", + "prettier-plugin-astro": "*", + "prettier-plugin-css-order": "*", + "prettier-plugin-jsdoc": "*", + "prettier-plugin-marko": "*", + "prettier-plugin-multiline-arrays": "*", + "prettier-plugin-organize-attributes": "*", + "prettier-plugin-organize-imports": "*", + "prettier-plugin-sort-imports": "*", + "prettier-plugin-svelte": "*" + }, + "peerDependenciesMeta": { + "@ianvs/prettier-plugin-sort-imports": { + "optional": true + }, + "@prettier/plugin-hermes": { + "optional": true + }, + "@prettier/plugin-oxc": { + "optional": true + }, + "@prettier/plugin-pug": { + "optional": true + }, + "@shopify/prettier-plugin-liquid": { + "optional": true + }, + "@trivago/prettier-plugin-sort-imports": { + "optional": true + }, + "@zackad/prettier-plugin-twig": { + "optional": true + }, + "prettier-plugin-astro": { + "optional": true + }, + "prettier-plugin-css-order": { + "optional": true + }, + "prettier-plugin-jsdoc": { + "optional": true + }, + "prettier-plugin-marko": { + "optional": true + }, + "prettier-plugin-multiline-arrays": { + "optional": true + }, + "prettier-plugin-organize-attributes": { + "optional": true + }, + "prettier-plugin-organize-imports": { + "optional": true + }, + "prettier-plugin-sort-imports": { + "optional": true + }, + "prettier-plugin-svelte": { + "optional": true + } + } + }, "node_modules/pretty-bytes": { "version": "6.1.1", "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-6.1.1.tgz", diff --git a/package.json b/package.json index 09801a9..ff3ae74 100644 --- a/package.json +++ b/package.json @@ -105,10 +105,11 @@ "globals": "^15.13.0", "postcss": "^8.4.49", "prettier": "3.4.2", + "prettier-plugin-tailwindcss": "^0.7.2", "tailwindcss": "^3.4.17", "typescript": "~5.6.2", "typescript-eslint": "^8.18.1", "vite": "^6.0.3", "vite-plugin-pwa": "^0.21.1" } -} \ No newline at end of file +} diff --git a/src/PageManager.tsx b/src/PageManager.tsx index 19c911d..e9b91cb 100644 --- a/src/PageManager.tsx +++ b/src/PageManager.tsx @@ -339,11 +339,11 @@ export function PageManager({ maxStackSize = 5 }: { maxStackSize?: number }) { > -
-
+
+
-
+
{!!secondaryStack.length && secondaryStack.map((item, index) => (
))}
-
+
- + @@ -407,20 +407,20 @@ export function PageManager({ maxStackSize = 5 }: { maxStackSize?: number }) {
{primaryPages.map(({ name, element, props }) => (
0 && 'shadow-lg', secondaryStack.length === 0 ? 'bg-surface' : '' @@ -440,7 +440,7 @@ export function PageManager({ maxStackSize = 5 }: { maxStackSize?: number }) { {secondaryStack.map((item, index) => (
{item.element} @@ -451,7 +451,7 @@ export function PageManager({ maxStackSize = 5 }: { maxStackSize?: number }) {
- + diff --git a/src/components/AboutInfoDialog/index.tsx b/src/components/AboutInfoDialog/index.tsx index 69e4e59..445160e 100644 --- a/src/components/AboutInfoDialog/index.tsx +++ b/src/components/AboutInfoDialog/index.tsx @@ -40,7 +40,7 @@ export default function AboutInfoDialog({ children }: { children: React.ReactNod {children} -
{content}
+
{content}
) diff --git a/src/components/AccountList/index.tsx b/src/components/AccountList/index.tsx index 7145789..2e7481b 100644 --- a/src/components/AccountList/index.tsx +++ b/src/components/AccountList/index.tsx @@ -37,18 +37,18 @@ export default function AccountList({ .finally(() => setSwitchingAccount(null)) }} > -
-
+
+
-
- -
+
+ +
{formatPubkey(act.pubkey)}
-
+
{switchingAccount && isSameAccount(act, switchingAccount) && ( -
+
)} diff --git a/src/components/AccountManager/BunkerLogin.tsx b/src/components/AccountManager/BunkerLogin.tsx index 0cb3c92..7bf7cc5 100644 --- a/src/components/AccountManager/BunkerLogin.tsx +++ b/src/components/AccountManager/BunkerLogin.tsx @@ -42,7 +42,7 @@ export default function BunkerLogin({ onChange={handleInputChange} className={errMsg ? 'border-destructive' : ''} /> - {errMsg &&
{errMsg}
} + {errMsg &&
{errMsg}
}
- {errMsg &&
{errMsg}
} + {errMsg &&
{errMsg}
}
-
+
-
+
-

{t('Secure Your Account')}

+

{t('Secure Your Account')}

{t('Add an extra layer of protection with a password')}

@@ -201,7 +201,7 @@ export default function Signup({ )}
-
+
-
+
{t("Don't have an account yet?")}
-
@@ -80,7 +80,7 @@ function AccountManagerNav({ <>
-
+
{t('Logged in Accounts')}
close?.()} /> diff --git a/src/components/AudioPlayer/index.tsx b/src/components/AudioPlayer/index.tsx index bce7082..5233489 100644 --- a/src/components/AudioPlayer/index.tsx +++ b/src/components/AudioPlayer/index.tsx @@ -129,7 +129,7 @@ export default function AudioPlayer({
e.stopPropagation()} @@ -137,12 +137,12 @@ export default function AudioPlayer({