From 1d640796eff553ff9723b042d080c3a8dc36452c Mon Sep 17 00:00:00 2001
From: vedatakd <vedat@vebze.com>
Date: Mon, 3 Feb 2020 17:27:47 +0300
Subject: [PATCH] upgrade 3.7

---
 .../advs-module/resources/lang/fr/addon.php   |  4 +-
 .../advs-module/resources/lang/fr/message.php |  2 +-
 .../resources/lang/en/control_panel.php       |  1 +
 .../resources/lang/tr/control_panel.php       |  1 +
 .../resources/views/partials/topbar.twig      |  2 +-
 bootstrap/app.php                             |  2 +-
 bootstrap/autoload.php                        |  2 +-
 bootstrap/cache/.gitignore                    |  2 -
 composer.json                                 | 52 ++++++++++++-------
 core/.gitkeep                                 |  1 -
 package.json                                  | 21 ++++----
 11 files changed, 52 insertions(+), 38 deletions(-)
 delete mode 100644 bootstrap/cache/.gitignore
 delete mode 100644 core/.gitkeep

diff --git a/addons/default/visiosoft/advs-module/resources/lang/fr/addon.php b/addons/default/visiosoft/advs-module/resources/lang/fr/addon.php
index b13f57bd7..c36630f5d 100644
--- a/addons/default/visiosoft/advs-module/resources/lang/fr/addon.php
+++ b/addons/default/visiosoft/advs-module/resources/lang/fr/addon.php
@@ -2,6 +2,6 @@
 
 return [
     'title'       => 'Les publicités',
-    'name'        => 'Module d\\'annonces',
-    'description' => 'Module d\\'annonces',
+    'name'        => 'Module dannonces',
+    'description' => 'Module dannonces',
 ];
