Skip to content

Commit 2e61834

Browse files
HudamabkhootHudamabkhoot
authored
Merge pull request #42 from the-collab-lab/feat/setup-tailwind-shadcn
Merge dev branch into main
2 parents 7dc2713 + 3220f21 commit 2e61834

Some content is hidden

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

53 files changed

+5066
-2415
lines changed

‎components.json‎

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

‎index.html‎

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!DOCTYPE html>
1+
<!doctype html>
22
<html lang="en">
33
<head>
44
<meta charset="UTF-8" />
@@ -10,9 +10,21 @@
1010
name="description"
1111
content="A smart shopping list that learns your purchase habits and makes suggestions, so you don't forget to buy what's important."
1212
/>
13-
<link rel="icon" type="image/svg+xml" href="/src/favicon.ico" />
13+
<link rel="icon" type="image/svg+xml" href="/src/favicon-cart.png" />
14+
<link rel="preconnect" href="https://fonts.googleapis.com" />
15+
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
16+
<link
17+
href="https://fonts.googleapis.com/css2?family=Montserrat:ital,wght@0,100..900;1,100..900&family=Playfair+Display:ital,wght@0,400..900;1,400..900&display=swap"
18+
rel="stylesheet"
19+
/>
20+
<link rel="preconnect" href="https://fonts.googleapis.com" />
21+
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
22+
<link
23+
href="https://fonts.googleapis.com/css2?family=Monda:[email protected]&family=Montserrat:wght@700&family=Playfair+Display:ital,wght@0,400..900;1,400..900&display=swap"
24+
rel="stylesheet"
25+
/>
1426
<meta name="color-scheme" content="dark light" />
15-
<title>Smart Shopping List</title>
27+
<title>GrocerEase</title>
1628
<script type="module" src="/src/index.jsx" async></script>
1729
</head>
1830
<body>

‎jsconfig.json‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
{
22
"compilerOptions": {
3-
"types": ["vitest/globals"]
3+
"baseUrl": ".",
4+
"paths": {
5+
"@/*": ["./src/*"]
6+
}
47
}
58
}

0 commit comments

Comments
 (0)