Skip to content

Commit b4853bd

Browse files
owiethowieth
committedOct 4, 2023
feat(app): prettier
1 parent b0010cc commit b4853bd

File tree

14 files changed

+121
-116
lines changed

14 files changed

+121
-116
lines changed
 

‎apps/app/src/app/layout.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import "@ui/styles/globals.css";
1+
import '@ui/styles/globals.css';
22

33
export default function RootLayout({
44
children,

‎apps/app/src/app/page.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Button } from "@ui/components/button";
1+
import { Button } from '@ui/components/button';
22

33
export default function Page() {
44
return (

‎apps/website/src/app/layout.tsx

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import "@ui/styles/globals.css";
1+
import '@ui/styles/globals.css';
22
import { Inter } from 'next/font/google';
3-
import Footer from "../components/footer/footer";
4-
import Header from "../components/header/header";
3+
import Footer from '../components/footer/footer';
4+
import Header from '../components/header/header';
55

66
const inter = Inter({ subsets: ['latin'] });
77

‎apps/website/src/app/pricing/page.tsx

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import { Card } from "@/src/components/card/card";
2-
import Section from "@/src/components/section/section";
3-
import H2 from "@/src/components/text/h2";
4-
import { Button } from "@ui/components/ui/button";
1+
import { Card } from '@/src/components/card/card';
2+
import Section from '@/src/components/section/section';
3+
import H2 from '@/src/components/text/h2';
4+
import { Button } from '@ui/components/ui/button';
55

66
const features = [
77
'Legal Consultation',

‎apps/website/src/components/text/h2.tsx

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
import { cn } from '@ui/lib/utils';
32
import { ReactNode } from 'react';
43

‎package.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@
1313
"@turbo/gen": "^1.9.7",
1414
"eslint": "^7.32.0",
1515
"eslint-config-custom": "*",
16-
"prettier": "^2.5.1",
16+
"prettier": "^3.0.3",
17+
"prettier-plugin-tailwindcss": "^0.5.4",
1718
"turbo": "^1.10.14"
1819
},
1920
"packageManager": "yarn@1.22.15",

‎packages/ui/components/ui/accordion.tsx

+18-18
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
1-
"use client"
1+
'use client';
22

3-
import * as React from "react"
4-
import * as AccordionPrimitive from "@radix-ui/react-accordion"
5-
import { ChevronDown } from "lucide-react"
3+
import * as React from 'react';
4+
import * as AccordionPrimitive from '@radix-ui/react-accordion';
5+
import { ChevronDown } from 'lucide-react';
66

7-
import { cn } from "@ui/lib/utils"
7+
import { cn } from '@ui/lib/utils';
88

9-
const Accordion = AccordionPrimitive.Root
9+
const Accordion = AccordionPrimitive.Root;
1010

1111
const AccordionItem = React.forwardRef<
1212
React.ElementRef<typeof AccordionPrimitive.Item>,
1313
React.ComponentPropsWithoutRef<typeof AccordionPrimitive.Item>
1414
>(({ className, ...props }, ref) => (
1515
<AccordionPrimitive.Item
1616
ref={ref}
17-
className={cn("border-b", className)}
17+
className={cn('border-b', className)}
1818
{...props}
1919
/>
20-
))
21-
AccordionItem.displayName = "AccordionItem"
20+
));
21+
AccordionItem.displayName = 'AccordionItem';
2222

2323
const AccordionTrigger = React.forwardRef<
2424
React.ElementRef<typeof AccordionPrimitive.Trigger>,
@@ -28,17 +28,17 @@ const AccordionTrigger = React.forwardRef<
2828
<AccordionPrimitive.Trigger
2929
ref={ref}
3030
className={cn(
31-
"flex flex-1 items-center justify-between py-4 font-medium transition-all hover:underline [&[data-state=open]>svg]:rotate-180",
32-
className
31+
'flex flex-1 items-center justify-between py-4 font-medium transition-all hover:underline [&[data-state=open]>svg]:rotate-180',
32+
className,
3333
)}
3434
{...props}
3535
>
3636
{children}
3737
<ChevronDown className="h-4 w-4 shrink-0 transition-transform duration-200" />
3838
</AccordionPrimitive.Trigger>
3939
</AccordionPrimitive.Header>
40-
))
41-
AccordionTrigger.displayName = AccordionPrimitive.Trigger.displayName
40+
));
41+
AccordionTrigger.displayName = AccordionPrimitive.Trigger.displayName;
4242

