Fixed layout issue

app/Helpers/helpers.php

@@ -1191,7 +1191,8 @@ if(!function_exists('getSurveyData')) {
             $entity = Client::where('uid', $survey->entity_uid)->first();
         }
         $preview = true;
-        $html = (string) view('app.admin.surveys.forms.'.$survey->internal_name, compact('entity', 'survey', 'preview'))->render();
+        $layout = 'app.admin.surveys.partials.preview-layout';
+        $html = (string) view('app.admin.surveys.forms.'.$survey->internal_name, compact('entity', 'survey', 'preview', 'layout'))->render();
         return $html;
     }
 }

app/Http/Controllers/GuestController.php

@@ -117,8 +117,8 @@ class GuestController extends Controller
         }
 
         if(!$entity) abort(404);
-
-        return view('app.admin.surveys.forms.'.$survey->internal_name, compact('entity', 'survey'));
+        $layout = 'app.admin.surveys.partials.form-layout';
+        return view('app.admin.surveys.forms.'.$survey->internal_name, compact('entity', 'survey', 'layout'));
     }
 
     public function viewSurveyFormSubmit(Request $request, $accessKey){

resources/views/app/admin/surveys/forms/sleep.blade.php

@@ -1,47 +1,40 @@
-@if(!isset($preview))
-    @extends ('app.admin.surveys.partials.form-layout')
-    @section('content')
-@endif
-<div class="card">
-    <div class="card-header">
-        Hi {{ $entity->displayName() }}
+@extends ($layout)
+@section('survey-header')
+  <span>Hi {{ $entity->displayName() }}</span>
+@endsection
+@section('survey-content')
+<form action="{{ route('view-survey-form-submit', $survey->access_key) }}" method="POST">
+  @csrf
+  <div class="row">
+    <div class="col-md-4">
+      <div class="form-group">
+        <label>First Name</label>
+        <input type="text" class="form-control" name="nameFirst" value="{{ $survey->getFieldValue('nameFirst') }}" />
+      </div>
     </div>
-    <div class="card-body">
-        <form action="{{ route('view-survey-form-submit', $survey->access_key) }}" method="POST">
-            @csrf
-            <div class="row">
-                <div class="col-md-4">
-                    <div class="form-group">
-                        <label>First Name</label>
-                        <input type="text" class="form-control" name="nameFirst" value="{{ $survey->getFieldValue('nameFirst') }}" />
-                    </div>
-                </div>
-                <div class="col-md-4">
-                    <div class="form-group">
-                        <label>Middle Name</label>
-                        <input type="text" class="form-control" name="nameMiddle" value="{{ $survey->getFieldValue('nameMiddle') }}" />
-                    </div>
-                </div>
-                <div class="col-md-4">
-                    <div class="form-group">
-                        <label>Last Name</label>
-                        <input type="text" class="form-control" name="nameLast" value="{{ $survey->getFieldValue('nameLast') }}" />
-                    </div>
-                </div>
-                <div class="col-md-12">
-                    <div class="form-group">
-                        <label>Explain your sleep issue</label>
-                        <textarea class="form-control" name="description">{{ $survey->getFieldValue('description') }}</textarea>
-                    </div>
-                </div>
-                <div class="col-md-12">
-                    <button class="btn btn-sm btn-primary">Submit</button>
-                </div>
-            </div>
-
-        </form>
+    <div class="col-md-4">
+      <div class="form-group">
+        <label>Middle Name</label>
+        <input type="text" class="form-control" name="nameMiddle" value="{{ $survey->getFieldValue('nameMiddle') }}" />
+      </div>
     </div>
-</div>
-@if(!isset($preview))
-    @endsection
-@endif
+    <div class="col-md-4">
+      <div class="form-group">
+        <label>Last Name</label>
+        <input type="text" class="form-control" name="nameLast" value="{{ $survey->getFieldValue('nameLast') }}" />
+      </div>
+    </div>
+    <div class="col-md-12">
+      <div class="form-group">
+        <label>Explain your sleep issue</label>
+        <textarea class="form-control" name="description">{{ $survey->getFieldValue('description') }}</textarea>
+      </div>
+    </div>
+    @if(!isset($preview))
+      <div class="col-md-12">
+        <button class="btn btn-sm btn-primary px-5 py-2">Submit</button>
+      </div>
+    @endif
+  </div>
+</form>
+@endsection

resources/views/app/admin/surveys/partials/form-layout.blade.php

@@ -5,7 +5,8 @@
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta name="csrf-token" content="{{ csrf_token() }}">
 
-    <title>{{ config('app.name') }}</title>
+    <title>Leadership Health | Survey</title>
+    <link rel="icon" href="/img/icon.svg">
 
     <!-- Fonts -->
     <link href="https://fonts.googleapis.com/css?family=Nunito:200,600" rel="stylesheet">
@@ -60,19 +61,37 @@
     @yield('head')
 </head>
 
-<body>
+<style>
+  .mcp-theme-1 * {
+    font-size: 13px !important;
+  }
+  .mcp-theme-1 .title span {
+    font-size: 17px !important;
+  }
+</style>
 
-    <main role="main" class="stag-content px-0">
+<body class="mcp-theme-1 bg-light">
+
+    <main role="main" class="stag-content px-0 py-5">
         <div class="container">
-            <div class="row">
-                <div class="col-12">
-                    @if(session('success'))
-                        <div class="alert alert-success rounded-0">{{ session('success') }}</div>
-                    @endif
-                    @if(session('error'))
-                        <div class="alert alert-danger rounded-0">{{ session('error') }}</div>
-                    @endif
-                    @yield('content')
+            <div class="row justify-content-center">
+                <div class="col-10">
+                    <div class="border shadow-sm bg-white br-rounded p-4">
+                      <div class="mb-4 text-center">
+                        <img src="{{asset('img/logo.svg')}}" class="w-25" alt="">
+                      </div>
+                      <h5 class="text-pry title mb-3">
+                        @yield('survey-header')
+                      </h5>
+                      <hr>
+                      @if(session('success'))
+                          <div class="alert alert-success p-1 rounded-0">{{ session('success') }}</div>
+                      @endif
+                      @if(session('error'))
+                          <div class="alert alert-danger p-1 rounded-0">{{ session('error') }}</div>
+                      @endif
+                      @yield('survey-content')
+                    </div>
                 </div>
             </div>
         </div>

resources/views/app/admin/surveys/partials/preview-layout.blade.php

@@ -0,0 +1 @@
+@yield('survey-content')

resources/views/layouts/guest_template.blade.php

@@ -6,6 +6,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1">
 
     <title>{{ config('app.name') }}</title>
+    <link rel="icon" href="/img/icon.svg">
 
     <!-- Fonts -->
     <link href="https://fonts.googleapis.com/css?family=Nunito:200,600" rel="stylesheet">

resources/views/layouts/template-no-mc.blade.php

@@ -6,6 +6,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1">
 
     <title>{{ config('app.name') }}</title>
+    <link rel="icon" href="/img/icon.svg">
 
     <!-- Fonts -->
     <link href="https://fonts.googleapis.com/css?family=Nunito:200,600" rel="stylesheet">

resources/views/layouts/template.blade.php

@@ -6,6 +6,7 @@
     <meta name="csrf-token" content="{{ csrf_token() }}">
 
     <title>{{ config('app.name') }}</title>
+    <link rel="icon" href="/img/icon.svg">
 
     <!-- Fonts -->
     <link href="https://fonts.googleapis.com/css?family=Nunito:200,600" rel="stylesheet">