diff --git a/app/Http/Controllers/Admin/DashboardController.php b/app/Http/Controllers/Admin/DashboardController.php index da9e271b30803072a85fc7b445f658109c25d1f3..842a248cc62374d11769d399a5d629ac67bfb7bc 100644 --- a/app/Http/Controllers/Admin/DashboardController.php +++ b/app/Http/Controllers/Admin/DashboardController.php @@ -274,7 +274,9 @@ class DashboardController extends Controller public function pageEdit($id){ // dd($slug); $data = DB::table('pages')->where('id', $id)->first(); + // dd($id); $cat = Category::all(); + // dd($cat); return view('admin.editPage', compact('data', 'cat', 'id')); } public function pageUpdate(Request $req, $slug){ @@ -284,20 +286,17 @@ class DashboardController extends Controller $fileName = $file->getClientOriginalName() ; $destinationPath = public_path().'/images/' ; $file->move($destinationPath, $fileName); - // $post->cover_image = $fileName ; - } - else - { - $fileName = 'noimage.jpg'; - // $post->cover_image = $fileName ; - } - - $id = DB::table('pages')->where('slug', $slug)->update(['description' => $req->content , + + DB::table('pages')->where('slug', $slug)->update([ + 'image' => $fileName + ]); + + } + DB::table('pages')->where('slug', $slug)->update(['description' => $req->content, 'status' => $req->status, 'meta_keyword' => $req->meta_keyword, 'meta_desc' => $req->meta_desc, 'category' => $req->cate, - 'image' => $fileName, 'updated_at' => Carbon::now() ]); return redirect()->action( diff --git a/public/images/crop_logo.png b/public/images/crop_logo.png new file mode 100644 index 0000000000000000000000000000000000000000..2c54038c562afaa6b69e8813211799f21a4d0c15 Binary files /dev/null and b/public/images/crop_logo.png differ diff --git a/resources/views/admin/editPage.blade.php b/resources/views/admin/editPage.blade.php index a174663c89720c0c1d7818787278c19cc71d04fe..5e9262d20afc8f2e7ffb84b3b97882400072c50c 100644 --- a/resources/views/admin/editPage.blade.php +++ b/resources/views/admin/editPage.blade.php @@ -45,7 +45,7 @@ <select id="cate" class="form-control col-md-5" name="cate" required> <option selected value="">Choose...</option> @foreach($cat as $c) - <option value="{{$c->id}}" {{$c->slug == $data->category ? 'selected' : ''}}>{{ $c->name }}</option> + <option value="{{$c->slug}}" {{$c->slug == $data->category ? 'selected' : ''}}>{{ $c->name }}</option> @endforeach <!-- <option value="nav">Nav</option> diff --git a/resources/views/frontend/services.blade.php b/resources/views/frontend/services.blade.php index caca5c1a39ef05310a8fc01fe1403ca470d2a868..c3a10ce0eed36843d3eb437580b84cc3717d3a41 100644 --- a/resources/views/frontend/services.blade.php +++ b/resources/views/frontend/services.blade.php @@ -4,13 +4,19 @@ Services | 01Synergy @endsection @section('content') - <h1 class="text-center">Our Services</h1> + {{-- <h1 class="text-center">Our Services</h1> --}} + <div class="container-fluid" style="padding:0; margin:0;"> + <div aria-label="breadcrumb" class="breadcrumb text-center" style="display:block; color: #1154ae; border-radius: 0;"> + <h1>Our Services</h1> + </div> +</div> @if(!empty($datas)) - @foreach($datas as $d) - <div class="row my-5" > - @if($d->type=='oneCol') + <div class="row my-5" > + @foreach($datas as $d) + + {{-- @if($d->type=='oneCol') <div class="col-md-12"> <p class="text-center"> @if($d->image != 'noimage.jpg') @@ -23,9 +29,10 @@ Services | 01Synergy <p>{!!$d->description!!}</p> </div> - @endif + @endif --}} @if($d->type=='twoCol') + <div class="container-fluid"> <div class="col-md-12"> <p class="text-center"> @@ -36,9 +43,9 @@ Services | 01Synergy <h1 style="margin-left:35px;" class="text-center">{{$d->name}}</h1> <hr> <div class="row"> - <div class="col-md-8" style="padding-left: 50px; padding-top:20px;"> + <div class="col-md-12" style="padding-left: 50px; padding-top:20px;"> <p> {!! $d->description !!} </p> - </div> + </div> <!-- <div class="col-md-4"> <h2 class="text-center">Contents</h2> @@ -56,38 +63,8 @@ Services | 01Synergy </div> @endforeach - @else - - <div id="content"> - <div class="row"> - <div class="col-md-12"> - <h1>Work Culture</h1> - <img src="{{ URL::asset('images/work1.jpg') }}" alt="image" id="img1" /> - </div> - <div class="col-md-12"> - <p> - Lorem ipsum dolor sit amet, consectetur adipisicing elit. Consequatur asperiores magni tempora quos, saepe dignissimos expedita? Incidunt numquam aut ab. Quos aliquam repellendus incidunt aspernatur, quod eligendi ea veniam unde. - </p> - <img src="{{ URL::asset('images/work2.jpg') }}" alt="image" id="img1" /> - </div> - - <div class="col-md-12"> - <p> - Lorem ipsum dolor sit amet, consectetur adipisicing elit. Consequatur asperiores magni tempora quos, saepe dignissimos expedita? Incidunt numquam aut ab. Quos aliquam repellendus incidunt aspernatur, quod eligendi ea veniam unde. - </p> - <img src="{{ URL::asset('images/work3.jpg') }}" alt="image" id="img1" /> - </div> - - <div class="col-md-12"> - <p> - Lorem ipsum dolor sit amet, consectetur adipisicing elit. Consequatur asperiores magni tempora quos, saepe dignissimos expedita? Incidunt numquam aut ab. Quos aliquam repellendus incidunt aspernatur, quod eligendi ea veniam unde. - </p> - <img src="{{ URL::asset('images/work4.jpg') }}" alt="image" id="img1" /> - </div> - </div> - </div> - - @endif + </div> + @endif </div> diff --git a/resources/views/frontend_layout/master.blade.php b/resources/views/frontend_layout/master.blade.php index 919d11f0e53a0e2dba5783d0643b7ed5206f95aa..566bf6f2081832b77e0dff2f1037f5b4031ff3cc 100644 --- a/resources/views/frontend_layout/master.blade.php +++ b/resources/views/frontend_layout/master.blade.php @@ -30,6 +30,7 @@ {{-- <link rel="stylesheet" href="{{ url('css/navbarstyle.css')}}"> --}} <link rel="stylesheet" href="{{ asset('css/responsive.css') }}"> <link rel="stylesheet" href="{{ asset('assets/css/navstyle.css?q=') }}"> + <link rel="icon" type="image/png" href="{{ url('/images/crop_logo.png') }}"> <style> .back-to-top { position: fixed;