Skip to content

Commit

Permalink
Remove antd and use tailwind/shadcn (#33)
Browse files Browse the repository at this point in the history
* initial commit

* replace circular progress with tailwind component

* migates resizable square and layout to tailwind

* format

* fix progress colors

* update button

* install shadcnui

* update progress bar

* configs

* update button

* update theme menu

* update device card

* configs

* update drawer/modal

* format

* add vaul wrapper

* eslint rules

* fix dialog rounded

* add theme dropdown icon

* rounded full as default for icons

* remove ant from modal

* dialog borders

* fix layout and square

* fix square

* add navbar

* fix layout

* partial migration of layouts

* fix pax device svg

* migrate input

* finish andt removal

* format and fix lint problems

* update packages

* update pnpm lock
  • Loading branch information
evertonstz authored Mar 12, 2024
1 parent c177d28 commit 8240754
Show file tree
Hide file tree
Showing 40 changed files with 2,495 additions and 1,425 deletions.
19 changes: 13 additions & 6 deletions .eslintrc.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,15 @@ module.exports = {
ignorePatterns: ['dist', '.eslintrc.cjs'],
parser: '@typescript-eslint/parser',
plugins: ['react-refresh', 'prettier'],
extends: ['eslint:recommended', 'plugin:@typescript-eslint/recommended-type-checked',
'plugin:@typescript-eslint/stylistic-type-checked', 'plugin:prettier/recommended', 'plugin:react/recommended',
'plugin:react-hooks/recommended', 'plugin:react/jsx-runtime'],
extends: [
'eslint:recommended',
'plugin:@typescript-eslint/recommended-type-checked',
'plugin:@typescript-eslint/stylistic-type-checked',
'plugin:prettier/recommended',
'plugin:react/recommended',
'plugin:react-hooks/recommended',
'plugin:react/jsx-runtime',
],
parserOptions: {
ecmaVersion: 'latest',
sourceType: 'module',
Expand All @@ -23,9 +29,10 @@ module.exports = {
'warn',
{ allowConstantExport: true },
],
'eqeqeq': 'error',
eqeqeq: 'error',
'prettier/prettier': 'error',
'max-len': ['error', 100],
'no-console': 'error'
'no-console': 'error',
'react/prop-types': 0,
},
}
};
5 changes: 4 additions & 1 deletion .prettierrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,10 @@
"arrowParens": "avoid",
"trailingComma": "all",
"importOrder": ["^@core/(.*)$", "^@server/(.*)$", "^@ui/(.*)$", "^[./]"],
"plugins": ["@trivago/prettier-plugin-sort-imports"],
"plugins": [
"@trivago/prettier-plugin-sort-imports",
"prettier-plugin-tailwindcss"
],
"importOrderSeparation": true,
"importOrderSortSpecifiers": true
}
17 changes: 17 additions & 0 deletions components.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"$schema": "https://ui.shadcn.com/schema.json",
"style": "default",
"rsc": false,
"tsx": true,
"tailwind": {
"config": "tailwind.config.js",
"css": "src/index.css",
"baseColor": "slate",
"cssVariables": false,
"prefix": ""
},
"aliases": {
"components": "@/components",
"utils": "@/lib/utils"
}
}
22 changes: 16 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,21 @@
"format": "prettier --ignore-path .gitignore --write \"**/*.+(js|ts|json)\""
},
"dependencies": {
"@ant-design/icons": "^5.3.0",
"@radix-ui/react-dialog": "^1.0.5",
"@radix-ui/react-dropdown-menu": "^2.0.6",
"@radix-ui/react-slot": "^1.0.2",
"@types/web-bluetooth": "^0.0.20",
"@uidotdev/usehooks": "^2.4.1",
"class-variance-authority": "^0.7.0",
"clsx": "^2.1.0",
"crypto-js": "^4.2.0",
"jest-environment-jsdom": "^29.7.0",
"lucide-react": "^0.352.0",
"react": "^18.2.0",
"react-dom": "^18.2.0"
"react-dom": "^18.2.0",
"tailwind-merge": "^2.2.1",
"tailwindcss-animate": "^1.0.7",
"vaul": "^0.9.0"
},
"devDependencies": {
"@babel/plugin-transform-modules-commonjs": "^7.23.3",
Expand All @@ -27,27 +35,29 @@
"@trivago/prettier-plugin-sort-imports": "^4.3.0",
"@types/crypto-js": "^4.2.2",
"@types/jest": "^29.5.11",
"@types/node": "^20.11.7",
"@types/node": "^20.11.24",
"@types/react": "^18.2.43",
"@types/react-dom": "^18.2.17",
"@typescript-eslint/eslint-plugin": "^6.14.0",
"@typescript-eslint/parser": "^6.14.0",
"@vitejs/plugin-react-swc": "^3.5.0",
"antd": "^5.13.3",
"autoprefixer": "^10.4.18",
"eslint": "^8.56.0",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-prettier": "^5.1.3",
"eslint-plugin-react": "^7.33.2",
"eslint-plugin-react-hooks": "^4.6.0",
"eslint-plugin-react-refresh": "^0.4.5",
"identity-obj-proxy": "^3.0.0",
"prettier": "^3.2.4",
"postcss": "^8.4.35",
"prettier": "^3.2.5",
"prettier-plugin-tailwindcss": "^0.5.12",
"tailwindcss": "^3.4.1",
"ts-jest": "^29.1.2",
"ts-node": "^10.9.2",
"typescript": "^5.2.2",
"vite": "^5.0.8",
"vitest": "^1.3.1"
},

"packageManager": "[email protected]+sha256.cea6d0bdf2de3a0549582da3983c70c92ffc577ff4410cbf190817ddc35137c2"
}
Loading

0 comments on commit 8240754

Please sign in to comment.