From ade528f3899d99bd028e5728be3a0380740d71bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= <cneytsenturk@gmail.com>
Date: Tue, 25 Aug 2020 13:09:12 +0300
Subject: [PATCH] close #1579 Fixed: Pre-Sale app page broken

---
 .../js/components/AkauntingCarousel.vue       |  5 ++-
 .../views/modules/item/pre_sale.blade.php     | 44 ++++++++++++-------
 resources/views/modules/item/show.blade.php   |  6 +--
 .../views/partials/modules/item.blade.php     |  1 +
 .../views/partials/modules/pre_sale.blade.php | 21 +++++----
 5 files changed, 47 insertions(+), 30 deletions(-)

diff --git a/resources/assets/js/components/AkauntingCarousel.vue b/resources/assets/js/components/AkauntingCarousel.vue
index 9e3c775d0..5e95f2c08 100644
--- a/resources/assets/js/components/AkauntingCarousel.vue
+++ b/resources/assets/js/components/AkauntingCarousel.vue
@@ -19,9 +19,12 @@
 
             <el-carousel-item v-for="(screenshot, index) in screenshots" :key="index">
                 <img class="d-block w-100 carousel-frame" height="365px" :src="screenshot.path_string" :alt="screenshot.alt_attribute">
-                <div class="carousel-description py-2">
+                <div class="carousel-description py-2" v-if="screenshot.description">
                     {{ screenshot.description }}
                 </div>
+                <div class="carousel-description py-2" v-else>
+                    {{ name }}
+                </div>
             </el-carousel-item>
         </el-carousel>
     </div>
diff --git a/resources/views/modules/item/pre_sale.blade.php b/resources/views/modules/item/pre_sale.blade.php
index ef69e2db8..44a876104 100644
--- a/resources/views/modules/item/pre_sale.blade.php
+++ b/resources/views/modules/item/pre_sale.blade.php
@@ -12,24 +12,32 @@
 
     <div class="row">
         <div class="col-md-8">
-            <h3>{{ $module->name }}</h3>
+            <div class="row">
+                <div class="col-xs-12 col-sm-12">
+                    <div class="float-left">
+                        <h3>{{ $module->name }}</h3>
+                    </div>
+                </div>
+            </div>
 
-            <div class="nav-wrapper">
+            <div class="nav-wrapper pt-0">
                 <ul class="nav nav-pills nav-fill flex-column flex-md-row" id="tabs-icons-text" role="tablist">
                     <li class="nav-item">
-                        <a class="nav-link mb-sm-2 mb-md-0 active" href="#description" data-toggle="tab" aria-selected="false">{{ trans('general.description') }}</a>
+                        <a class="nav-link mb-sm-2 mb-md-0 active" href="#description" data-toggle="tab" aria-selected="false">
+                            {{ trans('general.description') }}
+                        </a>
                     </li>
                 </ul>
             </div>
 
-            <div class="card shadow">
+            <div class="card">
                 <div class="card-body">
                     <div class="tab-content">
                         <div class="tab-pane fade show active" id="description">
                             {!! $module->description !!}
 
                             @if ($module->screenshots || $module->video)
