From 9184dbfb8f84bd865476453ef2563ec98eae0809 Mon Sep 17 00:00:00 2001 From: Guvanch Hojamov Date: Tue, 11 Aug 2020 13:54:01 +0500 Subject: [PATCH] guga push --- .idea/php.xml | 15 +- .idea/telemele.iml | 13 + app/User.php | 6 +- public/assets/js/index.js | 2 +- .../base/inc/sidebar_content.blade.php | 12 +- resources/views/web/layouts/app.blade.php | 261 +++++++++++++++++- .../views/web/layouts/headerMenu.blade.php | 1 + resources/views/web/layouts/home.blade.php | 9 +- routes/backpack/custom.php | 6 +- routes/web.php | 1 + 10 files changed, 315 insertions(+), 11 deletions(-) diff --git a/.idea/php.xml b/.idea/php.xml index 7796eee8..92d3d61e 100644 --- a/.idea/php.xml +++ b/.idea/php.xml @@ -108,12 +108,25 @@ + + + + + + + + + + + + + - + \ No newline at end of file diff --git a/.idea/telemele.iml b/.idea/telemele.iml index 11035498..238aebdf 100644 --- a/.idea/telemele.iml +++ b/.idea/telemele.iml @@ -28,6 +28,7 @@ + @@ -40,6 +41,7 @@ + @@ -58,6 +60,8 @@ + + @@ -92,18 +96,27 @@ + + + + + + + + + diff --git a/app/User.php b/app/User.php index b66b448d..8bb0d6d0 100644 --- a/app/User.php +++ b/app/User.php @@ -21,7 +21,11 @@ class User extends Authenticatable * @var array */ protected $fillable = [ - 'name', 'email', 'password', 'phone','username' + 'name', + 'email', + 'password', + 'phone', + 'username' ]; /** diff --git a/public/assets/js/index.js b/public/assets/js/index.js index 1ddb890a..bd870ebe 100644 --- a/public/assets/js/index.js +++ b/public/assets/js/index.js @@ -84,4 +84,4 @@ $(document).on('ready', function() { slideRight(); }); slideInitial(); -}); \ No newline at end of file +}); diff --git a/resources/views/vendor/backpack/base/inc/sidebar_content.blade.php b/resources/views/vendor/backpack/base/inc/sidebar_content.blade.php index b3c8725d..c0157099 100644 --- a/resources/views/vendor/backpack/base/inc/sidebar_content.blade.php +++ b/resources/views/vendor/backpack/base/inc/sidebar_content.blade.php @@ -27,7 +27,15 @@
  • Yokardaky reklama
    • - +
  • + Mahabat Nyrhanama + +
    • +
  • Subscription
    • -
  • User Subscriptions
    • \ No newline at end of file +
  • User Subscriptions
    • diff --git a/resources/views/web/layouts/app.blade.php b/resources/views/web/layouts/app.blade.php index f106126a..ae04cfab 100644 --- a/resources/views/web/layouts/app.blade.php +++ b/resources/views/web/layouts/app.blade.php @@ -30,7 +30,6 @@ - + @yield('after_scripts') diff --git a/resources/views/web/layouts/headerMenu.blade.php b/resources/views/web/layouts/headerMenu.blade.php index dbba5060..ff27cef6 100644 --- a/resources/views/web/layouts/headerMenu.blade.php +++ b/resources/views/web/layouts/headerMenu.blade.php @@ -15,6 +15,7 @@ @foreach($topMenus as $topMenu)
  • {{ $topMenu->name }}
    • @endforeach +
  • Mahabat Bukjalary
    • diff --git a/resources/views/web/layouts/home.blade.php b/resources/views/web/layouts/home.blade.php index 09f5ed67..686e4252 100644 --- a/resources/views/web/layouts/home.blade.php +++ b/resources/views/web/layouts/home.blade.php @@ -50,11 +50,12 @@
    - -
    - {{ $advertTop->alt }} + @if($advertTop !== null) +
    + {{ $advertTop->alt }} +
    + @endif
    -
    {{--

    Teleýaýlymlar

    --}} diff --git a/routes/backpack/custom.php b/routes/backpack/custom.php index cb06728b..81051482 100644 --- a/routes/backpack/custom.php +++ b/routes/backpack/custom.php @@ -33,4 +33,8 @@ Route::group([ CRUD::resource('group', 'GroupCrudController'); CRUD::resource('subscription', 'SubscriptionCrudController'); CRUD::resource('user_sub', 'User_subCrudController'); -}); // this should be the absolute last line of this file \ No newline at end of file + CRUD::resource('properties', 'PropertyTypeCrudController'); + CRUD::resource('gurnawlar', 'GurnawCrudController'); + CRUD::resource('folders', 'FolderCrudController'); + CRUD::resource('showbukjaorders', 'ShowBukjaOrdersCrudController'); +}); // this should be the absolute last line of this file diff --git a/routes/web.php b/routes/web.php index 2b030407..6bbd8581 100644 --- a/routes/web.php +++ b/routes/web.php @@ -33,6 +33,7 @@ Route::get('/film/{id}', 'MenuLinkController@getFilm')->name('getFilm'); Route::get('/habarlashyk', 'ContactController@habarlashyk')->name('cont'); Route::post('/contact/send', 'ContactController@send')->name('send'); +Route::resource('/bukjalar','BukjaController')->name('*','bukjalar'); Route::get('/sendMail/{id}', 'ContactController@sendMail'); Route::post('/postMail/', 'ContactController@postMail');