close #609 Fixed: Empty apps page category page broken

akaunting · Nov 9, 2018 · 4197741 · 4197741
1 parent 0777c64
commit 4197741
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 42 deletions.
diff --git a/resources/views/modules/home/index.blade.php b/resources/views/modules/home/index.blade.php
@@ -16,29 +16,41 @@
                 <h3>{{ trans('modules.top_paid') }}</h3>
             </div>
 
-            @foreach ($paid->data as $module)
-                @include('partials.modules.item')
-            @endforeach
+            @if ($paid->data)
+                @foreach ($paid->data as $module)
+                    @include('partials.modules.item')
+                @endforeach
+            @else
+                @include('partials.modules.no_apps')
+            @endif
         </div>
 
         <div class="col-md-12">
             <div class="content-header no-padding-left">
                 <h3>{{ trans('modules.new') }}</h3>
             </div>
 
-            @foreach ($new->data as $module)
-                @include('partials.modules.item')
-            @endforeach
+            @if ($new->data)
+                @foreach ($new->data as $module)
+                    @include('partials.modules.item')
+                @endforeach
+            @else
+                @include('partials.modules.no_apps')
+            @endif
         </div>
 
         <div class="col-md-12">
             <div class="content-header no-padding-left">
                 <h3>{{ trans('modules.top_free') }}</h3>
             </div>
 
-            @foreach ($free->data as $module)
-                @include('partials.modules.item')
-            @endforeach
+            @if ($free->data)
+                @foreach ($free->data as $module)
+                    @include('partials.modules.item')
+                @endforeach
+            @else
+                @include('partials.modules.no_apps')
+            @endif
         </div>
     </div>
 @endsection
diff --git a/resources/views/modules/my/index.blade.php b/resources/views/modules/my/index.blade.php
@@ -21,17 +21,7 @@
                     @include('partials.modules.item')
                 @endforeach
             @else
-                <div class="box box-success">
-                    <div class="box-body">
-                        <p class="col-md-12" style="margin-top: 15px">
-                            {{ trans('modules.no_apps') }}
-                        </p>
-                        <p class="col-md-12" style="margin-top: 20px">
-                            <small>{!! trans('modules.developer') !!}</small>
-                        </p>
-                    </div>
-                    <!-- /.box-body -->
-                </div>
+                @include('partials.modules.no_apps')
             @endif
         </div>
 
@@ -45,17 +35,7 @@
                     @include('partials.modules.item')
                 @endforeach
             @else
-                <div class="box box-success">
-                    <div class="box-body">
-                        <p class="col-md-12" style="margin-top: 15px">
-                            {{ trans('modules.no_apps') }}
-                        </p>
-                        <p class="col-md-12" style="margin-top: 20px">
-                            <small>{!! trans('modules.developer') !!}</small>
-                        </p>
-                    </div>
-                    <!-- /.box-body -->
-                </div>
+                @include('partials.modules.no_apps')
             @endif
         </div>
     </div>

diff --git a/resources/views/modules/tiles/index.blade.php b/resources/views/modules/tiles/index.blade.php
@@ -31,17 +31,7 @@
                     </ul>
                 </div>
             @else
-                <div class="box box-success">
-                    <div class="box-body">
-                        <p class="col-md-12" style="margin-top: 15px">
-                            {{ trans('modules.no_apps') }}
-                        </p>
-                        <p class="col-md-12" style="margin-top: 20px">
-                            <small>{!! trans('modules.developer') !!}</small>
-                        </p>
-                    </div>
-                    <!-- /.box-body -->
-                </div>
+                @include('partials.modules.no_apps')
             @endif
         </div>
     </div>

diff --git a/resources/views/partials/modules/no_apps.blade.php b/resources/views/partials/modules/no_apps.blade.php
@@ -0,0 +1,10 @@
+<div class="box box-success">
+    <div class="box-body">
+        <p class="col-md-12" style="margin-top: 15px">
+            {{ trans('modules.no_apps') }}
+        </p>
+        <p class="col-md-12" style="margin-top: 20px">
+            <small>{!! trans('modules.developer') !!}</small>
+        </p>
+    </div>
+</div>