From 732e1c4ed23f9441343fdb1e54ac7e18ca910727 Mon Sep 17 00:00:00 2001
From: Mitul Golakiya <mtl.golakiya@gmail.com>
Date: Thu, 23 Jun 2022 18:36:59 +0530
Subject: [PATCH] fix: user view/edit fixes

---
 templates/scaffold/users/edit.stub        | 46 +++++++++++++++--------
 templates/scaffold/users/fields.stub      |  6 ---
 templates/scaffold/users/show.stub        | 26 +++++++++----
 templates/scaffold/users/show_fields.stub |  4 +-
 4 files changed, 50 insertions(+), 32 deletions(-)

diff --git a/templates/scaffold/users/edit.stub b/templates/scaffold/users/edit.stub
index c4d3abf..d04ee71 100644
--- a/templates/scaffold/users/edit.stub
+++ b/templates/scaffold/users/edit.stub
@@ -2,22 +2,36 @@
 
 @section('content')
     <section class="content-header">
-        <h1>
-            User
-        </h1>
+        <div class="container-fluid">
+            <div class="row mb-2">
+                <div class="col-sm-12">
+                    <h1>User</h1>
+                </div>
+            </div>
+        </div>
    </section>
-   <div class="content">
-       @include('adminlte-templates::common.errors')
-       <div class="box box-primary">
-           <div class="box-body">
-               <div class="row">
-                   {!! Form::model($user, ['route' => ['users.update', $user->id], 'method' => 'patch']) !!}
-
-                        @include('users.fields')
-
-                   {!! Form::close() !!}
-               </div>
-           </div>
+
+    <div class="content px-3">
+
+        @include('adminlte-templates::common.errors')
+
+        <div class="card">
+
+           {!! Form::model($user, ['route' => ['users.update', $user->id], 'method' => 'patch']) !!}
+
+            <div class="card-body">
+                <div class="row">
+                    @include('users.fields')
+                </div>
+            </div>
+
+            <div class="card-footer">
+                {!! Form::submit('Save', ['class' => 'btn btn-primary']) !!}
+                <a href="{{ route('users.index') }}" class="btn btn-default">Cancel</a>
+            </div>
+
+           {!! Form::close() !!}
+
        </div>
-   </div>
+    </div>
 @endsection
\ No newline at end of file
diff --git a/templates/scaffold/users/fields.stub b/templates/scaffold/users/fields.stub
index 31012ed..5f3c805 100644
--- a/templates/scaffold/users/fields.stub
+++ b/templates/scaffold/users/fields.stub
@@ -21,9 +21,3 @@
       {!! Form::label('password', 'Password Confirmation') !!}
     {!! Form::password('password_confirmation', ['class' => 'form-control']) !!}
 </div>
-
-<!-- Submit Field -->
-<div class="form-group col-sm-12">
-    {!! Form::submit('Save', ['class' => 'btn btn-primary']) !!}
-    <a href="{!! route('users.index') !!}" class="btn btn-default">Cancel</a>
-</div>
diff --git a/templates/scaffold/users/show.stub b/templates/scaffold/users/show.stub
index 242e0c7..b51a7fb 100644
--- a/templates/scaffold/users/show.stub
+++ b/templates/scaffold/users/show.stub
@@ -2,16 +2,26 @@
 
 @section('content')
     <section class="content-header">
-        <h1>
-            User
-        </h1>
+        <div class="container-fluid">
+            <div class="row mb-2">
+                <div class="col-sm-6">
+                    <h1>Users</h1>
+                </div>
+                <div class="col-sm-6">
+                    <a class="btn btn-default float-right"
+                       href="{{ route('users.index') }}">
+                        Back
+                    </a>
+                </div>
+            </div>
+        </div>
     </section>
-    <div class="content">
-        <div class="box box-primary">
-            <div class="box-body">
-                <div class="row" style="padding-left: 20px">
+
+    <div class="content px-3">
+        <div class="card">
+            <div class="card-body">
+                <div class="row">
                     @include('users.show_fields')
-                    <a href="{!! route('users.index') !!}" class="btn btn-default">Back</a>
                 </div>
             </div>
         </div>
diff --git a/templates/scaffold/users/show_fields.stub b/templates/scaffold/users/show_fields.stub
index 4e5946a..df1049e 100644
--- a/templates/scaffold/users/show_fields.stub
+++ b/templates/scaffold/users/show_fields.stub
@@ -1,11 +1,11 @@
 <!-- Name Field -->
-<div class="form-group">
+<div class="col-sm-12">
     {!! Form::label('name', 'Name:') !!}
     <p>{!! $user->name !!}</p>
 </div>
 
 <!-- Email Field -->
-<div class="form-group">
+<div class="col-sm-12">
     {!! Form::label('email', 'Email:') !!}
     <p>{!! $user->email !!}</p>
 </div>