opensource/filament
3
0
Fork 0
mirror of https://github.com/filamentphp/filament.git synced 2026-08-30 17:07:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
Dan Harrin
2021-03-22 19:34:55 +00:00
parent b4a85d4929
commit 28abf75b23
6 changed files with 42 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/forms/config/forms.php
+1 -1
View File
@@ -4,6 +4,6 @@ return [
'default_filesystem_disk' => env('FILAMENT_FILESYSTEM_DRIVER', 'public'),
'default_attachment_upload_url' => null,
'default_attachment_upload_route' => null,
];
packages/forms/src/Components/MarkdownEditor.php
+1 -1
View File
@@ -26,7 +26,7 @@ class MarkdownEditor extends Field
{
$this->attachmentDisk(config('forms.default_filesystem_disk'));
$attachmentUploadUrl = config('forms.default_attachment_upload_url');
$attachmentUploadUrl = route(config('forms.default_attachment_upload_route'));
if ($attachmentUploadUrl) {
$this->enableAttachments($attachmentUploadUrl);
packages/forms/src/Components/RichEditor.php
+1 -1
View File
@@ -29,7 +29,7 @@ class RichEditor extends Field
{
$this->attachmentDisk(config('forms.default_filesystem_disk'));
$attachmentUploadUrl = config('forms.default_attachment_upload_url');
$attachmentUploadUrl = route(config('forms.default_attachment_upload_route'));
if ($attachmentUploadUrl) {
$this->enableAttachments($attachmentUploadUrl);
routes/web.php
+35 -29
View File
@@ -8,40 +8,46 @@ use Filament\Http\Middleware\AuthorizeAdmins;
use Illuminate\Routing\Middleware\ValidateSignature;
use Illuminate\Support\Facades\Route;
Route::get('assets/{path}', Controllers\AssetController::class)->where('path', '.*')->name('asset');
Route::name('filament.')
->middleware(config('filament.middleware.base'))
->domain(config('filament.domain'))
->prefix(config('filament.path'))
->group(function () {
Route::get('assets/{path}', Controllers\AssetController::class)->where('path', '.*')->name('asset');
// Authentication
Route::middleware(config('filament.middleware.guest'))->name('auth.')->group(function () {
Route::get('login', Livewire\Auth\Login::class)->name('login');
Route::get('forgot-password', Livewire\Auth\RequestPassword::class)->name('password.request');
Route::get('reset-password/{token}', Livewire\Auth\ResetPassword::class)->middleware([ValidateSignature::class])->name('password.reset');
});
// Authentication
Route::middleware(config('filament.middleware.guest'))->name('auth.')->group(function () {
Route::get('login', Livewire\Auth\Login::class)->name('login');
Route::get('forgot-password', Livewire\Auth\RequestPassword::class)->name('password.request');
Route::get('reset-password/{token}', Livewire\Auth\ResetPassword::class)->middleware([ValidateSignature::class])->name('password.reset');
});
// Images
Route::get('image/{path}', Controllers\ImageController::class)->where('path', '.*')->name('image');
// Images
Route::get('image/{path}', Controllers\ImageController::class)->where('path', '.*')->name('image');
// Authenticated routes
Route::middleware(config('filament.middleware.auth'))->group(function () {
foreach (Filament::getPages() as $page) {
Route::get($page::route()->uri, $page)->name('pages.' . $page::route()->name);
}
// Authenticated routes
Route::middleware(config('filament.middleware.auth'))->group(function () {
foreach (Filament::getPages() as $page) {
Route::get($page::route()->uri, $page)->name('pages.' . $page::route()->name);
}
Route::get('/', Livewire\Dashboard::class)->name('dashboard');
Route::get('account', Livewire\EditAccount::class)->name('account');
Route::get('/', Livewire\Dashboard::class)->name('dashboard');
Route::get('account', Livewire\EditAccount::class)->name('account');
Route::post('form-attachments', FormAttachmentController::class)->name('form-attachments.upload');
Route::post('form-attachments', FormAttachmentController::class)->name('form-attachments.upload');
foreach (Filament::getResources() as $resource) {
foreach ($resource::router()->routes as $route) {
Route::get('resources/' . $resource::getSlug() . '/' . $route->uri, $route->page)
->name('resources.' . $resource::getSlug() . '.' . $route->name);
}
}
foreach (Filament::getResources() as $resource) {
foreach ($resource::router()->routes as $route) {
Route::get('resources/' . $resource::getSlug() . '/' . $route->uri, $route->page)
->name('resources.' . $resource::getSlug() . '.' . $route->name);
}
}
Route::middleware(AuthorizeAdmins::class)->group(function () {
foreach (Filament::userResource()::router()->routes as $route) {
Route::get(Filament::userResource()::getSlug() . '/' . $route->uri, $route->page)
->name(Filament::userResource()::getSlug() . '.' . $route->name);
}
Route::middleware(AuthorizeAdmins::class)->group(function () {
foreach (Filament::userResource()::router()->routes as $route) {
Route::get(Filament::userResource()::getSlug() . '/' . $route->uri, $route->page)
->name(Filament::userResource()::getSlug() . '.' . $route->name);
}
});
});
});
});
src/FilamentServiceProvider.php
+4 -9
View File
@@ -5,7 +5,6 @@ namespace Filament;
use BladeUI\Icons\Factory as BladeUIFactory;
use Filament\Models\User;
use Filament\Pages\Page;
use Filament\Providers\RouteServiceProvider;
use Filament\Resources\Resource;
use Filament\Roles\Role;
use Filament\View\Components;
@@ -30,8 +29,8 @@ class FilamentServiceProvider extends ServiceProvider
{
$this->bootCommands();
$this->bootDirectives();
$this->bootLoaders();
$this->bootLivewireComponents();
$this->bootLoaders();
$this->bootPublishing();
$this->configure();
@@ -42,7 +41,6 @@ class FilamentServiceProvider extends ServiceProvider
$this->mergeConfigFrom(__DIR__ . '/../config/filament.php', 'filament');
$this->registerIcons();
$this->registerProviders();
$this->discoverFilamentPages();
$this->discoverFilamentResources();
@@ -108,6 +106,8 @@ class FilamentServiceProvider extends ServiceProvider
protected function bootLoaders()
{
$this->loadRoutesFrom(__DIR__ . '/../routes/web.php');
$this->loadViewComponentsAs('filament', [
'avatar' => Components\Avatar::class,
'image' => Components\Image::class,
@@ -177,7 +177,7 @@ class FilamentServiceProvider extends ServiceProvider
]);
$this->app['config']->set('forms', [
'default_attachment_upload_url' => route('filament.form-attachments.upload'),
'default_attachment_upload_route' => 'filament.form-attachments.upload',
'default_filesystem_disk' => $this->app['config']->get('filament.default_filesystem_disk'),
]);
});
@@ -332,9 +332,4 @@ class FilamentServiceProvider extends ServiceProvider
Livewire::component($alias, $class);
});
}
protected function registerProviders()
{
$this->app->register(RouteServiceProvider::class);
}
}
src/Providers/RouteServiceProvider.php
-18
View File
@@ -1,18 +0,0 @@
<?php
namespace Filament\Providers;
use Illuminate\Foundation\Support\Providers\RouteServiceProvider as ServiceProvider;
use Illuminate\Support\Facades\Route;
class RouteServiceProvider extends ServiceProvider
{
public function map()
{
Route::name('filament.')
->middleware(config('filament.middleware.base'))
->domain(config('filament.domain'))
->prefix(config('filament.path'))
->group(__DIR__ . '/../../routes/web.php');
}
}