Compare commits

..

No commits in common. '267213cff71c344ccd0352325438831aa21f7c9e' and '6f0779b76955d99bf792446a54402d2dfc0ebac9' have entirely different histories.

@ -131,10 +131,6 @@ php artisan client
- PartName.js: your theme part javascript - PartName.js: your theme part javascript
- screenshot.png: screenshot preview of theme part - screenshot.png: screenshot preview of theme part
## Demo
> Online demo available here: <a href="https://xshop.xstack.ir/login">https://xshop.xstack.ir/</a>
### Screenshots ### Screenshots
![1](https://raw.githubusercontent.com/A1Gard/xshop-installer-assets/master/screenshots/xshop-screenshot1.png) ![1](https://raw.githubusercontent.com/A1Gard/xshop-installer-assets/master/screenshots/xshop-screenshot1.png)

@ -42,12 +42,10 @@ class UserController extends XController
} }
$user->name = $request->input('name'); $user->name = $request->input('name');
if (!config('app.demo')) {
$user->email = $request->input('email'); $user->email = $request->input('email');
if (trim($request->input('password')) != '') { if (trim($request->input('password')) != '') {
$user->password = bcrypt($request->input('password')); $user->password = bcrypt($request->input('password'));
} }
}
$user->mobile = $request->input('mobile'); $user->mobile = $request->input('mobile');
$user->role = $request->input('role'); $user->role = $request->input('role');
$user->syncRoles($request->input('role')); $user->syncRoles($request->input('role'));

@ -46,7 +46,7 @@ class Item extends Model
} }
return $this->meta; return $this->meta;
}else{ }else{
return $this->dest->webUrl(); $this->dest()->webUrl();
} }
} }
} }

