diff --git a/.gitignore b/.gitignore index fa1eccb1e..2be8bbb33 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,4 @@ yarn.lock .php_cs.cache storage/ storage/*.key +/resources/themes/velocity/* \ No newline at end of file diff --git a/composer.json b/composer.json index 3e4f6d780..df3ba493a 100755 --- a/composer.json +++ b/composer.json @@ -68,35 +68,36 @@ }, "autoload": { - "classmap": [ - "database/seeds", - "database/factories" - ], - "psr-4": { - "App\\": "app/", - "Webkul\\User\\": "packages/Webkul/User/src", - "Webkul\\Admin\\": "packages/Webkul/Admin/src", - "Webkul\\Ui\\": "packages/Webkul/Ui/src", - "Webkul\\Category\\": "packages/Webkul/Category/src", - "Webkul\\Checkout\\": "packages/Webkul/Checkout/src", - "Webkul\\Attribute\\": "packages/Webkul/Attribute/src", - "Webkul\\Shop\\": "packages/Webkul/Shop/src", - "Webkul\\Core\\": "packages/Webkul/Core/src", - "Webkul\\Customer\\": "packages/Webkul/Customer/src", - "Webkul\\Inventory\\": "packages/Webkul/Inventory/src", - "Webkul\\Product\\": "packages/Webkul/Product/src", - "Webkul\\Theme\\": "packages/Webkul/Theme/src", - "Webkul\\Shipping\\": "packages/Webkul/Shipping/src", - "Webkul\\Payment\\": "packages/Webkul/Payment/src", - "Webkul\\Paypal\\": "packages/Webkul/Paypal/src", - "Webkul\\Sales\\": "packages/Webkul/Sales/src", - "Webkul\\Tax\\": "packages/Webkul/Tax/src", - "Webkul\\API\\": "packages/Webkul/API", - "Webkul\\CatalogRule\\": "packages/Webkul/CatalogRule/src", - "Webkul\\CartRule\\": "packages/Webkul/CartRule/src", - "Webkul\\Rule\\": "packages/Webkul/Rule/src", - "Webkul\\CMS\\": "packages/Webkul/CMS/src" - } + "classmap": [ + "database/seeds", + "database/factories" + ], + "psr-4": { + "App\\": "app/", + "Webkul\\User\\": "packages/Webkul/User/src", + "Webkul\\Admin\\": "packages/Webkul/Admin/src", + "Webkul\\Ui\\": "packages/Webkul/Ui/src", + "Webkul\\Category\\": "packages/Webkul/Category/src", + "Webkul\\Checkout\\": "packages/Webkul/Checkout/src", + "Webkul\\Attribute\\": "packages/Webkul/Attribute/src", + "Webkul\\Shop\\": "packages/Webkul/Shop/src", + "Webkul\\Core\\": "packages/Webkul/Core/src", + "Webkul\\Customer\\": "packages/Webkul/Customer/src", + "Webkul\\Inventory\\": "packages/Webkul/Inventory/src", + "Webkul\\Product\\": "packages/Webkul/Product/src", + "Webkul\\Theme\\": "packages/Webkul/Theme/src", + "Webkul\\Shipping\\": "packages/Webkul/Shipping/src", + "Webkul\\Payment\\": "packages/Webkul/Payment/src", + "Webkul\\Paypal\\": "packages/Webkul/Paypal/src", + "Webkul\\Sales\\": "packages/Webkul/Sales/src", + "Webkul\\Tax\\": "packages/Webkul/Tax/src", + "Webkul\\API\\": "packages/Webkul/API", + "Webkul\\CatalogRule\\": "packages/Webkul/CatalogRule/src", + "Webkul\\CartRule\\": "packages/Webkul/CartRule/src", + "Webkul\\Rule\\": "packages/Webkul/Rule/src", + "Webkul\\CMS\\": "packages/Webkul/CMS/src", + "Webkul\\Velocity\\": "packages/Webkul/Velocity/src" + } }, "autoload-dev": { diff --git a/config/app.php b/config/app.php index 1fdb5b5a4..49e9e5d5f 100755 --- a/config/app.php +++ b/config/app.php @@ -229,6 +229,7 @@ return [ Tymon\JWTAuth\Providers\LaravelServiceProvider::class, //Webkul packages + Webkul\Velocity\Providers\VelocityServiceProvider::class, Webkul\Theme\Providers\ThemeServiceProvider::class, Webkul\User\Providers\UserServiceProvider::class, Webkul\Admin\Providers\AdminServiceProvider::class, diff --git a/config/themes.php b/config/themes.php index f7db9b62b..d6610d7e9 100755 --- a/config/themes.php +++ b/config/themes.php @@ -16,5 +16,12 @@ return [ // 'name' => 'Bliss', // 'parent' => 'default' // ] + + 'velocity' => [ + 'views_path' => 'resources/themes/velocity/views', + 'assets_path' => 'public/themes/velocity/assets', + 'name' => 'Velocity', + 'parent' => 'default' + ], ] ]; \ No newline at end of file diff --git a/database/seeds/DatabaseSeeder.php b/database/seeds/DatabaseSeeder.php index 76e33f47d..4b94fd2d1 100755 --- a/database/seeds/DatabaseSeeder.php +++ b/database/seeds/DatabaseSeeder.php @@ -1,6 +1,7 @@ call(BagistoDatabaseSeeder::class); + $this->call(VelocityMetaDataSeeder::class); } } diff --git a/packages/Webkul/Admin/src/Resources/views/settings/locales/create.blade.php b/packages/Webkul/Admin/src/Resources/views/settings/locales/create.blade.php index 4906a56cb..55baebe44 100755 --- a/packages/Webkul/Admin/src/Resources/views/settings/locales/create.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/settings/locales/create.blade.php @@ -7,7 +7,7 @@ @section('content')
-
+