Skip to content

Commit feff90a

Browse files
Jaromír TrnkaJaromír Trnka
authored andcommitted
prettier and filters
1 parent 6c8c991 commit feff90a

27 files changed

+873
-1186
lines changed

.prettierrc

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
{
2-
"arrowParens": "always",
3-
"bracketSameLine": false,
4-
"bracketSpacing": true,
5-
"semi": true,
6-
"experimentalTernaries": true,
7-
"singleQuote": false,
8-
"jsxSingleQuote": false,
9-
"quoteProps": "as-needed",
10-
"trailingComma": "all",
11-
"singleAttributePerLine": false,
12-
"htmlWhitespaceSensitivity": "css",
13-
"vueIndentScriptAndStyle": false,
14-
"proseWrap": "preserve",
15-
"insertPragma": false,
16-
"printWidth": 80,
17-
"requirePragma": false,
18-
"tabWidth": 4,
19-
"useTabs": false,
20-
"embeddedLanguageFormatting": "auto",
21-
"plugins": ["prettier-plugin-tailwindcss"]
2+
"arrowParens": "always",
3+
"bracketSameLine": false,
4+
"bracketSpacing": true,
5+
"semi": true,
6+
"experimentalTernaries": true,
7+
"singleQuote": false,
8+
"jsxSingleQuote": false,
9+
"quoteProps": "as-needed",
10+
"trailingComma": "all",
11+
"singleAttributePerLine": false,
12+
"htmlWhitespaceSensitivity": "css",
13+
"vueIndentScriptAndStyle": false,
14+
"proseWrap": "preserve",
15+
"insertPragma": false,
16+
"printWidth": 120,
17+
"requirePragma": false,
18+
"tabWidth": 4,
19+
"useTabs": false,
20+
"embeddedLanguageFormatting": "auto",
21+
"plugins": ["prettier-plugin-tailwindcss"]
2222
}

README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# SmartCook
22

33
## Running the project
4+
45
To install dependencies:
56

67
```bash
@@ -14,4 +15,5 @@ bun dev
1415
```
1516

1617
## Design file
18+
1719
Visit the [Figma design file](https://www.figma.com/file/BHKZ042rxTdIOJhQVMwwY9/SmartCook?type=design&node-id=0%3A1&mode=design&t=tc2wsWI4isDCTCaz-1)

bun.lockb

17.6 KB
Binary file not shown.

components.json

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
{
2-
"$schema": "https://ui.shadcn.com/schema.json",
3-
"style": "new-york",
4-
"rsc": false,
5-
"tsx": true,
6-
"tailwind": {
7-
"config": "tailwind.config.js",
8-
"css": "src/styles/global.css",
9-
"baseColor": "slate",
10-
"cssVariables": true,
11-
"prefix": ""
12-
},
13-
"aliases": {
14-
"components": "@/components",
15-
"utils": "@/lib/utils"
16-
}
17-
}
2+
"$schema": "https://ui.shadcn.com/schema.json",
3+
"style": "new-york",
4+
"rsc": false,
5+
"tsx": true,
6+
"tailwind": {
7+
"config": "tailwind.config.js",
8+
"css": "src/styles/global.css",
9+
"baseColor": "slate",
10+
"cssVariables": true,
11+
"prefix": ""
12+
},
13+
"aliases": {
14+
"components": "@/components",
15+
"utils": "@/lib/utils"
16+
}
17+
}

src/@/components/ModeToggle.tsx

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,7 @@ import {
1010
} from "@/components/ui/dropdown-menu";
1111

