Skip to content

Commit

Permalink
wip
Browse files Browse the repository at this point in the history
  • Loading branch information
danharrin committed Feb 14, 2021
1 parent 831fb02 commit af44c50
Show file tree
Hide file tree
Showing 7 changed files with 19 additions and 13 deletions.
7 changes: 2 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,26 +1,23 @@
{
"name": "filament/filament",
"description": "Core package for Filament - a lightweight admin panel for the TALL stack.",
"description": "A lightweight admin panel for the TALL stack.",
"license": "MIT",
"require": {
"php": "^7.4|^8.0",
"blade-ui-kit/blade-heroicons": "^0.3",
"calebporzio/sushi": "^2.1",
"danharrin/date-format-converter": "^0.2.0",
"danharrin/livewire-rate-limiting": "^0.2.0",
"graham-campbell/markdown": "^13.1",
"illuminate/auth": "^8.0",
"illuminate/console": "^8.0",
"illuminate/container": "^8.0",
"illuminate/contracts": "^8.0",
"illuminate/cookie": "^8.0",
"illuminate/database": "^8.0",
"illuminate/filesystem": "^8.0",
"illuminate/http": "^8.0",
"illuminate/notifications": "^8.0",
"illuminate/routing": "^8.0",
"illuminate/session": "^8.0",
"illuminate/support": "^8.0",
"illuminate/validation": "^8.0",
"illuminate/view": "^8.0",
"league/glide-laravel": "^1.0",
"livewire/livewire": "^2.2",
Expand Down
9 changes: 8 additions & 1 deletion packages/forms/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,14 @@
},
"require": {
"php": "^7.4|^8.0",
"filament/support": "dev-develop"
"blade-ui-kit/blade-heroicons": "^0.3",
"danharrin/date-format-converter": "^0.2.0",
"filament/support": "^1.0",
"illuminate/database": "^8.0",
"illuminate/http": "^8.0",
"illuminate/support": "^8.0",
"illuminate/validation": "^8.0",
"livewire/livewire": "^2.2"
},
"autoload": {
"psr-4": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@

@if ($hint)
<div class="text-xs leading-tight text-gray-500 font-mono">
@markdown($hint)
{!! Str::of($hint)->markdown() !!}
</div>
@endif
</div>
Expand All @@ -46,7 +46,7 @@

@if ($helpMessage)
<div class="text-xs font-normal leading-tight text-gray-500">
@markdown($helpMessage)
{!! Str::of($helpMessage)->markdown() !!}
</div>
@endif
</div>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<?php

namespace Filament\Http\Controllers;
namespace Filament\Forms\Http\Controllers;

use Illuminate\Http\Request;
use Illuminate\Support\Facades\Storage;

class RichEditorAttachmentController extends Controller
class RichEditorAttachmentController
{
public function __invoke(Request $request)
{
Expand Down
5 changes: 4 additions & 1 deletion packages/support/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,10 @@
"source": "https://github.com/laravel-filament/filament"
},
"require": {
"php": "^7.4|^8.0"
"php": "^7.4|^8.0",
"illuminate/filesystem": "^8.0",
"illuminate/support": "^8.0",
"livewire/livewire": "^2.2"
},
"autoload": {
"psr-4": {
Expand Down
1 change: 0 additions & 1 deletion packages/support/src/SupportServiceProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
use Filament\Support\Providers\RouteServiceProvider;
use Filament\Support\Providers\ServiceProvider;
use Illuminate\Support\Facades\Blade;
use Illuminate\Support\HtmlString;

class SupportServiceProvider extends ServiceProvider
{
Expand Down
2 changes: 1 addition & 1 deletion routes/web.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
Route::get('/', Livewire\Dashboard::class)->name('dashboard');
Route::get('/account', Livewire\EditAccount::class)->name('account');

Route::post('/rich-editor-attachments', Controllers\RichEditorAttachmentController::class)->name('rich-editor-attachments.upload');
Route::post('/rich-editor-attachments', \Filament\Forms\Http\Controllers\RichEditorAttachmentController::class)->name('rich-editor-attachments.upload');

// Resources
Resource::all()->each(function ($resource) {
Expand Down

0 comments on commit af44c50

Please sign in to comment.