diff --git a/composer.json b/composer.json index d1c4bc5..98e408d 100644 --- a/composer.json +++ b/composer.json @@ -66,7 +66,10 @@ ] }, "config": { - "preferred-install": "dist" + "preferred-install": "dist", + "allow-plugins": { + "composer/installers": true + } }, "minimum-stability": "dev", "prefer-stable": true diff --git a/config/app.php b/config/app.php index 29e2eac..25f116d 100644 --- a/config/app.php +++ b/config/app.php @@ -28,7 +28,7 @@ return [ | any other location as required by the application or its packages. */ - 'name' => 'October CMS', + 'name' => 'Berkarar', /* |-------------------------------------------------------------------------- diff --git a/config/database.php b/config/database.php index 8796b2a..681741d 100644 --- a/config/database.php +++ b/config/database.php @@ -58,8 +58,8 @@ return [ 'host' => 'localhost', 'port' => 3306, 'database' => 'berkarar', - 'username' => 'root', - 'password' => '', + 'username' => 'shohrat', + 'password' => 'Qazwsx12**', 'charset' => 'utf8mb4', 'collation' => 'utf8mb4_unicode_ci', 'prefix' => '', diff --git a/modules/backend/assets/vendor/jcrop/MIT-LICENSE.txt b/modules/backend/assets/vendor/jcrop/MIT-LICENSE.txt old mode 100644 new mode 100755 diff --git a/modules/backend/assets/vendor/jcrop/README.md b/modules/backend/assets/vendor/jcrop/README.md old mode 100644 new mode 100755 diff --git a/modules/backend/assets/vendor/jcrop/css/Jcrop.gif b/modules/backend/assets/vendor/jcrop/css/Jcrop.gif old mode 100644 new mode 100755 diff --git a/modules/backend/assets/vendor/jcrop/css/jquery.Jcrop.min.css b/modules/backend/assets/vendor/jcrop/css/jquery.Jcrop.min.css old mode 100644 new mode 100755 diff --git a/modules/backend/assets/vendor/jcrop/js/jquery.Jcrop.js b/modules/backend/assets/vendor/jcrop/js/jquery.Jcrop.js old mode 100644 new mode 100755 diff --git a/modules/backend/database/seeds/SeedSetupAdmin.php b/modules/backend/database/seeds/SeedSetupAdmin.php index f8d4093..e161a41 100644 --- a/modules/backend/database/seeds/SeedSetupAdmin.php +++ b/modules/backend/database/seeds/SeedSetupAdmin.php @@ -25,24 +25,24 @@ class SeedSetupAdmin extends Seeder public function run() { - // UserRole::create([ - // 'name' => 'Publisher', - // 'code' => UserRole::CODE_PUBLISHER, - // 'description' => 'Site editor with access to publishing tools.', - // ]); + UserRole::create([ + 'name' => 'Publisher', + 'code' => UserRole::CODE_PUBLISHER, + 'description' => 'Site editor with access to publishing tools.', + ]); - // $role = UserRole::create([ - // 'name' => 'Developer', - // 'code' => UserRole::CODE_DEVELOPER, - // 'description' => 'Site administrator with access to developer tools.', - // ]); + $role = UserRole::create([ + 'name' => 'Developer', + 'code' => UserRole::CODE_DEVELOPER, + 'description' => 'Site administrator with access to developer tools.', + ]); - // $group = UserGroup::create([ - // 'name' => 'Owners', - // 'code' => UserGroup::CODE_OWNERS, - // 'description' => 'Default group for website owners.', - // 'is_new_user_default' => false - // ]); + $group = UserGroup::create([ + 'name' => 'Owners', + 'code' => UserGroup::CODE_OWNERS, + 'description' => 'Default group for website owners.', + 'is_new_user_default' => false + ]); $user = User::create([ 'email' => static::$email, @@ -54,9 +54,9 @@ class SeedSetupAdmin extends Seeder 'permissions' => [], 'is_superuser' => true, 'is_activated' => true, - 'role_id' => 3 //$role->id + 'role_id' => $role->id ]); - // $user->addGroup($group); + $user->addGroup($group); } } diff --git a/modules/backend/formwidgets/codeeditor/assets/vendor/ace/ace.js b/modules/backend/formwidgets/codeeditor/assets/vendor/ace/ace.js old mode 100644 new mode 100755 diff --git a/modules/backend/formwidgets/codeeditor/assets/vendor/ace/ext-emmet.js b/modules/backend/formwidgets/codeeditor/assets/vendor/ace/ext-emmet.js old mode 100644 new mode 100755 diff --git a/modules/backend/formwidgets/codeeditor/assets/vendor/ace/ext-searchbox.js b/modules/backend/formwidgets/codeeditor/assets/vendor/ace/ext-searchbox.js old mode 100644 new mode 100755 diff --git a/modules/backend/formwidgets/codeeditor/assets/vendor/ace/mode-css.js b/modules/backend/formwidgets/codeeditor/assets/vendor/ace/mode-css.js old mode 100644 new mode 100755 diff --git a/modules/backend/formwidgets/codeeditor/assets/vendor/ace/mode-html.js b/modules/backend/formwidgets/codeeditor/assets/vendor/ace/mode-html.js old mode 100644 new mode 100755 diff --git a/modules/backend/formwidgets/codeeditor/assets/vendor/ace/mode-javascript.js b/modules/backend/formwidgets/codeeditor/assets/vendor/ace/mode-javascript.js old mode 100644 new mode 100755 diff --git a/modules/backend/formwidgets/codeeditor/assets/vendor/ace/mode-less.js b/modules/backend/formwidgets/codeeditor/assets/vendor/ace/mode-less.js old mode 100644 new mode 100755 diff --git a/modules/backend/formwidgets/codeeditor/assets/vendor/ace/mode-markdown.js b/modules/backend/formwidgets/codeeditor/assets/vendor/ace/mode-markdown.js old mode 100644 new mode 100755 diff --git a/modules/backend/formwidgets/codeeditor/assets/vendor/ace/mode-php.js b/modules/backend/formwidgets/codeeditor/assets/vendor/ace/mode-php.js old mode 100644 new mode 100755 diff --git a/modules/backend/formwidgets/codeeditor/assets/vendor/ace/mode-plain_text.js b/modules/backend/formwidgets/codeeditor/assets/vendor/ace/mode-plain_text.js old mode 100644 new mode 100755 diff --git a/modules/backend/formwidgets/codeeditor/assets/vendor/ace/mode-sass.js b/modules/backend/formwidgets/codeeditor/assets/vendor/ace/mode-sass.js old mode 100644 new mode 100755 diff --git a/modules/backend/formwidgets/codeeditor/assets/vendor/ace/mode-scss.js b/modules/backend/formwidgets/codeeditor/assets/vendor/ace/mode-scss.js old mode 100644 new mode 100755 diff --git a/modules/backend/formwidgets/codeeditor/assets/vendor/ace/mode-twig.js b/modules/backend/formwidgets/codeeditor/assets/vendor/ace/mode-twig.js old mode 100644 new mode 100755 diff --git a/modules/backend/formwidgets/codeeditor/assets/vendor/ace/theme-ambiance.js b/modules/backend/formwidgets/codeeditor/assets/vendor/ace/theme-ambiance.js old mode 100644 new mode 100755 diff --git a/modules/backend/formwidgets/codeeditor/assets/vendor/ace/theme-chaos.js b/modules/backend/formwidgets/codeeditor/assets/vendor/ace/theme-chaos.js old mode 100644 new mode 100755 diff --git a/modules/backend/formwidgets/codeeditor/assets/vendor/ace/theme-chrome.js b/modules/backend/formwidgets/codeeditor/assets/vendor/ace/theme-chrome.js old mode 100644 new mode 100755 diff --git a/modules/backend/formwidgets/codeeditor/assets/vendor/ace/theme-clouds.js b/modules/backend/formwidgets/codeeditor/assets/vendor/ace/theme-clouds.js old mode 100644 new mode 100755 diff --git a/modules/backend/formwidgets/codeeditor/assets/vendor/ace/theme-clouds_midnight.js b/modules/backend/formwidgets/codeeditor/assets/vendor/ace/theme-clouds_midnight.js old mode 100644 new mode 100755 diff --git a/modules/backend/formwidgets/codeeditor/assets/vendor/ace/theme-cobalt.js b/modules/backend/formwidgets/codeeditor/assets/vendor/ace/theme-cobalt.js old mode 100644 new mode 100755 diff --git a/modules/backend/formwidgets/codeeditor/assets/vendor/ace/theme-crimson_editor.js b/modules/backend/formwidgets/codeeditor/assets/vendor/ace/theme-crimson_editor.js old mode 100644 new mode 100755 diff --git a/modules/backend/formwidgets/codeeditor/assets/vendor/ace/theme-dawn.js b/modules/backend/formwidgets/codeeditor/assets/vendor/ace/theme-dawn.js old mode 100644 new mode 100755 diff --git a/modules/backend/formwidgets/codeeditor/assets/vendor/ace/theme-dreamweaver.js b/modules/backend/formwidgets/codeeditor/assets/vendor/ace/theme-dreamweaver.js old mode 100644 new mode 100755 diff --git a/modules/backend/formwidgets/codeeditor/assets/vendor/ace/theme-eclipse.js b/modules/backend/formwidgets/codeeditor/assets/vendor/ace/theme-eclipse.js old mode 100644 new mode 100755 diff --git a/modules/backend/formwidgets/codeeditor/assets/vendor/ace/theme-github.js b/modules/backend/formwidgets/codeeditor/assets/vendor/ace/theme-github.js old mode 100644 new mode 100755 diff --git a/modules/backend/formwidgets/codeeditor/assets/vendor/ace/theme-idle_fingers.js b/modules/backend/formwidgets/codeeditor/assets/vendor/ace/theme-idle_fingers.js old mode 100644 new mode 100755 diff --git a/modules/backend/formwidgets/codeeditor/assets/vendor/ace/theme-iplastic.js b/modules/backend/formwidgets/codeeditor/assets/vendor/ace/theme-iplastic.js old mode 100644 new mode 100755 diff --git a/modules/backend/formwidgets/codeeditor/assets/vendor/ace/theme-katzenmilch.js b/modules/backend/formwidgets/codeeditor/assets/vendor/ace/theme-katzenmilch.js old mode 100644 new mode 100755 diff --git a/modules/backend/formwidgets/codeeditor/assets/vendor/ace/theme-kr_theme.js b/modules/backend/formwidgets/codeeditor/assets/vendor/ace/theme-kr_theme.js old mode 100644 new mode 100755 diff --git a/modules/backend/formwidgets/codeeditor/assets/vendor/ace/theme-kuroir.js b/modules/backend/formwidgets/codeeditor/assets/vendor/ace/theme-kuroir.js old mode 100644 new mode 100755 diff --git a/modules/backend/formwidgets/codeeditor/assets/vendor/ace/theme-merbivore.js b/modules/backend/formwidgets/codeeditor/assets/vendor/ace/theme-merbivore.js old mode 100644 new mode 100755 diff --git a/modules/backend/formwidgets/codeeditor/assets/vendor/ace/theme-merbivore_soft.js b/modules/backend/formwidgets/codeeditor/assets/vendor/ace/theme-merbivore_soft.js old mode 100644 new mode 100755 diff --git a/modules/backend/formwidgets/codeeditor/assets/vendor/ace/theme-mono_industrial.js b/modules/backend/formwidgets/codeeditor/assets/vendor/ace/theme-mono_industrial.js old mode 100644 new mode 100755 diff --git a/modules/backend/formwidgets/codeeditor/assets/vendor/ace/theme-monokai.js b/modules/backend/formwidgets/codeeditor/assets/vendor/ace/theme-monokai.js old mode 100644 new mode 100755 diff --git a/modules/backend/formwidgets/codeeditor/assets/vendor/ace/theme-pastel_on_dark.js b/modules/backend/formwidgets/codeeditor/assets/vendor/ace/theme-pastel_on_dark.js old mode 100644 new mode 100755 diff --git a/modules/backend/formwidgets/codeeditor/assets/vendor/ace/theme-solarized_dark.js b/modules/backend/formwidgets/codeeditor/assets/vendor/ace/theme-solarized_dark.js old mode 100644 new mode 100755 diff --git a/modules/backend/formwidgets/codeeditor/assets/vendor/ace/theme-solarized_light.js b/modules/backend/formwidgets/codeeditor/assets/vendor/ace/theme-solarized_light.js old mode 100644 new mode 100755 diff --git a/modules/backend/formwidgets/codeeditor/assets/vendor/ace/theme-sqlserver.js b/modules/backend/formwidgets/codeeditor/assets/vendor/ace/theme-sqlserver.js old mode 100644 new mode 100755 diff --git a/modules/backend/formwidgets/codeeditor/assets/vendor/ace/theme-terminal.js b/modules/backend/formwidgets/codeeditor/assets/vendor/ace/theme-terminal.js old mode 100644 new mode 100755 diff --git a/modules/backend/formwidgets/codeeditor/assets/vendor/ace/theme-textmate.js b/modules/backend/formwidgets/codeeditor/assets/vendor/ace/theme-textmate.js old mode 100644 new mode 100755 diff --git a/modules/backend/formwidgets/codeeditor/assets/vendor/ace/theme-tomorrow.js b/modules/backend/formwidgets/codeeditor/assets/vendor/ace/theme-tomorrow.js old mode 100644 new mode 100755 diff --git a/modules/backend/formwidgets/codeeditor/assets/vendor/ace/theme-tomorrow_night.js b/modules/backend/formwidgets/codeeditor/assets/vendor/ace/theme-tomorrow_night.js old mode 100644 new mode 100755 diff --git a/modules/backend/formwidgets/codeeditor/assets/vendor/ace/theme-tomorrow_night_blue.js b/modules/backend/formwidgets/codeeditor/assets/vendor/ace/theme-tomorrow_night_blue.js old mode 100644 new mode 100755 diff --git a/modules/backend/formwidgets/codeeditor/assets/vendor/ace/theme-tomorrow_night_bright.js b/modules/backend/formwidgets/codeeditor/assets/vendor/ace/theme-tomorrow_night_bright.js old mode 100644 new mode 100755 diff --git a/modules/backend/formwidgets/codeeditor/assets/vendor/ace/theme-tomorrow_night_eighties.js b/modules/backend/formwidgets/codeeditor/assets/vendor/ace/theme-tomorrow_night_eighties.js old mode 100644 new mode 100755 diff --git a/modules/backend/formwidgets/codeeditor/assets/vendor/ace/theme-twilight.js b/modules/backend/formwidgets/codeeditor/assets/vendor/ace/theme-twilight.js old mode 100644 new mode 100755 diff --git a/modules/backend/formwidgets/codeeditor/assets/vendor/ace/theme-vibrant_ink.js b/modules/backend/formwidgets/codeeditor/assets/vendor/ace/theme-vibrant_ink.js old mode 100644 new mode 100755 diff --git a/modules/backend/formwidgets/codeeditor/assets/vendor/ace/theme-xcode.js b/modules/backend/formwidgets/codeeditor/assets/vendor/ace/theme-xcode.js old mode 100644 new mode 100755 diff --git a/modules/backend/formwidgets/codeeditor/assets/vendor/ace/worker-css.js b/modules/backend/formwidgets/codeeditor/assets/vendor/ace/worker-css.js old mode 100644 new mode 100755 diff --git a/modules/backend/formwidgets/codeeditor/assets/vendor/ace/worker-html.js b/modules/backend/formwidgets/codeeditor/assets/vendor/ace/worker-html.js old mode 100644 new mode 100755 diff --git a/modules/backend/formwidgets/codeeditor/assets/vendor/ace/worker-javascript.js b/modules/backend/formwidgets/codeeditor/assets/vendor/ace/worker-javascript.js old mode 100644 new mode 100755 diff --git a/modules/backend/formwidgets/codeeditor/assets/vendor/ace/worker-php.js b/modules/backend/formwidgets/codeeditor/assets/vendor/ace/worker-php.js old mode 100644 new mode 100755 diff --git a/modules/backend/formwidgets/richeditor/assets/css/richeditor.css b/modules/backend/formwidgets/richeditor/assets/css/richeditor.css old mode 100644 new mode 100755 diff --git a/modules/backend/formwidgets/richeditor/assets/js/build-min.js b/modules/backend/formwidgets/richeditor/assets/js/build-min.js old mode 100644 new mode 100755 diff --git a/modules/backend/formwidgets/richeditor/assets/js/richeditor.js b/modules/backend/formwidgets/richeditor/assets/js/richeditor.js old mode 100644 new mode 100755 diff --git a/modules/backend/formwidgets/richeditor/assets/less/richeditor.less b/modules/backend/formwidgets/richeditor/assets/less/richeditor.less old mode 100644 new mode 100755 diff --git a/modules/backend/formwidgets/richeditor/partials/_richeditor.htm b/modules/backend/formwidgets/richeditor/partials/_richeditor.htm old mode 100644 new mode 100755 diff --git a/modules/cms/models/ThemeData.php b/modules/cms/models/ThemeData.php index 35b1800..49b7e4c 100644 --- a/modules/cms/models/ThemeData.php +++ b/modules/cms/models/ThemeData.php @@ -45,7 +45,7 @@ class ThemeData extends Model /** * @var array Relations */ - public $attachOne = ['image' => 'Tps\Shops\Classes\Attachment']; + public $attachOne = []; /** * @var ThemeData Cached array of objects diff --git a/modules/system/assets/ui/vendor/select2/js/i18n/az.js b/modules/system/assets/ui/vendor/select2/js/i18n/az.js old mode 100644 new mode 100755 diff --git a/modules/system/assets/ui/vendor/select2/js/i18n/bg.js b/modules/system/assets/ui/vendor/select2/js/i18n/bg.js old mode 100644 new mode 100755 diff --git a/modules/system/assets/ui/vendor/select2/js/i18n/ca.js b/modules/system/assets/ui/vendor/select2/js/i18n/ca.js old mode 100644 new mode 100755 diff --git a/modules/system/assets/ui/vendor/select2/js/i18n/cs.js b/modules/system/assets/ui/vendor/select2/js/i18n/cs.js old mode 100644 new mode 100755 diff --git a/modules/system/assets/ui/vendor/select2/js/i18n/da.js b/modules/system/assets/ui/vendor/select2/js/i18n/da.js old mode 100644 new mode 100755 diff --git a/modules/system/assets/ui/vendor/select2/js/i18n/de.js b/modules/system/assets/ui/vendor/select2/js/i18n/de.js old mode 100644 new mode 100755 diff --git a/modules/system/assets/ui/vendor/select2/js/i18n/en.js b/modules/system/assets/ui/vendor/select2/js/i18n/en.js old mode 100644 new mode 100755 diff --git a/modules/system/assets/ui/vendor/select2/js/i18n/es.js b/modules/system/assets/ui/vendor/select2/js/i18n/es.js old mode 100644 new mode 100755 diff --git a/modules/system/assets/ui/vendor/select2/js/i18n/et.js b/modules/system/assets/ui/vendor/select2/js/i18n/et.js old mode 100644 new mode 100755 diff --git a/modules/system/assets/ui/vendor/select2/js/i18n/eu.js b/modules/system/assets/ui/vendor/select2/js/i18n/eu.js old mode 100644 new mode 100755 diff --git a/modules/system/assets/ui/vendor/select2/js/i18n/fa.js b/modules/system/assets/ui/vendor/select2/js/i18n/fa.js old mode 100644 new mode 100755 diff --git a/modules/system/assets/ui/vendor/select2/js/i18n/fi.js b/modules/system/assets/ui/vendor/select2/js/i18n/fi.js old mode 100644 new mode 100755 diff --git a/modules/system/assets/ui/vendor/select2/js/i18n/fr.js b/modules/system/assets/ui/vendor/select2/js/i18n/fr.js old mode 100644 new mode 100755 diff --git a/modules/system/assets/ui/vendor/select2/js/i18n/gl.js b/modules/system/assets/ui/vendor/select2/js/i18n/gl.js old mode 100644 new mode 100755 diff --git a/modules/system/assets/ui/vendor/select2/js/i18n/he.js b/modules/system/assets/ui/vendor/select2/js/i18n/he.js old mode 100644 new mode 100755 diff --git a/modules/system/assets/ui/vendor/select2/js/i18n/hi.js b/modules/system/assets/ui/vendor/select2/js/i18n/hi.js old mode 100644 new mode 100755 diff --git a/modules/system/assets/ui/vendor/select2/js/i18n/hr.js b/modules/system/assets/ui/vendor/select2/js/i18n/hr.js old mode 100644 new mode 100755 diff --git a/modules/system/assets/ui/vendor/select2/js/i18n/hu.js b/modules/system/assets/ui/vendor/select2/js/i18n/hu.js old mode 100644 new mode 100755 diff --git a/modules/system/assets/ui/vendor/select2/js/i18n/id.js b/modules/system/assets/ui/vendor/select2/js/i18n/id.js old mode 100644 new mode 100755 diff --git a/modules/system/assets/ui/vendor/select2/js/i18n/is.js b/modules/system/assets/ui/vendor/select2/js/i18n/is.js old mode 100644 new mode 100755 diff --git a/modules/system/assets/ui/vendor/select2/js/i18n/it.js b/modules/system/assets/ui/vendor/select2/js/i18n/it.js old mode 100644 new mode 100755 diff --git a/modules/system/assets/ui/vendor/select2/js/i18n/ko.js b/modules/system/assets/ui/vendor/select2/js/i18n/ko.js old mode 100644 new mode 100755 diff --git a/modules/system/assets/ui/vendor/select2/js/i18n/lt.js b/modules/system/assets/ui/vendor/select2/js/i18n/lt.js old mode 100644 new mode 100755 diff --git a/modules/system/assets/ui/vendor/select2/js/i18n/lv.js b/modules/system/assets/ui/vendor/select2/js/i18n/lv.js old mode 100644 new mode 100755 diff --git a/modules/system/assets/ui/vendor/select2/js/i18n/mk.js b/modules/system/assets/ui/vendor/select2/js/i18n/mk.js old mode 100644 new mode 100755 diff --git a/modules/system/assets/ui/vendor/select2/js/i18n/nb.js b/modules/system/assets/ui/vendor/select2/js/i18n/nb.js old mode 100644 new mode 100755 diff --git a/modules/system/assets/ui/vendor/select2/js/i18n/nl.js b/modules/system/assets/ui/vendor/select2/js/i18n/nl.js old mode 100644 new mode 100755 diff --git a/modules/system/assets/ui/vendor/select2/js/i18n/pl.js b/modules/system/assets/ui/vendor/select2/js/i18n/pl.js old mode 100644 new mode 100755 diff --git a/modules/system/assets/ui/vendor/select2/js/i18n/pt-BR.js b/modules/system/assets/ui/vendor/select2/js/i18n/pt-BR.js old mode 100644 new mode 100755 diff --git a/modules/system/assets/ui/vendor/select2/js/i18n/pt.js b/modules/system/assets/ui/vendor/select2/js/i18n/pt.js old mode 100644 new mode 100755 diff --git a/modules/system/assets/ui/vendor/select2/js/i18n/ro.js b/modules/system/assets/ui/vendor/select2/js/i18n/ro.js old mode 100644 new mode 100755 diff --git a/modules/system/assets/ui/vendor/select2/js/i18n/ru.js b/modules/system/assets/ui/vendor/select2/js/i18n/ru.js old mode 100644 new mode 100755 diff --git a/modules/system/assets/ui/vendor/select2/js/i18n/sk.js b/modules/system/assets/ui/vendor/select2/js/i18n/sk.js old mode 100644 new mode 100755 diff --git a/modules/system/assets/ui/vendor/select2/js/i18n/sr.js b/modules/system/assets/ui/vendor/select2/js/i18n/sr.js old mode 100644 new mode 100755 diff --git a/modules/system/assets/ui/vendor/select2/js/i18n/sv.js b/modules/system/assets/ui/vendor/select2/js/i18n/sv.js old mode 100644 new mode 100755 diff --git a/modules/system/assets/ui/vendor/select2/js/i18n/th.js b/modules/system/assets/ui/vendor/select2/js/i18n/th.js old mode 100644 new mode 100755 diff --git a/modules/system/assets/ui/vendor/select2/js/i18n/tr.js b/modules/system/assets/ui/vendor/select2/js/i18n/tr.js old mode 100644 new mode 100755 diff --git a/modules/system/assets/ui/vendor/select2/js/i18n/uk.js b/modules/system/assets/ui/vendor/select2/js/i18n/uk.js old mode 100644 new mode 100755 diff --git a/modules/system/assets/ui/vendor/select2/js/i18n/vi.js b/modules/system/assets/ui/vendor/select2/js/i18n/vi.js old mode 100644 new mode 100755 diff --git a/modules/system/assets/ui/vendor/select2/js/i18n/zh-CN.js b/modules/system/assets/ui/vendor/select2/js/i18n/zh-CN.js old mode 100644 new mode 100755 diff --git a/modules/system/assets/ui/vendor/select2/js/i18n/zh-TW.js b/modules/system/assets/ui/vendor/select2/js/i18n/zh-TW.js old mode 100644 new mode 100755 diff --git a/modules/system/assets/ui/vendor/select2/js/select2.full.js b/modules/system/assets/ui/vendor/select2/js/select2.full.js old mode 100644 new mode 100755 diff --git a/modules/system/lang/fi/validation.php b/modules/system/lang/fi/validation.php old mode 100644 new mode 100755 diff --git a/themes/berkarar/assets/css/animate.css b/themes/berkarar/assets/css/animate.css old mode 100644 new mode 100755 diff --git a/themes/berkarar/assets/css/components/1-main/mixin.scss b/themes/berkarar/assets/css/components/1-main/mixin.scss old mode 100644 new mode 100755 diff --git a/themes/berkarar/assets/css/components/1-main/nulifier.scss b/themes/berkarar/assets/css/components/1-main/nulifier.scss old mode 100644 new mode 100755 diff --git a/themes/berkarar/assets/css/components/1-main/variables.scss b/themes/berkarar/assets/css/components/1-main/variables.scss old mode 100644 new mode 100755 diff --git a/themes/berkarar/assets/css/components/2-layout/breadcrumb.scss b/themes/berkarar/assets/css/components/2-layout/breadcrumb.scss old mode 100644 new mode 100755 diff --git a/themes/berkarar/assets/css/components/2-layout/file-input.scss b/themes/berkarar/assets/css/components/2-layout/file-input.scss old mode 100644 new mode 100755 diff --git a/themes/berkarar/assets/css/components/2-layout/footer.scss b/themes/berkarar/assets/css/components/2-layout/footer.scss old mode 100644 new mode 100755 diff --git a/themes/berkarar/assets/css/components/2-layout/header.scss b/themes/berkarar/assets/css/components/2-layout/header.scss old mode 100644 new mode 100755 diff --git a/themes/berkarar/assets/css/components/2-layout/modal.scss b/themes/berkarar/assets/css/components/2-layout/modal.scss old mode 100644 new mode 100755 diff --git a/themes/berkarar/assets/css/components/2-layout/responsive.scss b/themes/berkarar/assets/css/components/2-layout/responsive.scss old mode 100644 new mode 100755 diff --git a/themes/berkarar/assets/css/components/2-layout/select.scss b/themes/berkarar/assets/css/components/2-layout/select.scss old mode 100644 new mode 100755 diff --git a/themes/berkarar/assets/css/components/2-layout/slick-theme.scss b/themes/berkarar/assets/css/components/2-layout/slick-theme.scss old mode 100644 new mode 100755 diff --git a/themes/berkarar/assets/css/components/2-layout/slick.scss b/themes/berkarar/assets/css/components/2-layout/slick.scss old mode 100644 new mode 100755 diff --git a/themes/berkarar/assets/css/components/2-layout/slider.scss b/themes/berkarar/assets/css/components/2-layout/slider.scss old mode 100644 new mode 100755 diff --git a/themes/berkarar/assets/css/components/3-page/about.scss b/themes/berkarar/assets/css/components/3-page/about.scss old mode 100644 new mode 100755 diff --git a/themes/berkarar/assets/css/components/3-page/bills.scss b/themes/berkarar/assets/css/components/3-page/bills.scss old mode 100644 new mode 100755 diff --git a/themes/berkarar/assets/css/components/3-page/contact.scss b/themes/berkarar/assets/css/components/3-page/contact.scss old mode 100644 new mode 100755 diff --git a/themes/berkarar/assets/css/components/3-page/home.scss b/themes/berkarar/assets/css/components/3-page/home.scss old mode 100644 new mode 100755 diff --git a/themes/berkarar/assets/css/components/3-page/post.scss b/themes/berkarar/assets/css/components/3-page/post.scss old mode 100644 new mode 100755 diff --git a/themes/berkarar/assets/css/components/3-page/result.scss b/themes/berkarar/assets/css/components/3-page/result.scss old mode 100644 new mode 100755 diff --git a/themes/berkarar/assets/css/jquery.fancybox.min.css b/themes/berkarar/assets/css/jquery.fancybox.min.css old mode 100644 new mode 100755 diff --git a/themes/berkarar/assets/css/main.css b/themes/berkarar/assets/css/main.css old mode 100644 new mode 100755 diff --git a/themes/berkarar/assets/css/main.scss b/themes/berkarar/assets/css/main.scss old mode 100644 new mode 100755 diff --git a/themes/berkarar/assets/css/prepros.config b/themes/berkarar/assets/css/prepros.config old mode 100644 new mode 100755 diff --git a/themes/berkarar/assets/css/swiper.min.css b/themes/berkarar/assets/css/swiper.min.css old mode 100644 new mode 100755 diff --git a/themes/berkarar/assets/images/about-pics-1.png b/themes/berkarar/assets/images/about-pics-1.png old mode 100644 new mode 100755 diff --git a/themes/berkarar/assets/images/about-pics-2.png b/themes/berkarar/assets/images/about-pics-2.png old mode 100644 new mode 100755 diff --git a/themes/berkarar/assets/images/about-pics-3.png b/themes/berkarar/assets/images/about-pics-3.png old mode 100644 new mode 100755 diff --git a/themes/berkarar/assets/images/about-pics-4.png b/themes/berkarar/assets/images/about-pics-4.png old mode 100644 new mode 100755 diff --git a/themes/berkarar/assets/images/about-pics-5.png b/themes/berkarar/assets/images/about-pics-5.png old mode 100644 new mode 100755 diff --git a/themes/berkarar/assets/images/bg.png b/themes/berkarar/assets/images/bg.png old mode 100644 new mode 100755 diff --git a/themes/berkarar/assets/images/flag.png b/themes/berkarar/assets/images/flag.png old mode 100644 new mode 100755 diff --git a/themes/berkarar/assets/images/flag_en.png b/themes/berkarar/assets/images/flag_en.png old mode 100644 new mode 100755 diff --git a/themes/berkarar/assets/images/flag_ru.png b/themes/berkarar/assets/images/flag_ru.png old mode 100644 new mode 100755 diff --git a/themes/berkarar/assets/images/flag_tk.png b/themes/berkarar/assets/images/flag_tk.png old mode 100644 new mode 100755 diff --git a/themes/berkarar/assets/images/intro.png b/themes/berkarar/assets/images/intro.png old mode 100644 new mode 100755 diff --git a/themes/berkarar/assets/images/logo.png b/themes/berkarar/assets/images/logo.png old mode 100644 new mode 100755 diff --git a/themes/berkarar/assets/images/menu-bg.png b/themes/berkarar/assets/images/menu-bg.png old mode 100644 new mode 100755 diff --git a/themes/berkarar/assets/images/movie-bg.png b/themes/berkarar/assets/images/movie-bg.png old mode 100644 new mode 100755 diff --git a/themes/berkarar/assets/images/movie-logo.png b/themes/berkarar/assets/images/movie-logo.png old mode 100644 new mode 100755 diff --git a/themes/berkarar/assets/images/movie-photo.jpg b/themes/berkarar/assets/images/movie-photo.jpg old mode 100644 new mode 100755 diff --git a/themes/berkarar/assets/images/movie-pic-1.png b/themes/berkarar/assets/images/movie-pic-1.png old mode 100644 new mode 100755 diff --git a/themes/berkarar/assets/images/movie-pic-2.png b/themes/berkarar/assets/images/movie-pic-2.png old mode 100644 new mode 100755 diff --git a/themes/berkarar/assets/images/rahat-coffee.png b/themes/berkarar/assets/images/rahat-coffee.png old mode 100644 new mode 100755 diff --git a/themes/berkarar/assets/images/restaurant-1.png b/themes/berkarar/assets/images/restaurant-1.png old mode 100644 new mode 100755 diff --git a/themes/berkarar/assets/images/restaurant-2.png b/themes/berkarar/assets/images/restaurant-2.png old mode 100644 new mode 100755 diff --git a/themes/berkarar/assets/images/restaurant-bg.png b/themes/berkarar/assets/images/restaurant-bg.png old mode 100644 new mode 100755 diff --git a/themes/berkarar/assets/images/shop-1.png b/themes/berkarar/assets/images/shop-1.png old mode 100644 new mode 100755 diff --git a/themes/berkarar/assets/images/shop-2.png b/themes/berkarar/assets/images/shop-2.png old mode 100644 new mode 100755 diff --git a/themes/berkarar/assets/images/svg/arrow-down.svg b/themes/berkarar/assets/images/svg/arrow-down.svg old mode 100644 new mode 100755 diff --git a/themes/berkarar/assets/images/svg/big-arrow.svg b/themes/berkarar/assets/images/svg/big-arrow.svg old mode 100644 new mode 100755 diff --git a/themes/berkarar/assets/images/svg/clock.svg b/themes/berkarar/assets/images/svg/clock.svg old mode 100644 new mode 100755 diff --git a/themes/berkarar/assets/images/svg/crumb-arrow.svg b/themes/berkarar/assets/images/svg/crumb-arrow.svg old mode 100644 new mode 100755 diff --git a/themes/berkarar/assets/images/svg/crumb-white-arrow.svg b/themes/berkarar/assets/images/svg/crumb-white-arrow.svg old mode 100644 new mode 100755 diff --git a/themes/berkarar/assets/images/svg/email.svg b/themes/berkarar/assets/images/svg/email.svg old mode 100644 new mode 100755 diff --git a/themes/berkarar/assets/images/svg/facebook.svg b/themes/berkarar/assets/images/svg/facebook.svg old mode 100644 new mode 100755 diff --git a/themes/berkarar/assets/images/svg/gps.svg b/themes/berkarar/assets/images/svg/gps.svg old mode 100644 new mode 100755 diff --git a/themes/berkarar/assets/images/svg/home.svg b/themes/berkarar/assets/images/svg/home.svg old mode 100644 new mode 100755 diff --git a/themes/berkarar/assets/images/svg/instagram.svg b/themes/berkarar/assets/images/svg/instagram.svg old mode 100644 new mode 100755 diff --git a/themes/berkarar/assets/images/svg/map.svg b/themes/berkarar/assets/images/svg/map.svg old mode 100644 new mode 100755 diff --git a/themes/berkarar/assets/images/svg/mouse-arrow.svg b/themes/berkarar/assets/images/svg/mouse-arrow.svg old mode 100644 new mode 100755 diff --git a/themes/berkarar/assets/images/svg/movie-arrow.svg b/themes/berkarar/assets/images/svg/movie-arrow.svg old mode 100644 new mode 100755 diff --git a/themes/berkarar/assets/images/svg/phone.svg b/themes/berkarar/assets/images/svg/phone.svg old mode 100644 new mode 100755 diff --git a/themes/berkarar/assets/images/svg/search.svg b/themes/berkarar/assets/images/svg/search.svg old mode 100644 new mode 100755 diff --git a/themes/berkarar/assets/images/svg/slider-arrow.svg b/themes/berkarar/assets/images/svg/slider-arrow.svg old mode 100644 new mode 100755 diff --git a/themes/berkarar/assets/images/svg/small-arrow.svg b/themes/berkarar/assets/images/svg/small-arrow.svg old mode 100644 new mode 100755 diff --git a/themes/berkarar/assets/images/svg/small-black-arrow.svg b/themes/berkarar/assets/images/svg/small-black-arrow.svg old mode 100644 new mode 100755 diff --git a/themes/berkarar/assets/images/svg/twitter.svg b/themes/berkarar/assets/images/svg/twitter.svg old mode 100644 new mode 100755 diff --git a/themes/berkarar/assets/images/svg/youtube.svg b/themes/berkarar/assets/images/svg/youtube.svg old mode 100644 new mode 100755 diff --git a/themes/berkarar/assets/js/custom-file-input.js b/themes/berkarar/assets/js/custom-file-input.js old mode 100644 new mode 100755 diff --git a/themes/berkarar/assets/js/customSelect.js b/themes/berkarar/assets/js/customSelect.js old mode 100644 new mode 100755 diff --git a/themes/berkarar/assets/js/jquery.js b/themes/berkarar/assets/js/jquery.js old mode 100644 new mode 100755 diff --git a/themes/berkarar/assets/js/main.js b/themes/berkarar/assets/js/main.js old mode 100644 new mode 100755 diff --git a/themes/berkarar/assets/js/modal-close.js b/themes/berkarar/assets/js/modal-close.js old mode 100644 new mode 100755 diff --git a/themes/berkarar/assets/js/slick.min.js b/themes/berkarar/assets/js/slick.min.js old mode 100644 new mode 100755 diff --git a/themes/berkarar/assets/js/slider.js b/themes/berkarar/assets/js/slider.js old mode 100644 new mode 100755 diff --git a/themes/berkarar/assets/js/swiper-bundle.min.js b/themes/berkarar/assets/js/swiper-bundle.min.js old mode 100644 new mode 100755 diff --git a/themes/berkarar/assets/js/tabs.js b/themes/berkarar/assets/js/tabs.js old mode 100644 new mode 100755 diff --git a/themes/berkarar/assets/js/wow.min.js b/themes/berkarar/assets/js/wow.min.js old mode 100644 new mode 100755 diff --git a/themes/berkarar/assets/prepros.config b/themes/berkarar/assets/prepros.config old mode 100644 new mode 100755 diff --git a/themes/berkarar/customize.yaml b/themes/berkarar/customize.yaml old mode 100644 new mode 100755 diff --git a/themes/berkarar/layouts/default.htm b/themes/berkarar/layouts/default.htm old mode 100644 new mode 100755 index 5467b2c..04c6a56 --- a/themes/berkarar/layouts/default.htm +++ b/themes/berkarar/layouts/default.htm @@ -14,48 +14,64 @@ forceUrl = 0 limit(8)->get(); + $this['top_categories'] = Tps\Shops\Models\TopCategory::orderBy('sort_order')->get(); $this['category_settings'] = [ [ [ - "limit" => 9, + "limit" => 8, "start" => 0, ] ], [ [ - "limit" => 5, + "limit" => 0, "start" => 1 ], [ "limit" => 5, "start" => 2 ], - ], - [ [ - "limit" => 6, - "start" => 3 - ], - [ - "limit" => 5, - "start" => 4 - ], - ], - [ - [ - "limit" => 9, + "limit" => 0, "start" => 5 ] ], [ [ - "limit" => 5, - "start" => 6 + "limit" => 4, + "start" => 3 + ], + [ + "limit" => 2, + "start" => 4 + ], + ], + [ + [ + "limit" => 3, + "start" => 7 ], [ "limit" => 3, - "start" => 7 + "start" => 9 + ], + ], + [ + [ + "limit" => 3, + "start" => 6 + ], + [ + "limit" => 0, + "start" => 8 + ], + [ + "limit" => 0, + "start" => 10 + ], + [ + "limit" => 0, + "start" => 11 ], ], ]; diff --git a/themes/berkarar/pages/about.htm b/themes/berkarar/pages/about.htm old mode 100644 new mode 100755 diff --git a/themes/berkarar/pages/category.htm b/themes/berkarar/pages/category.htm old mode 100644 new mode 100755 diff --git a/themes/berkarar/pages/contact.htm b/themes/berkarar/pages/contact.htm old mode 100644 new mode 100755 diff --git a/themes/berkarar/pages/home.htm b/themes/berkarar/pages/home.htm old mode 100644 new mode 100755 index acaba05..40a7c37 --- a/themes/berkarar/pages/home.htm +++ b/themes/berkarar/pages/home.htm @@ -1,6 +1,7 @@ title = "Berkarar" url = "/" layout = "default" +is_hidden = 0 == == - {% partial 'home/slider' %} {% partial 'home/sales' %} {% partial 'home/movies' %} diff --git a/themes/berkarar/pages/profile.htm b/themes/berkarar/pages/profile.htm old mode 100644 new mode 100755 diff --git a/themes/berkarar/pages/sales.htm b/themes/berkarar/pages/sales.htm old mode 100644 new mode 100755 diff --git a/themes/berkarar/pages/shop.htm b/themes/berkarar/pages/shop.htm old mode 100644 new mode 100755 diff --git a/themes/berkarar/pages/top_category.htm b/themes/berkarar/pages/top_category.htm old mode 100644 new mode 100755 diff --git a/themes/berkarar/partials/home/movies.htm b/themes/berkarar/partials/home/movies.htm old mode 100644 new mode 100755 diff --git a/themes/berkarar/partials/home/sales.htm b/themes/berkarar/partials/home/sales.htm old mode 100644 new mode 100755 diff --git a/themes/berkarar/partials/home/shop_item.htm b/themes/berkarar/partials/home/shop_item.htm old mode 100644 new mode 100755 diff --git a/themes/berkarar/partials/home/shops.htm b/themes/berkarar/partials/home/shops.htm old mode 100644 new mode 100755 diff --git a/themes/berkarar/partials/home/slider.htm b/themes/berkarar/partials/home/slider.htm old mode 100644 new mode 100755 diff --git a/themes/berkarar/partials/site/footer.htm b/themes/berkarar/partials/site/footer.htm old mode 100644 new mode 100755 index d408393..644eebb --- a/themes/berkarar/partials/site/footer.htm +++ b/themes/berkarar/partials/site/footer.htm @@ -1,8 +1,9 @@ +==