4343
const AccordionContent = React.forwardRef<
4444
React.ElementRef<typeof AccordionPrimitive.Content>,
@@ -47,14 +47,14 @@ const AccordionContent = React.forwardRef<
4747
<AccordionPrimitive.Content
4848
ref={ref}
4949
className={cn(
50-
"overflow-hidden text-sm transition-all data-[state=closed]:animate-accordion-up data-[state=open]:animate-accordion-down",
51-
className
50+
'data-[state=closed]:animate-accordion-up data-[state=open]:animate-accordion-down overflow-hidden text-sm transition-all',
51+
className,
5252
)}
5353
{...props}
5454
>
5555
<div className="pb-4 pt-0">{children}</div>
5656
</AccordionPrimitive.Content>
57-
))
58-
AccordionContent.displayName = AccordionPrimitive.Content.displayName
57+
));
58+
AccordionContent.displayName = AccordionPrimitive.Content.displayName;
5959

60-
export { Accordion, AccordionItem, AccordionTrigger, AccordionContent }
60+
export { Accordion, AccordionItem, AccordionTrigger, AccordionContent };

‎packages/ui/components/ui/button.tsx

+26-26
Original file line numberDiff line numberDiff line change
@@ -1,56 +1,56 @@
1-
import * as React from "react"
2-
import { Slot } from "@radix-ui/react-slot"
3-
import { cva, type VariantProps } from "class-variance-authority"
1+
import * as React from 'react';
2+
import { Slot } from '@radix-ui/react-slot';
3+
import { cva, type VariantProps } from 'class-variance-authority';
44

5-
import { cn } from "@ui/lib/utils"
5+
import { cn } from '@ui/lib/utils';
66

77
const buttonVariants = cva(
8-
"inline-flex items-center justify-center rounded-md text-sm font-medium ring-offset-background transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50",
8+
'inline-flex items-center justify-center rounded-md text-sm font-medium ring-offset-background transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50',
99
{
1010
variants: {
1111
variant: {
12-
default: "bg-primary text-primary-foreground hover:bg-primary/90",
12+
default: 'bg-primary text-primary-foreground hover:bg-primary/90',
1313
destructive:
14-
"bg-destructive text-destructive-foreground hover:bg-destructive/90",
14+
'bg-destructive text-destructive-foreground hover:bg-destructive/90',
1515
outline:
16-
"border border-input bg-background hover:bg-accent hover:text-accent-foreground",
16+
'border border-input bg-background hover:bg-accent hover:text-accent-foreground',
1717
secondary:
18-
"bg-secondary text-secondary-foreground hover:bg-secondary/80",
19-
ghost: "hover:bg-accent hover:text-accent-foreground",
20-
link: "text-primary underline-offset-4 hover:underline",
18+
'bg-secondary text-secondary-foreground hover:bg-secondary/80',
19+
ghost: 'hover:bg-accent hover:text-accent-foreground',
20+
link: 'text-primary underline-offset-4 hover:underline',
2121
},
2222
size: {
23-
default: "h-10 px-4 py-2",
24-
sm: "h-9 rounded-md px-3",
25-
lg: "h-11 rounded-md px-8",
26-
icon: "h-10 w-10",
23+
default: 'h-10 px-4 py-2',
24+
sm: 'h-9 rounded-md px-3',
25+
lg: 'h-11 rounded-md px-8',
26+
icon: 'h-10 w-10',
2727
},
2828
},
2929
defaultVariants: {
30-
variant: "default",
31-
size: "default",
30+
variant: 'default',
31+
size: 'default',
3232
},
33-
}
34-
)
33+
},
34+
);
3535

