pratiksh404 / adminetic-website

src/Provider/WebsiteServiceProvider.php

Spacing +7 added lines, -7 removed lines

@@ -120,15 +120,15 @@ 
     {
         // Publish Config File
         $this->publishes([
-            __DIR__ . '/../../config/website.php' => config_path('website.php'),
+            __DIR__.'/../../config/website.php' => config_path('website.php'),
         ], 'website-config');
         // Publish View Files
         $this->publishes([
-            __DIR__ . '/../../resources/views' => resource_path('views/vendor/adminetic/plugin/website'),
+            __DIR__.'/../../resources/views' => resource_path('views/vendor/adminetic/plugin/website'),
         ], 'website-views');
         // Publish Migration Files
         $this->publishes([
-            __DIR__ . '/../../database/migrations' => database_path('migrations'),
+            __DIR__.'/../../database/migrations' => database_path('migrations'),
         ], 'website-migrations');
     }
 
@@ -139,8 +139,8 @@ 
      */
     protected function registerResource()
     {
-        $this->loadMigrationsFrom(__DIR__ . '/../../database/migrations'); // Loading Migration Files
-        $this->loadViewsFrom(__DIR__ . '/../../resources/views', 'website'); // Loading Views Files
+        $this->loadMigrationsFrom(__DIR__.'/../../database/migrations'); // Loading Migration Files
+        $this->loadViewsFrom(__DIR__.'/../../resources/views', 'website'); // Loading Views Files
         $this->registerRoutes();
     }
 
@@ -163,8 +163,8 @@ 
      */
     protected function registerRoutes()
     {
-        Route::group($this->routeConfiguration(), function () {
-            $this->loadRoutesFrom(__DIR__ . '/../../routes/web.php');
+        Route::group($this->routeConfiguration(), function() {
+            $this->loadRoutesFrom(__DIR__.'/../../routes/web.php');
         });
     }
 

database/migrations/2021_10_11_024609_create_blocks_table.php

Spacing +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
      */
     public function up()
     {
-        Schema::create('blocks', function (Blueprint $table) {
+        Schema::create('blocks', function(Blueprint $table) {
             $table->id();
             $table->string('code')->unique();
             $table->string('type');

src/Repositories/BlockRepository.php

Spacing +2 added lines, -2 removed lines

@@ -14,7 +14,7 @@ 
     public function indexBlock()
     {
         $blocks = config('adminetic.caching', true)
-            ? (Cache::has('blocks') ? Cache::get('blocks') : Cache::rememberForever('blocks', function () {
+            ? (Cache::has('blocks') ? Cache::get('blocks') : Cache::rememberForever('blocks', function() {
                 return Block::orderBy('position')->get();
             }))
             : Block::orderBy('position')->get();
@@ -79,7 +79,7 @@ 
                 'image' => request()->image->store('website/block', 'public'),
             ]);
             $image = Image::make(request()->file('image')->getRealPath());
-            $image->save(public_path('storage/' . $block->image));
+            $image->save(public_path('storage/'.$block->image));
         }
     }
 

src/Http/Requests/BlockRequest.php

Spacing +2 added lines, -15 removed lines

@@ -39,23 +39,10 @@
         $id = $this->block->id ?? '';
 
         return [
-<<<<<<< HEAD
+<< << <<< HEAD
             'code' => 'required|max:255|unique:blocks,code,' . $id,
             'type' => 'required|max:255',
             'name' => 'required|max:255|unique:blocks,name,' . $id,
 =======
             'code' => 'required|max:255|unique:blocks,code,'.$id,
-            'name' => 'required|max:255|unique:blocks,name,'.$id,
->>>>>>> 03ed8c22796652ffecb9c7cedb0423656ccc6e3b
-            'image' => 'nullable|file|image|max:3000',
-            'version' => 'required|numeric|max:60',
-            'theme' => 'nullable|numeric|max:60',
-            'page' => 'nullable|max:255',
-            'location' => 'required|max:255',
-            'position' => 'sometimes|numeric',
-            'body' => 'nullable|max:55000',
-            'setting' => 'nullable',
-            'active' => 'sometimes|boolean',
-        ];
-    }
-}
+            'name' => 'required|max:255|unique:blocks,name,'.$id
\ No newline at end of file