1212
export function ModeToggle() {
13-
const [theme, setThemeState] = React.useState<
14-
"theme-light" | "dark" | "system"
15-
>("theme-light");
13+
const [theme, setThemeState] = React.useState<"theme-light" | "dark" | "system">("theme-light");
1614

1715
React.useEffect(() => {
1816
const isDarkMode = document.documentElement.classList.contains("dark");
@@ -21,9 +19,7 @@ export function ModeToggle() {
2119

2220
React.useEffect(() => {
2321
const isDark =
24-
theme === "dark" ||
25-
(theme === "system" &&
26-
window.matchMedia("(prefers-color-scheme: dark)").matches);
22+
theme === "dark" || (theme === "system" && window.matchMedia("(prefers-color-scheme: dark)").matches);
2723
document.documentElement.classList[isDark ? "add" : "remove"]("dark");
2824
}, [theme]);
2925

@@ -37,15 +33,9 @@ export function ModeToggle() {
3733
</Button>
3834
</DropdownMenuTrigger>
3935
<DropdownMenuContent align="end">
40-
<DropdownMenuItem onClick={() => setThemeState("theme-light")}>
41-
Light
42-
</DropdownMenuItem>
43-
<DropdownMenuItem onClick={() => setThemeState("dark")}>
44-
Dark
45-
</DropdownMenuItem>
46-
<DropdownMenuItem onClick={() => setThemeState("system")}>
47-
System
48-
</DropdownMenuItem>
36+
<DropdownMenuItem onClick={() => setThemeState("theme-light")}>Light</DropdownMenuItem>
37+
<DropdownMenuItem onClick={() => setThemeState("dark")}>Dark</DropdownMenuItem>
38+
<DropdownMenuItem onClick={() => setThemeState("system")}>System</DropdownMenuItem>
4939
</DropdownMenuContent>
5040
</DropdownMenu>
5141
);

src/@/components/ui/accordion.tsx

Lines changed: 39 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,51 @@
1-
import * as React from "react"
2-
import * as AccordionPrimitive from "@radix-ui/react-accordion"
3-
import { ChevronDownIcon } from "@radix-ui/react-icons"
1+
import * as React from "react";
2+
import * as AccordionPrimitive from "@radix-ui/react-accordion";
3+
import { ChevronDownIcon } from "@radix-ui/react-icons";
44

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

7-
const Accordion = AccordionPrimitive.Root
7+
const Accordion = AccordionPrimitive.Root;
88

99
const AccordionItem = React.forwardRef<
10-
React.ElementRef<typeof AccordionPrimitive.Item>,
11-
React.ComponentPropsWithoutRef<typeof AccordionPrimitive.Item>
10+
React.ElementRef<typeof AccordionPrimitive.Item>,
11+
React.ComponentPropsWithoutRef<typeof AccordionPrimitive.Item>
1212
>(({ className, ...props }, ref) => (
13-
<AccordionPrimitive.Item
14-
ref={ref}
15-
className={cn("border-b", className)}
16-
{...props}
17-
/>
18-
))
19-
AccordionItem.displayName = "AccordionItem"
13+
<AccordionPrimitive.Item ref={ref} className={cn("border-b", className)} {...props} />
14+
));
15+
AccordionItem.displayName = "AccordionItem";
2016

2117
const AccordionTrigger = React.forwardRef<
22-
React.ElementRef<typeof AccordionPrimitive.Trigger>,
23-
React.ComponentPropsWithoutRef<typeof AccordionPrimitive.Trigger>
18+
React.ElementRef<typeof AccordionPrimitive.Trigger>,
19+
React.ComponentPropsWithoutRef<typeof AccordionPrimitive.Trigger>
2420
>(({ className, children, ...props }, ref) => (
25-
<AccordionPrimitive.Header className="flex">
26-
<AccordionPrimitive.Trigger
27-
ref={ref}
28-
className={cn(
29-
"flex flex-1 items-center justify-between py-4 text-sm font-medium transition-all hover:underline [&[data-state=open]>svg]:rotate-180",
30-
className
31-
)}
32-
{...props}
33-
>
34-
{children}
35-
<ChevronDownIcon className="h-4 w-4 shrink-0 text-muted-foreground transition-transform duration-200" />
36-
</AccordionPrimitive.Trigger>
37-
</AccordionPrimitive.Header>
38-
))
39-
AccordionTrigger.displayName = AccordionPrimitive.Trigger.displayName
21+
<AccordionPrimitive.Header className="flex">
22+
<AccordionPrimitive.Trigger
23+
ref={ref}
24+
className={cn(
25+
"flex flex-1 items-center justify-between py-4 text-sm font-medium transition-all hover:underline [&[data-state=open]>svg]:rotate-180",
26+
className,
27+
)}
28+
{...props}
29+
>
30+
{children}
31+
<ChevronDownIcon className="h-4 w-4 shrink-0 text-muted-foreground transition-transform duration-200" />
32+
</AccordionPrimitive.Trigger>
33+
</AccordionPrimitive.Header>
34+
));
35+
AccordionTrigger.displayName = AccordionPrimitive.Trigger.displayName;
4036