3636
export interface ButtonProps
3737
extends React.ButtonHTMLAttributes<HTMLButtonElement>,
3838
VariantProps<typeof buttonVariants> {
39-
asChild?: boolean
39+
asChild?: boolean;
4040
}
4141

4242
const Button = React.forwardRef<HTMLButtonElement, ButtonProps>(
4343
({ className, variant, size, asChild = false, ...props }, ref) => {
44-
const Comp = asChild ? Slot : "button"
44+
const Comp = asChild ? Slot : 'button';
4545
return (
4646
<Comp
4747
className={cn(buttonVariants({ variant, size, className }))}
4848
ref={ref}
4949
{...props}
5050
/>
51-
)
52-
}
53-
)
54-
Button.displayName = "Button"
51+
);
52+
},
53+
);
54+
Button.displayName = 'Button';
5555

56-
export { Button, buttonVariants }
56+
export { Button, buttonVariants };

‎packages/ui/components/ui/dialog.tsx

+33-33
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
"use client"
1+
'use client';
22

3-
import * as React from "react"
4-
import * as DialogPrimitive from "@radix-ui/react-dialog"
5-
import { X } from "lucide-react"
3+
import * as React from 'react';
4+
import * as DialogPrimitive from '@radix-ui/react-dialog';
5+
import { X } from 'lucide-react';
66

7-
import { cn } from "@ui/lib/utils"
7+
import { cn } from '@ui/lib/utils';
88

9-
const Dialog = DialogPrimitive.Root
9+
const Dialog = DialogPrimitive.Root;
1010

11-
const DialogTrigger = DialogPrimitive.Trigger
11+
const DialogTrigger = DialogPrimitive.Trigger;
1212

13-
const DialogPortal = DialogPrimitive.Portal
13+
const DialogPortal = DialogPrimitive.Portal;
1414

1515
const DialogOverlay = React.forwardRef<
1616
React.ElementRef<typeof DialogPrimitive.Overlay>,
@@ -19,13 +19,13 @@ const DialogOverlay = React.forwardRef<
1919
<DialogPrimitive.Overlay
2020
ref={ref}
2121
className={cn(
22-
"fixed inset-0 z-50 bg-background/80 backdrop-blur-sm data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0",
23-
className
22+
'bg-background/80 data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 fixed inset-0 z-50 backdrop-blur-sm',
23+
className,
2424
)}
2525
{...props}
2626
/>
27-
))
28-
DialogOverlay.displayName = DialogPrimitive.Overlay.displayName
27+
));
28+
DialogOverlay.displayName = DialogPrimitive.Overlay.displayName;
2929

3030
const DialogContent = React.forwardRef<
3131
React.ElementRef<typeof DialogPrimitive.Content>,
@@ -36,48 +36,48 @@ const DialogContent = React.forwardRef<
3636
<DialogPrimitive.Content
3737
ref={ref}
3838
className={cn(
39-
"fixed left-[50%] top-[50%] z-50 grid w-full max-w-lg translate-x-[-50%] translate-y-[-50%] gap-4 border bg-background p-6 shadow-lg duration-200 data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[state=closed]:slide-out-to-left-1/2 data-[state=closed]:slide-out-to-top-[48%] data-[state=open]:slide-in-from-left-1/2 data-[state=open]:slide-in-from-top-[48%] sm:rounded-lg md:w-full",
40-
className
39+
'bg-background data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[state=closed]:slide-out-to-left-1/2 data-[state=closed]:slide-out-to-top-[48%] data-[state=open]:slide-in-from-left-1/2 data-[state=open]:slide-in-from-top-[48%] fixed left-[50%] top-[50%] z-50 grid w-full max-w-lg translate-x-[-50%] translate-y-[-50%] gap-4 border p-6 shadow-lg duration-200 sm:rounded-lg md:w-full',
40+
className,
4141
)}
4242
{...props}
4343
>
4444
{children}
45-
<DialogPrimitive.Close className="absolute right-4 top-4 rounded-sm opacity-70 ring-offset-background transition-opacity hover:opacity-100 focus:outline-none focus:ring-2 focus:ring-ring focus:ring-offset-2 disabled:pointer-events-none data-[state=open]:bg-accent data-[state=open]:text-muted-foreground">
45+
<DialogPrimitive.Close className="ring-offset-background focus:ring-ring data-[state=open]:bg-accent data-[state=open]:text-muted-foreground absolute right-4 top-4 rounded-sm opacity-70 transition-opacity hover:opacity-100 focus:outline-none focus:ring-2 focus:ring-offset-2 disabled:pointer-events-none">
4646
<X className="h-4 w-4" />
4747
<span className="sr-only">Close</span>
4848
</DialogPrimitive.Close>
4949
</DialogPrimitive.Content>
5050
</DialogPortal>
51-
))
52-
DialogContent.displayName = DialogPrimitive.Content.displayName
51+
));
52+
DialogContent.displayName = DialogPrimitive.Content.displayName;
5353

