diff --git a/app/Http/Controllers/Admin/UserController.php b/app/Http/Controllers/Admin/UserController.php index bb6e3d86..44e21f5a 100644 --- a/app/Http/Controllers/Admin/UserController.php +++ b/app/Http/Controllers/Admin/UserController.php @@ -42,9 +42,11 @@ public function save($user, $request) } $user->name = $request->input('name'); - $user->email = $request->input('email'); - if (trim($request->input('password')) != '') { - $user->password = bcrypt($request->input('password')); + if (!config('app.demo')) { + $user->email = $request->input('email'); + if (trim($request->input('password')) != '') { + $user->password = bcrypt($request->input('password')); + } } $user->mobile = $request->input('mobile'); $user->role = $request->input('role'); @@ -105,9 +107,9 @@ public function edit(User $item) } } } - unset($routes['home'], $routes['user'], $routes['ckeditor'],$routes['area'],$routes['lang'],$routes['gfx']); + unset($routes['home'], $routes['user'], $routes['ckeditor'], $routes['area'], $routes['lang'], $routes['gfx']); // - return view($this->formView, compact('item','routes')); + return view($this->formView, compact('item', 'routes')); } public function bulk(Request $request) diff --git a/config/app.php b/config/app.php index 96f1a66f..802bd5fe 100644 --- a/config/app.php +++ b/config/app.php @@ -17,7 +17,7 @@ 'name' => env('APP_NAME', 'Laravel'), 'version' => env('APP_VERSION', '2.0.0-beta-2'), - + 'demo' => env('APP_DEMO', false), /* |-------------------------------------------------------------------------- | Application Environment diff --git a/resources/js/client.js b/resources/js/client.js index d09fc3a0..30b9380f 100644 --- a/resources/js/client.js +++ b/resources/js/client.js @@ -14,7 +14,7 @@ import "./client-custom/windowLoader.js"; import "../views/segments/preloader/PreloaderCircle/PreloaderCircle.js"; import "../views/segments/menu/RecetMenu/RecetMenu.js"; import "../views/segments/slider/SliderSimple/SliderSimple.js"; -import "../views/segments/products/LatestProducts/LatestProducts.js"; +import "../views/segments/posts/PostsSlider/PostsSlider.js"; import "../views/segments/posts/PostsIconSimple/PostsIconSimple.js"; import "../views/segments/index/CounterGrid/CounterGrid.js"; import "../views/segments/categories/CategoriesFavImageLinks/CategoriesFavImageLinks.js"; @@ -26,6 +26,7 @@ import "../views/segments/footer/WaveFooter/WaveFooter.js"; import "../views/segments/card/NsCard/NsCard.js"; import "../views/segments/products_page/ProductGridSidebar/ProductGridSidebar.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/post/PostSidebar/PostSidebar.js"; import "../views/segments/clips_page/ClipListGrid/ClipListGrid.js"; diff --git a/resources/lang/fa.json b/resources/lang/fa.json index 1ab20600..6b6aa0f6 100644 --- a/resources/lang/fa.json +++ b/resources/lang/fa.json @@ -142,11 +142,13 @@ "Customer mobile": "", "Customers": "مشتری‌ها", "Customers list": "فهرست مشتری‌ها", + "DEMO VERSION": "نگارش آزمایشی", "Dashboard": "پیشخوان", "Date": "تاریخ", "Datetime": "تاریخ و زمان", "Deattach": "عدم پیوست", "Default": "پیش‌فرض", + "Default admin email is :E1 (developer) or :E2 (admin) and default password is: :P": "در نگارش آزمایشی رایانامه توسعه دهنده :E1 است و رایانامه مدیر عادی :E2 و گذرواژه هر دو :P است", "DefaultFooter": "فوتر پیش‌فرض", "DefaultHeader": "هدر پیش‌فرض", "Description": "توضیحات", @@ -420,8 +422,9 @@ "Tags": "برچسب‌ها", "Tags list": "فهرست برچسب‌ها", "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 loaded every :M minutes in demo version": "در نگارش آزمایشی تغییرات ظاهری هر :M دقیقه به روز می‌شوند، پس شکیبا باشید", "Theme part created successfully: [blade, js, json, scss, php, assets, screenshot]": "", "There is nothing added to card!": "چیزی در سبد خرید وجود ندارد", "There is nothing to show!": "اینجا چیزی برای نمایش وجود ندارد", @@ -482,6 +485,7 @@ "You can choose one or more image together": "شما می‌توانی یک یا چند عکس را همزمان انتخاب کنید", "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't change email or password in demo version": "در نگارش آزمایشی امکان تعویض رایانامه یا گذرواژه وجود ندارد", "You don't have access this action": "شما دسترسی لازم برای این بخش را ندارید", "You don't have any comments, We are so pleased to hear your look-out": "شما هیچ دیدگاهی تاکنون ارسال نکرده‌اید، از شما تقاضا داریم تجربیات و نگرش خود را برای ما ارسال کنید، چون بسیار ارزشمند است", "You have some products in your shopping card.": "در سبد خرید شما محصول وجود دارد", diff --git a/resources/sass/client.scss b/resources/sass/client.scss index ad0632ad..bfc71646 100644 --- a/resources/sass/client.scss +++ b/resources/sass/client.scss @@ -25,7 +25,7 @@ $xshop-shadow:2px 2px 4px #777777; @import "../views/segments/preloader/PreloaderCircle/PreloaderCircle"; @import "../views/segments/menu/RecetMenu/RecetMenu"; @import "../views/segments/slider/SliderSimple/SliderSimple"; -@import "../views/segments/products/LatestProducts/LatestProducts"; +@import "../views/segments/posts/PostsSlider/PostsSlider"; @import "../views/segments/posts/PostsIconSimple/PostsIconSimple"; @import "../views/segments/index/CounterGrid/CounterGrid"; @import "../views/segments/categories/CategoriesFavImageLinks/CategoriesFavImageLinks"; @@ -37,6 +37,7 @@ $xshop-shadow:2px 2px 4px #777777; @import "../views/segments/card/NsCard/NsCard"; @import "../views/segments/products_page/ProductGridSidebar/ProductGridSidebar"; @import "../views/segments/product/ProductKaren/ProductKaren"; +@import "../views/segments/products_page/ProductGridSidebar/ProductGridSidebar"; @import "../views/segments/posts_page/GridPostListSidebar/GridPostListSidebar"; @import "../views/segments/post/PostSidebar/PostSidebar"; @import "../views/segments/clips_page/ClipListGrid/ClipListGrid"; diff --git a/resources/views/admin/areas/area-list.blade.php b/resources/views/admin/areas/area-list.blade.php index 30f8fe50..b9807a68 100644 --- a/resources/views/admin/areas/area-list.blade.php +++ b/resources/views/admin/areas/area-list.blade.php @@ -1,10 +1,14 @@ - @extends('layouts.app') @section('title') {{__("Area design")}} @endsection @section('content') + @if(config('app.demo')) +
+ {{__("Theme loaded every :M minutes in demo version", ['M' => 5])}} +
+ @endif
@foreach($areas as $area)
diff --git a/resources/views/admin/users/user-form.blade.php b/resources/views/admin/users/user-form.blade.php index 67d51afe..8dd7c0e4 100644 --- a/resources/views/admin/users/user-form.blade.php +++ b/resources/views/admin/users/user-form.blade.php @@ -24,6 +24,11 @@
  • {{__("E-mail is unique each users")}}
    • + @if(config('app.demo')) +
  • + {{__("You can't change email or password in demo version")}} +
    • + @endif
    diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php index 8889d8de..e1f827f0 100644 --- a/resources/views/auth/login.blade.php +++ b/resources/views/auth/login.blade.php @@ -5,6 +5,13 @@ @section('content')
    + @if(config('app.demo')) +
    + {{__("DEMO VERSION")}} +
    + {{__("Default admin email is :E1 (developer) or :E2 (admin) and default password is: :P",["E1" => '`developer@example.com`','E2' => '`admin@example.com`','P' => '`password`' ])}} +
    + @endif