4137
const AccordionContent = React.forwardRef<
42-
React.ElementRef<typeof AccordionPrimitive.Content>,
43-
React.ComponentPropsWithoutRef<typeof AccordionPrimitive.Content>
38+
React.ElementRef<typeof AccordionPrimitive.Content>,
39+
React.ComponentPropsWithoutRef<typeof AccordionPrimitive.Content>
4440
>(({ className, children, ...props }, ref) => (
45-
<AccordionPrimitive.Content
46-
ref={ref}
47-
className="overflow-hidden text-sm data-[state=closed]:animate-accordion-up data-[state=open]:animate-accordion-down"
48-
{...props}
49-
>
50-
<div className={cn("pb-4 pt-0", className)}>{children}</div>
51-
</AccordionPrimitive.Content>
52-
))
53-
AccordionContent.displayName = AccordionPrimitive.Content.displayName
41+
<AccordionPrimitive.Content
42+
ref={ref}
43+
className="overflow-hidden text-sm data-[state=closed]:animate-accordion-up data-[state=open]:animate-accordion-down"
44+
{...props}
45+
>
46+
<div className={cn("pb-4 pt-0", className)}>{children}</div>
47+
</AccordionPrimitive.Content>
48+
));
49+
AccordionContent.displayName = AccordionPrimitive.Content.displayName;
5450

55-
export { Accordion, AccordionItem, AccordionTrigger, AccordionContent }
51+
export { Accordion, AccordionItem, AccordionTrigger, AccordionContent };

src/@/components/ui/avatar.tsx

Lines changed: 27 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,38 @@
1-
import * as React from "react"
2-
import * as AvatarPrimitive from "@radix-ui/react-avatar"
1+
import * as React from "react";
2+
import * as AvatarPrimitive from "@radix-ui/react-avatar";
33

4-
import { cn } from "@/lib/utils"
4+
import { cn } from "@/lib/utils";
55

66
const Avatar = React.forwardRef<
7-
React.ElementRef<typeof AvatarPrimitive.Root>,
8-
React.ComponentPropsWithoutRef<typeof AvatarPrimitive.Root>
7+
React.ElementRef<typeof AvatarPrimitive.Root>,
8+
React.ComponentPropsWithoutRef<typeof AvatarPrimitive.Root>
99
>(({ className, ...props }, ref) => (
10-
<AvatarPrimitive.Root
11-
ref={ref}
12-
className={cn(
13-
"relative flex h-10 w-10 shrink-0 overflow-hidden rounded-full",
14-
className
15-
)}
16-
{...props}
17-
/>
18-
))
19-
Avatar.displayName = AvatarPrimitive.Root.displayName
10+
<AvatarPrimitive.Root
11+
ref={ref}
12+
className={cn("relative flex h-10 w-10 shrink-0 overflow-hidden rounded-full", className)}
13+
{...props}
14+
/>
15+
));
16+
Avatar.displayName = AvatarPrimitive.Root.displayName;
2017

2118
const AvatarImage = React.forwardRef<
22-
React.ElementRef<typeof AvatarPrimitive.Image>,
23-
React.ComponentPropsWithoutRef<typeof AvatarPrimitive.Image>
19+
React.ElementRef<typeof AvatarPrimitive.Image>,
20+
React.ComponentPropsWithoutRef<typeof AvatarPrimitive.Image>
2421
>(({ className, ...props }, ref) => (
25-
<AvatarPrimitive.Image
26-
ref={ref}
27-
className={cn("aspect-square h-full w-full", className)}
28-
{...props}
29-
/>
30-
))
31-
AvatarImage.displayName = AvatarPrimitive.Image.displayName
22+
<AvatarPrimitive.Image ref={ref} className={cn("aspect-square h-full w-full", className)} {...props} />
23+
));
24+
AvatarImage.displayName = AvatarPrimitive.Image.displayName;
3225

