Skip to content

Commit

Permalink
Merge branch 'main' into minimal-theme
Browse files Browse the repository at this point in the history
  • Loading branch information
zepfietje committed Dec 28, 2023
2 parents 6038f55 + 1fb79c6 commit c30e352
Show file tree
Hide file tree
Showing 10 changed files with 5 additions and 17 deletions.
2 changes: 0 additions & 2 deletions app/Filament/Pages/Dashboard.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,12 @@

namespace App\Filament\Pages;

use Filament\Forms\Components\Checkbox;
use Filament\Forms\Components\DatePicker;
use Filament\Forms\Components\Section;
use Filament\Forms\Components\Select;
use Filament\Forms\Form;
use Filament\Forms\Get;
use Filament\Pages\Dashboard as BaseDashboard;
use Filament\Pages\Page;

class Dashboard extends BaseDashboard
{
Expand Down
2 changes: 0 additions & 2 deletions app/Filament/Resources/Blog/PostResource.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,13 @@
namespace App\Filament\Resources\Blog;

use App\Filament\Resources\Blog\PostResource\Pages;
use App\Filament\Resources\Blog\PostResource\RelationManagers;
use App\Models\Blog\Post;
use Filament\Forms;
use Filament\Forms\Components\SpatieTagsInput;
use Filament\Forms\Form;
use Filament\Infolists\Components;
use Filament\Infolists\Infolist;
use Filament\Notifications\Notification;
use Filament\Pages\SubNavigationPosition;
use Filament\Resources\Pages\Page;
use Filament\Resources\Resource;
use Filament\Tables;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
namespace App\Filament\Resources\Blog\PostResource\Pages;

use App\Filament\Resources\Blog\PostResource;
use Filament\Actions;
use Filament\Resources\Pages\ViewRecord;

class ViewPost extends ViewRecord
Expand Down
1 change: 0 additions & 1 deletion app/Filament/Resources/Shop/OrderResource.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
use App\Filament\Resources\Shop\OrderResource\RelationManagers;
use App\Filament\Resources\Shop\OrderResource\Widgets\OrderStats;
use App\Forms\Components\AddressForm;
use App\Models\Blog\Category;
use App\Models\Shop\Order;
use App\Models\Shop\Product;
use Filament\Forms;
Expand Down
1 change: 0 additions & 1 deletion app/Filament/Resources/Shop/ProductResource.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
use Filament\Forms\Components\SpatieMediaLibraryFileUpload;
use Filament\Forms\Form;
use Filament\Notifications\Notification;
use Filament\Resources\Pages\Page;
use Filament\Resources\Resource;
use Filament\Tables;
use Filament\Tables\Filters\QueryBuilder;
Expand Down
2 changes: 1 addition & 1 deletion app/Livewire/Form.php
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ protected function getFormSchema(): array
->schema([
Forms\Components\TextInput::make('two'),
]),
])
]),
];
}

Expand Down
2 changes: 0 additions & 2 deletions database/factories/Blog/LinkFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,7 @@
namespace Database\Factories\Blog;

use Database\Factories\Concerns\CanCreateImages;
use Database\Seeders\DatabaseSeeder;
use Illuminate\Database\Eloquent\Factories\Factory;
use Illuminate\Support\Facades\Storage;
use Illuminate\Support\Str;

/**
Expand Down
3 changes: 0 additions & 3 deletions database/factories/Blog/PostFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,8 @@

use App\Models\Blog\Post;
use Database\Factories\Concerns\CanCreateImages;
use Database\Seeders\DatabaseSeeder;
use Illuminate\Database\Eloquent\Factories\Factory;
use Illuminate\Support\Facades\Storage;
use Illuminate\Support\Str;
use Throwable;

class PostFactory extends Factory
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
public function up()
{
Schema::create('shop_category_product', function (Blueprint $table) {
$table->primary(['shop_category_id', 'shop_product_id']);
$table->foreignId('shop_category_id')->nullable();
$table->foreignId('shop_product_id')->nullable();
$table->id();
$table->foreignId('shop_category_id');
$table->foreignId('shop_product_id');
$table->timestamps();
});
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
public function up(): void
{
Schema::create('job_batches', function (Blueprint $table) {
$table->string('id')->primary();
$table->id();
$table->string('name');
$table->integer('total_jobs');
$table->integer('pending_jobs');
Expand Down

0 comments on commit c30e352

Please sign in to comment.