Merge pull request #657 from openclassify/dia

improve the way vue js is compiled to prevent errors

addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php

@@ -292,7 +292,9 @@ class AdvRepository extends EntryRepository implements AdvRepositoryInterface
             ->inRandomOrder()
             ->first();
 
+        if ($adv) {
             $adv = $this->getLocationNames($adv);
+        }
 
         return $adv;
     }

addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php

@@ -343,17 +343,14 @@ class AdvsController extends PublicController
     {
         $id = is_null($id) ? $seo : $id;
 
-        $categories = array();
-        $categories_id = array();
-        $isActiveComplaints = $this->adv_model->is_enabled('complaints');
-        $isCommentActive = $this->adv_model->is_enabled('comments');
+        $adv = $this->adv_repository->getListItemAdv($id);
 
-        if ($isActiveComplaints) {
+        if ($adv) {
+
+            if ($this->adv_model->is_enabled('complaints')) {
                 $complaints = ComplaintsComplainTypesEntryModel::all();
             }
 
-        $adv = $this->adv_repository->getListItemAdv($id);
-
             $recommended_advs = $this->adv_repository->getRecommendedAds($adv->id);
 
             foreach ($recommended_advs as $index => $ad) {
@@ -361,6 +358,8 @@ class AdvsController extends PublicController
                 $recommended_advs[$index] = $this->adv_model->AddAdsDefaultCoverImage($ad);
             }
 
+            $categories = array();
+            $categories_id = array();
             for ($i = 1; $i <= 10; $i++) {
                 $cat = "cat" . $i;
                 if ($adv->$cat != null) {
@@ -382,8 +381,7 @@ class AdvsController extends PublicController
 
             //Cloudinary Module
             $adv->video_url = null;
-        $isActiveCloudinary = $this->adv_model->is_enabled('cloudinary');
-        if ($isActiveCloudinary) {
+            if ($this->adv_model->is_enabled('cloudinary')) {
 
                 $CloudinaryModel = new VideoModel();
                 $Cloudinary = $CloudinaryModel->getVideo($id);
@@ -395,7 +393,7 @@ class AdvsController extends PublicController
 
             $options = $this->optionRepository->findAllBy('adv_id', $id);
 
-        if ($isCommentActive) {
+            if ($this->adv_model->is_enabled('comments')) {
                 $CommentModel = new CommentModel();
                 $comments = $CommentModel->getComments($adv->id)->get();
             }
@@ -425,7 +423,10 @@ class AdvsController extends PublicController
             } else {
                 return back();
             }
-
+        } else {
+            $this->messages->error(trans('visiosoft.module.advs::message.ad_doesnt_exist'));
+            return redirect()->route('visiosoft.module.advs::list');
+        }
     }
 
     public function preview($id)

addons/default/visiosoft/cats-module/resources/config/settings.php

@@ -7,4 +7,11 @@ return [
             "default_value" => 5000,
         ]
     ],
+    "include_cities_sitemap" => [
+        "type"   => "anomaly.field_type.boolean",
+        "config" => [
+            "default_value" => true,
+            "mode"          => "checkbox",
+        ]
+    ]
 ];

addons/default/visiosoft/cats-module/resources/lang/en/setting.php

@@ -4,4 +4,7 @@ return [
     'sitemap_dividing_number' => [
         'name' => 'Sitemap Dividing Number',
     ],
+    'include_cities_sitemap' => [
+        'name' => 'Include Cities in Sitemap',
+    ],
 ];

addons/default/visiosoft/cats-module/src/Http/Controller/SitemapController.php

@@ -23,9 +23,14 @@ class SitemapController extends PublicController
     public function index()
     {
         $categoriesCount = $this->categoryRepository->count();
-        $citiesCount = $this->cityRepository->count();
 
+        if (setting_value('visiosoft.module.cats::include_cities_sitemap')) {
+            $citiesCount = $this->cityRepository->count();
             $pagesCount = $citiesCount ? $categoriesCount * $citiesCount : $categoriesCount;
+        } else {
+            $pagesCount = $categoriesCount;
+        }
+
         $pagesCount = ceil($pagesCount / setting_value('visiosoft.module.cats::sitemap_dividing_number'));
 
         return response()->view('visiosoft.module.cats::sitemap.index', [
@@ -39,8 +44,8 @@ class SitemapController extends PublicController
         $page = request()->page ?: 1;
         $skip = $page - 1;
 
-        $citiesCount = $this->cityRepository->count();
-        if ($citiesCount) {
+        if (setting_value('visiosoft.module.cats::include_cities_sitemap')
+            && $citiesCount = $this->cityRepository->count()) {
             $categoriesCount = $this->categoryRepository->count();
 
             $takeCategories = $categoriesCount / ($categoriesCount * $citiesCount / $sitemapDividingNumber);

addons/default/visiosoft/defaultadmin-theme/resources/config/settings.php

@@ -18,6 +18,12 @@ return [
             "default_value" => 'OpenClassify',
         ]
     ],
+    "footer_copyright_org_name" => [
+        "type"   => "anomaly.field_type.text",
+        "config" => [
+            "default_value" => 'OpenClassify, Inc',
+        ]
+    ],
     "sidebar_main_color" => [
         "type"   => "anomaly.field_type.colorpicker",
         "config" => [

addons/default/visiosoft/defaultadmin-theme/resources/lang/en/setting.php

@@ -17,6 +17,9 @@ return [
     "title" => [
         'name' => 'Title',
     ],
+    "footer_copyright_org_name" => [
+        'name' => 'Footer Copyright Organization Name',
+    ],
     "sidebar_main_color" => [
         'name' => 'Sidebar Main Color',
     ],

addons/default/visiosoft/defaultadmin-theme/resources/views/partials/footer.twig

@@ -2,7 +2,7 @@
 
     <ul class="meta">
         <li class="copyright">
-            &copy; {{ 'now'|date('Y') }} OpenClassify, Inc
+            &copy; {{ 'now'|date('Y') }} {{ setting_value('visiosoft.theme.defaultadmin::footer_copyright_org_name') }}
         </li>
         <li class="footprint">
             {{ request_time() }} <span>|</span> {{ memory_usage() }}

resources/assets/js/app.js

@@ -15,8 +15,29 @@ require('./bootstrap');
 
 window.Vue = require('vue');
 
+const requireModulesVueFiles = (moduleVueFiles) => {
+    moduleVueFiles.keys().map(key => {
+        Vue.component(
+            key.split('/').pop().split('.')[0],
+            moduleVueFiles(key).default
+        )
+    })
+}
+
+requireModulesVueFiles(require.context(
+    '../../../addons/default/visiosoft',
+    true,
+    /\.vue$/i
+))
+
+requireModulesVueFiles(require.context(
+    '../../../core/visiosoft',
+    true,
+    /\.vue$/i
+))
+
 // Vue.component('example', require('./components/Example.vue').default);
-//
-// const app = new Vue({
-//     el: '#app'
-// });
+
+const app = new Vue({
+    el: '#openclassify'
+});

webpack.mix.js

@@ -13,6 +13,4 @@ let mix = require('laravel-mix');
 
 mix
     .js('resources/assets/js/app.js', 'public/js')
-    .js('addons/default/visiosoft/*/resources/js/vue/app.js', 'public/js')
-    .js('core/visiosoft/*/resources/js/vue/app.js', 'public/js')
     .sass('resources/assets/sass/app.scss', 'public/css');