3326
const AvatarFallback = React.forwardRef<
34-
React.ElementRef<typeof AvatarPrimitive.Fallback>,
35-
React.ComponentPropsWithoutRef<typeof AvatarPrimitive.Fallback>
27+
React.ElementRef<typeof AvatarPrimitive.Fallback>,
28+
React.ComponentPropsWithoutRef<typeof AvatarPrimitive.Fallback>
3629
>(({ className, ...props }, ref) => (
37-
<AvatarPrimitive.Fallback
38-
ref={ref}
39-
className={cn(
40-
"flex h-full w-full items-center justify-center rounded-full bg-muted",
41-
className
42-
)}
43-
{...props}
44-
/>
45-
))
46-
AvatarFallback.displayName = AvatarPrimitive.Fallback.displayName
30+
<AvatarPrimitive.Fallback
31+
ref={ref}
32+
className={cn("flex h-full w-full items-center justify-center rounded-full bg-muted", className)}
33+
{...props}
34+
/>
35+
));
36+
AvatarFallback.displayName = AvatarPrimitive.Fallback.displayName;
4737

48-
export { Avatar, AvatarImage, AvatarFallback }
38+
export { Avatar, AvatarImage, AvatarFallback };

src/@/components/ui/badge.tsx

Lines changed: 21 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,30 @@
1-
import * as React from "react"
2-
import { cva, type VariantProps } from "class-variance-authority"
1+
import * as React from "react";
2+
import { cva, type VariantProps } from "class-variance-authority";
33

4-
import { cn } from "@/lib/utils"
4+
import { cn } from "@/lib/utils";
55

66
const badgeVariants = cva(
7-
"inline-flex items-center rounded-md border px-2.5 py-0.5 text-xs font-semibold transition-colors focus:outline-none focus:ring-2 focus:ring-ring focus:ring-offset-2",
8-
{
9-
variants: {
10-
variant: {
11-
default:
12-
"border-transparent bg-primary text-primary-foreground shadow hover:bg-primary/80",
13-
secondary:
14-
"border-transparent bg-secondary text-secondary-foreground hover:bg-secondary/80",
15-
destructive:
16-
"border-transparent bg-destructive text-destructive-foreground shadow hover:bg-destructive/80",
17-
outline: "text-foreground",
18-
},
7+
"inline-flex items-center rounded-md border px-2.5 py-0.5 text-xs font-semibold transition-colors focus:outline-none focus:ring-2 focus:ring-ring focus:ring-offset-2",
8+
{
9+
variants: {
10+
variant: {
11+
default: "border-transparent bg-primary text-primary-foreground shadow hover:bg-primary/80",
12+
secondary: "border-transparent bg-secondary text-secondary-foreground hover:bg-secondary/80",
13+
destructive:
14+
"border-transparent bg-destructive text-destructive-foreground shadow hover:bg-destructive/80",
15+
outline: "text-foreground",
16+
},
17+
},
18+
defaultVariants: {
19+
variant: "default",
20+
},
1921
},
20-
defaultVariants: {
21-
variant: "default",
22-
},
23-
}
24-
)
22+
);
2523

26-
export interface BadgeProps
27-
extends React.HTMLAttributes<HTMLDivElement>,
28-
VariantProps<typeof badgeVariants> {}
24+
export interface BadgeProps extends React.HTMLAttributes<HTMLDivElement>, VariantProps<typeof badgeVariants> {}
2925

3026
function Badge({ className, variant, ...props }: BadgeProps) {
31-
return (
32-
<div className={cn(badgeVariants({ variant }), className)} {...props} />
33-
)
27+
return <div className={cn(badgeVariants({ variant }), className)} {...props} />;
3428
}
3529

36-
export { Badge, badgeVariants }
30+
export { Badge, badgeVariants };

0 commit comments

Comments
 (0)