Skip to content

Commit 239563e

Browse files
authored
📦 Update and fix prettier config (#987)
1 parent bafb922 commit 239563e

Some content is hidden

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

68 files changed

+181
-161
lines changed
+12-10
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
---
22
name: "\U0001F41E Bug report"
33
about: Create a report to help us improve
4-
title: ''
4+
title: ""
55
labels: bug
6-
assignees: ''
7-
6+
assignees: ""
87
---
98

109
**Describe the bug**
1110
A clear and concise description of what the bug is.
1211

1312
**To Reproduce**
1413
Steps to reproduce the behavior:
14+
1515
1. Go to '...'
1616
2. Click on '....'
1717
3. Scroll down to '....'
@@ -24,15 +24,17 @@ A clear and concise description of what you expected to happen.
2424
If applicable, add screenshots to help explain your problem.
2525

2626
**Desktop (please complete the following information):**
27-
- OS: [e.g. iOS]
28-
- Browser [e.g. chrome, safari]
29-
- Version [e.g. 22]
27+
28+
- OS: [e.g. iOS]
29+
- Browser [e.g. chrome, safari]
30+
- Version [e.g. 22]
3031

3132
**Smartphone (please complete the following information):**
32-
- Device: [e.g. iPhone6]
33-
- OS: [e.g. iOS8.1]
34-
- Browser [e.g. stock browser, safari]
35-
- Version [e.g. 22]
33+
34+
- Device: [e.g. iPhone6]
35+
- OS: [e.g. iOS8.1]
36+
- Browser [e.g. stock browser, safari]
37+
- Version [e.g. 22]
3638

3739
**Additional context**
3840
Add any other context about the problem here.

.github/ISSUE_TEMPLATE/---feature-request.md

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
---
22
name: "\U0001F914 Feature request"
33
about: Please use discussions instead of issues for feature requests
4-
title: ''
5-
labels: ''
6-
assignees: ''
7-
4+
title: ""
5+
labels: ""
6+
assignees: ""
87
---
98

109
**DO NOT OPEN AN ISSUE FOR FEATURE REQUESTS**

.prettierrc

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
{
2+
"plugins": ["prettier-plugin-tailwindcss"],
23
"semi": true,
34
"tabWidth": 2,
45
"useTabs": false,

apps/docs/contribute/documentation.mdx

+4-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,10 @@ description: Help us maintain and improve our documentation
77
If you have a [Github](https://github.com) account, you can make changes or report issues using the links that appear at the top of each page.
88

99
<Frame caption="Links to edit a page or open an issue on Github">
10-
<img src="/images/contribute/edit-documentation.png" alt="Edit Documentation Links"/>
10+
<img
11+
src="/images/contribute/edit-documentation.png"
12+
alt="Edit Documentation Links"
13+
/>
1114
</Frame>
1215

1316
## Submitting a Pull Request

apps/docs/contribute/translations.mdx

+5-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Once you've joined the project:
2020
3. Start translating!
2121

2222
<Frame>
23-
<img src="/images/contribute/crowdin-project.png" alt="Crowdin Project"/>
23+
<img src="/images/contribute/crowdin-project.png" alt="Crowdin Project" />
2424
</Frame>
2525

2626
## Tips for Translators
@@ -98,7 +98,10 @@ If your language requires more than one plural form, you can add additional rule
9898
```
9999

100100
<Frame caption="Crowdin let's you preview your message to make sure it works">
101-
<img src="/images/contribute/icu-message-format.png" alt="Using ICU Message Format on Corwdin"/>
101+
<img
102+
src="/images/contribute/icu-message-format.png"
103+
alt="Using ICU Message Format on Corwdin"
104+
/>
102105
</Frame>
103106

104107
### Register

apps/docs/introduction.mdx

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ description: "Welcome to the official documentation for Rallly."
55
---
66

77
<Frame>
8-
<img src="/images/self-hosting/splash.png" alt="Rallly Splash Image"/>
8+
<img src="/images/self-hosting/splash.png" alt="Rallly Splash Image" />
99
</Frame>
1010

1111
## What is Rallly?

apps/docs/self-hosting/introduction.mdx

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Rallly is 100% open-source and available under the [GNU Affero General Public Li
88
which allows you to run your own instance of Rallly for free for both personal and commercial use.
99

1010
<Frame>
11-
<img src="/images/self-hosting/splash.png" alt="Rallly Splash Image"/>
11+
<img src="/images/self-hosting/splash.png" alt="Rallly Splash Image" />
1212
</Frame>
1313

1414
## Official Docker Image

apps/docs/tsconfig.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"extends": "@rallly/tsconfig/next.json",
33
"include": ["**/*.ts", "**/*.tsx", "**/*.js"],
4-
"exclude": ["node_modules"]
4+
"exclude": ["node_modules"],
55
}

apps/docs/workflow/finalize.mdx

+1
Original file line numberDiff line numberDiff line change
@@ -27,5 +27,6 @@ description: "Pick a final date for your event"
2727
<Frame>
2828
<img src="/images/workflow/finalized.png" alt="Finalized Poll"/>
2929
</Frame>
30+
3031
</Step>
3132
</Steps>

apps/landing/src/components/blog/markdown-styles.module.css

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@
1010
}
1111

1212
.markdown h2 {
13-
@apply mt-12 mb-4 text-2xl font-semibold leading-snug;
13+
@apply mb-4 mt-12 text-2xl font-semibold leading-snug;
1414
}
1515

1616
.markdown h3 {
17-
@apply mt-8 mb-4 text-xl font-semibold leading-snug;
17+
@apply mb-4 mt-8 text-xl font-semibold leading-snug;
1818
}
1919

2020
.markdown a {

apps/landing/src/pages/cookie-policy.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ const PrivacyPolicy = () => {
88
return (
99
<PageLayout>
1010
<NextSeo title="Cookie Policy" />
11-
<div className="prose my-16 mx-auto max-w-3xl rounded-lg bg-white p-8 shadow-md">
11+
<div className="prose mx-auto my-16 max-w-3xl rounded-lg bg-white p-8 shadow-md">
1212
<h1>Cookie Policy</h1>
1313
<p>Last updated: 19 April 2023</p>
1414
<p>

apps/landing/src/pages/privacy-policy.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ const PrivacyPolicy = () => {
77
return (
88
<PageLayout>
99
<NextSeo title="Privacy Policy" />
10-
<div className="prose my-16 mx-auto max-w-3xl rounded-lg bg-white p-8 shadow-md">
10+
<div className="prose mx-auto my-16 max-w-3xl rounded-lg bg-white p-8 shadow-md">
1111
<h1>Privacy Policy</h1>
1212
<p>Last updated: 1 August 2023</p>
1313
<p>

apps/landing/src/pages/terms-of-use.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ const PrivacyPolicy = () => {
77
return (
88
<PageLayout>
99
<NextSeo title="Terms of Use" />
10-
<div className="prose my-16 mx-auto max-w-3xl rounded-lg bg-white p-8 shadow-md">
10+
<div className="prose mx-auto my-16 max-w-3xl rounded-lg bg-white p-8 shadow-md">
1111
<h1>Terms of Use</h1>
1212
<p>Last updated: 4 July 2023</p>
1313
<p>

apps/landing/src/style.css

+3-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@
88
}
99
body {
1010
@apply text-foreground overflow-y-auto bg-gray-200/50;
11-
font-feature-settings: "rlig" 1, "calt" 1;
11+
font-feature-settings:
12+
"rlig" 1,
13+
"calt" 1;
1214
}
1315
html {
1416
@apply h-full font-sans text-base;

apps/landing/tsconfig.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
"baseUrl": ".",
55
"paths": {
66
"@/*": ["src/*"],
7-
"~/*": ["public/*"]
7+
"~/*": ["public/*"],
88
},
9-
"checkJs": false
9+
"checkJs": false,
1010
},
1111
"include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", ".next/types/**/*.ts"],
12-
"exclude": ["node_modules"]
12+
"exclude": ["node_modules"],
1313
}

apps/web/src/app/[locale]/(admin)/layout.tsx

+6-6
Original file line numberDiff line numberDiff line change
@@ -29,18 +29,18 @@ const Auth = ({ children }: { children: React.ReactNode }) => {
2929

3030
function MobileNavigation() {
3131
return (
32-
<div className="lg:hidden shadow-sm bg-gray-100 border-b flex items-center justify-between px-4 py-3">
32+
<div className="flex items-center justify-between border-b bg-gray-100 px-4 py-3 shadow-sm lg:hidden">
3333
<LogoLink />
34-
<div className="flex gap-x-2.5 justify-end">
34+
<div className="flex justify-end gap-x-2.5">
3535
<Link
3636
href="/settings/profile"
37-
className="inline-flex items-center w-7 h-9"
37+
className="inline-flex h-9 w-7 items-center"
3838
>
3939
<CurrentUserAvatar size="sm" />
4040
</Link>
4141
<Button asChild variant="ghost">
4242
<Link href="/menu">
43-
<MenuIcon className="h-4 w-4 text-muted-foreground" />
43+
<MenuIcon className="text-muted-foreground h-4 w-4" />
4444
</Link>
4545
</Button>
4646
</div>
@@ -59,15 +59,15 @@ export default async function Layout({
5959
<MobileNavigation />
6060
<div
6161
className={cn(
62-
"hidden lg:flex z-50 inset-y-0 lg:fixed lg:w-72 bg-gray-100 shrink-0 flex-col gap-y-5 overflow-y-auto border-r lg:px-6 lg:py-4 px-5 py-4",
62+
"inset-y-0 z-50 hidden shrink-0 flex-col gap-y-5 overflow-y-auto border-r bg-gray-100 px-5 py-4 lg:fixed lg:flex lg:w-72 lg:px-6 lg:py-4",
6363
)}
6464
>
6565
<div>
6666
<LogoLink />
6767
</div>
6868
<Sidebar />
6969
</div>
70-
<div className={cn("grow min-h-screen lg:pl-72 bg-gray-50")}>
70+
<div className={cn("min-h-screen grow bg-gray-50 lg:pl-72")}>
7171
{children}
7272
</div>
7373
</div>

apps/web/src/app/[locale]/(admin)/menu-item.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ export function MenuItem({
2323
className={cn(
2424
isCurrent
2525
? "bg-gray-200 text-indigo-600"
26-
: "text-gray-700 hover:text-primary",
27-
"group flex items-center gap-x-3 rounded-md py-2 px-3 text-sm leading-6 font-semibold",
26+
: "hover:text-primary text-gray-700",
27+
"group flex items-center gap-x-3 rounded-md px-3 py-2 text-sm font-semibold leading-6",
2828
)}
2929
>
3030
<Icon

apps/web/src/app/[locale]/(admin)/new/page.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ export default async function Page({ params }: { params: { locale: string } }) {
1616
return (
1717
<PageContainer>
1818
<PageHeader>
19-
<div className="flex justify-between items-center gap-x-4">
19+
<div className="flex items-center justify-between gap-x-4">
2020
<PageTitle>
2121
<Trans t={t} i18nKey="polls" />
2222
</PageTitle>

apps/web/src/app/[locale]/(admin)/polls/layout.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@ export default async function Layout({
2222
return (
2323
<PageContainer>
2424
<PageHeader>
25-
<div className="flex justify-between items-center gap-x-4">
25+
<div className="flex items-center justify-between gap-x-4">
2626
<PageTitle>
2727
<Trans t={t} i18nKey="polls" />
2828
</PageTitle>
2929
<Button asChild>
3030
<Link href="/new">
31-
<PenBoxIcon className="w-4 text-muted-foreground h-4" />
31+
<PenBoxIcon className="text-muted-foreground h-4 w-4" />
3232
<span className="hidden sm:inline">
3333
<Trans t={t} i18nKey="newPoll" />
3434
</span>

apps/web/src/app/[locale]/(admin)/polls/loading.tsx

+6-6
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,19 @@ import { Skeleton } from "@/components/skeleton";
22

33
function Row() {
44
return (
5-
<div className="flex first:pt-0 py-4 items-center gap-x-4">
5+
<div className="flex items-center gap-x-4 py-4 first:pt-0">
66
<div className="grow">
7-
<Skeleton className="w-48 h-5 mb-2" />
8-
<Skeleton className="w-24 h-4" />
7+
<Skeleton className="mb-2 h-5 w-48" />
8+
<Skeleton className="h-4 w-24" />
99
</div>
1010
<div className="pr-8">
11-
<Skeleton className="w-24 h-4" />
11+
<Skeleton className="h-4 w-24" />
1212
</div>
1313
<div className="pr-8">
14-
<Skeleton className="w-24 h-4" />
14+
<Skeleton className="h-4 w-24" />
1515
</div>
1616
<div className="pr-8">
17-
<Skeleton className="w-12 h-4" />
17+
<Skeleton className="h-4 w-12" />
1818
</div>
1919
</div>
2020
);

apps/web/src/app/[locale]/(admin)/polls/polls-folders.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ function PollFolder({
2727
className={cn(
2828
isActive
2929
? "bg-gray-100"
30-
: "shadow-sm text-muted-foreground hover:bg-gray-100 active:bg-gray-200",
30+
: "text-muted-foreground shadow-sm hover:bg-gray-100 active:bg-gray-200",
3131
)}
3232
>
3333
<Link href={href}>{children}</Link>

apps/web/src/app/[locale]/(admin)/polls/polls-list.tsx

+7-7
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import Loader from "./loading";
2020
const EmptyState = () => {
2121
return (
2222
<div className="py-24">
23-
<div className="mx-auto max-w-md rounded-md border-2 w-full border-dashed border-gray-300 p-8 text-center">
23+
<div className="mx-auto w-full max-w-md rounded-md border-2 border-dashed border-gray-300 p-8 text-center">
2424
<div className="mb-4">
2525
<InboxIcon className="inline-block h-10 w-10 text-gray-400" />
2626
</div>
@@ -84,14 +84,14 @@ export function PollsList() {
8484
cell: ({ row }) => {
8585
return (
8686
<Link className="group block" href={`/poll/${row.original.id}`}>
87-
<div className="flex items-center gap-x-2 mb-1 min-w-0">
88-
<h3 className="font-semibold truncate text-gray-600 group-hover:text-gray-900">
87+
<div className="mb-1 flex min-w-0 items-center gap-x-2">
88+
<h3 className="truncate font-semibold text-gray-600 group-hover:text-gray-900">
8989
{row.original.title}
9090
</h3>
91-
<ArrowRightIcon className="h-4 w-4 opacity-0 transition-all group-focus:translate-x-2 group-hover:opacity-100" />
91+
<ArrowRightIcon className="h-4 w-4 opacity-0 transition-all group-hover:opacity-100 group-focus:translate-x-2" />
9292
</div>
9393
{row.original.event ? (
94-
<p className="text-sm text-muted-foreground">
94+
<p className="text-muted-foreground text-sm">
9595
{row.original.event.duration === 0
9696
? adjustTimeZone(
9797
row.original.event.start,
@@ -134,7 +134,7 @@ export function PollsList() {
134134
cell: ({ row }) => {
135135
const { createdAt } = row.original;
136136
return (
137-
<p className="text-sm whitespace-nowrap text-muted-foreground">
137+
<p className="text-muted-foreground whitespace-nowrap text-sm">
138138
<time dateTime={createdAt.toDateString()}>
139139
<Trans
140140
i18nKey="createdTime"
@@ -150,7 +150,7 @@ export function PollsList() {
150150
cell: ({ row }) => {
151151
return (
152152
<Tooltip delayDuration={100}>
153-
<TooltipTrigger className="flex items-center text-muted-foreground gap-x-2">
153+
<TooltipTrigger className="text-muted-foreground flex items-center gap-x-2">
154154
<UsersIcon className="h-4 w-4" />
155155
<span className="text-sm">
156156
{row.original.participants.length}

apps/web/src/app/[locale]/(admin)/settings/menu-item.tsx

+3-3
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ export function MenuItem(props: { href: string; children: React.ReactNode }) {
2020
return (
2121
<Link
2222
className={clsx(
23-
"flex min-w-0 items-center rounded-none gap-x-2 px-3 py-2 text-sm font-medium",
23+
"flex min-w-0 items-center gap-x-2 rounded-none px-3 py-2 text-sm font-medium",
2424
pathname === props.href
2525
? "bg-white"
2626
: "text-gray-500 hover:bg-gray-100 focus:bg-gray-200",
@@ -66,7 +66,7 @@ export function SettingsMenu() {
6666

6767
return (
6868
<>
69-
<div className="hidden overflow-hidden shadow-sm divide-x lg:inline-flex mb-4 border rounded-md bg-gray-50">
69+
<div className="mb-4 hidden divide-x overflow-hidden rounded-md border bg-gray-50 shadow-sm lg:inline-flex">
7070
{menuItems.map((item, i) => (
7171
<MenuItem key={i} href={item.href}>
7272
<item.icon className="h-4 w-4" />
@@ -90,7 +90,7 @@ export function SettingsMenu() {
9090
{menuItems.map((item, i) => (
9191
<SelectItem key={i} value={item.title}>
9292
<div className="flex items-center gap-x-2.5">
93-
<item.icon className="h-4 w-4 text-muted-foreground" />
93+
<item.icon className="text-muted-foreground h-4 w-4" />
9494
<span className="font-medium">{item.title}</span>
9595
</div>
9696
</SelectItem>

0 commit comments

Comments
 (0)