diff --git a/README.md b/README.md index 6f8331e9b..071093b88 100755 --- a/README.md +++ b/README.md @@ -1,46 +1,20 @@ -

-Total Downloads -

+

+Sarga +

-

-Total Downloads -Latest Stable Version -License -Backers on Open Collective -Backers on Open Collective -Sponsors on Open Collective -

-## Hactoberfest Rules -- On four successful PR merges, Bagisto will provide a T-Shirt, Stickers, Notebook, Pen, and Bagisto Elephant. -- We have added the 'Hactoberfest' label to the issues with the difficulty level label. -- Although we have added the 'hactoberfest' topic in our repo, we will consider only PRs whose issue is labelled with 'Hactoberfest'. Below is the link, -- [Hacktoberfest Labelled Issues](https://github.com/bagisto/bagisto/issues?q=is%3Aopen+is%3Aissue+label%3AHacktoberfest) - -## Topics -1. [Introduction](#introduction) -2. [Documentation](#documentation) -3. [Requirements](#requirements) -4. [Installation & Configuration](#installation-and-configuration) -5. [License](#license) -6. [Security Vulnerabilities](#security-vulnerabilities) -7. [Modules](#modules) -8. [Miscellaneous](#miscellaneous) ### Introduction -[Bagisto](https://www.bagisto.com) is a hand-tailored E-Commerce framework built on some of the hottest opensource technologies +[Sarga](https://www.sarga.com.tr) is a hand-tailored E-Commerce framework built on some of the hottest opensource technologies such as [Laravel](https://laravel.com) (a [PHP](https://secure.php.net/) framework) and [Vue.js](https://vuejs.org) a progressive Javascript framework. -**Bagisto can help you cut down your time, cost, and workforce for building online stores or migrating from physical stores +**Sarga can help you cut down your time, cost, and workforce for building online stores or migrating from physical stores to the ever-demanding online world. Your business -- whether small or huge -- can benefit. And it's straightforward to set it up.** -**Read our documentation: [Bagisto Docs](https://devdocs.bagisto.com/)** +**Read our documentation: [Sarga Docs](https://devdocs.bagisto.com/)** -**We also have a forum for any concerns, feature requests, or discussions. Please visit: [Bagisto Forums](https://forums.bagisto.com/)** - -# Visit our live [Demo](https://demo.bagisto.com) It packs in lots of features that will allow your E-Commerce business to scale in no time: @@ -59,14 +33,6 @@ It packs in lots of features that will allow your E-Commerce business to scale i * Price rules (Discount) inbuilt. * Theme (Velocity). * CMS Pages. -* Check out [these features and more](https://bagisto.com/features/). - -**For Developers**: -Take advantage of two of the hottest frameworks used in this project -- Laravel and Vue.js -- both have been used in Bagisto. - -### Documentation - -#### Bagisto Documentation [https://devdocs.bagisto.com](https://devdocs.bagisto.com) ### Requirements @@ -78,31 +44,6 @@ Take advantage of two of the hottest frameworks used in this project -- Laravel * **Node**: 8.11.3 LTS or higher. * **Composer**: 1.6.5 or higher. -### Installation and Configuration - -**1. You can install Bagisto by using the GUI installer.** - -##### a. Download zip from the link below: - -[Download the latest release](https://github.com/bagisto/bagisto/releases/latest) - -##### b. Extract the contents of the zip and execute the project in your browser: - -~~~ -http(s)://example.com -~~~ - -**2. Or you can install Bagisto from your console.** - -##### Execute these commands below, in order - -~~~ -1. composer create-project bagisto/bagisto -~~~ - -~~~ -2. PHP artisan bagisto: install -~~~ **To execute Bagisto**: @@ -146,46 +87,3 @@ Bagisto is a truly open-source E-Commerce framework that will always be free und ### Security Vulnerabilities Would you please not disclose security vulnerabilities publicly? If you find any security vulnerability in Bagisto, then please email us: mailto:support@bagisto.com. -### Modules -[Available Modules](https://bagisto.com/en/extensions) - -Need something else? Please email us at support@bagisto.com. - -### Miscellaneous - -#### Contribute - -Bagisto is a community-driven project; we appreciate every contribution from the community. - -- If you found an issue that you think we should know about, or if you have a suggestion, please submit an issue. -- If you want to submit a solution or offer a new feature, please create a pull request. - -Please read our [contributing guide](https://github.com/bagisto/bagisto/blob/master/.github/CONTRIBUTING.md) for more info. - -#### Contributors - -This project is on [Open Collective](https://opencollective.com/bagisto), and it exists thanks to the people who contribute. - - - -#### Backers - -Thank you to all our backers! 🙏 - - - -#### Sponsors - -Support this project by becoming a sponsor. Your logo will show up here with a link to your website. - -
- - - -
- - - - - - diff --git a/composer.json b/composer.json index b7f001f11..abc0e1c36 100755 --- a/composer.json +++ b/composer.json @@ -102,7 +102,8 @@ "Webkul\\BookingProduct\\": "packages/Webkul/BookingProduct/src", "Webkul\\SocialLogin\\": "packages/Webkul/SocialLogin/src", "Webkul\\DebugBar\\": "packages/Webkul/DebugBar/src", - "Webkul\\Marketing\\": "packages/Webkul/Marketing/src" + "Webkul\\Marketing\\": "packages/Webkul/Marketing/src", + "Sarga\\Shop\\": "packages/Sarga/Shop/src" } }, "autoload-dev": { diff --git a/config/app.php b/config/app.php index f4fffff28..cc79426c2 100755 --- a/config/app.php +++ b/config/app.php @@ -13,7 +13,7 @@ return [ | */ - 'name' => env('APP_NAME', 'Bagisto'), + 'name' => env('APP_NAME', 'Sarga'), /* |-------------------------------------------------------------------------- @@ -77,7 +77,7 @@ return [ | */ - 'timezone' => env('APP_TIMEZONE', 'Asia/Kolkata'), + 'timezone' => env('APP_TIMEZONE', 'Asia/Ashgabat'), /* |-------------------------------------------------------------------------- @@ -118,7 +118,7 @@ return [ | (use capital letters!) */ - 'default_country' => null, + 'default_country' => 'TM', /* |-------------------------------------------------------------------------- @@ -129,7 +129,7 @@ return [ | */ - 'currency' => env('APP_CURRENCY', 'USD'), + 'currency' => env('APP_CURRENCY', 'TMT'), /* |-------------------------------------------------------------------------- @@ -140,7 +140,7 @@ return [ | */ - 'channel' => 'default', + 'channel' => 'trendyol', /* |-------------------------------------------------------------------------- @@ -269,16 +269,16 @@ return [ Webkul\Checkout\Providers\CheckoutServiceProvider::class, Webkul\Shipping\Providers\ShippingServiceProvider::class, Webkul\Payment\Providers\PaymentServiceProvider::class, - Webkul\Paypal\Providers\PaypalServiceProvider::class, +// Webkul\Paypal\Providers\PaypalServiceProvider::class, Webkul\Sales\Providers\SalesServiceProvider::class, Webkul\Tax\Providers\TaxServiceProvider::class, Webkul\API\Providers\APIServiceProvider::class, Webkul\CatalogRule\Providers\CatalogRuleServiceProvider::class, Webkul\CartRule\Providers\CartRuleServiceProvider::class, Webkul\Rule\Providers\RuleServiceProvider::class, - Webkul\CMS\Providers\CMSServiceProvider::class, - Webkul\Velocity\Providers\VelocityServiceProvider::class, - Webkul\BookingProduct\Providers\BookingProductServiceProvider::class, +// Webkul\CMS\Providers\CMSServiceProvider::class, +// Webkul\Velocity\Providers\VelocityServiceProvider::class, +// Webkul\BookingProduct\Providers\BookingProductServiceProvider::class, Webkul\SocialLogin\Providers\SocialLoginServiceProvider::class, Webkul\DebugBar\Providers\DebugBarServiceProvider::class, Webkul\Marketing\Providers\MarketingServiceProvider::class, diff --git a/database/seeders/DatabaseSeeder.php b/database/seeders/DatabaseSeeder.php index a74fd0aa3..da85a52bb 100755 --- a/database/seeders/DatabaseSeeder.php +++ b/database/seeders/DatabaseSeeder.php @@ -5,6 +5,7 @@ namespace Database\Seeders; use Illuminate\Database\Seeder; use Webkul\Velocity\Database\Seeders\VelocityMetaDataSeeder; use Webkul\Admin\Database\Seeders\DatabaseSeeder as BagistoDatabaseSeeder; +use Sarga\Shop\Database\Seeders\DatabaseSeeder as SargaDatabaseSeeder; class DatabaseSeeder extends Seeder { @@ -15,7 +16,8 @@ class DatabaseSeeder extends Seeder */ public function run() { - $this->call(BagistoDatabaseSeeder::class); - $this->call(VelocityMetaDataSeeder::class); +// $this->call(BagistoDatabaseSeeder::class); +// $this->call(VelocityMetaDataSeeder::class); + $this->call(SargaDatabaseSeeder::class); } } diff --git a/packages/Sarga/Shop/composer.json b/packages/Sarga/Shop/composer.json new file mode 100644 index 000000000..81c6818bc --- /dev/null +++ b/packages/Sarga/Shop/composer.json @@ -0,0 +1,30 @@ +{ + "name": "sarga/shop", + "description": "Shop for Sarga.", + "license": "MIT", + + "authors": [ + { + "name": "merdan muhammedow", + "email": "merdan.m@gmail.com" + } + ], + + "require": {}, + "autoload": { + "psr-4": { + "Sarga\\Shop\\": "src/" + } + }, + + "extra": { + "laravel": { + "providers": [ + "Sarga\\Shop\\Providers\\ShopServiceProvider" + ], + "aliases": {} + } + }, + + "minimum-stability": "dev" +} diff --git a/packages/Sarga/Shop/src/Database/Seeders/ChannelTableSeeder.php b/packages/Sarga/Shop/src/Database/Seeders/ChannelTableSeeder.php new file mode 100644 index 000000000..e44695905 --- /dev/null +++ b/packages/Sarga/Shop/src/Database/Seeders/ChannelTableSeeder.php @@ -0,0 +1,17 @@ +call(SLocalesTableSeeder::class); + $this->call(DemoCategoryTableSeeder::class); + $this->call(ChannelTableSeeder::class); + + } +} \ No newline at end of file diff --git a/packages/Sarga/Shop/src/Database/Seeders/DemoCategoryTableSeeder.php b/packages/Sarga/Shop/src/Database/Seeders/DemoCategoryTableSeeder.php new file mode 100644 index 000000000..103e5b240 --- /dev/null +++ b/packages/Sarga/Shop/src/Database/Seeders/DemoCategoryTableSeeder.php @@ -0,0 +1,52 @@ +faker = $faker; + $this->categoryRepository = $categoryRepository; + } + + public function run() + { + $this->categoryRepository->deleteWhere([['id', '!=', 1]]); + for ($i = 2; $i < $this->numberOfParentCategories; $i++) { + $createdCategory = $this->categoryRepository->create([ + 'id' => $i, + 'slug' => $this->faker->slug, + 'name' => $this->faker->firstName, + 'description' => $this->faker->text(), + 'parent_id' => 1, + 'status' => 1, + ]); + + if ($createdCategory) { + for ($j = ($i-1)*$this->numberOfParentCategories; $j < ($i-1)*$this->numberOfParentCategories+$this->numberOfChildCategories; ++$j) { + + $this->categoryRepository->create([ + 'id' => $j, + 'slug' => $this->faker->slug, + 'name' => $this->faker->firstName, + 'description' => $this->faker->text(), + 'parent_id' => $createdCategory->id, + 'status' => 1 + ]); + } + } + } + } +} diff --git a/packages/Sarga/Shop/src/Database/Seeders/SLocalesTableSeeder.php b/packages/Sarga/Shop/src/Database/Seeders/SLocalesTableSeeder.php new file mode 100644 index 000000000..d8030dec3 --- /dev/null +++ b/packages/Sarga/Shop/src/Database/Seeders/SLocalesTableSeeder.php @@ -0,0 +1,10 @@ +publishes([ +// __DIR__ . '/../../publishable/assets' => public_path('themes/default/assets'), +// __DIR__ . '/../Resources/views' => resource_path('themes/default/views'), +// __DIR__ . '/../Resources/lang' => resource_path('lang/vendor/shop'), +// ]); + + /* loaders */ +// $this->loadRoutesFrom(__DIR__ . '/../Http/routes.php'); +// $this->loadMigrationsFrom(__DIR__ . '/../Database/Migrations'); +// $this->loadTranslationsFrom(__DIR__ . '/../Resources/lang', 'shop'); +// $this->loadViewsFrom(__DIR__ . '/../Resources/views', 'shop'); + + /* aliases */ +// $router->aliasMiddleware('locale', Locale::class); +// $router->aliasMiddleware('theme', Theme::class); +// $router->aliasMiddleware('currency', Currency::class); + + /* view composers */ +// $this->composeView(); + + /* paginators */ +// Paginator::defaultView('shop::partials.pagination'); +// Paginator::defaultSimpleView('shop::partials.pagination'); + } + + /** + * Register services. + * + * @return void + */ + public function register() + { +// $this->registerConfig(); + } + + /** + * Bind the the data to the views. + * + * @return void + */ + protected function composeView() + { + view()->composer('shop::customers.account.partials.sidemenu', function ($view) { + $tree = Tree::create(); + + foreach (config('menu.customer') as $item) { + $tree->add($item, 'menu'); + } + + $tree->items = core()->sortItems($tree->items); + + $view->with('menu', $tree); + }); + } + + /** + * Register package config. + * + * @return void + */ + protected function registerConfig() + { + $this->mergeConfigFrom( + dirname(__DIR__) . '/Config/menu.php', 'menu.customer' + ); + + $this->mergeConfigFrom( + dirname(__DIR__) . '/Config/system.php', 'core' + ); + } +} diff --git a/public/installer/AdminConfig.php b/public/installer/AdminConfig.php deleted file mode 100755 index daebea11e..000000000 --- a/public/installer/AdminConfig.php +++ /dev/null @@ -1,115 +0,0 @@ -connect_error) { - $data['connection'] = $conn->connect_error; - } - - $email = $_POST['admin_email']; - $name = $_POST['admin_name']; - $password = password_hash($_POST['admin_password'], PASSWORD_BCRYPT, ['cost' => 10]); - - // Deleting migrated admin - $deleteAdmin = "DELETE FROM admins WHERE id=1"; - $conn->query($deleteAdmin); - - // query for insertion - $sql = "INSERT INTO admins (name, email, password, role_id, status) - VALUES ('".$name."', '".$email."', '".$password."', '1', '1')"; - - if ($conn->query($sql) === TRUE) { - $data['insert_success'] = 'Data Successfully inserted into database'; - } else { - $data['insert_fail'] = "Error: " . $sql . "
" . $conn->error; - } - - $conn->close(); - } else { - $data['support_error'] = 'Bagisto currently support MySQL only. Press OK to still continue or change you DB connection to MySQL'; - } - - $storage_output = exec('cd ../.. && '. $phpbin .' artisan storage:link 2>&1'); - - // if there are no errors process our form, then return a message - // show a message of success and provide a true success variable - $data['success'] = true; - $data['message'] = 'Success!'; - } - - // return all our data to an AJAX call - echo json_encode($data); \ No newline at end of file diff --git a/public/installer/CSS/style.css b/public/installer/CSS/style.css deleted file mode 100755 index 91467bf8b..000000000 --- a/public/installer/CSS/style.css +++ /dev/null @@ -1,350 +0,0 @@ -body { - margin: 0; - font-size: 16px; - font-family: "Montserrat", sans-serif; - color: #000311; - background: #fff; - position: relative; - height: 100%; -} - -a { color: rgb(0, 65, 255); text-decoration: none;} - -.initial-display{ - padding-top: 50px; - text-align: center; -} - -.initial-display .logo { - width: 150px; -} - -.initial-display p { - font-size: 24px; - color: #333333; - text-align: center; - font-weight: 600; - margin-top: 10px; - padding-bottom: 10px; -} - -.card { - border-radius: 5px; - box-shadow: 1px 9px 18px rgba(62, 85, 120, 0.45); -} - -.btn-primary { - background-color: #0041FF; -} - -.warning { - margin-left: 15%; -} - -.footer { - bottom: 0; - position: absolute; - width: 100%; - padding-bottom: 20px; -} - -.form-control{ - border: 2px solid #C7C7C7; - border-radius: 3px; - -webkit-transition: 0.2s cubic-bezier(0.4, 0, 0.2, 1); - transition: 0.2s cubic-bezier(0.4, 0, 0.2, 1); - padding: 0px 10px; - font-size: 15px; - margin-top: 10px; -} - -.form-control:focus { - border-color: #0041FF; - box-shadow: 0px 1px 1px rgba(0, 0, 0, 0.075) inset, 0px 0px 8px rgba(11, 50, 139, 0.5); -} - -.form-group label.required::after { - margin-left: 1px; - content: "*"; - color: #FC6868; - font-weight: 700; - display: inline-block; -} - -.form-error { - color: #ff5656 !important; -} - -.control-group.has-error .control { - border-color: #FC6868 !important; -} - -.requirements_list { - width: 90%; - list-style: none; - margin-left: 4%; - padding:0; -} - -.requirements_list li { - padding: 0 10px 10px; - margin-bottom: 10px; - border-bottom: 1px dashed #dcdcdc; - line-height: normal; -} - -.requirements_list li:last-child { border-bottom: 0;} - -.requirements_list small { - font-size: 13px; - color:#9b9b9b; -} - -.title { - font-size: 16px; - color: #151515; - line-height: 30px; - text-align: left; - margin-top: 30px; - margin-bottom: 10px; - text-align: center; -} - -.welcome, .environment, .migration, .permission, .admin, .finish { - display : none; -} - -.check { - line-height: 35px; - margin-left: 25%; -} - -.composer { - position: auto; - top: calc(50% + 24px); - display: none; -} - -.message { - padding-left: 140px; -} - -.cp-round { - position: auto !important; - padding-bottom: 130px; -} - -.cp-round:before { - border-radius: 50%; - content: " "; - width: 48px; - height: 48px; - display: inline-block; - box-sizing: border-box; - border-top: solid 6px #bababa; - border-right: solid 6px #bababa; - border-bottom: solid 6px #bababa; - border-left: solid 6px #bababa; - position: absolute; - top: calc(40% - 14px); - left: calc(50% - 24px); -} - -.cp-round:after { - border-radius: 50%; - content: " "; - width: 48px; - height: 48px; - display: inline-block; - box-sizing: border-box; - border-top: solid 6px #0041FF; - border-right: solid 6px #bababa; - border-bottom: solid 6px #bababa; - border-left: solid 6px #bababa; - position: absolute; - top: calc(40% - 14px); - left: calc(50% - 24px); - animation: spin 1s ease-in-out infinite; -} - -@keyframes spin { - 0% { transform: rotate(0deg); } - 100% { transform: rotate(360deg); } -} - -@media (min-width: 768px) and (max-width: 1024px) and (orientation: landscape) { - .initial-display{ - padding-top: 15px; - } - - .initial-display p { - margin-top: 4px; - } -} - -/* Select */ - -.select2-container--bootstrap4 .select2-selection--single { - height: calc(2.25rem + 2px) !important; } - .select2-container--bootstrap4 .select2-selection--single .select2-selection__placeholder { - color: #757575; - line-height: 2.25rem; } - .select2-container--bootstrap4 .select2-selection--single .select2-selection__arrow { - position: absolute; - top: 50%; - right: 3px; - width: 20px; } - .select2-container--bootstrap4 .select2-selection--single .select2-selection__arrow b { - top: 60%; - border-color: #343a40 transparent transparent transparent; - border-style: solid; - border-width: 5px 4px 0 4px; - width: 0; - height: 0; - left: 50%; - margin-left: -4px; - margin-top: -2px; - position: absolute; } - .select2-container--bootstrap4 .select2-selection--single .select2-selection__rendered { - line-height: 2.25rem; } - - .select2-search--dropdown .select2-search__field { - border: 1px solid #ced4da; - border-radius: 0.25rem; } - - .select2-results__message { - color: #6c757d; } - - .select2-container--bootstrap4 .select2-selection--multiple { - min-height: calc(2.25rem + 2px) !important; } - .select2-container--bootstrap4 .select2-selection--multiple .select2-selection__rendered { - -webkit-box-sizing: border-box; - box-sizing: border-box; - list-style: none; - margin: 0; - padding: 0 5px; - width: 100%; } - .select2-container--bootstrap4 .select2-selection--multiple .select2-selection__choice { - color: #343a40; - border: 1px solid #bdc6d0; - border-radius: 0.2rem; - padding: 0; - padding-right: 5px; - cursor: pointer; - float: left; - margin-top: 0.3em; - margin-right: 5px; } - .select2-container--bootstrap4 .select2-selection--multiple .select2-selection__choice__remove { - color: #bdc6d0; - font-weight: bold; - margin-left: 3px; - margin-right: 1px; - padding-right: 3px; - padding-left: 3px; - float: left; } - .select2-container--bootstrap4 .select2-selection--multiple .select2-selection__choice__remove:hover { - color: #343a40; } - - .select2-container { - display: block; } - .select2-container *:focus { - outline: 0; } - - .input-group .select2-container--bootstrap4 { - -webkit-box-flex: 1; - -ms-flex-positive: 1; - flex-grow: 1; } - - .input-group-prepend ~ .select2-container--bootstrap4 .select2-selection { - border-top-left-radius: 0; - border-bottom-left-radius: 0; } - - .input-group > .select2-container--bootstrap4:not(:last-child) .select2-selection { - border-top-right-radius: 0; - border-bottom-right-radius: 0; } - - .select2-container--bootstrap4 .select2-selection { - background-color: #fff; - border: 1px solid #ced4da; - border-radius: 0.25rem; - -webkit-transition: border-color 0.15s ease-in-out, -webkit-box-shadow 0.15s ease-in-out; - transition: border-color 0.15s ease-in-out, -webkit-box-shadow 0.15s ease-in-out; - transition: border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out; - transition: border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out, -webkit-box-shadow 0.15s ease-in-out; - width: 100%; } - @media screen and (prefers-reduced-motion: reduce) { - .select2-container--bootstrap4 .select2-selection { - -webkit-transition: none; - transition: none; } } - - .select2-container--bootstrap4.select2-container--focus .select2-selection { - border-color: #0041FF; - -webkit-box-shadow: 0 0 0 0.2rem rgba(0, 123, 255, 0.25); - box-shadow: 0 0 0 0.2rem rgba(0, 123, 255, 0.25); } - - .select2-container--bootstrap4.select2-container--focus.select2-container--open .select2-selection { - border-bottom: none; - border-bottom-left-radius: 0; - border-bottom-right-radius: 0; } - - .select2-container--bootstrap4.select2-container--disabled .select2-selection, .select2-container--bootstrap4.select2-container--disabled.select2-container--focus .select2-selection { - background-color: #e9ecef; - cursor: not-allowed; - border-color: #ced4da; - -webkit-box-shadow: none; - box-shadow: none; } - - .select2-container--bootstrap4.select2-container--disabled .select2-search__field, .select2-container--bootstrap4.select2-container--disabled.select2-container--focus .select2-search__field { - background-color: transparent; } - - select.is-invalid ~ .select2-container--bootstrap4 .select2-selection, - form.was-validated select:invalid ~ .select2-container--bootstrap4 .select2-selection { - border-color: #dc3545; } - - select.is-valid ~ .select2-container--bootstrap4 .select2-selection, - form.was-validated select:valid ~ .select2-container--bootstrap4 .select2-selection { - border-color: #28a745; } - - .select2-container--bootstrap4 .select2-dropdown { - border-color: #ced4da; - border-top: none; - border-top-left-radius: 0; - border-top-right-radius: 0; } - .select2-container--bootstrap4 .select2-dropdown.select2-dropdown--above { - border-top: 1px solid #ced4da; - border-top-left-radius: 0.25rem; - border-top-right-radius: 0.25rem; } - .select2-container--bootstrap4 .select2-dropdown .select2-results__option[aria-selected=true] { - background-color: #e9ecef; } - - .select2-container--bootstrap4 .select2-results__option--highlighted, - .select2-container--bootstrap4 .select2-results__option--highlighted.select2-results__option[aria-selected=true] { - background-color: #0041FF; - color: #f8f9fa; } - - .select2-container--bootstrap4 .select2-results__option[role=group] { - padding: 0; } - - .select2-container--bootstrap4 .select2-results > .select2-results__options { - max-height: 15em; - overflow-y: auto; } - - .select2-container--bootstrap4 .select2-results__group { - padding: 6px; - display: list-item; - color: #6c757d; } - - .select2-container--bootstrap4 .select2-selection__clear { - width: 1.2em; - height: 1.2em; - line-height: 1.15em; - padding-left: 0.3em; - margin-top: 0.5em; - border-radius: 100%; - background-color: #6c757d; - color: #f8f9fa; - float: right; - margin-right: 0.3em; } - .select2-container--bootstrap4 .select2-selection__clear:hover { - background-color: #343a40; } - \ No newline at end of file diff --git a/public/installer/Classes/Requirement.php b/public/installer/Classes/Requirement.php deleted file mode 100755 index 8919934ff..000000000 --- a/public/installer/Classes/Requirement.php +++ /dev/null @@ -1,161 +0,0 @@ - [ - 'openssl', - 'pdo', - 'mbstring', - 'tokenizer', - 'JSON', - 'cURL', - ], - // 'apache' => [ - // 'mod_rewrite', - // ] - ]; - - $results = []; - - foreach($requirements as $type => $requirement) - { - switch ($type) { - // check php requirements - case 'php': - foreach($requirements[$type] as $requirement) - { - $results['requirements'][$type][$requirement] = true; - - if(!extension_loaded($requirement)) - { - $results['requirements'][$type][$requirement] = false; - - $results['errors'] = true; - } - } - break; - - // check apache requirements - // case 'apache': - // foreach ($requirements[$type] as $requirement) { - // // if function doesn't exist we can't check apache modules - // if(function_exists('apache_get_modules')) - // { - // $results['requirements'][$type][$requirement] = true; - - // if(!in_array($requirement,apache_get_modules())) - // { - // $results['requirements'][$type][$requirement] = false; - - // $results['errors'] = true; - // } - // } - // } - //break; - } - } - - return $results; - } - - /** - * Check PHP version requirement. - * - * @return array - */ - public function checkPHPversion() - { - /** - * Minimum PHP Version Supported (Override is in installer.php config file). - * - * @var _minPhpVersion - */ - $_minPhpVersion = '7.3.0'; - - $currentPhpVersion = $this->getPhpVersionInfo(); - $supported = false; - - if (version_compare((str_pad($currentPhpVersion['version'], 6, "0")), $_minPhpVersion) >= 0) { - $supported = true; - } - - $phpStatus = [ - 'full' => $currentPhpVersion['full'], - 'current' => $currentPhpVersion['version'], - 'minimum' => $_minPhpVersion, - 'supported' => $supported - ]; - - return $phpStatus; - } - - /** - * Get current Php version information - * - * @return array - */ - private static function getPhpVersionInfo() - { - $currentVersionFull = PHP_VERSION; - preg_match("#^\d+(\.\d+)*#", $currentVersionFull, $filtered); - $currentVersion = $filtered[0]; - - return [ - 'full' => $currentVersionFull, - 'version' => $currentVersion - ]; - } - - /** - * Check composer installation. - * - * @return array - */ - public function composerInstall() - { - $location = str_replace('\\', '/', getcwd()); - $currentLocation = explode("/", $location); - array_pop($currentLocation); - array_pop($currentLocation); - $desiredLocation = implode("/", $currentLocation); - $autoLoadFile = $desiredLocation . '/' . 'vendor' . '/' . 'autoload.php'; - - if (file_exists($autoLoadFile)) { - $data['composer_install'] = 0; - } else { - $data['composer_install'] = 1; - $data['composer'] = 'Bagisto has detected that the required composer dependencies are not installed.
Go to the root directory of Bagisto and run "composer install".'; - } - - return $data; - } - - /** - * Render view for class. - * - */ - public function render() - { - $requirements = $this->checkRequirements(); - - $phpVersion = $this->checkPHPversion(); - - $composerInstall = $this->composerInstall(); - - ob_start(); - - include __DIR__ . '/../Views/requirements.blade.php'; - - return ob_get_clean(); - } -} diff --git a/public/installer/Classes/Welcome.php b/public/installer/Classes/Welcome.php deleted file mode 100755 index a18c507fa..000000000 --- a/public/installer/Classes/Welcome.php +++ /dev/null @@ -1,17 +0,0 @@ - diff --git a/public/installer/Composer.php b/public/installer/Composer.php deleted file mode 100755 index 05205e11e..000000000 --- a/public/installer/Composer.php +++ /dev/null @@ -1,6 +0,0 @@ - $value) { - $changedData[] = $key . '=' . $value; - } - - // inserting new form-data to env - $changedData = implode(PHP_EOL, $changedData); - file_put_contents($envFile, $changedData); - - $data['success'] = true; - $data['message'] = 'Success!'; - } - - // return all our data to an AJAX call - echo json_encode($data); \ No newline at end of file diff --git a/public/installer/EnvConfig.php b/public/installer/EnvConfig.php deleted file mode 100755 index 7ab0df389..000000000 --- a/public/installer/EnvConfig.php +++ /dev/null @@ -1,143 +0,0 @@ - $value) { - $changedData[] = $key . '=' . $value; - } - - // inserting new form-data to env - $changedData = implode(PHP_EOL, $changedData); - file_put_contents($envFile, $changedData); - - // checking database connection(mysql only) - if ($_POST["database_connection"] == 'mysql') { - // create connection - @$conn = new mysqli($_POST["host_name"], $_POST["user_name"], $_POST["user_password"], $_POST["database_name"], $_POST['port_name']); - - // check connection - if ($conn->connect_error) { - $errors['database_error'] = $conn->connect_error; - $data['errors'] = $errors; - $data['success'] = false; - } else { - $data['success'] = true; - $data['message'] = 'Success!'; - } - } else { - $data['success'] = true; - $data['message'] = 'Success!'; - } -} - -// return all our data to an AJAX call -echo json_encode($data); diff --git a/public/installer/Images/favicon.ico b/public/installer/Images/favicon.ico deleted file mode 100755 index e9c217bb3..000000000 Binary files a/public/installer/Images/favicon.ico and /dev/null differ diff --git a/public/installer/Images/green-check.svg b/public/installer/Images/green-check.svg deleted file mode 100755 index 25fbb6ab7..000000000 --- a/public/installer/Images/green-check.svg +++ /dev/null @@ -1,19 +0,0 @@ - - - - Check-Accent - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file diff --git a/public/installer/Images/logo.svg b/public/installer/Images/logo.svg deleted file mode 100755 index 412899b60..000000000 --- a/public/installer/Images/logo.svg +++ /dev/null @@ -1,19 +0,0 @@ - - - - Logo+Text - Created with Sketch. - - - - - - - - - - \ No newline at end of file diff --git a/public/installer/Images/red-check.svg b/public/installer/Images/red-check.svg deleted file mode 100755 index 6911d37d2..000000000 --- a/public/installer/Images/red-check.svg +++ /dev/null @@ -1,20 +0,0 @@ - - - - Check-Accent Copy - Created with Sketch. - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/public/installer/MigrationRun.php b/public/installer/MigrationRun.php deleted file mode 100755 index ffc1d5ad9..000000000 --- a/public/installer/MigrationRun.php +++ /dev/null @@ -1,15 +0,0 @@ - [ - 'key' => 'seeder_results', - 'command' => 'cd ../.. && '. $phpbin .' artisan db:seed 2>&1' - ], - 'publish' => [ - 'key' => 'publish_results', - 'command' => 'cd ../.. && '. $phpbin .' artisan vendor:publish --all --force 2>&1' - ], - 'storage_link' => [ - 'key' => 'storage_link_results', - 'command' => 'cd ../.. && '. $phpbin .' artisan storage:link 2>&1' - ], - 'key' => [ - 'key' => 'key_results', - 'command' => 'cd ../.. && '. $phpbin .' artisan key:generate 2>&1' - ], - 'optimize' => [ - 'key' => 'optimize_results', - 'command' => 'cd ../.. && '. $phpbin .' artisan optimize 2>&1' - ], -]; - -// run command on terminal -$data = []; -foreach ($commands as $key => $value) { - exec($value['command'], $data[$key], $data[$value['key']]); -} - -// return a response -// return all our data to an AJAX call -echo json_encode($data); diff --git a/public/installer/Views/admin.blade.php b/public/installer/Views/admin.blade.php deleted file mode 100644 index 736c28658..000000000 --- a/public/installer/Views/admin.blade.php +++ /dev/null @@ -1,119 +0,0 @@ -
-
-

Create a Administrator

-
- -
-
-
-
-
-
- - -
- -
- - -
- -
- - -
- -
- - -
- -
- -
-
-
-
-
-
-
- - \ No newline at end of file diff --git a/public/installer/Views/email.blade.php b/public/installer/Views/email.blade.php deleted file mode 100644 index 33bb189f9..000000000 --- a/public/installer/Views/email.blade.php +++ /dev/null @@ -1,136 +0,0 @@ -
-
-

Email Configuration

-
- -
-
-
-
-
- - -
-
- - -
- -
- - -
-
- -
- - -
- -
- - -
- -
- - -
- -
- - -
- -
- -
-
-
-
-
-
-
- - - - \ No newline at end of file diff --git a/public/installer/Views/environment.blade.php b/public/installer/Views/environment.blade.php deleted file mode 100644 index d8aa96a55..000000000 --- a/public/installer/Views/environment.blade.php +++ /dev/null @@ -1,259 +0,0 @@ -
-
-

Environment Configuration

-
- -
-
-
-
-
-
-
- - -
- -
- - -
- -
- - -
- -
- - -
- -
- - -
- -
- - -
-
- -
-
- -
- - -
- -
-
- - -
- -
- - -
-
- -
- - -
- -
- - -
- -
- - -
- -
- - -
- -
- - -
-
-
-
-
-
-
-
- - diff --git a/public/installer/Views/finish.blade.php b/public/installer/Views/finish.blade.php deleted file mode 100644 index 85b61bc39..000000000 --- a/public/installer/Views/finish.blade.php +++ /dev/null @@ -1,32 +0,0 @@ -
-
-

Installation completed

-
- -
-
-
-
-
- Bagisto is successfully installed on your system.
-
-
-
- -
 
-
- - Bagisto Extensions - Bagisto Forums -
-
-
-
- - \ No newline at end of file diff --git a/public/installer/Views/migration.blade.php b/public/installer/Views/migration.blade.php deleted file mode 100644 index d503e545f..000000000 --- a/public/installer/Views/migration.blade.php +++ /dev/null @@ -1,232 +0,0 @@ - - -
-
-

Ready for installation

-
- -
-
-
-
- - -
- - -
- -
-
-

Click the button below to:

-
- -
- Create the database tables -
- -
- Populate the database tables -
- -
- Publishing the vendor files -
-
- -
-
-

Checking Composer dependencies

-

Creating the database tables, this can take a few moments.

-

Populating the database tables

-
-
- -
 
- -
-
- - -
- -
- back -
-
-
-
-
-
-
- - - diff --git a/public/installer/Views/requirements.blade.php b/public/installer/Views/requirements.blade.php deleted file mode 100755 index 57ab742ba..000000000 --- a/public/installer/Views/requirements.blade.php +++ /dev/null @@ -1,66 +0,0 @@ - - -
-
-

Server Requirements

-
- -
-
-
-
-
    -
  • - - - - PHP - ( or higher) -
    - - - Bagisto has detected that your PHP version () is not supported.
    - Contact your provider if you are not the server administrator. -     - -
    • - - $require): ?> - $enabled) : ?> -
  • - - - - -
    • - - - -
  • - - - composer - -
    - - - - - -
    • -
- - -
- -
- -
-
-
-
-
diff --git a/public/installer/Views/welcome.blade.php b/public/installer/Views/welcome.blade.php deleted file mode 100755 index 4230adedd..000000000 --- a/public/installer/Views/welcome.blade.php +++ /dev/null @@ -1,44 +0,0 @@ - - - - -
-
-

Welcome to Bagisto

- -
-
- - Have you ever heard of an old saying, “No man is an island”? We probably heard that a million times. That saying is actually true because when we became successful, we usually achieve that because someone has helped us. And our thank-you speech skills could be the best thing we can do in return. You may also see - - -
- INTRODUCTION -
- - - Have you ever heard of an old saying, “No man is an island”? We probably heard that a million times. That saying is actually true because when we became successful, we usually achieve that because someone has helped us. And our thank-you speech skills could be the best thing we can do in return. You may also see - -
-
- -
- -
-
-
- - - - - - - - - - - - - - - diff --git a/public/installer/index.php b/public/installer/index.php deleted file mode 100755 index a5c04aa6e..000000000 --- a/public/installer/index.php +++ /dev/null @@ -1,138 +0,0 @@ - - - - - - - - - - Bagisto Installer - - - - - - - - - - - - - - - - - -
-
- -
-
- - connect_error) { - // retrieving admin entry - $prefix = $dbPrefix . 'admins'; - $sql = "SELECT id, name FROM $prefix"; - $result = $conn->query($sql); - - if ($result) { - $installed = true; - } - } - - $conn->close(); - } else { - $installed = true; - } - } - - if (! $installed) { - // including classes - include __DIR__ . '/Classes/Requirement.php'; - - // including php files - include __DIR__ . '/Views/environment.blade.php'; - include __DIR__ . '/Views/migration.blade.php'; - include __DIR__ . '/Views/admin.blade.php'; - include __DIR__ . '/Views/email.blade.php'; - include __DIR__ . '/Views/finish.blade.php'; - - // object creation - $requirement = new Requirement(); - echo $requirement->render(); - } else { - // getting url - $actual_link = (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] === 'on' ? "https" : "http") . "://$_SERVER[HTTP_HOST]$_SERVER[REQUEST_URI]"; - - $url = explode("/", $actual_link); - array_pop($url); - array_pop($url); - $url = implode("/", $url); - $url = $url . '/404'; - - // redirecting to 404 error page - header("Location: $url"); - } - ?> - -
- Bagisto a community project by Webkul -
- - - - - - \ No newline at end of file diff --git a/public/installer/install.php b/public/installer/install.php deleted file mode 100755 index 6bf86ea79..000000000 --- a/public/installer/install.php +++ /dev/null @@ -1,89 +0,0 @@ -connect_error) { - // retrieving admin entry - $prefix = $databaseData['DB_PREFIX'].'admins'; - $sql = "SELECT id, name FROM $prefix"; - $result = $conn->query($sql); - - if ($result) { - $installed = true; - } - } - - $conn->close(); - } else { - $installed = true; - } - } - - if (! $installed) { - // getting url - $actual_link = (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] === 'on' ? "https" : "http") . "://$_SERVER[HTTP_HOST]$_SERVER[REQUEST_URI]"; - - $url = explode("/", $actual_link); - array_pop($url); - $url = implode("/", $url); - $url = $url . '/installer'; - - return $url; - } else { - return null; - } -?> - - - diff --git a/public/installer/js/script.js b/public/installer/js/script.js deleted file mode 100644 index 314d3eda8..000000000 --- a/public/installer/js/script.js +++ /dev/null @@ -1,85 +0,0 @@ -window.onload = function() { - - var welcome = document.getElementById('welcome'); - var requirement = document.getElementById('requirement'); - var environment = document.getElementById('environment'); - var migration = document.getElementById('migration'); - var admin = document.getElementById('admin'); - - var welcomeCheck = document.getElementById('welcome-check'); - var requirementCheck = document.getElementById('requirement-check'); - var requirementsRefresh = document.getElementById('requirements-refresh'); - - var permisssionCheck = document.getElementById('permission-check'); - var environmentCheck = document.getElementById('environment-check'); - var continue_to_admin = document.getElementById('continue'); - - var permissionBack = document.getElementById('permission-back'); - var requirementBack = document.getElementById('requirement-back'); - var envBack = document.getElementById('envronment-back'); - var migrationBack = document.getElementById('migration-back'); - - if (requirementCheck) { - requirementCheck.addEventListener('click', myFunction); - } - - if (requirementsRefresh) { - requirementsRefresh.addEventListener('click', myFunction); - } - - if (welcomeCheck) { - welcomeCheck.addEventListener('click', myFunction); - } - - if (permisssionCheck) { - permisssionCheck.addEventListener('click', myFunction); - } - - if (environmentCheck) { - environmentCheck.addEventListener('click', myFunction); - } - - if (continue_to_admin) { - continue_to_admin.addEventListener('click', myFunction); - } - - if (envBack) { - envBack.addEventListener('click', myFunction); - } - - if (requirementBack) { - requirementBack.addEventListener('click', myFunction); - } - - if (permissionBack) { - permissionBack.addEventListener('click', myFunction); - } - - if (migrationBack) { - migrationBack.addEventListener('click', myFunction); - } - - function myFunction() { - if(this.id == 'welcome-check') { - requirement.style.display = "block"; - welcome.style.display = "none"; - } else if (this.id == 'requirement-check') { - environment.style.display = "block"; - requirement.style.display = "none"; - } else if (this.id == 'continue') { - migration.style.display = "none"; - admin.style.display ="block"; - } else if (this.id == 'requirement-back') { - welcome.style.display = "block"; - requirement.style.display = "none"; - } else if (this.id == 'envronment-back') { - environment.style.display ="none"; - requirement.style.display = "block"; - } else if (this.id == 'migration-back') { - migration.style.display = "none"; - environment.style.display ="block"; - } else if (this.id == 'requirements-refresh') { - location.reload(); - } - } -};