Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactoring files #253

Merged
merged 3 commits into from
Apr 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions .prettierignore

This file was deleted.

12 changes: 12 additions & 0 deletions packages/admin/.editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
root = true

[*]
charset = utf-8
end_of_line = lf
insert_final_newline = true
indent_style = space
indent_size = 4
trim_trailing_whitespace = true

[*{.yml,.yaml,.css,.js,.json}]
indent_size = 2
8 changes: 8 additions & 0 deletions packages/admin/.prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
node_modules
dist
/vendor
/public
.git
**/.git
package-lock.json
composer.lock
20 changes: 18 additions & 2 deletions packages/admin/.prettierrc
Original file line number Diff line number Diff line change
@@ -1,6 +1,22 @@
{
"printWidth": 120,
"semi": false,
"singleQuote": true,
"tailwindConfig": "./packages/admin/tailwind.config.js",
"trailingComma": "all"
"tabWidth": 4,
"tailwindConfig": "./tailwind.config.js",
"trailingComma": "all",
"plugins": [
"prettier-plugin-blade",
"prettier-plugin-tailwindcss"
],
"overrides": [
{
"files": [
"*.blade.php"
],
"options": {
"parser": "blade"
}
}
]
}
4 changes: 1 addition & 3 deletions packages/admin/config/components/setting.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
'inventory-create' => Pages\Settings\Inventories\Create::class,
'inventory-edit' => Pages\Settings\Inventories\Edit::class,
'legal' => Pages\Settings\LegalPage::class,
'analytics' => Pages\Settings\Analytics::class,
// 'analytics' => Pages\Settings\Analytics::class,
'payment' => Pages\Settings\Payment::class,
'team-index' => Pages\Settings\Team\Index::class,
'team-roles' => Pages\Settings\Team\RolePermission::class,
Expand All @@ -37,8 +37,6 @@
'modals.create-permission' => Livewire\Modals\CreatePermission::class,
'modals.create-role' => Livewire\Modals\CreateRole::class,
'modals.confirm-password' => Livewire\Modals\ConfirmPassword::class,
'modals.delete-inventory' => Livewire\Modals\DeleteInventory::class,
'modals.delete-role' => Livewire\Modals\DeleteRole::class,
'modals.logout-others-browser' => Livewire\Modals\LogoutOthersBrowser::class,
'modals.payment-method-form' => Livewire\Modals\PaymentMethodForm::class,

Expand Down
14 changes: 7 additions & 7 deletions packages/admin/config/settings.php
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,13 @@
'route' => 'shopper.settings.inventories',
'permission' => null,
],
[
'name' => 'Analytics',
'description' => 'Get a better understanding of where your traffic is coming from.',
'icon' => svg('untitledui-pie-chart', 'h-6 w-6'),
'route' => 'shopper.settings.analytics',
'permission' => null,
],
// [
// 'name' => 'Analytics',
// 'description' => 'Get a better understanding of where your traffic is coming from.',
// 'icon' => svg('untitledui-pie-chart', 'h-6 w-6'),
// 'route' => 'shopper.settings.analytics',
// 'permission' => null,
// ],
[
'name' => 'Payment methods',
'description' => 'Add different payment methods for your customers.',
Expand Down
4 changes: 2 additions & 2 deletions packages/admin/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"build:css": "npx tailwindcss -i resources/css/shopper.css -o public/shopper.css --postcss --minify",
"build:js": "node scripts/build.js",
"build": "npm-run-all build:*",
"prettier": "npx prettier --write ."
"prettier": "npx prettier --write ./resources"
},
"devDependencies": {
"@alpinejs/focus": "^3.12.0",
Expand All @@ -27,7 +27,7 @@
"postcss": "^8.4.4",
"postcss-import": "^15.1.0",
"prettier": "^3.1.1",
"prettier-plugin-blade": "^2.0.0",
"prettier-plugin-blade": "^2",
"prettier-plugin-tailwindcss": "^0.5.10",
"resolve-url-loader": "^2.3.1",
"sortablejs": "^1.15.0",
Expand Down
Loading
Loading