a1gard
/
xshop
mirror of https://github.com/4xmen/xshop.git
1
0
Fork 1
Code Issues 1 Packages Projects Releases Wiki Activity

fixed some bug ui/ux & translate mistakes

Browse Source
pull/49/head
A1Gard 4 months ago
parent f634f41bcb
commit 0de66aa3c5
16 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File

4
database/seeders/AreaSeeder.php
Unescape Escape View File

@ -34,7 +34,7 @@ class AreaSeeder extends Seeder
'icon' => 'ri-ai-generate',
],
[
'name' => 'default_header',
'name' => 'defaultHeader',
'valid_segments' => json_encode(
["top", "header", "other", "ads", "menu"]
),
@ -43,7 +43,7 @@ class AreaSeeder extends Seeder
'icon' => 'ri-window-line',
],
[
'name' => 'default_footer',
'name' => 'defaultFooter',
'valid_segments' => json_encode(
["footer", "other", "ads", "groups"]
),

6
database/seeders/PartSeeder.php
Unescape Escape View File

@ -87,7 +87,7 @@ class PartSeeder extends Seeder
$part = new Part();
$part->segment = 'menu';
$part->part = 'AplMenu';
$part->area_id = Area::where('name', 'default_header')->first()->id;
$part->area_id = Area::where('name', 'defaultHeader')->first()->id;
$part->sort = 0;
$part->save();
@ -95,14 +95,14 @@ class PartSeeder extends Seeder
$part = new Part();
$part->segment = 'header';
$part->part = 'SimpleHeader';
$part->area_id = Area::where('name', 'default_header')->first()->id;
$part->area_id = Area::where('name', 'defaultHeader')->first()->id;
$part->sort = 0;
$part->save();
$part = new Part();
$part->segment = 'footer';
$part->part = 'WaveFooter';
$part->area_id = Area::where('name', 'default_footer')->first()->id;
$part->area_id = Area::where('name', 'defaultFooter')->first()->id;
$part->sort = 2;
$part->save();

2
resources/js/client.js
Unescape Escape View File

@ -29,6 +29,7 @@ import "../views/segments/product/ProductKaren/ProductKaren.js";
import "../views/segments/posts_page/GridPostListSidebar/GridPostListSidebar.js";
import "../views/segments/post/PostSidebar/PostSidebar.js";
import "../views/segments/clips_page/ClipListGrid/ClipListGrid.js";
import "../views/segments/posts_page/GridPostListSidebar/GridPostListSidebar.js";
import "../views/segments/invoice/LianaInvoice/LianaInvoice.js";
import "../views/segments/clip/DorClip/DorClip.js";
import "../views/segments/galleries_page/GalleriesList/GalleriesList.js";
@ -39,4 +40,3 @@ import "../views/segments/customer/AvisaCustomer/AvisaCustomer.js";
import "../views/segments/attachments_page/DenaAttachList/DenaAttachList.js";
import "../views/segments/attachment/AttachmentWithPreview/AttachmentWithPreview.js";
import "../views/segments/contact/MeloContact/MeloContact.js";
import "../views/segments/posts_page/GridPostListSidebar/GridPostListSidebar.js";

4
resources/lang/fa.json
Unescape Escape View File

@ -145,8 +145,8 @@
"Datetime": "تاریخ و زمان",
"Deattach": "عدم پیوست",
"Default": "پیش‌فرض",
"Default footer": "هدر پیش‌فرض",
"Default header": "فوتر پیش‌فرض",
"DefaultFooter": "فوتر پیش‌فرض",
"DefaultHeader": "هدر پیش‌فرض",
"Description": "توضیحات",
"Description Table": "جدول توضیحات",
"Description Text": "نوشته توضیحات",

2
resources/sass/client.scss
Unescape Escape View File

@ -40,6 +40,7 @@ $xshop-shadow:2px 2px 4px #777777;
@import "../views/segments/posts_page/GridPostListSidebar/GridPostListSidebar";
@import "../views/segments/post/PostSidebar/PostSidebar";
@import "../views/segments/clips_page/ClipListGrid/ClipListGrid";
@import "../views/segments/posts_page/GridPostListSidebar/GridPostListSidebar";
@import "../views/segments/invoice/LianaInvoice/LianaInvoice";
@import "../views/segments/clip/DorClip/DorClip";
@import "../views/segments/galleries_page/GalleriesList/GalleriesList";
@ -50,4 +51,3 @@ $xshop-shadow:2px 2px 4px #777777;
@import "../views/segments/attachments_page/DenaAttachList/DenaAttachList";
@import "../views/segments/attachment/AttachmentWithPreview/AttachmentWithPreview";
@import "../views/segments/contact/MeloContact/MeloContact";
@import "../views/segments/posts_page/GridPostListSidebar/GridPostListSidebar";

4
resources/views/client/category.blade.php
Unescape Escape View File

@ -11,7 +11,7 @@ if ($category->bg != null){
@section('content')
<main>
@if(\App\Models\Area::where('name',$area)->first()->use_default)
@foreach(getParts('default_header') as $part)
@foreach(getParts('defaultHeader') as $part)
@php($p = $part->getBladeWithData())
@include($p['blade'],['data' => $p['data']])
@endforeach
@ -21,7 +21,7 @@ if ($category->bg != null){
@include($p['blade'],['data' => $p['data']])
@endforeach
@if(\App\Models\Area::where('name',$area)->first()->use_default)
@foreach(getParts('default_footer') as $part)
@foreach(getParts('defaultFooter') as $part)
@php($p = $part->getBladeWithData())
@include($p['blade'],['data' => $p['data']])
@endforeach

4
resources/views/client/default-list.blade.php
Unescape Escape View File

@ -6,7 +6,7 @@
@section('content')
<main>
@if(\App\Models\Area::where('name',$area)->first()->use_default)
@foreach(getParts('default_header') as $part)
@foreach(getParts('defaultHeader') as $part)
@php($p = $part->getBladeWithData())
@include($p['blade'],['data' => $p['data']])
@endforeach
@ -16,7 +16,7 @@
@include($p['blade'],['data' => $p['data']])
@endforeach
@if(\App\Models\Area::where('name',$area)->first()->use_default)
@foreach(getParts('default_footer') as $part)
@foreach(getParts('defaultFooter') as $part)
@php($p = $part->getBladeWithData())
@include($p['blade'],['data' => $p['data']])
@endforeach

4
resources/views/client/gallery.blade.php
Unescape Escape View File

@ -6,7 +6,7 @@
@section('content')
<main>
@if(\App\Models\Area::where('name',$area)->first()->use_default)
@foreach(getParts('default_header') as $part)
@foreach(getParts('defaultHeader') as $part)
@php($p = $part->getBladeWithData())
@include($p['blade'],['data' => $p['data']])
@endforeach
@ -16,7 +16,7 @@
@include($p['blade'],['data' => $p['data']])
@endforeach
@if(\App\Models\Area::where('name',$area)->first()->use_default)
@foreach(getParts('default_footer') as $part)
@foreach(getParts('defaultFooter') as $part)
@php($p = $part->getBladeWithData())
@include($p['blade'],['data' => $p['data']])
@endforeach

4
resources/views/client/group.blade.php
Unescape Escape View File

@ -11,7 +11,7 @@ if ($group->bg != null){
@section('content')
<main>
@if(\App\Models\Area::where('name',$area)->first()->use_default)
@foreach(getParts('default_header') as $part)
@foreach(getParts('defaultHeader') as $part)
@php($p = $part->getBladeWithData())
@include($p['blade'],['data' => $p['data']])
@endforeach
@ -21,7 +21,7 @@ if ($group->bg != null){
@include($p['blade'],['data' => $p['data']])
@endforeach
@if(\App\Models\Area::where('name',$area)->first()->use_default)
@foreach(getParts('default_footer') as $part)
@foreach(getParts('defaultFooter') as $part)
@php($p = $part->getBladeWithData())
@include($p['blade'],['data' => $p['data']])
@endforeach

4
resources/views/client/invoice.blade.php
Unescape Escape View File

@ -7,7 +7,7 @@
<main>
<div class="no-print">
@if(\App\Models\Area::where('name',$area)->first()->use_default)
@foreach(getParts('default_header') as $part)
@foreach(getParts('defaultHeader') as $part)
@php($p = $part->getBladeWithData())
@include($p['blade'],['data' => $p['data']])
@endforeach
@ -19,7 +19,7 @@
@endforeach
<div class="no-print">
@if(\App\Models\Area::where('name',$area)->first()->use_default)
@foreach(getParts('default_footer') as $part)
@foreach(getParts('defaultFooter') as $part)
@php($p = $part->getBladeWithData())
@include($p['blade'],['data' => $p['data']])
@endforeach

4
resources/views/client/post.blade.php
Unescape Escape View File

@ -6,7 +6,7 @@
@endsection
@section('content')
@if(\App\Models\Area::where('name',$area)->first()->use_default)
@foreach(getParts('default_header') as $part)
@foreach(getParts('defaultHeader') as $part)
@php($p = $part->getBladeWithData())
@include($p['blade'],['data' => $p['data']])
@endforeach
@ -16,7 +16,7 @@
@include($p['blade'],['data' => $p['data']])
@endforeach
@if(\App\Models\Area::where('name',$area)->first()->use_default)
@foreach(getParts('default_footer') as $part)
@foreach(getParts('defaultFooter') as $part)
@php($p = $part->getBladeWithData())
@include($p['blade'],['data' => $p['data']])
@endforeach

4
resources/views/client/tag.blade.php
Unescape Escape View File

@ -4,7 +4,7 @@
{{$title}} - {{config('app.name')}}
@endsection
@section('content')
@foreach(getParts('default_header') as $part)
@foreach(getParts('defaultHeader') as $part)
@php($p = $part->getBladeWithData())
@include($p['blade'],['data' => $p['data']])
@endforeach
@ -94,7 +94,7 @@
</div>
</div>
</div>
@foreach(getParts('default_footer') as $part)
@foreach(getParts('defaultFooter') as $part)
@php($p = $part->getBladeWithData())
@include($p['blade'],['data' => $p['data']])
@endforeach

4
resources/views/client/welcome.blade.php
Unescape Escape View File

@ -6,7 +6,7 @@
@section('content')
<main>
@if(\App\Models\Area::where('name',$area)->first()->use_default)
@foreach(getParts('default_header') as $part)
@foreach(getParts('defaultHeader') as $part)
@php($p = $part->getBladeWithData())
@include($p['blade'],['data' => $p['data']])
@endforeach
@ -16,7 +16,7 @@
@include($p['blade'],['data' => $p['data']])
@endforeach
@if(\App\Models\Area::where('name',$area)->first()->use_default)
@foreach(getParts('default_footer') as $part)
@foreach(getParts('defaultFooter') as $part)
@php($p = $part->getBladeWithData())
@include($p['blade'],['data' => $p['data']])
@endforeach

2
resources/views/segments/header/ParallaxHeader/ParallaxHeader.blade.php
Unescape Escape View File

@ -1,4 +1,4 @@
<header class='ParallaxHeader' style="background-image: url('{{$bg??asset('upload/images/'.$data->area->name.'.'.$data->part.'.jpg')}}')">
<header class='ParallaxHeader' style="background-image: url('{{$bg??asset('upload/images/'.$part->area->name . '.' . $part->part.'.jpg')}}')">
<div class="{{gfx()['container']}}">
<h1>
{{$title}}

2
resources/views/segments/header/ParallaxHeader/ParallaxHeader.php
Unescape Escape View File

@ -20,7 +20,7 @@ class ParallaxHeader
$setting->title = $part->area->name . ' ' . $part->part.' default image';
$setting->save();
File::copy(__DIR__.'/../../default-assets/bg.jpg',public_path('upload/images/').$part->area->name . '.' . $part->part.'.jpg');
File::copy(__DIR__.'/../../default-assets/bg.jpg',public_path('upload/images/').$part->area->name . '_' . $part->part.'.jpg');
}
public static function onRemove(Part $part = null)
{

2
resources/views/segments/header/ParallaxHeaderPin/ParallaxHeaderPin.blade.php
Unescape Escape View File

@ -1,4 +1,4 @@
<header class='ParallaxHeaderPin' style="background-image: url('{{$bg??asset('upload/images/'.$data->area->name.'.'.$data->part.'.jpg')}}')">
<header class='ParallaxHeaderPin' style="background-image: url('{{$bg??asset('upload/images/'.$part->area->name . '.' . $part->part.'.jpg')}}')">
<div class="{{gfx()['container']}}">
<h1>
{{$title}}

Write Preview
Loading…
Cancel
Save