Skip to content

Commit 81f1a49

Browse files
rupadanarupadana
authored
Merge pull request #124 from rupadana/patch-v4
Change resource path location
2 parents 57d9e56 + e2482af commit 81f1a49

33 files changed

+160
-155
lines changed

‎resources/lang/it/api-service.php‎

Lines changed: 64 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -1,64 +1,64 @@
1-
<?php
2-
3-
// translations for Rupadana/ApiService
4-
return [
5-
6-
/*
7-
|--------------------------------------------------------------------------
8-
| Model
9-
|--------------------------------------------------------------------------
10-
*/
11-
12-
'model' => 'Token',
13-
'models' => 'Tokens',
14-
15-
/*
16-
|--------------------------------------------------------------------------
17-
| Table Columns
18-
|--------------------------------------------------------------------------
19-
*/
20-
21-
'column.name' => 'Nome',
22-
'column.user' => 'Utente',
23-
'column.abilities' => 'Permessi',
24-
'column.created_at' => 'Creato il',
25-
26-
/*
27-
|--------------------------------------------------------------------------
28-
| Form Fields
29-
|--------------------------------------------------------------------------
30-
*/
31-
32-
'field.name' => 'Nome',
33-
'field.user' => 'Utente',
34-
'field.ability' => 'Permessi',
35-
36-
/*
37-
|--------------------------------------------------------------------------
38-
| Form Actions
39-
|--------------------------------------------------------------------------
40-
*/
41-
42-
'action.select_all' => 'Seleziona tutto',
43-
'action.unselect_all' => 'Deseleziona tutto',
44-
'action.close' => 'Chiudi',
45-
46-
/*
47-
|--------------------------------------------------------------------------
48-
| Section & Tabs
49-
|--------------------------------------------------------------------------
50-
*/
51-
52-
'section.general' => 'Generale:',
53-
'section.abilities' => 'Permessi:',
54-
'section.abilities.description' => 'Seleziona permessi per il token',
55-
56-
/*
57-
|--------------------------------------------------------------------------
58-
| Notifications
59-
|--------------------------------------------------------------------------
60-
*/
61-
62-
'notification.token.created' => 'Token creato, salvalo e tienilo al sicuro!',
63-
64-
];
1+
<?php
2+
3+
// translations for Rupadana/ApiService
4+
return [
5+
6+
/*
7+
|--------------------------------------------------------------------------
8+
| Model
9+
|--------------------------------------------------------------------------
10+
*/
11+
12+
'model' => 'Token',
13+
'models' => 'Tokens',
14+
15+
/*
16+
|--------------------------------------------------------------------------
17+
| Table Columns
18+
|--------------------------------------------------------------------------
19+
*/
20+
21+
'column.name' => 'Nome',
22+
'column.user' => 'Utente',
23+
'column.abilities' => 'Permessi',
24+
'column.created_at' => 'Creato il',
25+
26+
/*
27+
|--------------------------------------------------------------------------
28+
| Form Fields
29+
|--------------------------------------------------------------------------
30+
*/
31+
32+
'field.name' => 'Nome',
33+
'field.user' => 'Utente',
34+
'field.ability' => 'Permessi',
35+
36+
/*
37+
|--------------------------------------------------------------------------
38+
| Form Actions
39+
|--------------------------------------------------------------------------
40+
*/
41+
42+
'action.select_all' => 'Seleziona tutto',
43+
'action.unselect_all' => 'Deseleziona tutto',
44+
'action.close' => 'Chiudi',
45+
46+
/*
47+
|--------------------------------------------------------------------------
48+
| Section & Tabs
49+
|--------------------------------------------------------------------------
50+
*/
51+
52+
'section.general' => 'Generale:',
53+
'section.abilities' => 'Permessi:',
54+
'section.abilities.description' => 'Seleziona permessi per il token',
55+
56+
/*
57+
|--------------------------------------------------------------------------
58+
| Notifications
59+
|--------------------------------------------------------------------------
60+
*/
61+
62+
'notification.token.created' => 'Token creato, salvalo e tienilo al sicuro!',
63+
64+
];

