From 3a1642435a0fb067b508179007519d878325d472 Mon Sep 17 00:00:00 2001 From: Diatrex Date: Thu, 7 Jan 2021 14:43:54 +0300 Subject: [PATCH 1/6] #6 Notation and information part design on the map --- package.json | 3 +++ webpack.mix.js | 1 + 2 files changed, 4 insertions(+) diff --git a/package.json b/package.json index a5d22e8d9..6aa43294f 100644 --- a/package.json +++ b/package.json @@ -22,5 +22,8 @@ "sass-loader": "^7.1.0", "vue": "^2.5.17", "vue-template-compiler": "^2.6.11" + }, + "dependencies": { + "ol": "^6.5.0" } } diff --git a/webpack.mix.js b/webpack.mix.js index 69594ff2d..045a028cc 100644 --- a/webpack.mix.js +++ b/webpack.mix.js @@ -13,4 +13,5 @@ let mix = require('laravel-mix'); mix .js('resources/assets/js/app.js', 'public/js') + .js('addons/default/visiosoft/*/resources/js/init.js', 'public/js') .sass('resources/assets/sass/app.scss', 'public/css'); From fef2c51316a45677d8c6765493c8f3adee5a2a6a Mon Sep 17 00:00:00 2001 From: Diatrex Date: Thu, 7 Jan 2021 16:08:34 +0300 Subject: [PATCH 2/6] revert --- package.json | 3 --- webpack.mix.js | 1 - 2 files changed, 4 deletions(-) diff --git a/package.json b/package.json index 6aa43294f..a5d22e8d9 100644 --- a/package.json +++ b/package.json @@ -22,8 +22,5 @@ "sass-loader": "^7.1.0", "vue": "^2.5.17", "vue-template-compiler": "^2.6.11" - }, - "dependencies": { - "ol": "^6.5.0" } } diff --git a/webpack.mix.js b/webpack.mix.js index 045a028cc..69594ff2d 100644 --- a/webpack.mix.js +++ b/webpack.mix.js @@ -13,5 +13,4 @@ let mix = require('laravel-mix'); mix .js('resources/assets/js/app.js', 'public/js') - .js('addons/default/visiosoft/*/resources/js/init.js', 'public/js') .sass('resources/assets/sass/app.scss', 'public/css'); From e1367dbfbb4b9e72f490118c85e7d6241b7d812a Mon Sep 17 00:00:00 2001 From: Diatrex Date: Mon, 18 Jan 2021 17:59:15 +0300 Subject: [PATCH 3/6] for now --- ...soft.module.advs__create_status_stream.php | 48 +++++++++++ ....module.advs__create_user_status_field.php | 26 ++++++ .../visiosoft/advs-module/src/AdvsModule.php | 5 ++ .../profile-module/resources/assets/js/ads.js | 85 ++++++++++++------- .../views/profile/partials/navigation.twig | 2 +- .../Http/Controller/MyProfileController.php | 9 +- 6 files changed, 137 insertions(+), 38 deletions(-) create mode 100644 addons/default/visiosoft/advs-module/migrations/2020_12_18_131819_visiosoft.module.advs__create_status_stream.php create mode 100644 addons/default/visiosoft/advs-module/migrations/2020_12_18_134817_visiosoft.module.advs__create_user_status_field.php diff --git a/addons/default/visiosoft/advs-module/migrations/2020_12_18_131819_visiosoft.module.advs__create_status_stream.php b/addons/default/visiosoft/advs-module/migrations/2020_12_18_131819_visiosoft.module.advs__create_status_stream.php new file mode 100644 index 000000000..d05cf2076 --- /dev/null +++ b/addons/default/visiosoft/advs-module/migrations/2020_12_18_131819_visiosoft.module.advs__create_status_stream.php @@ -0,0 +1,48 @@ + 'status', + 'title_column' => 'slug', + 'translatable' => true, + 'versionable' => false, + 'trashable' => true, + 'searchable' => false, + 'sortable' => false, + ]; + + protected $fields = [ + "is_system" => [ + "type" => "anomaly.field_type.boolean", + "config" => [ + "default_value" => false, + "mode" => "radio", + ] + ], + "user_access" => [ + "type" => "anomaly.field_type.boolean", + "config" => [ + "default_value" => true, + "mode" => "radio", + ] + ] + ]; + + protected $assignments = [ + 'name' => [ + 'required' => true, + 'translatable' => true, + ], + 'slug' => [ + 'required' => true, + 'unique' => true, + ], + "is_system", + "user_access" + ]; +} diff --git a/addons/default/visiosoft/advs-module/migrations/2020_12_18_134817_visiosoft.module.advs__create_user_status_field.php b/addons/default/visiosoft/advs-module/migrations/2020_12_18_134817_visiosoft.module.advs__create_user_status_field.php new file mode 100644 index 000000000..690d449c1 --- /dev/null +++ b/addons/default/visiosoft/advs-module/migrations/2020_12_18_134817_visiosoft.module.advs__create_user_status_field.php @@ -0,0 +1,26 @@ + 'advs', + ]; + + protected $fields = [ + "user_status" => [ + "type" => "anomaly.field_type.relationship", + "config" => [ + "related" => \Visiosoft\AdvsModule\Status\StatusModel::class, + "mode" => "lookup", + ] + ], + ]; + + protected $assignments = [ + 'user_status', + ]; +} diff --git a/addons/default/visiosoft/advs-module/src/AdvsModule.php b/addons/default/visiosoft/advs-module/src/AdvsModule.php index 50b814e24..532fbc93a 100644 --- a/addons/default/visiosoft/advs-module/src/AdvsModule.php +++ b/addons/default/visiosoft/advs-module/src/AdvsModule.php @@ -24,6 +24,11 @@ class AdvsModule extends Module ], ], ], + 'status' => [ + 'buttons' => [ + 'new_status', + ], + ], 'product_options' => [ 'title' => 'visiosoft.module.advs::section.product_options.title', 'buttons' => [ diff --git a/addons/default/visiosoft/profile-module/resources/assets/js/ads.js b/addons/default/visiosoft/profile-module/resources/assets/js/ads.js index 05128b421..5f3616bd2 100644 --- a/addons/default/visiosoft/profile-module/resources/assets/js/ads.js +++ b/addons/default/visiosoft/profile-module/resources/assets/js/ads.js @@ -125,43 +125,70 @@ function addAdsRow(id, href, image, name, formatted_price, city, country, cat1, } function dropdownRow(id, type) { - var dropdown = "
\n" + - " \n" + - "
\n"; + var dropdown = ` +
+ +
+ `; if (type == "passive") { - dropdown += "" + - " " + - approve + - "\n"; + dropdown += ` + + + ${approve} + + `; } else { - dropdown += "" + - " " + - passive + - "\n"; + dropdown += ` + + + ${passive} + + `; } - dropdown += "" + - " " + - edit_ad + - "\n"; - - dropdown += "" + - " " + - delete_ad + - "\n"; - - dropdown += "" + - " " + - extend_ad + - "\n"; - - dropdown += "
"; + dropdown += ` + + + ${edit_ad} + + + + ${delete_ad} + + + + ${extend_ad} + +
+ +
+ +
+
+
+
+ `; return dropdown; } +$(document).on('click', '.adv-status-toggle', function (e) { + e.stopPropagation(); + e.preventDefault(); + + if (!$(this).next('div').hasClass('show')) { + $(this).next('div').addClass('show'); + } else { + $(this).next('div').removeClass('show'); + } +}) + function addDropdownBlock() { const dropdowns = $('.my-ads-dropdown') for (let i = 0; i < dropdowns.length; i++) { diff --git a/addons/default/visiosoft/profile-module/resources/views/profile/partials/navigation.twig b/addons/default/visiosoft/profile-module/resources/views/profile/partials/navigation.twig index 340e9ca46..5c38fe95f 100644 --- a/addons/default/visiosoft/profile-module/resources/views/profile/partials/navigation.twig +++ b/addons/default/visiosoft/profile-module/resources/views/profile/partials/navigation.twig @@ -38,4 +38,4 @@
-{{ asset_add("scripts.js", "visiosoft.module.profile::assets/js/profile-nav.js") }} \ No newline at end of file +{{ asset_add("scripts.js", "visiosoft.module.profile::assets/js/profile-nav.js") }} diff --git a/addons/default/visiosoft/profile-module/src/Http/Controller/MyProfileController.php b/addons/default/visiosoft/profile-module/src/Http/Controller/MyProfileController.php index 01920904c..c4f169965 100644 --- a/addons/default/visiosoft/profile-module/src/Http/Controller/MyProfileController.php +++ b/addons/default/visiosoft/profile-module/src/Http/Controller/MyProfileController.php @@ -2,31 +2,24 @@ use Anomaly\SettingsModule\Setting\Contract\SettingRepositoryInterface; use Anomaly\Streams\Platform\Http\Controller\PublicController; -use Anomaly\Streams\Platform\Model\Options\OptionsAdvertisementEntryModel; use Anomaly\Streams\Platform\Model\Users\UsersUsersEntryModel; use Anomaly\UsersModule\User\Contract\UserRepositoryInterface; use Illuminate\Http\Request; use Illuminate\Support\Facades\Auth; use Rinvex\Subscriptions\Models\Plan; -use Rinvex\Subscriptions\Models\PlanSubscription; use Visiosoft\AdvsModule\Adv\AdvModel; -use Visiosoft\AdvsModule\Adv\Contract\AdvRepositoryInterface; use Visiosoft\AdvsModule\Adv\Event\ChangeStatusAd; use Visiosoft\LocationModule\Country\CountryModel; use Visiosoft\AlgoliaModule\Search\SearchModel; use Visiosoft\CloudsiteModule\CloudsiteModule; -use Visiosoft\CloudsiteModule\Site\SiteModel; -use Visiosoft\OrdersModule\Orderdetail\Event\AgainPuchaseOrder; use Visiosoft\PackagesModule\Http\Controller\PackageFEController; use Visiosoft\MessagesModule\Message\MessageModel; use Visiosoft\PackagesModule\Package\PackageModel; -use Visiosoft\PackagesModule\User\UserModel; use Visiosoft\ProfileModule\Adress\AdressModel; use Visiosoft\ProfileModule\Adress\Contract\AdressRepositoryInterface; use Visiosoft\ProfileModule\Adress\Form\AdressFormBuilder; use Visiosoft\ProfileModule\Education\EducationModel; use Visiosoft\ProfileModule\EducationPart\EducationPartModel; -use Visiosoft\ProfileModule\EducationPartOption\EducationPartOptionModel; use Visiosoft\ProfileModule\Profile\Form\ProfileFormBuilder; use Illuminate\Contracts\Events\Dispatcher; @@ -51,7 +44,7 @@ class MyProfileController extends PublicController protected $user; - public function home(ProfileFormBuilder $form, AdvRepositoryInterface $advRepository) + public function home(ProfileFormBuilder $form) { $advs_count = new AdvModel(); $advs_count = count($advs_count->myAdvsByUser()->get()); From 5b2bf658df1fcfc147d40350cae55e598412b5bf Mon Sep 17 00:00:00 2001 From: Diatrex Date: Wed, 20 Jan 2021 18:05:51 +0300 Subject: [PATCH 4/6] changes --- .../profile-module/resources/assets/js/ads.js | 85 +++++++------------ 1 file changed, 29 insertions(+), 56 deletions(-) diff --git a/addons/default/visiosoft/profile-module/resources/assets/js/ads.js b/addons/default/visiosoft/profile-module/resources/assets/js/ads.js index 5f3616bd2..05128b421 100644 --- a/addons/default/visiosoft/profile-module/resources/assets/js/ads.js +++ b/addons/default/visiosoft/profile-module/resources/assets/js/ads.js @@ -125,70 +125,43 @@ function addAdsRow(id, href, image, name, formatted_price, city, country, cat1, } function dropdownRow(id, type) { - var dropdown = ` -
- -
- `; + var dropdown = "
\n" + + " \n" + + "
\n"; if (type == "passive") { - dropdown += ` - - - ${approve} - - `; + dropdown += "" + + " " + + approve + + "\n"; } else { - dropdown += ` - - - ${passive} - - `; + dropdown += "" + + " " + + passive + + "\n"; } - dropdown += ` - - - ${edit_ad} - - - - ${delete_ad} - - - - ${extend_ad} - -
- -
- -
-
-
-
- `; + dropdown += "" + + " " + + edit_ad + + "\n"; + + dropdown += "" + + " " + + delete_ad + + "\n"; + + dropdown += "" + + " " + + extend_ad + + "\n"; + + dropdown += "
"; return dropdown; } -$(document).on('click', '.adv-status-toggle', function (e) { - e.stopPropagation(); - e.preventDefault(); - - if (!$(this).next('div').hasClass('show')) { - $(this).next('div').addClass('show'); - } else { - $(this).next('div').removeClass('show'); - } -}) - function addDropdownBlock() { const dropdowns = $('.my-ads-dropdown') for (let i = 0; i < dropdowns.length; i++) { From c577e436192aabaaa0c7da8879cf36ab119d6ea6 Mon Sep 17 00:00:00 2001 From: Diatrex Date: Thu, 21 Jan 2021 14:41:22 +0300 Subject: [PATCH 5/6] #3158 [profile-module] Profile page is not working --- .../profile-module/resources/assets/css/profile.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/default/visiosoft/profile-module/resources/assets/css/profile.scss b/addons/default/visiosoft/profile-module/resources/assets/css/profile.scss index 3dafb014d..7f4046095 100644 --- a/addons/default/visiosoft/profile-module/resources/assets/css/profile.scss +++ b/addons/default/visiosoft/profile-module/resources/assets/css/profile.scss @@ -21,7 +21,7 @@ background-color: transparent; svg path { - fill: rgba(#000, 1); + fill: #000; } } @@ -34,7 +34,7 @@ width: 15px; path { - fill: rgba(#000, .4); + fill: rgba(0, 0, 0, .4); } } } From 42da2b3f81fb8a05131d56fd35272f57db461e63 Mon Sep 17 00:00:00 2001 From: Diatrex Date: Thu, 21 Jan 2021 17:04:27 +0300 Subject: [PATCH 6/6] =?UTF-8?q?#3101=20emlak24=20ocak=20ay=C4=B1=20yap?= =?UTF-8?q?=C4=B1lacaklar?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../visiosoft/singlefile-field_type/resources/js/upload.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/addons/default/visiosoft/singlefile-field_type/resources/js/upload.js b/addons/default/visiosoft/singlefile-field_type/resources/js/upload.js index f4e39538c..e0e651d52 100644 --- a/addons/default/visiosoft/singlefile-field_type/resources/js/upload.js +++ b/addons/default/visiosoft/singlefile-field_type/resources/js/upload.js @@ -26,8 +26,7 @@ $(function () { formData.append('folder', element.data('folder')); }, renameFile: function (file) { - let newName = new Date().getTime() + '_' + file.name; - return newName; + return new Date().getTime() + '_' + file.name.replace(/ /g, '_'); }, accept: function (file, done) { $.get(REQUEST_ROOT_PATH + '/streams/singlefile-field_type/exists/' + element.data('folder'), {'file': file.name}, function (data) {