diff --git a/app/Http/Controllers/Admin/AboutUsController.php b/app/Http/Controllers/Admin/AboutUsController.php index 2d2a990..5e33e36 100644 --- a/app/Http/Controllers/Admin/AboutUsController.php +++ b/app/Http/Controllers/Admin/AboutUsController.php @@ -148,7 +148,7 @@ class AboutUsController extends Controller */ public function update(Request $request, $id) { - dd($request->all()); + // dd($request->all()); $setting=AboutUs::findorfail($id); $this->validate(\request(),[ diff --git a/app/Http/Controllers/Admin/NewsAndUpdateController.php b/app/Http/Controllers/Admin/NewsAndUpdateController.php index 55abbf5..6e6e07c 100644 --- a/app/Http/Controllers/Admin/NewsAndUpdateController.php +++ b/app/Http/Controllers/Admin/NewsAndUpdateController.php @@ -17,7 +17,7 @@ use function GuzzleHttp\Promise\all; class NewsAndUpdateController extends Controller { protected $view = 'admin.news_and_update.'; - protected $redirect = 'admin/news_and_updates'; + protected $redirect = 'admin/blogs'; public function index() { diff --git a/app/Http/Controllers/BlogController.php b/app/Http/Controllers/BlogController.php new file mode 100644 index 0000000..db068d7 --- /dev/null +++ b/app/Http/Controllers/BlogController.php @@ -0,0 +1,19 @@ +get(); + return view('blogs',compact('blogs')); + } + + public function blog_detail($slug){ + $blog = NewsAndUpdate::where(['slug' => $slug, 'status' => 1])->first(); + return view('blog-detail',compact('blog')); + } +} diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php index 7cbdc38..96e368d 100644 --- a/app/Http/Controllers/HomeController.php +++ b/app/Http/Controllers/HomeController.php @@ -5,12 +5,14 @@ namespace App\Http\Controllers; use Illuminate\Http\Request; use App\Models\Slider; use App\Models\Testimonial; +use App\Models\NewsAndUpdate; class HomeController extends Controller { public function index(){ $sliders = Slider::where('status',1)->get(); $testimonials = Testimonial::where('status',1)->get(); - return view('welcome',compact('sliders','testimonials')); + $blogs = NewsAndUpdate::where('status',1)->get(); + return view('welcome',compact('sliders','testimonials','blogs')); } } diff --git a/public/images/news_and_update/2023/01/31/cf96e89432529e97306608d4584773d9.png b/public/images/news_and_update/2023/01/31/cf96e89432529e97306608d4584773d9.png new file mode 100644 index 0000000..a3a107a Binary files /dev/null and b/public/images/news_and_update/2023/01/31/cf96e89432529e97306608d4584773d9.png differ diff --git a/public/images/news_and_update/2023/01/31/e52d135f8d454cc04cbf6250151e1c42.png b/public/images/news_and_update/2023/01/31/e52d135f8d454cc04cbf6250151e1c42.png new file mode 100644 index 0000000..b473b05 Binary files /dev/null and b/public/images/news_and_update/2023/01/31/e52d135f8d454cc04cbf6250151e1c42.png differ diff --git a/resources/views/admin/about_us/edit.blade.php b/resources/views/admin/about_us/edit.blade.php index 8846b0f..8617dee 100644 --- a/resources/views/admin/about_us/edit.blade.php +++ b/resources/views/admin/about_us/edit.blade.php @@ -44,21 +44,21 @@
-
-
-
@@ -80,13 +80,13 @@
- +
- +
@@ -124,43 +124,47 @@ } }); - ClassicEditor - .create( document.querySelector( '#body' ), - { - ckfinder: { - uploadUrl: '{{route('image.upload').'?_token='.csrf_token()}}', - } + $(document).ready(function() { + $('.summernote_class').summernote() + }) + + // ClassicEditor + // .create( document.querySelector( '#body' ), + // { + // ckfinder: { + // uploadUrl: '{{route('image.upload').'?_token='.csrf_token()}}', + // } - }) - ClassicEditor - .create( document.querySelector( '#body1' ), - { - ckfinder: { - uploadUrl: '{{route('image.upload').'?_token='.csrf_token()}}', - } - }) - ClassicEditor - .create( document.querySelector( '#body2' ), - { - ckfinder: { - uploadUrl: '{{route('image.upload').'?_token='.csrf_token()}}', } - }) - ClassicEditor - .create( document.querySelector( '#body3' ), - { - ckfinder: { - uploadUrl: '{{route('image.upload').'?_token='.csrf_token()}}', } - }) - ClassicEditor - .create( document.querySelector( '#body4' ), - { - ckfinder: { - uploadUrl: '{{route('image.upload').'?_token='.csrf_token()}}', } - }) - .catch( error => - { console.error( error ); - } - ); + // }) + // ClassicEditor + // .create( document.querySelector( '#body1' ), + // { + // ckfinder: { + // uploadUrl: '{{route('image.upload').'?_token='.csrf_token()}}', + // } + // }) + // ClassicEditor + // .create( document.querySelector( '#body2' ), + // { + // ckfinder: { + // uploadUrl: '{{route('image.upload').'?_token='.csrf_token()}}', } + // }) + // ClassicEditor + // .create( document.querySelector( '#body3' ), + // { + // ckfinder: { + // uploadUrl: '{{route('image.upload').'?_token='.csrf_token()}}', } + // }) + // ClassicEditor + // .create( document.querySelector( '#body4' ), + // { + // ckfinder: { + // uploadUrl: '{{route('image.upload').'?_token='.csrf_token()}}', } + // }) + // .catch( error => + // { console.error( error ); + // } + // ); diff --git a/resources/views/admin/layouts/app.blade.php b/resources/views/admin/layouts/app.blade.php index dd11abf..1aeb716 100644 --- a/resources/views/admin/layouts/app.blade.php +++ b/resources/views/admin/layouts/app.blade.php @@ -33,7 +33,7 @@ {!! Html::style('admin/plugins/daterangepicker/daterangepicker.css') !!} {{-- --}} - + {!! Html::style('admin/plugins/summernote/summernote-bs4.min.css') !!} {!! Html::style('admin/flatpickr/dist/flatpickr.min.css') !!} diff --git a/resources/views/admin/layouts/menubar.blade.php b/resources/views/admin/layouts/menubar.blade.php index ea5a879..64a69fa 100644 --- a/resources/views/admin/layouts/menubar.blade.php +++ b/resources/views/admin/layouts/menubar.blade.php @@ -124,10 +124,10 @@
  • - +

    - News and Updates + Blogs

    • diff --git a/resources/views/admin/news_and_update/create.blade.php b/resources/views/admin/news_and_update/create.blade.php index 62638e1..bd098f5 100644 --- a/resources/views/admin/news_and_update/create.blade.php +++ b/resources/views/admin/news_and_update/create.blade.php @@ -19,14 +19,14 @@
    -

    Create News and Update

    - List +

    Create Blog

    + List
    @include('success.success') @include('errors.error') - {!! Form::open(['url' => '/admin/news_and_updates', 'class' => 'form-horizontal', 'method'=> 'POST','files' => true]) !!} + {!! Form::open(['url' => '/admin/blogs', 'class' => 'form-horizontal', 'method'=> 'POST','files' => true]) !!}
    diff --git a/resources/views/admin/news_and_update/edit.blade.php b/resources/views/admin/news_and_update/edit.blade.php index 0c54cc4..2615b98 100644 --- a/resources/views/admin/news_and_update/edit.blade.php +++ b/resources/views/admin/news_and_update/edit.blade.php @@ -19,15 +19,15 @@
    -

    Edit NewsAndUpdate

    - List - Create +

    Edit Blog

    + List + Create
    @include('success.success') @include('errors.error') - {!! Form::open(['url' => '/admin/news_and_updates/'.$setting->id, 'class' => 'form-horizontal', 'method'=> 'POST','files' => true]) !!} + {!! Form::open(['url' => '/admin/blogs/'.$setting->id, 'class' => 'form-horizontal', 'method'=> 'POST','files' => true]) !!}
    diff --git a/resources/views/admin/news_and_update/index.blade.php b/resources/views/admin/news_and_update/index.blade.php index 0f8dba3..7b87689 100644 --- a/resources/views/admin/news_and_update/index.blade.php +++ b/resources/views/admin/news_and_update/index.blade.php @@ -21,9 +21,9 @@
    -

    NewsAndUpdate

    +

    Blogs

    - Create + Create
    @@ -107,13 +107,13 @@ --> - + - + - + diff --git a/resources/views/admin/page/edit.blade.php b/resources/views/admin/page/edit.blade.php index b31873f..5258b28 100644 --- a/resources/views/admin/page/edit.blade.php +++ b/resources/views/admin/page/edit.blade.php @@ -20,40 +20,54 @@

    Partner Edit

    - List - Create + List + Create
    @include('success.success') @include('errors.error') - {!! Form::open(['url' => '/admin/partners/'.$setting->id, 'class' => 'form-horizontal', 'method'=> 'POST','files' => true]) !!} + {!! Form::open(['url' => '/admin/pages/'.$setting->id, 'class' => 'form-horizontal', 'method'=> 'POST','files' => true]) !!}
    - - + +
    - +
    - + - - + +
    +
    +
    + + +
    +
    + +
    +
    + + +
    +
    +
    diff --git a/resources/views/admin/page/index.blade.php b/resources/views/admin/page/index.blade.php index 9843d9c..b0088c3 100644 --- a/resources/views/admin/page/index.blade.php +++ b/resources/views/admin/page/index.blade.php @@ -73,10 +73,10 @@ {{config('custom.status')[$setting->status]}} - + - + diff --git a/resources/views/blog-detail.blade.php b/resources/views/blog-detail.blade.php index ed462a2..9d9db18 100644 --- a/resources/views/blog-detail.blade.php +++ b/resources/views/blog-detail.blade.php @@ -16,31 +16,36 @@
    -
    Dec 09, 2022, 2 mins read
    -

    Ten Reasons that make Australia the Best Destination

    -

    Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged. It was popularized in the 1960s with the release of Letterset sheets containing Lorem Ipsum passages, and more recently with desktop publishing software like Aldus PageMaker including versions of Lorem Ipsum. Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged. It was popularized in the 1960s with the release of Letterset sheets containing Lorem Ipsum passages, and more recently with desktop publishing software like Aldus PageMaker including versions of Lorem Ipsum. Lorem Ipsum is simply dummy text of the printing and typesetting industry. + @php $date = Carbon\Carbon::createFromFormat('Y-m-d', $blog->publish_date);@endphp +

    {{$date->format('j M, Y')}}
    +

    {{$blog->title}}

    + {!!$blog->description!!} +

    Recent Posts

    - + @foreach(App\Models\NewsAndUpdate::where('id','!=',$blog->first()->id)->where('status','1')->get() as $recent) +
    - +
    -
    25/01/2023
    + @php $date = Carbon\Carbon::createFromFormat('Y-m-d', $recent->publish_date);@endphp +
    {{$date->format('j M, Y')}}
    2 min read
    -

    Best ways to settle your career in Australia

    +

    {{$recent->title}}

     - + @endforeach +
    diff --git a/resources/views/blogs.blade.php b/resources/views/blogs.blade.php index 61d706f..217f200 100644 --- a/resources/views/blogs.blade.php +++ b/resources/views/blogs.blade.php @@ -26,32 +26,39 @@ Latest Articles + @php + $blog = $blogs->where('blog_type',1)->first(); + @endphp
    - +

    Study in Australia

    -
    Dec 09, 2022, 2 mins read
    -

    Ten Reasons that make Australia the Best Destination

    -

    If you want to study in a city surrounded by lush greenery and a pleasant atmosphere..

    -     Read More + @php $date = Carbon\Carbon::createFromFormat('Y-m-d', $blog->publish_date);@endphp +
    {{$date->format('j M, Y')}}
    +

    {{$blog->title}}

    +

    {!!(\Illuminate\Support\Str::limit($blog->description, 200, $end='...'))!!}

    + Read More
    -
    +
    + @foreach($blogs->where('blog_type','!=',1) as $blog) +
    - +

    Study in Australia

    -
    Dec 09, 2022, 2 mins read
    -

    Ten Reasons that make Australia the Best Destination

    -

    If you want to study in a city surrounded by lush greenery and a pleasant atmosphere..

    +
    {{$blog->publish_date}}
    +

    {{$blog->title}}

    +

    {!!(\Illuminate\Support\Str::limit($blog->description, 200, $end='...'))!!}

    Read More
    -
    + @endforeach +
    diff --git a/resources/views/layout/app.blade.php b/resources/views/layout/app.blade.php index 8123877..8fb80c7 100644 --- a/resources/views/layout/app.blade.php +++ b/resources/views/layout/app.blade.php @@ -33,6 +33,8 @@ @php $phone = \App\Models\Setting::where('slug','phone')->get('value')->first()->value ?? ''; $email = \App\Models\Setting::where('slug','email')->get('value')->first()->value ?? ''; + $address = \App\Models\Setting::where('slug','address')->get('value')->first()->value ?? ''; + $twitter = \App\Models\Setting::where('slug','twitter')->get('value')->first()->value ?? ''; $facebook = \App\Models\Setting::where('slug','facebook')->get('value')->first()->value ?? ''; $instagram = \App\Models\Setting::where('slug','instagram')->get('value')->first()->value ?? ''; $linkedin = \App\Models\Setting::where('slug','linkedin')->get('value')->first()->value ?? ''; @@ -43,7 +45,7 @@
    - @if($email != '') + @if($email != '')
    {{$email}} @@ -54,7 +56,7 @@ {{$phone}}
    - @endif + @endif
    @endsection diff --git a/routes/web.php b/routes/web.php index 230944d..5957410 100644 --- a/routes/web.php +++ b/routes/web.php @@ -8,6 +8,7 @@ use App\Http\Controllers\Admin\PageController; use App\Http\Controllers\ServiceController as FrontendServiceController; use App\Http\Controllers\Admin\ReferralController as ReferralAdminController; use App\Http\Controllers\RecruitmentController; +use App\Http\Controllers\BlogController; use App\Http\Controllers\AboutUsController as FrontendAboutUsController; use App\Http\Controllers\Admin\ServiceSectionController; use App\Http\Controllers\Admin\AccomodationController; @@ -69,12 +70,8 @@ Route::get('about', [FrontendAboutUsController::class,'index']); // Route::get('/about', function () { // return view('about'); // }); -Route::get('/blogs', function () { - return view('blogs'); -}); -Route::get('/blog-detail', function () { - return view('blog-detail'); -}); +Route::get('blogs', [BlogController::class,'index']); +Route::get('blog/{slug}', [BlogController::class,'blog_detail']); Route::get('/faq', function () { return view('faq'); }); @@ -126,13 +123,13 @@ Route::group(['middleware'=>['auth']],function (){ Route::get('pages/{id}/delete',[PageController::class,'destroy']); - Route::get('news_and_updates',[NewsAndUpdateController::class,'index']); - Route::get('news_and_updates/create',[NewsAndUpdateController::class,'create']); - Route::post('news_and_updates',[NewsAndUpdateController::class,'store']); - Route::get('news_and_updates/{id}',[NewsAndUpdateController::class,'show']); - Route::get('news_and_updates/{id}/edit',[NewsAndUpdateController::class,'edit']); - Route::post('news_and_updates/{id}',[NewsAndUpdateController::class,'update']); - Route::get('news_and_updates/delete/{id}',[NewsAndUpdateController::class,'delete']); + Route::get('blogs',[NewsAndUpdateController::class,'index']); + Route::get('blogs/create',[NewsAndUpdateController::class,'create']); + Route::post('blogs',[NewsAndUpdateController::class,'store']); + Route::get('blogs/{id}',[NewsAndUpdateController::class,'show']); + Route::get('blogs/{id}/edit',[NewsAndUpdateController::class,'edit']); + Route::post('blogs/{id}',[NewsAndUpdateController::class,'update']); + Route::get('blogs/delete/{id}',[NewsAndUpdateController::class,'delete']); // Route::get('blog_point/{blog_point_id}',[BlogController::class,'blog_point']); Route::get('galleries',[GalleryController::class,'index']); @@ -299,9 +296,9 @@ Route::group(['middleware'=>['auth']],function (){ Route::get('/study-abroad-detail', function () { return view('study-abroad-detail'); }); -Route::get('/visa', function () { - return view('visa'); -}); +// Route::get('/visa', function () { +// return view('visa'); +// }); Route::get('/contact', function () { return view('contact'); });