‎routes/api.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
$router->post('/auth/login', [AuthController::class, 'login'])->middleware(config('api-service.login-middleware', []));
1414
$router->post('/auth/logout', [AuthController::class, 'logout'])->middleware(config('api-service.logout-middleware', ['auth:sanctum']));
1515

16-
if (ApiService::tenancyAwareness() && (!ApiService::isRoutePrefixedByPanel() || !ApiService::isTenancyEnabled())) {
16+
if (ApiService::tenancyAwareness() && (! ApiService::isRoutePrefixedByPanel() || ! ApiService::isTenancyEnabled())) {
1717
throw new InvalidTenancyConfiguration("Tenancy awareness is enabled!. Please set 'api-service.route.panel_prefix=true' and 'api-service.tenancy.enabled=true'");
1818
}
1919

@@ -43,7 +43,7 @@
4343
});
4444
}
4545

46-
if (!ApiService::tenancyAwareness()) {
46+
if (! ApiService::tenancyAwareness()) {
4747
Route::prefix($panelRoutePrefix)
4848
->name($panelNamePrefix)
4949
->middleware($middlewares)

‎src/ApiServicePlugin.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,8 @@ public function route(Panel $panel): void
6666
try {
6767
$resourceName = str($resource)->beforeLast('Resource')->explode('\\')->last();
6868

69-
$apiServiceClass = $resource . '\\Api\\' . $resourceName . 'ApiService';
70-
69+
$apiServiceClass = str($resource)->remove($resourceName . 'Resource') . 'Api\\' . $resourceName . 'ApiService';
70+
// dd($apiServiceClass);
7171
app($apiServiceClass)->registerRoutes($panel);
7272
} catch (Exception $e) {
7373
}

‎src/Commands/MakeApiRequest.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ public function handle(): int
9696
$namespace .= $resourceNamespace !== '' ? "\\{$resourceNamespace}" : '';
9797

9898
$baseResourcePath =
99-
(string) str("{$pluralModelClass}\\{$resource}")
99+
(string) str("{$pluralModelClass}")
100100
->prepend('/')
101101
->prepend($path)
102102
->replace('\\', '/')
@@ -107,7 +107,7 @@ public function handle(): int
107107
$modelNamespace = app("{$namespace}\\{$pluralModelClass}\\{$resourceClass}")->getModel();
108108

109109
$this->copyStubToApp('Request', $requestDirectory, [
110-
'namespace' => "{$namespace}\\{$pluralModelClass}\\{$resourceClass}\\Api\\Requests",
110+
'namespace' => "{$namespace}\\{$pluralModelClass}\\Api\\Requests",
111111
'nameClass' => $nameClass,
112112
'validationRules' => $this->getValidationRules(new $modelNamespace),
113113
]);

‎src/Commands/MakeApiServiceCommand.php‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -89,14 +89,14 @@ public function handle(): int
8989
$deleteHandlerClass = 'DeleteHandler';
9090

9191
$baseResourcePath =
92-
(string) str("{$pluralModelClass}\\{$resource}")
92+
(string) str("{$pluralModelClass}")
9393
->prepend('/')
9494
->prepend($path)
9595
->replace('\\', '/')
9696
->replace('//', '/');
9797

98-
$transformerClass = "{$namespace}\\{$pluralModelClass}\\{$resourceClass}\\Api\\Transformers\\{$transformer}";
99-
$handlersNamespace = "{$namespace}\\{$pluralModelClass}\\{$resourceClass}\\Api\\Handlers";
98+
$transformerClass = "{$namespace}\\{$pluralModelClass}\\Api\\Transformers\\{$transformer}";
99+
$handlersNamespace = "{$namespace}\\{$pluralModelClass}\\Api\\Handlers";
100100

101101
$resourceApiDirectory = "{$baseResourcePath}/Api/$apiServiceClass.php";
102102
$createHandlerDirectory = "{$baseResourcePath}/Api/Handlers/$createHandlerClass.php";
@@ -119,7 +119,7 @@ public function handle(): int
119119
});
120120