@ -16,8 +16,8 @@ return [
*/ */
'name' => env('APP_NAME', 'Laravel'), 'name' => env('APP_NAME', 'Laravel'),
'version' => env('APP_VERSION', '2.0.0-beta-3'), 'version' => env('APP_VERSION', '2.0.0-beta-2'),
'demo' => env('APP_DEMO', false),
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| Application Environment | Application Environment

@ -14,7 +14,7 @@ import "./client-custom/windowLoader.js";
import "../views/segments/preloader/PreloaderCircle/PreloaderCircle.js"; import "../views/segments/preloader/PreloaderCircle/PreloaderCircle.js";
import "../views/segments/menu/RecetMenu/RecetMenu.js"; import "../views/segments/menu/RecetMenu/RecetMenu.js";
import "../views/segments/slider/SliderSimple/SliderSimple.js"; import "../views/segments/slider/SliderSimple/SliderSimple.js";
import "../views/segments/posts/PostsSlider/PostsSlider.js"; import "../views/segments/products/LatestProducts/LatestProducts.js";
import "../views/segments/posts/PostsIconSimple/PostsIconSimple.js"; import "../views/segments/posts/PostsIconSimple/PostsIconSimple.js";
import "../views/segments/index/CounterGrid/CounterGrid.js"; import "../views/segments/index/CounterGrid/CounterGrid.js";
import "../views/segments/categories/CategoriesFavImageLinks/CategoriesFavImageLinks.js"; import "../views/segments/categories/CategoriesFavImageLinks/CategoriesFavImageLinks.js";
@ -26,7 +26,6 @@ import "../views/segments/footer/WaveFooter/WaveFooter.js";
import "../views/segments/card/NsCard/NsCard.js"; import "../views/segments/card/NsCard/NsCard.js";
import "../views/segments/products_page/ProductGridSidebar/ProductGridSidebar.js"; import "../views/segments/products_page/ProductGridSidebar/ProductGridSidebar.js";
import "../views/segments/product/ProductKaren/ProductKaren.js"; import "../views/segments/product/ProductKaren/ProductKaren.js";
import "../views/segments/products_page/ProductGridSidebar/ProductGridSidebar.js";
import "../views/segments/posts_page/GridPostListSidebar/GridPostListSidebar.js"; import "../views/segments/posts_page/GridPostListSidebar/GridPostListSidebar.js";
import "../views/segments/post/PostSidebar/PostSidebar.js"; import "../views/segments/post/PostSidebar/PostSidebar.js";
import "../views/segments/clips_page/ClipListGrid/ClipListGrid.js"; import "../views/segments/clips_page/ClipListGrid/ClipListGrid.js";

@ -142,13 +142,11 @@
"Customer mobile": "", "Customer mobile": "",
"Customers": "مشتری‌ها", "Customers": "مشتری‌ها",
"Customers list": "فهرست مشتری‌ها", "Customers list": "فهرست مشتری‌ها",
"DEMO VERSION": "نگارش آزمایشی",
"Dashboard": "پیشخوان", "Dashboard": "پیشخوان",
"Date": "تاریخ", "Date": "تاریخ",
"Datetime": "تاریخ و زمان", "Datetime": "تاریخ و زمان",
"Deattach": "عدم پیوست", "Deattach": "عدم پیوست",
"Default": "پیش‌فرض", "Default": "پیش‌فرض",
"Default admin email is :E1 (developer) or :E2 (admin) and default password is: :P": "در نگارش آزمایشی رایانامه توسعه دهنده :E1 است و رایانامه مدیر عادی :E2 و گذرواژه هر دو :P است",
"DefaultFooter": "فوتر پیش‌فرض", "DefaultFooter": "فوتر پیش‌فرض",
"DefaultHeader": "هدر پیش‌فرض", "DefaultHeader": "هدر پیش‌فرض",
"Description": "توضیحات", "Description": "توضیحات",
@ -422,9 +420,8 @@
"Tags": "برچسب‌ها", "Tags": "برچسب‌ها",
"Tags list": "فهرست برچسب‌ها", "Tags list": "فهرست برچسب‌ها",
"Tags, Press enter": "برچسب‌ها، Enter را بزنید", "Tags, Press enter": "برچسب‌ها، Enter را بزنید",
"The first and\/or second image will be index image": "اولی وی دومی به عنوان تصویر شاخص در نظر گرفته می‌شود", "The first and\/or second image will be index image": "اولی وی دومی به عنواان تصویر شاخص در نظر گرفته می‌شود",
"Theme": "قالب", "Theme": "قالب",
"Theme loaded every :M minutes in demo version": "در نگارش آزمایشی تغییرات ظاهری هر :M دقیقه به روز می‌شوند، پس شکیبا باشید",
"Theme part created successfully: [blade, js, json, scss, php, assets, screenshot]": "", "Theme part created successfully: [blade, js, json, scss, php, assets, screenshot]": "",
"There is nothing added to card!": "چیزی در سبد خرید وجود ندارد", "There is nothing added to card!": "چیزی در سبد خرید وجود ندارد",
"There is nothing to show!": "اینجا چیزی برای نمایش وجود ندارد", "There is nothing to show!": "اینجا چیزی برای نمایش وجود ندارد",
@ -485,7 +482,6 @@
"You can choose one or more image together": "شما می‌توانی یک یا چند عکس را همزمان انتخاب کنید", "You can choose one or more image together": "شما می‌توانی یک یا چند عکس را همزمان انتخاب کنید",
"You can create \/ edit clip as draft, publish it when you want": "شما میتوانید کلیپ را ایجاد و ویرایش کنید، هر زمان که خواستید آن را منتشر کنید", "You can create \/ edit clip as draft, publish it when you want": "شما میتوانید کلیپ را ایجاد و ویرایش کنید، هر زمان که خواستید آن را منتشر کنید",
"You can leave the slug empty; it will be generated automatically.": "شما می‌توانید نامک را خالی بگذارید به صورت خودکار ساخته شود", "You can leave the slug empty; it will be generated automatically.": "شما می‌توانید نامک را خالی بگذارید به صورت خودکار ساخته شود",
"You can't change email or password in demo version": "در نگارش آزمایشی امکان تعویض رایانامه یا گذرواژه وجود ندارد",
"You don't have access this action": "شما دسترسی لازم برای این بخش را ندارید", "You don't have access this action": "شما دسترسی لازم برای این بخش را ندارید",
"You don't have any comments, We are so pleased to hear your look-out": "شما هیچ دیدگاهی تاکنون ارسال نکرده‌اید، از شما تقاضا داریم تجربیات و نگرش خود را برای ما ارسال کنید، چون بسیار ارزشمند است", "You don't have any comments, We are so pleased to hear your look-out": "شما هیچ دیدگاهی تاکنون ارسال نکرده‌اید، از شما تقاضا داریم تجربیات و نگرش خود را برای ما ارسال کنید، چون بسیار ارزشمند است",
"You have some products in your shopping card.": "در سبد خرید شما محصول وجود دارد", "You have some products in your shopping card.": "در سبد خرید شما محصول وجود دارد",

@ -25,7 +25,7 @@ $xshop-shadow:2px 2px 4px #777777;
@import "../views/segments/preloader/PreloaderCircle/PreloaderCircle"; @import "../views/segments/preloader/PreloaderCircle/PreloaderCircle";
@import "../views/segments/menu/RecetMenu/RecetMenu"; @import "../views/segments/menu/RecetMenu/RecetMenu";
@import "../views/segments/slider/SliderSimple/SliderSimple"; @import "../views/segments/slider/SliderSimple/SliderSimple";
@import "../views/segments/posts/PostsSlider/PostsSlider"; @import "../views/segments/products/LatestProducts/LatestProducts";
@import "../views/segments/posts/PostsIconSimple/PostsIconSimple"; @import "../views/segments/posts/PostsIconSimple/PostsIconSimple";
@import "../views/segments/index/CounterGrid/CounterGrid"; @import "../views/segments/index/CounterGrid/CounterGrid";
@import "../views/segments/categories/CategoriesFavImageLinks/CategoriesFavImageLinks"; @import "../views/segments/categories/CategoriesFavImageLinks/CategoriesFavImageLinks";
@ -37,7 +37,6 @@ $xshop-shadow:2px 2px 4px #777777;
@import "../views/segments/card/NsCard/NsCard"; @import "../views/segments/card/NsCard/NsCard";
@import "../views/segments/products_page/ProductGridSidebar/ProductGridSidebar"; @import "../views/segments/products_page/ProductGridSidebar/ProductGridSidebar";
@import "../views/segments/product/ProductKaren/ProductKaren"; @import "../views/segments/product/ProductKaren/ProductKaren";
@import "../views/segments/products_page/ProductGridSidebar/ProductGridSidebar";
@import "../views/segments/posts_page/GridPostListSidebar/GridPostListSidebar"; @import "../views/segments/posts_page/GridPostListSidebar/GridPostListSidebar";
@import "../views/segments/post/PostSidebar/PostSidebar"; @import "../views/segments/post/PostSidebar/PostSidebar";
@import "../views/segments/clips_page/ClipListGrid/ClipListGrid"; @import "../views/segments/clips_page/ClipListGrid/ClipListGrid";

@ -1,14 +1,10 @@
@extends('layouts.app') @extends('layouts.app')
@section('title') @section('title')
{{__("Area design")}} {{__("Area design")}}
@endsection @endsection
@section('content') @section('content')
@if(config('app.demo'))
<div class="alert alert-warning">
{{__("Theme loaded every :M minutes in demo version", ['M' => 5])}}
</div>
@endif
<div class="row"> <div class="row">
@foreach($areas as $area) @foreach($areas as $area)
<div class="col-md-4"> <div class="col-md-4">

@ -24,11 +24,6 @@
<li> <li>
{{__("E-mail is unique each users")}} {{__("E-mail is unique each users")}}
</li> </li>
@if(config('app.demo'))
<li>
{{__("You can't change email or password in demo version")}}
</li>
@endif
</ul> </ul>
</div> </div>

@ -5,13 +5,6 @@
@section('content') @section('content')
<div class="forms"> <div class="forms">
@if(config('app.demo'))
<div class="alert alert-warning mb-5">
{{__("DEMO VERSION")}}
<hr>
{{__("Default admin email is :E1 (developer) or :E2 (admin) and default password is: :P",["E1" => '`developer@example.com`','E2' => '`admin@example.com`','P' => '`password`' ])}}
</div>
@endif
<div class="card" id="raw-form"> <div class="card" id="raw-form">
<div class="card-header"> <div class="card-header">

Loading…
Cancel
Save