5454
const DialogHeader = ({
5555
className,
5656
...props
5757
}: React.HTMLAttributes<HTMLDivElement>) => (
5858
<div
5959
className={cn(
60-
"flex flex-col space-y-1.5 text-center sm:text-left",
61-
className
60+
'flex flex-col space-y-1.5 text-center sm:text-left',
61+
className,
6262
)}
6363
{...props}
6464
/>
65-
)
66-
DialogHeader.displayName = "DialogHeader"
65+
);
66+
DialogHeader.displayName = 'DialogHeader';
6767

6868
const DialogFooter = ({
6969
className,
7070
...props
7171
}: React.HTMLAttributes<HTMLDivElement>) => (
7272
<div
7373
className={cn(
74-
"flex flex-col-reverse sm:flex-row sm:justify-end sm:space-x-2",
75-
className
74+
'flex flex-col-reverse sm:flex-row sm:justify-end sm:space-x-2',
75+
className,
7676
)}
7777
{...props}
7878
/>
79-
)
80-
DialogFooter.displayName = "DialogFooter"
79+
);
80+
DialogFooter.displayName = 'DialogFooter';
8181

8282
const DialogTitle = React.forwardRef<
8383
React.ElementRef<typeof DialogPrimitive.Title>,
@@ -86,25 +86,25 @@ const DialogTitle = React.forwardRef<
8686
<DialogPrimitive.Title
8787
ref={ref}
8888
className={cn(
89-
"text-lg font-semibold leading-none tracking-tight",
90-
className
89+
'text-lg font-semibold leading-none tracking-tight',
90+
className,
9191
)}
9292
{...props}
9393
/>
94-
))
95-
DialogTitle.displayName = DialogPrimitive.Title.displayName
94+
));
95+
DialogTitle.displayName = DialogPrimitive.Title.displayName;
9696

9797
const DialogDescription = React.forwardRef<
9898
React.ElementRef<typeof DialogPrimitive.Description>,
9999
React.ComponentPropsWithoutRef<typeof DialogPrimitive.Description>
100100
>(({ className, ...props }, ref) => (
101101
<DialogPrimitive.Description
102102
ref={ref}
103-
className={cn("text-sm text-muted-foreground", className)}
103+
className={cn('text-muted-foreground text-sm', className)}
104104
{...props}
105105
/>
106-
))
107-
DialogDescription.displayName = DialogPrimitive.Description.displayName
106+
));
107+
DialogDescription.displayName = DialogPrimitive.Description.displayName;
108108

109109
export {
110110
Dialog,
@@ -116,4 +116,4 @@ export {
116116
DialogFooter,
117117
DialogTitle,
118118
DialogDescription,
119-
}
119+
};

‎packages/ui/components/ui/input.tsx

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import * as React from "react"
1+
import * as React from 'react';
22

3-
import { cn } from "@ui/lib/utils"
3+
import { cn } from '@ui/lib/utils';
44

