Skip to content

Commit 0e39571

Browse files
authored
Feature/stractural js (#13)
* add trouble shooting * add seperate command for dev * update js structure * fix: shadcn ui command issue * update doc for shadcn ui * update readme * add build files
1 parent db96cc3 commit 0e39571

File tree

184 files changed

+319
-7631
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

+319
-7631
lines changed

README.md

Lines changed: 24 additions & 0 deletions
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<?php return array('dependencies' => array('react-jsx-runtime', 'wp-block-editor', 'wp-blocks', 'wp-i18n'), 'version' => '397ef6e06862ec3ffe04');
1+
<?php return array('dependencies' => array('react-jsx-runtime', 'wp-block-editor', 'wp-blocks', 'wp-i18n'), 'version' => '2b44e7ba224aadd1fd2c');

assets/blocks/block-1/index.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

components.json

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,20 @@
22
"$schema": "https://ui.shadcn.com/schema.json",
33
"style": "new-york",
44
"rsc": false,
5-
"tsx": false,
5+
"tsx": true,
66
"tailwind": {
77
"config": "tailwind.config.js",
8-
"css": "src/admin/index.css",
9-
"baseColor": "stone",
8+
"css": "documentation/app/global.css",
9+
"baseColor": "zinc",
1010
"cssVariables": true,
1111
"prefix": ""
1212
},
1313
"aliases": {
1414
"components": "@/components",
15-
"utils": "@/lib/utils"
16-
}
15+
"utils": "@/lib/utils",
16+
"ui": "@/components/ui",
17+
"lib": "@/lib",
18+
"hooks": "@/hooks"
19+
},
20+
"iconLibrary": "lucide"
1721
}

documentation/app/global.css

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,66 @@
11
@tailwind base;
22
@tailwind components;
33
@tailwind utilities;
4+
@layer base {
5+
:root {
6+
--background: 0 0% 100%;
7+
--foreground: 240 10% 3.9%;
8+
--card: 0 0% 100%;
9+
--card-foreground: 240 10% 3.9%;
10+
--popover: 0 0% 100%;
11+
--popover-foreground: 240 10% 3.9%;
12+
--primary: 240 5.9% 10%;
13+
--primary-foreground: 0 0% 98%;
14+
--secondary: 240 4.8% 95.9%;
15+
--secondary-foreground: 240 5.9% 10%;
16+
--muted: 240 4.8% 95.9%;
17+
--muted-foreground: 240 3.8% 46.1%;
18+
--accent: 240 4.8% 95.9%;
19+
--accent-foreground: 240 5.9% 10%;
20+
--destructive: 0 84.2% 60.2%;
21+
--destructive-foreground: 0 0% 98%;
22+
--border: 240 5.9% 90%;
23+
--input: 240 5.9% 90%;
24+
--ring: 240 10% 3.9%;
25+
--chart-1: 12 76% 61%;
26+
--chart-2: 173 58% 39%;
27+
--chart-3: 197 37% 24%;
28+
--chart-4: 43 74% 66%;
29+
--chart-5: 27 87% 67%;
30+
--radius: 0.5rem
31+
}
32+
.dark {
33+
--background: 240 10% 3.9%;
34+
--foreground: 0 0% 98%;
35+
--card: 240 10% 3.9%;
36+
--card-foreground: 0 0% 98%;
37+
--popover: 240 10% 3.9%;
38+
--popover-foreground: 0 0% 98%;
39+
--primary: 0 0% 98%;
40+
--primary-foreground: 240 5.9% 10%;
41+
--secondary: 240 3.7% 15.9%;
42+
--secondary-foreground: 0 0% 98%;
43+
--muted: 240 3.7% 15.9%;
44+
--muted-foreground: 240 5% 64.9%;
45+
--accent: 240 3.7% 15.9%;
46+
--accent-foreground: 0 0% 98%;
47+
--destructive: 0 62.8% 30.6%;
48+
--destructive-foreground: 0 0% 98%;
49+
--border: 240 3.7% 15.9%;
50+
--input: 240 3.7% 15.9%;
51+
--ring: 240 4.9% 83.9%;
52+
--chart-1: 220 70% 50%;
53+
--chart-2: 160 60% 45%;
54+
--chart-3: 30 80% 55%;
55+
--chart-4: 280 65% 60%;
56+
--chart-5: 340 75% 55%
57+
}
58+
}
59+
@layer base {
60+
* {
61+
@apply border-border;
62+
}
63+
body {
64+
@apply bg-background text-foreground;
65+
}
66+
}
-184 KB
Binary file not shown.

package.json

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
"type": "module",
55
"scripts": {
66
"dev": "concurrently \"vite -c vite.frontend.config.js --port 5173\" \"vite -c vite.admin.config.js --port 5174\"",
7+
"dev:admin": "vite -c vite.admin.config.js --port 5174",
8+
"dev:frontend": "vite -c vite.frontend.config.js --port 5173",
79
"dev:all": "concurrently \"npm run dev\" \"npm run block:start\"",
810
"dev:server": "concurrently \"npm run dev\" \"npx @wp-now/wp-now start\"",
911
"build": "vite build -c vite.frontend.config.js && vite build -c vite.admin.config.js && npm run block:build",
@@ -72,6 +74,7 @@
7274
"@headlessui/react": "^1.7.17",
7375
"@heroicons/react": "^2.0.18",
7476
"@hookform/resolvers": "^3.3.4",
77+
"@radix-ui/react-accordion": "^1.2.3",
7578
"@radix-ui/react-avatar": "^1.0.4",
7679
"@radix-ui/react-dialog": "^1.0.5",
7780
"@radix-ui/react-dropdown-menu": "^2.0.6",
@@ -89,8 +92,8 @@
8992
"@wordpress/block-editor": "^14.7.0",
9093
"@wordpress/blocks": "^14.1.0",
9194
"@wordpress/i18n": "^5.12.0",
92-
"class-variance-authority": "^0.7.0",
93-
"clsx": "^2.0.0",
95+
"class-variance-authority": "^0.7.1",
96+
"clsx": "^2.1.1",
9497
"cmdk": "^0.2.1",
9598
"date-fns": "^3.3.1",
9699
"embla-carousel-react": "^8.4.0",
@@ -104,7 +107,7 @@
104107
"react-router-dom": "^6.18.0",
105108
"recharts": "^2.12.7",
106109
"sonner": "^1.2.4",
107-
"tailwind-merge": "^2.2.0",
110+
"tailwind-merge": "^2.6.0",
108111
"tailwind-variants": "^0.1.18",
109112
"tailwindcss-animate": "^1.0.7",
110113
"tailwindcss-react-aria-components": "^1.0.0-rc.0",

src/admin/components/accounts/connections/gmail/step-2.tsx

Lines changed: 0 additions & 86 deletions
This file was deleted.

src/admin/pages/dashboard/index.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs";
1515

1616
import { CalendarDateRangePicker } from "@/components/dashboard/date-range-picker"
1717
// import { MainNav } from "@/components/dashboard/main-nav"
18-
import { Overview } from "@//components/dashboard/overview"
18+
import { Overview } from "@/components/dashboard/overview"
1919
import { RecentSales } from "@/components/dashboard/recent-sales"
2020
import { Search } from "@/components/dashboard/search"
2121
import TeamSwitcher from "@/components/dashboard/team-switcher"

src/admin/pages/inbox/index.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22

33
import { MailComp } from "@/components/inbox/mail"
4-
import { accounts, mails } from "@/pages/inbox/data"
4+
import { accounts, mails } from "@/admin/pages/inbox/data"
55

66
export default function MailPage() {
77

0 commit comments

Comments
 (0)