Skip to content

Commit 21f3777

Browse files
committed
format
Closes #865
1 parent 5de13cb commit 21f3777

16 files changed

+27
-22
lines changed

app/components/ui/input-otp.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ const InputOTPSlot = React.forwardRef<
4040
<div
4141
ref={ref}
4242
className={cn(
43-
'relative flex h-10 w-10 items-center justify-center border-y border-r border-input text-base md:text-sm transition-all first:rounded-l-md first:border-l last:rounded-r-md',
43+
'relative flex h-10 w-10 items-center justify-center border-y border-r border-input text-base transition-all first:rounded-l-md first:border-l last:rounded-r-md md:text-sm',
4444
isActive && 'z-10 ring-2 ring-ring ring-offset-background',
4545
className,
4646
)}

app/components/ui/input.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ const Input = React.forwardRef<HTMLInputElement, InputProps>(
1111
<input
1212
type={type}
1313
className={cn(
14-
'flex h-10 w-full rounded-md border border-input bg-background px-3 py-2 text-base md:text-sm ring-offset-background file:border-0 file:bg-transparent file:text-base md:file:text-sm file:font-medium placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50 aria-[invalid]:border-input-invalid',
14+
'flex h-10 w-full rounded-md border border-input bg-background px-3 py-2 text-base ring-offset-background file:border-0 file:bg-transparent file:text-base file:font-medium placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50 aria-[invalid]:border-input-invalid md:text-sm md:file:text-sm',
1515
className,
1616
)}
1717
ref={ref}

app/components/ui/textarea.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ const Textarea = React.forwardRef<HTMLTextAreaElement, TextareaProps>(
1010
return (
1111
<textarea
1212
className={cn(
13-
'flex min-h-[80px] w-full rounded-md border border-input bg-background px-3 py-2 text-base md:text-sm ring-offset-background placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50 aria-[invalid]:border-input-invalid',
13+
'flex min-h-[80px] w-full rounded-md border border-input bg-background px-3 py-2 text-base ring-offset-background placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50 aria-[invalid]:border-input-invalid md:text-sm',
1414
className,
1515
)}
1616
ref={ref}

app/routes/_auth+/onboarding.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ export default function OnboardingRoute() {
228228
<div className="flex items-center justify-between gap-6">
229229
<StatusButton
230230
className="w-full"
231-
status={isPending ? 'pending' : form.status ?? 'idle'}
231+
status={isPending ? 'pending' : (form.status ?? 'idle')}
232232
type="submit"
233233
disabled={isPending}
234234
>

app/routes/_auth+/onboarding_.$provider.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@ export default function OnboardingProviderRoute() {
271271
<div className="flex items-center justify-between gap-6">
272272
<StatusButton
273273
className="w-full"
274-
status={isPending ? 'pending' : form.status ?? 'idle'}
274+
status={isPending ? 'pending' : (form.status ?? 'idle')}
275275
type="submit"
276276
disabled={isPending}
277277
>

app/routes/settings+/profile.change-email.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ export default function ChangeEmailIndex() {
138138
<ErrorList id={form.errorId} errors={form.errors} />
139139
<div>
140140
<StatusButton
141-
status={isPending ? 'pending' : form.status ?? 'idle'}
141+
status={isPending ? 'pending' : (form.status ?? 'idle')}
142142
>
143143
Send Confirmation
144144
</StatusButton>

app/routes/settings+/profile.connections.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ function Connection({
197197
status={
198198
deleteFetcher.state !== 'idle'
199199
? 'pending'
200-
: deleteFetcher.data?.status ?? 'idle'
200+
: (deleteFetcher.data?.status ?? 'idle')
201201
}
202202
>
203203
<Icon name="cross-1" />

app/routes/settings+/profile.index.tsx

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,9 @@ function UpdateProfile() {
262262
size="wide"
263263
name="intent"
264264
value={profileUpdateActionIntent}
265-
status={fetcher.state !== 'idle' ? 'pending' : form.status ?? 'idle'}
265+
status={
266+
fetcher.state !== 'idle' ? 'pending' : (form.status ?? 'idle')
267+
}
266268
>
267269
Save changes
268270
</StatusButton>
@@ -309,7 +311,7 @@ function SignOutOfSessions() {
309311
status={
310312
fetcher.state !== 'idle'
311313
? 'pending'
312-
: fetcher.data?.status ?? 'idle'
314+
: (fetcher.data?.status ?? 'idle')
313315
}
314316
>
315317
<Icon name="avatar">

app/routes/settings+/profile.password.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ export default function ChangePasswordRoute() {
167167
</Button>
168168
<StatusButton
169169
type="submit"
170-
status={isPending ? 'pending' : form.status ?? 'idle'}
170+
status={isPending ? 'pending' : (form.status ?? 'idle')}
171171
>
172172
Change Password
173173
</StatusButton>

app/routes/settings+/profile.password_.create.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ export default function CreatePasswordRoute() {
118118
</Button>
119119
<StatusButton
120120
type="submit"
121-
status={isPending ? 'pending' : form.status ?? 'idle'}
121+
status={isPending ? 'pending' : (form.status ?? 'idle')}
122122
>
123123
Create Password
124124
</StatusButton>

app/routes/settings+/profile.photo.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ export default function PhotoRoute() {
202202
pendingIntent === 'submit'
203203
? 'pending'
204204
: lastSubmissionIntent === 'submit'
205-
? form.status ?? 'idle'
205+
? (form.status ?? 'idle')
206206
: 'idle'
207207
}
208208
>
@@ -228,7 +228,7 @@ export default function PhotoRoute() {
228228
pendingIntent === 'delete'
229229
? 'pending'
230230
: lastSubmissionIntent === 'delete'
231-
? form.status ?? 'idle'
231+
? (form.status ?? 'idle')
232232
: 'idle'
233233
}
234234
>

app/routes/settings+/profile.two-factor.verify.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ export default function TwoFactorRoute() {
201201
pendingIntent === 'verify'
202202
? 'pending'
203203
: lastSubmissionIntent === 'verify'
204-
? form.status ?? 'idle'
204+
? (form.status ?? 'idle')
205205
: 'idle'
206206
}
207207
type="submit"
@@ -217,7 +217,7 @@ export default function TwoFactorRoute() {
217217
pendingIntent === 'cancel'
218218
? 'pending'
219219
: lastSubmissionIntent === 'cancel'
220-
? form.status ?? 'idle'
220+
? (form.status ?? 'idle')
221221
: 'idle'
222222
}
223223
type="submit"

app/routes/users+/$username_+/notes.$noteId.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ export function DeleteNote({ id }: { id: string }) {
172172
name="intent"
173173
value="delete-note"
174174
variant="destructive"
175-
status={isPending ? 'pending' : form.status ?? 'idle'}
175+
status={isPending ? 'pending' : (form.status ?? 'idle')}
176176
disabled={isPending}
177177
className="w-full max-md:aspect-square max-md:px-0"
178178
>

app/utils/auth.server.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ export async function requireUserId(
5353
redirectTo =
5454
redirectTo === null
5555
? null
56-
: redirectTo ?? `${requestUrl.pathname}${requestUrl.search}`
56+
: (redirectTo ?? `${requestUrl.pathname}${requestUrl.search}`)
5757
const loginParams = redirectTo ? new URLSearchParams({ redirectTo }) : null
5858
const loginRedirect = ['/login', loginParams?.toString()]
5959
.filter(Boolean)

docs/fonts.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ easy to do so.
66

77
## Using Custom Fonts
88

9-
You can use custom fonts by creating the `./public/fonts` directory (if it doesn't already exist) and adding them to it.
9+
You can use custom fonts by creating the `./public/fonts` directory (if it
10+
doesn't already exist) and adding them to it.
1011
[Google Fonts](https://fonts.google.com/) is a good place to find open source
1112
fonts. You will also need to add the `css` file for the font to the
1213
`./app/styles` directory, if your font doesn't come with one (Google Fonts

public/favicons/README.md

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
# Favicon
22

3-
This directory has the icons used for android devices. In
4-
some cases, we cannot reliably detect light/dark mode preference. Hence these icons should not have a transparent background. These icons are
5-
referenced in the `site.webmanifest` file.
3+
This directory has the icons used for android devices. In some cases, we cannot
4+
reliably detect light/dark mode preference. Hence these icons should not have a
5+
transparent background. These icons are referenced in the `site.webmanifest`
6+
file.
67

7-
The icons used by modern browsers and Apple devices are in `app/assets/favicons` as they can be imported with a fingerprint to bust the browser cache.
8+
The icons used by modern browsers and Apple devices are in `app/assets/favicons`
9+
as they can be imported with a fingerprint to bust the browser cache.
810

911
Note, there's also a `favicon.ico` in the root of `/public` which some older
1012
browsers will request automatically. This is a fallback for those browsers.

0 commit comments

Comments
 (0)