conflicts

app/Http/Kernel.php

@@ -35,7 +35,7 @@ class Kernel extends HttpKernel
             \Illuminate\Session\Middleware\StartSession::class,
             // \Illuminate\Session\Middleware\AuthenticateSession::class,
             \Illuminate\View\Middleware\ShareErrorsFromSession::class,
-            \App\Http\Middleware\VerifyCsrfToken::class,
+            // \App\Http\Middleware\VerifyCsrfToken::class,
             \Illuminate\Routing\Middleware\SubstituteBindings::class,
         ],
 

resources/views/account-setup.blade.php

@@ -16,7 +16,7 @@
         @endif
         <div class="form-group">
             <label for="" class="control-label">First Name</label>
-            <input class="form-control" name="first_name" autofocus required value="{{old('first_name')}}">
+            <input type="text" class="form-control" name="first_name" autofocus required value="{{old('first_name')}}">
             @error('first_name')
             <span class="text-sm text-danger">{{$message}}</span>
             @enderror
@@ -24,7 +24,7 @@
 
         <div class="form-group">
             <label for="" class="control-label">Last Name</label>
-            <input class="form-control" name="last_name" autofocus required value="{{old('last_name')}}">
+            <input type="text" class="form-control" name="last_name" required value="{{old('last_name')}}">
             @error('last_name')
             <span class="text-sm text-danger">{{$message}}</span>
             @enderror
@@ -32,7 +32,7 @@
 
         <div class="form-group">
             <label for="" class="control-label">Email Address</label>
-            <input class="form-control" name="email_address" autofocus required value="{{old('email_address')}}">
+            <input type="email" class="form-control" name="email_address" required value="{{old('email_address')}}">
             @error('email_address')
             <span class="text-sm text-danger">{{$message}}</span>
             @enderror
@@ -40,7 +40,7 @@
 
         <div class="form-group">
             <label for="" class="control-label">Password</label>
-            <input class="form-control" type="password" name="password" minlength="6" required autofocus value="{{old('password')}}">
+            <input class="form-control" type="password" name="password" minlength="6" required value="{{old('password')}}">
             @error('password')
             <div class="text-sm text-danger mt-2">{{$message}}</div>
             @enderror

resources/views/confirm-auth-token.blade.php

@@ -18,8 +18,13 @@
         <strong>
           Please enter the code sent to {{ $maskedCellNumber }}.
         </strong>
+<<<<<<< HEAD
       </div>
       <input class="form-control" name="confirmation_token" autocomplete="off" autofocus placeholder="" required value="{{old('confirmation_token')}}">
+=======
+      </label>
+      <input type="number" class="form-control" name="confirmation_token" autocomplete="off" autofocus required value="{{old('confirmation_token')}}">
+>>>>>>> e1b2b5645e5d58029b8fed8f56beb3a535ed4ea4
     </div>
     <div class="row">
       <div class="col-12 text-center">