added Deeba menu part

fixed menu item lang bug url
optimized menu item url function
fixed some ui bug other theme part [responsive]
update composer description
added generator

app/Models/Item.php

@@ -17,17 +17,36 @@ class Item extends Model
         return $this->belongsTo(Menu::class, 'menu_id', 'id');
     }
 
+
     public function parent()
     {
-        return $this->belongsTo(MenuItem::class, 'parent');
+        return $this->belongsTo(Item::class, 'parent');
     }
 
     public function children()
     {
-        return $this->hasMany(MenuItem::class, 'parent');
+        return $this->hasMany(Item::class, 'parent');
     }
 
     public function dest(){
         return $this->morphTo('menuable','menuable_type','menuable_id');
     }
+
+    public function webUrl(){
+        if ($this->kind == 'direct'){
+
+            if ( config('app.xlang.active') && app()->getLocale() != config('app.xlang.main')){
+                if ($this->meta[0] != '/'){
+
+                    $welcome = \route('client.welcome');
+                    return str_replace($welcome,$welcome .'/'.app()->getLocale(),$this->meta);
+                }else{
+                    return  '/'.app()->getLocale() . $this->meta;
+                }
+            }
+            return $this->meta;
+        }else{
+            $this->dest()->webUrl();
+        }
+    }
 }

composer.json

@@ -1,7 +1,7 @@
 {
     "name": "xmen/xshop",
     "type": "project",
-    "description": "The skeleton application for the Laravel framework.",
+    "description": "Very customizable and easy to use shopping system, open source project based on laravel",
     "keywords": ["xshop", "e-shop", "laravel","laravel-shop","open-source-shop"],
     "license": "GPL-3.0-or-later",
     "require": {

config/app.php

@@ -16,6 +16,7 @@ return [
     */
 
     'name' => env('APP_NAME', 'Laravel'),
+    'version' => env('APP_VERSION', '2.0.0-alpha'),
 
     /*
     |--------------------------------------------------------------------------

database/seeders/MenuSeeder.php

@@ -29,7 +29,6 @@ class MenuSeeder extends Seeder
                'menuable_id' => 1,
                'menuable_type' => Group::class,
                'user_id' => 1,
-               'kind'=>'direct',
            ],
            [
                'title' => "Contact",

resources/views/segments/menu/AplMenu/AplMenu.blade.php

@@ -10,7 +10,7 @@
         @foreach(getMenuBySetting($data->area->name.'_'.$data->part.'_menu')->items as $item)
             <li>
                 @if($item->meta == null)
-                    <a href="{{$item->dest->webUrl()}}">
+                    <a href="{{$item->webUrl()}}">
                         {{$item->title}}
                     </a>
                     @switch($item->menuable_type)
@@ -73,7 +73,7 @@
 
                     @endswitch
                 @else
-                    <a href="{{$item->meta}}">
+                    <a href="{{$item->webUrl()}}">
                         {{$item->title}}
                     </a>
                 @endif

resources/views/segments/menu/DeebaMenu/DeebaMenu.blade.php

@@ -0,0 +1,39 @@
+<nav id='DeebaMenu'>
+    <div class="{{gfx()['container']}}">
+        <ul>
+            @php($items = getMenuBySetting($data->area->name.'_'.$data->part.'_menu')->items)
+            @php($menuShow = false)
+            @foreach($items as $i => $item)
+                {{-- find center --}}
+                @if(!$menuShow && ($i > (count($items) / 2) -1 )  )
+                    @php($menuShow = true)
+                    <li id="deeba-logo-main">
+                        <a href="#">
+                            <img src="{{asset('upload/images/logo.png')}}" alt="">
+                        </a>
+                    </li>
+                @endif
+
+                <li>
+                    <a href="{{$item->webUrl()}}">
+                        {{$item->title}}
+                    </a>
+                </li>
+            @endforeach
+            <li id="deeba-toggle">
+                <a >
+                    <i class="ri-menu-line"></i>
+                </a>
+            </li>
+        </ul>
+    </div>
+    <ul id="deeba-sided">
+        @foreach(getMenuBySetting($data->area->name.'_'.$data->part.'_menu')->items as $item)
+            <li>
+                <a href="{{$item->webUrl()}}">
+                    {{$item->title}}
+                </a>
+            </li>
+        @endforeach
+    </ul>
+</nav>

resources/views/segments/menu/DeebaMenu/DeebaMenu.js

@@ -0,0 +1,14 @@
+const scrollBreakpoint = window.innerHeight * 0.7;
+window.addEventListener('scroll',function () {
+    if (window.scrollY > scrollBreakpoint){
+        document.querySelector('#DeebaMenu').classList.add('active')
+    }else{
+        document.querySelector('#DeebaMenu').classList.remove('active')
+    }
+});
+
+window.addEventListener('load',function () {
+    document.querySelector('#deeba-toggle')?.addEventListener('click',function () {
+        document.querySelector('#deeba-sided').classList.toggle('show');
+    });
+});

resources/views/segments/menu/DeebaMenu/DeebaMenu.json

@@ -0,0 +1,10 @@
+{
+    "name": "DeebaMenu",
+    "version": "1.0",
+    "author": "xStack",
+    "email": "xshop@xstack.ir",
+    "license": "GPL-3.0-or-later",
+    "url": "https:\/\/xstack.ir",
+    "author_url": "https:\/\/4xmen.ir",
+    "packages": []
+}

resources/views/segments/menu/DeebaMenu/DeebaMenu.php

@@ -0,0 +1,31 @@
+<?php
+
+namespace Resources\Views\Segments;
+
+use App\Models\Menu;
+use App\Models\Part;
+use App\Models\Setting;
+
+class DeebaMenu
+{
+    public static function onAdd(Part $part = null)
+    {
+        $setting = new Setting();
+        $setting->section = 'theme';
+        $setting->key = $part->area->name . '_' . $part->part.'_menu';
+        $setting->value = Menu::first()->id;
+        $setting->type = 'MENU';
+        $setting->size = 12;
+        $setting->title =  $part->area->name . ' ' . $part->part .' menu';
+        $setting->save();
+    }
+    public static function onRemove(Part $part = null)
+    {
+        Setting::where('key',$part->area->name . '_' . $part->part.'_menu')->first()?->delete();
+
+    }
+    public static function onMount(Part $part = null)
+    {
+        return $part;
+    }
+}

resources/views/segments/menu/DeebaMenu/DeebaMenu.scss

@@ -0,0 +1,124 @@
+#DeebaMenu {
+    position: absolute;
+    top: 0;
+    left: 0;
+    z-index: 999;
+    width: 100%;
+    transition: 500ms;
+    background: #11111100;
+    backdrop-filter: blur(0);
+
+
+    ul {
+        display: flex;
+        justify-content: space-between;
+        list-style: none;
+        text-align: center;
+        overflow: hidden;
+
+
+        li {
+            transition: 500ms;
+            flex: 1;
+
+            a {
+                padding: 1rem;
+                display: block;
+
+                color:var(--xshop-primary);
+
+                &:hover {
+                    background: var(--xshop-secondary);
+                    color: var(--xshop-diff2);
+                }
+            }
+        }
+
+    }
+
+    #deeba-logo-main {
+        flex-grow: 2;
+        transition: 500ms;
+
+
+        a {
+            background: transparent;
+        }
+
+        img {
+            height: 100px;
+        }
+    }
+
+    #deeba-toggle,.fixed-center{
+        display: none;
+    }
+
+    &.active{
+
+        ul{
+            height: 3.5rem;
+            padding: 0;
+            margin: 0;
+        }
+        background: #11111133;
+        position: fixed;
+        backdrop-filter: blur(7px);
+        #deeba-logo-main img{
+            height: 1em;
+        }
+    }
+
+    #deeba-sided{
+        opacity: .9;
+        padding: 0;
+        position: fixed;
+        inset-inline-end:  -300px;
+        top: 3.5rem;
+        bottom: 0;
+        overflow-y: auto;
+        height: calc(100vh - 3.5rem);
+        width: 270px;
+        z-index: 999;
+        background: var(--xshop-secondary);
+        display: block;
+
+        li{
+            display: block;
+            a{
+                color: var(--xshop-diff2);
+                transition: 300ms;
+                &:hover{
+                    background: var(--xshop-primary);
+                    color: var(--xshop-diff);
+                }
+            }
+
+        }
+
+    }
+}
+
+/*-1024px width*/
+@media (max-width: 1024px) {
+    #DeebaMenu{
+        li{
+            display: none;
+        }
+
+        #deeba-toggle,.fixed-center{
+            display: block;
+            cursor: pointer;
+        }
+        //.fixed-center{
+        //    visibility: hidden;
+        //}
+        #deeba-logo-main{
+            display: block;
+            flex-grow: 8;
+        }
+        .show{
+            inset-inline-end: 0 !important;
+        }
+    }
+}