-                               <akaunting-carousel :name="'{{ $module->name }}'" :height="'430px'"
+                               <akaunting-carousel :name="'{{ $module->name }}'" :height="'430px'" arrow="always"
                                     @if ($module->video)
                                         @php
                                             if (strpos($module->video->link, '=') !== false) {
@@ -54,6 +62,7 @@
             <div class="card">
                 <div class="card-body">
                     <div id="countdown-pre-sale"></div>
+
                     <div class="text-center">
                         <strong>
                             <div class="text-xl">
@@ -61,6 +70,7 @@
                                     {{ trans('modules.free') }}
                                 @else
                                     {!! $module->price_prefix !!}
+
                                     @if (isset($module->special_price))
                                         <del class="text-danger">{{ $module->price }}</del>
                                         {{ $module->special_price }}
@@ -101,27 +111,27 @@
                 <table class="table">
                     <tbody>
                         @if ($module->vendor_name)
-                            <tr>
-                                <th>{{ trans_choice('general.developers', 1) }}</th>
-                                <td class="text-right"><a href="{{ route('apps.vendors.show', $module->vendor->slug) }}">{{ $module->vendor_name }}</a></td>
+                            <tr class="row">
+                                <th class="col-5">{{ trans_choice('general.developers', 1) }}</th>
+                                <td class="col-7 text-right"><a href="{{ route('apps.vendors.show', $module->vendor->slug) }}">{{ $module->vendor_name }}</a></td>
                             </tr>
                         @endif
                         @if ($module->version)
-                            <tr>
-                                <th>{{ trans('footer.version') }}</th>
-                                <td class="text-right">{{ $module->version }}</td>
+                            <tr class="row">
+                                <th class="col-5">{{ trans('footer.version') }}</th>
+                                <td class="col-7 text-right">{{ $module->version }}</td>
                             </tr>
                         @endif
                         @if ($module->created_at)
-                            <tr>
-                                <th>{{ trans('modules.added') }}</th>
-                                <td class="text-right">@date($module->created_at)</td>
+                            <tr class="row">
+                                <th class="col-5">{{ trans('modules.added') }}</th>
+                                <td class="col-7 text-right long-texts">@date($module->created_at)</td>
                             </tr>
                         @endif
                         @if ($module->updated_at)
-                            <tr>
-                                <th>{{ trans('modules.updated') }}</th>
-                                <td class="text-right">{{ Date::parse($module->updated_at)->diffForHumans() }}</td>
+                            <tr class="row">
+                                <th class="col-5">{{ trans('modules.updated') }}</th>
+                                <td class="col-7 text-right">{{ Date::parse($module->updated_at)->diffForHumans() }}</td>
                             </tr>
                         @endif
                         @if ($module->categories)
diff --git a/resources/views/modules/item/show.blade.php b/resources/views/modules/item/show.blade.php
index 967b3e456..d430533bd 100644
--- a/resources/views/modules/item/show.blade.php
+++ b/resources/views/modules/item/show.blade.php
@@ -4,7 +4,7 @@
 
 @section('new_button')
     <span><a href="{{ route('apps.api-key.create') }}" class="btn btn-white btn-sm header-button-top"><span class="fa fa-key"></span> &nbsp;{{ trans('modules.api_key') }}</a></span>
-    <span><a href="{{ route('apps.my.index')  }}" class="btn btn-white btn-sm header-button-top"><span class="fa fa-user"></span> &nbsp;{{ trans('modules.my_apps') }}</a></span>
+    <span><a href="{{ route('apps.my.index') }}" class="btn btn-white btn-sm header-button-top"><span class="fa fa-user"></span> &nbsp;{{ trans('modules.my_apps') }}</a></span>
 @endsection
 
 @section('content')
@@ -73,9 +73,9 @@
                         <div class="tab-pane fade show active" id="description">
                             {!! $module->description !!}
 
-                            @if($module->screenshots || $module->video)
+                            @if ($module->screenshots || $module->video)
                                <akaunting-carousel :name="'{{ $module->name }}'" :height="'430px'" arrow="always"
-                                    @if($module->video)
+                                    @if ($module->video)
                                         @php
                                             if (strpos($module->video->link, '=') !== false) {
                                                 $code = explode('=', $module->video->link);
diff --git a/resources/views/partials/modules/item.blade.php b/resources/views/partials/modules/item.blade.php
index 1a6451c85..5c7a05258 100644
--- a/resources/views/partials/modules/item.blade.php
+++ b/resources/views/partials/modules/item.blade.php
@@ -38,6 +38,7 @@
                     @endif
                 </small>
             </div>
+
             <div class="float-right mr--3">
                 <small>
                     <strong>
diff --git a/resources/views/partials/modules/pre_sale.blade.php b/resources/views/partials/modules/pre_sale.blade.php
index d2e5b34ff..ae36c26a1 100644
--- a/resources/views/partials/modules/pre_sale.blade.php
+++ b/resources/views/partials/modules/pre_sale.blade.php
@@ -1,22 +1,25 @@
 <div class="col-md-3">
     <div class="card">
         <div class="card-header py-2">
-            <div class="float-left ml--3">
-                <h4 class="mb-0"><a href="{{ route('apps.app.show', $module->slug) }}">{{ $module->name }}</a></h4>
-            </div>
-            <div class="float-right mr--3">
-                <span class="badge badge-pill badge-danger">{{ trans('modules.badge.pre_sale') }}</span>
-            </div>
+            <h4 class="ml--3 mb-0 float-left">
+                <a href="{{ route('apps.app.show', $module->slug) }}">{{ $module->name }}</a>
+            </h4>
+
+            <span class="mr--3 float-right">
+                <span class="badge bg-danger text-white">{{ trans('modules.badge.pre_sale') }}</span>
+            </span>
         </div>
-        <a href="{{ route('apps.app.show', [module->slug) }}">
+
+        <a href="{{ route('apps.app.show', $module->slug) }}">
             @foreach ($module->files as $file)
                 @if (($file->media_type == 'image') && ($file->pivot->zone == 'thumbnail'))
-                    <img src="{{ $file->path_string }}" alt="{{ $module->name }}"  class="card-img-top card-border">
+                    <img src="{{ $file->path_string }}" alt="{{ $module->name }}" class="card-img-top border-radius-none">
                 @endif
             @endforeach
         </a>
+
         <div class="card-footer py-2">
-            <div class="float-left ml--3 mt-1">
+            <div class="float-left ml--3 mt--1">
                 <small class="text-sm">
                     {{ trans('modules.pre_sale') }}
                 </small>