Skip to content

Commit d81e395

Browse files
committed
Merge branch 'Dev' into 197-redesign-shop-single-item-view
2 parents 4dc1a15 + 73821c5 commit d81e395

File tree

184 files changed

+1388
-372
lines changed

Some content is hidden

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

184 files changed

+1388
-372
lines changed

components.json

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
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": "gray",
10+
"cssVariables": false,
11+
"prefix": ""
12+
},
13+
"aliases": {
14+
"components": "@/components",
15+
"utils": "@/utilities/utils"
16+
}
17+
}

jsconfig.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{
2+
"compilerOptions": {
3+
"baseUrl": ".",
4+
"paths": {
5+
"@/*": [
6+
"./src/*"
7+
]
8+
}
9+
}
10+
}

package.json

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,13 @@
2323
"@hookstate/core": "^4.0.1",
2424
"@tanstack/react-query": "^5.22.2",
2525
"@tanstack/react-query-devtools": "^5.24.0",
26+
"@tanstack/react-table": "^8.17.3",
2627
"axios": "^1.6.1",
28+
"class-variance-authority": "^0.7.0",
29+
"clsx": "^2.1.1",
2730
"date-fns": "^2.30.0",
2831
"html-react-parser": "^5.0.6",
32+
"lucide-react": "^0.395.0",
2933
"million": "^3.0.2",
3034
"prop-types": "^15.8.1",
3135
"react": "^18.2.0",
@@ -40,7 +44,9 @@
4044
"react-router-dom": "^6.11.2",
4145
"react-share": "^5.1.0",
4246
"react-simple-wysiwyg": "^2.2.5",
47+
"tailwind-merge": "^2.3.0",
4348
"tailwind-scrollbar-hide": "^1.1.7",
49+
"tailwindcss-animate": "^1.0.7",
4450
"yet-another-react-lightbox": "^3.15.6"
4551
},
4652
"devDependencies": {
@@ -49,7 +55,7 @@
4955
"@types/react": "^18.0.28",
5056
"@types/react-dom": "^18.0.11",
5157
"@vitejs/plugin-react": "^4.0.0",
52-
"autoprefixer": "^10.4.14",
58+
"autoprefixer": "^10.4.19",
5359
"concurrently": "^8.2.2",
5460
"eslint": "^8.43.0",
5561
"eslint-config-airbnb": "^19.0.4",
@@ -61,9 +67,9 @@
6167
"eslint-plugin-react-hooks": "^4.6.0",
6268
"husky": "^8.0.0",
6369
"knip": "^4.6.0",
64-
"postcss": "^8.4.23",
70+
"postcss": "^8.4.38",
6571
"prettier": "^3.3.2",
66-
"tailwindcss": "^3.3.2",
72+
"tailwindcss": "^3.4.3",
6773
"typescript": "^5.4.5",
6874
"vite": "^5.0.0",
6975
"vitest": "^1.6.0"

0 commit comments

Comments
 (0)