resources/views/segments/menu/RecetMenu/RecetMenu.blade.php

@@ -7,16 +7,9 @@
         </li>
         @foreach(getMenuBySetting($data->area->name.'_'.$data->part.'_menu')->items as $item)
             <li>
-                @if($item->meta == null)
+                <a href="{{$item->webUrl()}}">
-                <a href="{{$item->dest->webUrl()}}">
                     {{$item->title}}
                 </a>
-                @else
-                <a href="{{$item->meta}}">
-                    {{$item->title}}
-                </a>
-                @endif
-
             </li>
         @endforeach
         <li class="float-end">

resources/views/segments/posts/PostIndexImage/PostIndexImage.scss

@@ -23,6 +23,8 @@
        border-radius: var(--xshop-border-radius);
        padding: 1rem;
 
+       margin-bottom: 1rem;
+
        h3{
            font-size: 22px;
            padding:  1rem 0;

resources/views/segments/products/LatestProducts/LatestProducts.blade.php

@@ -5,7 +5,7 @@
         </h1>
         <div class="row">
             @foreach(\App\Models\Product::where('status',1)->limit(4)->get() as $product)
-                <div class="col-lg-3 col-md-2">
+                <div class="col-lg-3 col-md-6">
                     <div class="product-item">
                         <a class="fav-btn" data-slug="{{$product->slug}}" data-is-fav="{{$product->isFav()}}"
                            data-bs-custom-class="custom-tooltip"

resources/views/segments/products/LatestProducts/LatestProducts.scss

@@ -10,6 +10,7 @@
         border-radius: var(--xshop-border-radius);
         position: relative;
         overflow: hidden;
+        margin-bottom: 1rem;
         img{
             height: 250px;
             width: 100%;

resources/views/website/inc/website-head.blade.php

@@ -7,6 +7,10 @@
     <meta http-equiv="X-UA-Compatible" content="ie=edge">
     <meta name="theme-color" content="{{gfx()['primary']}}"/>
     <meta name="robots" content="follow,index">
+
+    <meta name="generator" content="xShop; version={{config('app.version')}}">
+    {{--  Please don't modify or remove generator --}}
+
     <title>
         @yield('title')
     </title>