shihaam/akaunting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

close #1579 Fixed: Pre-Sale app page broken

Browse Source
This commit is contained in:
Cüneyt Şentürk 2020-08-25 13:09:12 +03:00
parent e6f2075eef
commit ade528f389
5 changed files with 47 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
resources/assets/js/components/AkauntingCarousel.vue
View File

@ -19,9 +19,12 @@
<el-carousel-item v-for="(screenshot, index) in screenshots" :key="index"> <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"> <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 }} {{ screenshot.description }}
</div> </div>
<div class="carousel-description py-2" v-else>
{{ name }}
</div>
</el-carousel-item> </el-carousel-item>
</el-carousel> </el-carousel>
</div> </div>

44
resources/views/modules/item/pre_sale.blade.php
View File

@ -12,24 +12,32 @@
<div class="row"> <div class="row">
<div class="col-md-8"> <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"> <ul class="nav nav-pills nav-fill flex-column flex-md-row" id="tabs-icons-text" role="tablist">
<li class="nav-item"> <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> </li>
</ul> </ul>
</div> </div>
<div class="card shadow"> <div class="card">
<div class="card-body"> <div class="card-body">
<div class="tab-content"> <div class="tab-content">
<div class="tab-pane fade show active" id="description"> <div class="tab-pane fade show active" id="description">
{!! $module->description !!} {!! $module->description !!}
@if ($module->screenshots || $module->video) @if ($module->screenshots || $module->video)
<akaunting-carousel :name="'{{ $module->name }}'" :height="'430px'" <akaunting-carousel :name="'{{ $module->name }}'" :height="'430px'" arrow="always"
@if ($module->video) @if ($module->video)
@php @php
if (strpos($module->video->link, '=') !== false) { if (strpos($module->video->link, '=') !== false) {
@ -54,6 +62,7 @@
<div class="card"> <div class="card">
<div class="card-body"> <div class="card-body">
<div id="countdown-pre-sale"></div> <div id="countdown-pre-sale"></div>
<div class="text-center"> <div class="text-center">
<strong> <strong>
<div class="text-xl"> <div class="text-xl">
@ -61,6 +70,7 @@
{{ trans('modules.free') }} {{ trans('modules.free') }}
@else @else
{!! $module->price_prefix !!} {!! $module->price_prefix !!}
@if (isset($module->special_price)) @if (isset($module->special_price))
<del class="text-danger">{{ $module->price }}</del> <del class="text-danger">{{ $module->price }}</del>
{{ $module->special_price }} {{ $module->special_price }}
@ -101,27 +111,27 @@
<table class="table"> <table class="table">
<tbody> <tbody>
@if ($module->vendor_name) @if ($module->vendor_name)
<tr> <tr class="row">
<th>{{ trans_choice('general.developers', 1) }}</th> <th class="col-5">{{ trans_choice('general.developers', 1) }}</th>
<td class="text-right"><a href="{{ route('apps.vendors.show', $module->vendor->slug) }}">{{ $module->vendor_name }}</a></td> <td class="col-7 text-right"><a href="{{ route('apps.vendors.show', $module->vendor->slug) }}">{{ $module->vendor_name }}</a></td>
</tr> </tr>
@endif @endif
@if ($module->version) @if ($module->version)
<tr> <tr class="row">
<th>{{ trans('footer.version') }}</th> <th class="col-5">{{ trans('footer.version') }}</th>
<td class="text-right">{{ $module->version }}</td> <td class="col-7 text-right">{{ $module->version }}</td>
</tr> </tr>
@endif @endif
@if ($module->created_at) @if ($module->created_at)
<tr> <tr class="row">
<th>{{ trans('modules.added') }}</th> <th class="col-5">{{ trans('modules.added') }}</th>
<td class="text-right">@date($module->created_at)</td> <td class="col-7 text-right long-texts">@date($module->created_at)</td>
</tr> </tr>
@endif @endif
@if ($module->updated_at) @if ($module->updated_at)
<tr> <tr class="row">
<th>{{ trans('modules.updated') }}</th> <th class="col-5">{{ trans('modules.updated') }}</th>
<td class="text-right">{{ Date::parse($module->updated_at)->diffForHumans() }}</td> <td class="col-7 text-right">{{ Date::parse($module->updated_at)->diffForHumans() }}</td>
</tr> </tr>
@endif @endif
@if ($module->categories) @if ($module->categories)

6
resources/views/modules/item/show.blade.php
View File

@ -4,7 +4,7 @@
@section('new_button') @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.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 @endsection
@section('content') @section('content')
@ -73,9 +73,9 @@
<div class="tab-pane fade show active" id="description"> <div class="tab-pane fade show active" id="description">
{!! $module->description !!} {!! $module->description !!}
@if($module->screenshots || $module->video) @if ($module->screenshots || $module->video)
<akaunting-carousel :name="'{{ $module->name }}'" :height="'430px'" arrow="always" <akaunting-carousel :name="'{{ $module->name }}'" :height="'430px'" arrow="always"
@if($module->video) @if ($module->video)
@php @php
if (strpos($module->video->link, '=') !== false) { if (strpos($module->video->link, '=') !== false) {
$code = explode('=', $module->video->link); $code = explode('=', $module->video->link);

1
resources/views/partials/modules/item.blade.php
View File

@ -38,6 +38,7 @@
@endif @endif
</small> </small>
</div> </div>
<div class="float-right mr--3"> <div class="float-right mr--3">
<small> <small>
<strong> <strong>

21
resources/views/partials/modules/pre_sale.blade.php
View File

@ -1,22 +1,25 @@
<div class="col-md-3"> <div class="col-md-3">
<div class="card"> <div class="card">
<div class="card-header py-2"> <div class="card-header py-2">
<div class="float-left ml--3"> <h4 class="ml--3 mb-0 float-left">
<h4 class="mb-0"><a href="{{ route('apps.app.show', $module->slug) }}">{{ $module->name }}</a></h4> <a href="{{ route('apps.app.show', $module->slug) }}">{{ $module->name }}</a>
</div> </h4>
<div class="float-right mr--3">
<span class="badge badge-pill badge-danger">{{ trans('modules.badge.pre_sale') }}</span> <span class="mr--3 float-right">
</div> <span class="badge bg-danger text-white">{{ trans('modules.badge.pre_sale') }}</span>
</span>
</div> </div>
<a href="{{ route('apps.app.show', [module->slug) }}">
<a href="{{ route('apps.app.show', $module->slug) }}">
@foreach ($module->files as $file) @foreach ($module->files as $file)
@if (($file->media_type == 'image') && ($file->pivot->zone == 'thumbnail')) @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 @endif
@endforeach @endforeach
</a> </a>
<div class="card-footer py-2"> <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"> <small class="text-sm">
{{ trans('modules.pre_sale') }} {{ trans('modules.pre_sale') }}
</small> </small>