121121
$this->copyStubToApp('ResourceApiService', $resourceApiDirectory, [
122-
'namespace' => "{$namespace}\\{$pluralModelClass}\\{$resourceClass}\\Api",
122+
'namespace' => "{$namespace}\\{$pluralModelClass}\\Api",
123123
'resource' => "{$namespace}\\{$pluralModelClass}\\{$resourceClass}",
124124
'resourceClass' => $resourceClass,
125125
'resourcePageClass' => $resourceApiDirectory,
@@ -128,13 +128,15 @@ public function handle(): int
128128

129129
$this->copyStubToApp('DeleteHandler', $deleteHandlerDirectory, [
130130
'resource' => "{$namespace}\\{$pluralModelClass}\\{$resourceClass}",
131+
'resourcePath' => "{$namespace}\\{$pluralModelClass}",
131132
'resourceClass' => $resourceClass,
132133
'handlersNamespace' => $handlersNamespace,
133134
'model' => $model,
134135
]);
135136

136137
$this->copyStubToApp('DetailHandler', $detailHandlerDirectory, [
137138
'resource' => "{$namespace}\\{$pluralModelClass}\\{$resourceClass}",
139+
'resourcePath' => "{$namespace}\\{$pluralModelClass}",
138140
'resourceClass' => $resourceClass,
139141
'handlersNamespace' => $handlersNamespace,
140142
'transformer' => $transformer,
@@ -144,20 +146,23 @@ public function handle(): int
144146

145147
$this->copyStubToApp('CreateHandler', $createHandlerDirectory, [
146148
'resource' => "{$namespace}\\{$pluralModelClass}\\{$resourceClass}",
149+
'resourcePath' => "{$namespace}\\{$pluralModelClass}",
147150
'resourceClass' => $resourceClass,
148151
'handlersNamespace' => $handlersNamespace,
149152
'model' => $model,
150153
]);
151154

152155
$this->copyStubToApp('UpdateHandler', $updateHandlerDirectory, [
153156
'resource' => "{$namespace}\\{$pluralModelClass}\\{$resourceClass}",
157+
'resourcePath' => "{$namespace}\\{$pluralModelClass}",
154158
'resourceClass' => $resourceClass,
155159
'handlersNamespace' => $handlersNamespace,
156160
'model' => $model,
157161
]);
158162

159163
$this->copyStubToApp('PaginationHandler', $paginationHandlerDirectory, [
160164
'resource' => "{$namespace}\\{$pluralModelClass}\\{$resourceClass}",
165+
'resourcePath' => "{$namespace}\\{$pluralModelClass}",
161166
'resourceClass' => $resourceClass,
162167
'handlersNamespace' => $handlersNamespace,
163168
'transformer' => $transformer,

‎src/Commands/MakeApiTransformerCommand.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ public function handle(): int
8181
$namespace .= $resourceNamespace !== '' ? "\\{$resourceNamespace}" : '';
8282

8383
$baseResourcePath =
84-
(string) str("{$pluralModelClass}\\{$resource}")
84+
(string) str("{$pluralModelClass}")
8585
->prepend('/')
8686
->prepend($path)
8787
->replace('\\', '/')
@@ -92,7 +92,7 @@ public function handle(): int
9292
$modelClass = app("{$namespace}\\{$pluralModelClass}\\{$resourceClass}")->getModel();
9393

9494
$this->copyStubToApp('ApiTransformer', $resourceApiTransformerDirectory, [
95-
'namespace' => "{$namespace}\\{$pluralModelClass}\\{$resourceClass}\\Api\\Transformers",
95+
'namespace' => "{$namespace}\\{$pluralModelClass}\\Api\\Transformers",
9696
'resource' => "{$namespace}\\{$pluralModelClass}\\{$resourceClass}",
9797
'resourceClass' => $resourceClass,
9898
'resourcePageClass' => $resourceApiTransformerDirectory,

‎src/Http/Handlers.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ public static function getAbility(): array
103103
{
104104
if (config('api-service.use-spatie-permission-middleware', false)) {
105105
return [
106-
static::getKebabClassName() . '_' . strtolower(preg_replace('/(?<!^)([A-Z])/', '::$1', str(static::getModel())->explode('\\')->last())),
106+
static::$permission,
107107
];
108108
}
109109

‎src/Resources/TokenResource.php‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,27 +2,25 @@
22

33
namespace Rupadana\ApiService\Resources;
44

5-
use Filament\Schemas\Schema;
6-
use Filament\Schemas\Components\Section;
5+
use App\Models\User;
76
use Filament\Actions\Action;
8-
use Filament\Actions\DeleteAction;
97
use Filament\Actions\BulkActionGroup;
8+
use Filament\Actions\DeleteAction;
109
use Filament\Actions\DeleteBulkAction;
11-
use Rupadana\ApiService\Resources\TokenResource\Pages\ListTokens;
12-
use Rupadana\ApiService\Resources\TokenResource\Pages\CreateToken;
13-
use App\Models\User;
1410
use Filament\Facades\Filament;
1511
use Filament\Forms\Components\CheckboxList;
1612
use Filament\Forms\Components\Select;
1713
use Filament\Forms\Components\TextInput;
1814
use Filament\Resources\Resource;
19-
use Filament\Tables;
15+
use Filament\Schemas\Components\Section;
16+
use Filament\Schemas\Schema;
2017
use Filament\Tables\Columns\TextColumn;
2118
use Filament\Tables\Table;
2219
use Illuminate\Database\Eloquent\Builder;
2320
use Rupadana\ApiService\ApiServicePlugin;
2421
use Rupadana\ApiService\Models\Token;
25-
use Rupadana\ApiService\Resources\TokenResource\Pages;
22+
use Rupadana\ApiService\Resources\TokenResource\Pages\CreateToken;
23+
use Rupadana\ApiService\Resources\TokenResource\Pages\ListTokens;
2624

2725
class TokenResource extends Resource
2826
{
@@ -41,7 +39,7 @@ public static function form(Schema $schema): Schema
4139
{
4240
return $schema
4341
->components([
44-
Section::make( __('api-service::api-service.section.general'))
42+
Section::make(__('api-service::api-service.section.general'))
4543
->schema([
4644
TextInput::make('name')
4745
->label(__('api-service::api-service.field.name'))
@@ -89,8 +87,8 @@ public static function getAbilitiesSchema(): array
8987
CheckboxList::make('ability')
9088
->label(__('api-service::api-service.field.ability'))
9189
->options($extractedAbilities)
92-
->selectAllAction(fn (Action $action) => $action->label( __('api-service::api-service.action.select_all')))
93-
->deselectAllAction(fn (Action $action) => $action->label( __('api-service::api-service.action.unselect_all')))
90+
->selectAllAction(fn (Action $action) => $action->label(__('api-service::api-service.action.select_all')))
91+
->deselectAllAction(fn (Action $action) => $action->label(__('api-service::api-service.action.unselect_all')))
9492
->bulkToggleable(),
9593
])
9694
->collapsible();

‎src/Resources/TokenResource/Pages/CreateToken.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
namespace Rupadana\ApiService\Resources\TokenResource\Pages;
44

5-
use Filament\Actions\Action;
65
use App\Models\User;
6+
use Filament\Actions\Action;
77
use Filament\Notifications\Notification;
88
use Filament\Resources\Pages\CreateRecord;
99
use Illuminate\Database\Eloquent\Model;

‎src/Resources/TokenResource/Pages/EditToken.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
namespace Rupadana\ApiService\Resources\TokenResource\Pages;
44

55
use Filament\Actions\DeleteAction;
6-
use Filament\Actions;
76
use Filament\Resources\Pages\EditRecord;
87
use Rupadana\ApiService\Resources\TokenResource;
98

0 commit comments

Comments
 (0)