Merge branch 'zamin_new_branch' into developer

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(

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>

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>
 

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;