55
export interface InputProps
66
extends React.InputHTMLAttributes<HTMLInputElement> {}
@@ -11,15 +11,15 @@ 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-sm ring-offset-background file:border-0 file:bg-transparent 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",
15-
className
14+
'border-input bg-background ring-offset-background placeholder:text-muted-foreground focus-visible:ring-ring flex h-10 w-full rounded-md border px-3 py-2 text-sm file:border-0 file:bg-transparent file:text-sm file:font-medium focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50',
15+
className,
1616
)}
1717
ref={ref}
1818
{...props}
1919
/>
20-
)
21-
}
22-
)
23-
Input.displayName = "Input"
20+
);
21+
},
22+
);
23+
Input.displayName = 'Input';
2424

25-
export { Input }
25+
export { Input };

‎packages/ui/components/ui/label.tsx

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
"use client"
1+
'use client';
22

3-
import * as React from "react"
4-
import * as LabelPrimitive from "@radix-ui/react-label"
5-
import { cva, type VariantProps } from "class-variance-authority"
3+
import * as React from 'react';
4+
import * as LabelPrimitive from '@radix-ui/react-label';
5+
import { cva, type VariantProps } from 'class-variance-authority';
66

7-
import { cn } from "@ui/lib/utils"
7+
import { cn } from '@ui/lib/utils';
88

99
const labelVariants = cva(
10-
"text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70"
11-
)
10+
'text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70',
11+
);
1212

1313
const Label = React.forwardRef<
1414
React.ElementRef<typeof LabelPrimitive.Root>,
@@ -20,7 +20,7 @@ const Label = React.forwardRef<
2020
className={cn(labelVariants(), className)}
2121
{...props}
2222
/>
23-
))
24-
Label.displayName = LabelPrimitive.Root.displayName
23+
));
24+
Label.displayName = LabelPrimitive.Root.displayName;
2525

26-
export { Label }
26+
export { Label };

‎packages/ui/lib/utils.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import { type ClassValue, clsx } from "clsx"
2-
import { twMerge } from "tailwind-merge"
3-
1+
import { type ClassValue, clsx } from 'clsx';
2+
import { twMerge } from 'tailwind-merge';
3+
44
export function cn(...inputs: ClassValue[]) {
5-
return twMerge(clsx(inputs))
5+
return twMerge(clsx(inputs));
66
}

‎prettier.config.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ const config = {
88
arrowParens: 'avoid',
99
};
1010

11-
module.exports = config;
11+
module.exports = config;

‎yarn.lock

+9-4
Original file line numberDiff line numberDiff line change
@@ -5384,10 +5384,15 @@ prelude-ls@^1.2.1:
53845384
resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396"
53855385
integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==
53865386

5387-
prettier@^2.5.1:
5388-
version "2.8.8"
5389-
resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.8.8.tgz#e8c5d7e98a4305ffe3de2e1fc4aca1a71c28b1da"
5390-
integrity sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==
5387+
prettier-plugin-tailwindcss@^0.5.4:
5388+
version "0.5.5"
5389+
resolved "https://registry.yarnpkg.com/prettier-plugin-tailwindcss/-/prettier-plugin-tailwindcss-0.5.5.tgz#2860de31772235231339ca5e8c745969532fab95"
5390+
integrity sha512-voy0CjWv/CM8yeaduv5ZwovovpTGMR5LbzlhGF+LtEvMJt9wBeVTVnW781hL38R/RcDXCJwN2rolsgr94B/n0Q==
5391+
5392+
prettier@^3.0.3:
5393+
version "3.0.3"
5394+
resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.0.3.tgz#432a51f7ba422d1469096c0fdc28e235db8f9643"
5395+
integrity sha512-L/4pUDMxcNa8R/EthV08Zt42WBO4h1rarVtK0K+QJG0X187OLo7l699jWw0GKuwzkPQ//jMFA/8Xm6Fh3J/DAg==
53915396

53925397
progress@^2.0.0:
53935398
version "2.0.3"

0 commit comments

Comments
 (0)
Please sign in to comment.