diff --git a/addons/default/visiosoft/advs-module/resources/lang/fr/message.php b/addons/default/visiosoft/advs-module/resources/lang/fr/message.php
index 8ea6e75be..2a4d5d42b 100644
--- a/addons/default/visiosoft/advs-module/resources/lang/fr/message.php
+++ b/addons/default/visiosoft/advs-module/resources/lang/fr/message.php
@@ -2,7 +2,7 @@
 
 return [
     'error_added_cart' => 'Le produit demandé est actuellement manquant ou inactif',
-    'please_buy_package' => 'S\\'il vous plaît acheter le paquet',
+    'please_buy_package' => 'Sil vous plaît acheter le paquet',
     'please_payment' => 'Please Pay',
     'bank_account_info' => 'Bank account information',
     'agreement' => 'By clicking Post, you agree to our Terms of Use and Privacy Policy acknowledge that you are the rightful owner of this item.',
diff --git a/addons/default/visiosoft/defaultadmin-theme/resources/lang/en/control_panel.php b/addons/default/visiosoft/defaultadmin-theme/resources/lang/en/control_panel.php
index 1402aa1ec..5d0f6a9a0 100644
--- a/addons/default/visiosoft/defaultadmin-theme/resources/lang/en/control_panel.php
+++ b/addons/default/visiosoft/defaultadmin-theme/resources/lang/en/control_panel.php
@@ -6,4 +6,5 @@ return [
     'logout'    => 'Logout',
     'view_site' => 'View Site',
     'title'     => 'Control Panel',
+    'search_placeholder'     => 'Type to search',
 ];
diff --git a/addons/default/visiosoft/defaultadmin-theme/resources/lang/tr/control_panel.php b/addons/default/visiosoft/defaultadmin-theme/resources/lang/tr/control_panel.php
index 091e413d1..f3ad90112 100644
--- a/addons/default/visiosoft/defaultadmin-theme/resources/lang/tr/control_panel.php
+++ b/addons/default/visiosoft/defaultadmin-theme/resources/lang/tr/control_panel.php
@@ -6,4 +6,5 @@ return [
     'logout'    => 'Çıkış Yap',
     'view_site' => 'Siteyi Görüntüle',
     'title'     => 'Kontrol Paneli',
+    'search_placeholder'     => 'Ara',
 ];
diff --git a/addons/default/visiosoft/defaultadmin-theme/resources/views/partials/topbar.twig b/addons/default/visiosoft/defaultadmin-theme/resources/views/partials/topbar.twig
index dba16133d..f1d4f4d0a 100644
--- a/addons/default/visiosoft/defaultadmin-theme/resources/views/partials/topbar.twig
+++ b/addons/default/visiosoft/defaultadmin-theme/resources/views/partials/topbar.twig
@@ -19,7 +19,7 @@
 
             <form class="navbar-form dropdown" id="search">
 
-                <input type="text" class="form-control search-bar" placeholder="Type to search...">
+                <input type="text" class="form-control search-bar" placeholder="{{ trans('visiosoft.theme.defaultadmin::control_panel.search_placeholder') }}...">
 
                 <button type="submit" class="btn btn-search"><i class="fa fa-search"></i></button>
 
diff --git a/bootstrap/app.php b/bootstrap/app.php
index 4bb306184..7c0085c84 100644
--- a/bootstrap/app.php
+++ b/bootstrap/app.php
@@ -52,4 +52,4 @@ $app->singleton(
 |
 */
 
-return $app;
+return $app;
\ No newline at end of file
diff --git a/bootstrap/autoload.php b/bootstrap/autoload.php
index 383013796..531823854 100644
--- a/bootstrap/autoload.php
+++ b/bootstrap/autoload.php
@@ -31,4 +31,4 @@ $compiledPath = __DIR__.'/cache/compiled.php';
 
 if (file_exists($compiledPath)) {
     require $compiledPath;
-}
+}
\ No newline at end of file
diff --git a/bootstrap/cache/.gitignore b/bootstrap/cache/.gitignore
deleted file mode 100644
index d6b7ef32c..000000000
--- a/bootstrap/cache/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*
-!.gitignore
diff --git a/composer.json b/composer.json
index 5cf2e15cc..6c147e4f4 100644
--- a/composer.json
+++ b/composer.json
@@ -17,65 +17,72 @@
     "require": {
         "wikimedia/composer-merge-plugin": "~1.4.0",
         "anomaly/streams-composer-plugin": "~1.1.0",
-        "anomaly/streams-platform": "~1.5.0",
+        "visiosoft/streams-platform": "^1.7",
         "anomaly/default_authenticator-extension": "~2.1.0",
         "anomaly/throttle_security_check-extension": "~2.1.0",
-        "anomaly/local_storage_adapter-extension": "~2.1.0",
+        "anomaly/private_storage_adapter-extension": "~1.0.0",
         "anomaly/default_page_handler-extension": "~2.1.0",
         "anomaly/user_security_check-extension": "~2.1.0",
         "anomaly/xml_feed_widget-extension": "~2.1.0",
         "anomaly/page_link_type-extension": "~2.1.0",
         "anomaly/url_link_type-extension": "~2.1.0",
         "anomaly/relationship-field_type": "~2.2.0",
+        "anomaly/colorpicker-field_type": "~2.3.0",
         "anomaly/polymorphic-field_type": "~2.1.0",
         "anomaly/checkboxes-field_type": "~2.4.0",
+        "anomaly/encrypted-field_type": "~2.1.0",
         "anomaly/datetime-field_type": "~3.0.0",
         "anomaly/repeater-field_type": "~1.3.0",
         "anomaly/language-field_type": "~2.2.0",
-        "anomaly/multiple-field_type": "~2.2.0",
+        "anomaly/multiple-field_type": "~2.3.0",
         "anomaly/textarea-field_type": "~2.1.0",
+        "anomaly/markdown-field_type": "~3.1.0",
         "anomaly/wysiwyg-field_type": "~3.1.0",
         "anomaly/boolean-field_type": "~2.3.0",
+        "anomaly/country-field_type": "~2.3.0",
         "anomaly/decimal-field_type": "~2.1.0",
         "anomaly/integer-field_type": "~2.1.0",
         "anomaly/editor-field_type": "~3.1.0",
         "anomaly/select-field_type": "~2.3.0",
+        "anomaly/slider-field_type": "~3.0.0",
         "anomaly/addon-field_type": "~2.2.0",
         "anomaly/email-field_type": "~2.1.0",
-        "anomaly/files-field_type": "~2.2.0",
-        "anomaly/tags-field_type": "~2.3.0",
+        "anomaly/state-field_type": "~2.3.0",
+        "anomaly/files-field_type": "~2.3.0",
+        "anomaly/tags-field_type": "~2.4.0",
         "anomaly/slug-field_type": "~2.1.0",
         "anomaly/text-field_type": "~2.2.0",
-        "anomaly/file-field_type": "~2.2.32",
+        "anomaly/file-field_type": "2.2.32",
         "anomaly/url-field_type": "~2.2.0",
         "anomaly/configuration-module": "~2.1.0",
-        "anomaly/preferences-module": "~2.1.0",
+        "anomaly/preferences-module": "~2.2.0",
         "anomaly/navigation-module": "~2.4.0",
         "anomaly/dashboard-module": "~2.2.0",
-        "anomaly/redirects-module": "~2.2.0",
-        "anomaly/variables-module": "~2.3.0",
-        "anomaly/settings-module": "~2.3.0",
-        "anomaly/addons-module": "~2.2.0",
-        "anomaly/blocks-module": "~1.2.0",
-        "anomaly/users-module": "~2.4.0",
-        "anomaly/pages-module": "~2.5.0",
-        "anomaly/posts-module": "~2.5.0",
-        "anomaly/files-module": "~2.5.0",
+        "anomaly/redirects-module": "~2.3.0",
+        "anomaly/variables-module": "~2.4.0",
+        "anomaly/settings-module": "~2.4.0",
+        "anomaly/addons-module": "~2.3.0",
+        "anomaly/blocks-module": "~1.3.0",
+        "anomaly/search-module": "~3.0.0",
+        "anomaly/system-module": "~1.0.0",
+        "anomaly/users-module": "~2.5.0",
+        "anomaly/pages-module": "~2.6.0",
+        "anomaly/posts-module": "~2.6.0",
+        "anomaly/files-module": "~2.6.0",
         "anomaly/contact-plugin": "~1.2.0",
         "anomaly/helper-plugin": "~2.1.0",
         "anomaly/robots-extension": "~2.1.0",
-        "anomaly/sitemap-extension": "~2.1.0",
+        "anomaly/sitemap-extension": "~2.2.0",
         "anomaly/html_block-extension": "~1.0.0",
         "anomaly/wysiwyg_block-extension": "~1.0.0",
         "ammadeuss/laravel-html-dom-parser": "^1.1",
         "visiosoft/decimal-field_type": "~2.1.0",
         "visiosoft/integer-field_type": "~2.1.0",
-        "guzzlehttp/guzzle": "~6.3.3"
+        "guzzlehttp/guzzle": "~6.3.3",
     },
     "require-dev": {
         "filp/whoops": "~2.0",
-        "laravel/tinker": "^1.0",
-        "phpunit/phpunit": "~6.0",
+        "phpunit/phpunit": "^7.0",
         "fzaninotto/faker": "~1.4",
         "mockery/mockery": "0.9.*",
         "symfony/css-selector": "3.1.*",
@@ -113,6 +120,11 @@
             ],
             "recurse": true,
             "replace": false
+        },
+        "laravel": {
+            "dont-discover": [
+                "*"
+            ]
         }
     },
     "config": {
diff --git a/core/.gitkeep b/core/.gitkeep
deleted file mode 100644
index 8b1378917..000000000
--- a/core/.gitkeep
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/package.json b/package.json
index 4eff79c06..8c4fedd4f 100644
--- a/package.json
+++ b/package.json
@@ -3,20 +3,23 @@
     "scripts": {
         "dev": "npm run development",
         "development": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
-        "watch": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --watch --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
+        "watch": "npm run development -- --watch",
         "watch-poll": "npm run watch -- --watch-poll",
         "hot": "cross-env NODE_ENV=development node_modules/webpack-dev-server/bin/webpack-dev-server.js --inline --hot --config=node_modules/laravel-mix/setup/webpack.config.js",
         "prod": "npm run production",
-        "production": "cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js"
+        "production": "cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --no-progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js"
     },
     "devDependencies": {
-        "axios": "^0.18.1",
-        "bootstrap": "^4.0.0",
-        "popper.js": "^1.12",
+        "axios": "^0.19",
+        "bootstrap": "^4.1.0",
         "cross-env": "^5.1",
         "jquery": "^3.2",
-        "laravel-mix": "^2.0",
-        "lodash": "^4.17.4",
-        "vue": "^2.5.7"
+        "laravel-mix": "^4.0.7",
+        "lodash": "^4.17.13",
+        "popper.js": "^1.12",
+        "resolve-url-loader": "^2.3.1",
+        "sass": "^1.15.2",
+        "sass-loader": "^7.1.0",
+        "vue": "^2.5.17"
     }
-}
+}
\ No newline at end of file