diff --git a/packages/Sarga/Admin/src/Config/menu.php b/packages/Sarga/Admin/src/Config/menu.php index 1a5ccf5aa..cc0e584f4 100644 --- a/packages/Sarga/Admin/src/Config/menu.php +++ b/packages/Sarga/Admin/src/Config/menu.php @@ -5,7 +5,7 @@ return [ 'key' => 'catalog.scrap', 'name' => 'sarga::app.layouts.scrap', 'route' => 'admin.scrap-categories.index', - 'sort' => 5, + 'sort' => 6, 'icon-class' => '', ], [ diff --git a/packages/Sarga/Brand/composer.json b/packages/Sarga/Brand/composer.json index 429c3cf54..3a80c2109 100644 --- a/packages/Sarga/Brand/composer.json +++ b/packages/Sarga/Brand/composer.json @@ -12,7 +12,7 @@ }, "autoload": { "psr-4": { - "Sarga\\Admin\\": "src/" + "Sarga\\Brand\\": "src/" } }, "extra": { diff --git a/packages/Sarga/Brand/src/Config/concord.php b/packages/Sarga/Brand/src/Config/concord.php new file mode 100644 index 000000000..a07af6bcc --- /dev/null +++ b/packages/Sarga/Brand/src/Config/concord.php @@ -0,0 +1,4 @@ + 'catalog.brand', + 'name' => 'brand::app.brands', + 'route' => 'admin.catalog.brand.index', + 'sort' => 5, + 'icon-class' => '', + ] +]; \ No newline at end of file diff --git a/packages/Sarga/Brand/src/Contracts/Brand.php b/packages/Sarga/Brand/src/Contracts/Brand.php new file mode 100644 index 000000000..a0ecb27fc --- /dev/null +++ b/packages/Sarga/Brand/src/Contracts/Brand.php @@ -0,0 +1,7 @@ +brandRepository = $brandRepository; + $this->_config = request('_config'); + } public function index() { - + return view($this->_config['view']); } public function create(){ - + return view($this->_config['view']); } - public function edit(){ - + public function edit($id){ + $brand = $this->brandRepository->find($id); + return view($this->_config['view'], compact('brand')); } public function update(){ } - public function destroy(){ + public function destroy($id){ } diff --git a/packages/Sarga/Brand/src/Models/Brand.php b/packages/Sarga/Brand/src/Models/Brand.php index b470d66d2..466125a9e 100644 --- a/packages/Sarga/Brand/src/Models/Brand.php +++ b/packages/Sarga/Brand/src/Models/Brand.php @@ -3,6 +3,7 @@ use Illuminate\Database\Eloquent\Model; use Illuminate\Support\Facades\Storage; use Sarga\Brand\Contracts\Brand as BrandContract; + class Brand extends Model implements BrandContract { protected $fillable = [ diff --git a/packages/Sarga/Brand/src/Models/BrandProxy.php b/packages/Sarga/Brand/src/Models/BrandProxy.php new file mode 100644 index 000000000..5e47bb4fc --- /dev/null +++ b/packages/Sarga/Brand/src/Models/BrandProxy.php @@ -0,0 +1,8 @@ +loadMigrationsFrom(__DIR__ . '/../Database/Migrations'); - + $this->loadRoutesFrom(__DIR__ . '/../Routes/brand-routes.php'); + $this->loadViewsFrom(__DIR__ . '/../Resources/views', 'brand'); + $this->loadTranslationsFrom(__DIR__ . '/../Resources/lang', 'brand'); // CategoryProxy::observe(CategoryObserver::class); } + + public function register() + { + $this->mergeConfigFrom( + dirname(__DIR__) . '/Config/menu.php', + 'menu.admin' + ); + $this->mergeConfigFrom(dirname(__DIR__) . '/Config/concord.php','concord.modules'); + } } \ No newline at end of file diff --git a/packages/Sarga/Brand/src/Resources/lang/en/app.php b/packages/Sarga/Brand/src/Resources/lang/en/app.php new file mode 100644 index 000000000..3514ab2df --- /dev/null +++ b/packages/Sarga/Brand/src/Resources/lang/en/app.php @@ -0,0 +1,6 @@ + 'Brand', + 'brands' => 'Brands', + 'create_brand' => 'Create brand' +]; diff --git a/packages/Sarga/Brand/src/Resources/lang/tr/app.php b/packages/Sarga/Brand/src/Resources/lang/tr/app.php new file mode 100644 index 000000000..f914dd4f6 --- /dev/null +++ b/packages/Sarga/Brand/src/Resources/lang/tr/app.php @@ -0,0 +1,5 @@ + 'Marka', + 'brands' => 'Markalar' +]; diff --git a/packages/Sarga/Brand/src/Resources/views/admin/create.blade.php b/packages/Sarga/Brand/src/Resources/views/admin/create.blade.php index 305c75e2f..07c54d509 100644 --- a/packages/Sarga/Brand/src/Resources/views/admin/create.blade.php +++ b/packages/Sarga/Brand/src/Resources/views/admin/create.blade.php @@ -6,7 +6,7 @@ @section('content')
-
+
@stop \ No newline at end of file diff --git a/packages/Sarga/Brand/src/Resources/views/admin/index.blade.php b/packages/Sarga/Brand/src/Resources/views/admin/index.blade.php index b3d9bbc7f..0511f7033 100644 --- a/packages/Sarga/Brand/src/Resources/views/admin/index.blade.php +++ b/packages/Sarga/Brand/src/Resources/views/admin/index.blade.php @@ -1 +1,20 @@ - +
+
+

{{ __('brand::app.brands') }}

+
+ +
+ + {{ __('brand::app.create_brand') }} + +
+
+ +@stop \ No newline at end of file diff --git a/packages/Sarga/Brand/src/Http/Routes/admin-routes.php b/packages/Sarga/Brand/src/Routes/admin-routes.php similarity index 57% rename from packages/Sarga/Brand/src/Http/Routes/admin-routes.php rename to packages/Sarga/Brand/src/Routes/admin-routes.php index acc2f10cc..d25383697 100644 --- a/packages/Sarga/Brand/src/Http/Routes/admin-routes.php +++ b/packages/Sarga/Brand/src/Routes/admin-routes.php @@ -11,32 +11,34 @@ Route::group(['middleware' => ['web', 'admin', 'admin_locale'], 'prefix' => conf * Categories routes. */ Route::get('/brands', [BrandController::class, 'index'])->defaults('_config', [ - 'view' => 'admin::catalog.categories.index', - ])->name('admin.catalog.categories.index'); + 'view' => 'brand::admin.index', + ])->name('admin.catalog.brand.index'); Route::get('/brands/create', [BrandController::class, 'create'])->defaults('_config', [ - 'view' => 'admin::catalog.categories.create', - ])->name('admin.catalog.categories.create'); + 'view' => 'brand::admin.create', + ])->name('admin.catalog.brand.create'); Route::post('/brands/create', [BrandController::class, 'store'])->defaults('_config', [ - 'redirect' => 'admin.catalog.categories.index', - ])->name('admin.catalog.categories.store'); + 'redirect' => 'admin.catalog.brand.index', + ])->name('admin.catalog.brand.store'); Route::get('/brands/edit/{id}', [BrandController::class, 'edit'])->defaults('_config', [ - 'view' => 'admin::catalog.categories.edit', - ])->name('admin.catalog.categories.edit'); + 'view' => 'brand::admin.edit', + ])->name('admin.catalog.brand.edit'); Route::put('/brands/edit/{id}', [BrandController::class, 'update'])->defaults('_config', [ - 'redirect' => 'admin.catalog.categories.index', - ])->name('admin.catalog.categories.update'); + 'redirect' => 'admin.catalog.brand.index', + ])->name('admin.catalog.brand.update'); - Route::post('/brands/delete/{id}', [BrandController::class, 'destroy'])->name('admin.catalog.categories.delete'); + Route::post('/brands/delete/{id}', [BrandController::class, 'destroy']) + ->name('admin.catalog.brand.delete'); Route::post('brands/massdelete', [BrandController::class, 'massDestroy'])->defaults('_config', [ - 'redirect' => 'admin.catalog.categories.index', - ])->name('admin.catalog.categories.massdelete'); + 'redirect' => 'admin.catalog.brand.index', + ])->name('admin.catalog.brand.massdelete'); - Route::post('/brands/product/count', [BrandController::class, 'productCount'])->name('admin.catalog.categories.product.count'); + Route::post('/brands/product/count', [BrandController::class, 'productCount']) + ->name('admin.catalog.brand.product.count'); }); }); diff --git a/packages/Sarga/Brand/src/Routes/brand-routes.php b/packages/Sarga/Brand/src/Routes/brand-routes.php new file mode 100644 index 000000000..8c1dd002b --- /dev/null +++ b/packages/Sarga/Brand/src/Routes/brand-routes.php @@ -0,0 +1,9 @@ +