Merge branch 'release/1.0.0'

_ide_helper.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * A helper file for Laravel 5, to provide autocomplete information to your IDE
- * Generated for Laravel 5.2.45 on 2016-10-19.
+ * Generated for Laravel 5.2.45 on 2016-10-21.
  *
  * @author Barry vd. Heuvel <[email protected]>
  * @see https://github.com/barryvdh/laravel-ide-helper
@@ -14072,6 +14072,22 @@ public static function getInstance(){
     }
 
 
+    class Recaptcha extends \GreggilGreggilbert\Recaptcha\RecaptchaServiceProviderbert\Recaptcha\Facades\Recaptcha{
+
+        /**
+         * Render the recaptcha
+         *
+         * @param array $options
+         * @return \Greggilbert\Recaptcha\view 
+         * @static 
+         */
+        public static function render($options = array()){
+            return \Greggilbert\Recaptcha\Recaptcha::render($options);
+        }
+
+    }
+
+
     class Html extends \Collective\Html\HtmlFacade{
 
         /**

app/Forms/Admin/UsersForm.php

@@ -33,7 +33,7 @@ public function buildForm()
                 'choices' => $roles,
                 'multiple' => false,
                 'label' => 'Access Level',
-                'selected' => $this->model->roles[0]->id
+                'selected' => ($this->model) ? $this->model->roles[0]->id : null
             ])
 
             ->add('nomination_limit', 'text', [

app/Http/Controllers/Api/UserController.php

@@ -12,7 +12,7 @@ class UserController extends Controller
     public function index ()
     {
         // Don't select all fields to keep password hash and tokens private
-        $Users = \App\User::query()->select(["id", "name_first", "name_last", "rank", "phone", "affiliation_id", "email", "created_at", "updated_at"])->paginate(5);
-        return $Users;
+            $Users = \App\User::query()->select(["id", "name_first", "name_last", "rank", "phone", "affiliation_id", "email", "created_at", "updated_at"])->paginate(5);
+            return $Users;
     }
 }

database/seeds/UsersTableSeeder.php

@@ -53,14 +53,30 @@ public function run()
                 "affiliation_id"    => 1,
                 "email"             => "[email protected]",
                 'password'          => 'admin',
-                'nomination_limit'  => 5,
+                'nomination_limit'  => 1000000,
                 'active' => 'Y',
             ]
         );
 
         $role = \App\Role::find(1);
         $newUser->attachRole($role);
 
+        // Add test nominator account
+        $newUser2 = App\User::create(
+            [
+                'name_first'        => "Nominator",
+                'name_last'         => "Account",
+                "affiliation_id"    => 2,
+                "email"             => "[email protected]",
+                'password'          => 'nomnom',
+                'nomination_limit'  => 5,
+                'active' => 'Y',
+            ]
+        );
+
+        $role2 = \App\Role::find(2);
+        $newUser2->attachRole($role2);
+
 
     }
 }

readme.md

@@ -91,6 +91,12 @@ You will eventually want to shut down vagrant (so you're not running a virtual m
 
 ## Additional Configuration
 
+### Developer Login Credentials
+
+**Username:** `[email protected]`
+
+**Password:** `admin`
+
 ### Testing emails with Mailtrap.io
 1. Register an account with https://mailtrap.io - You can link your github account
 2. In your local `.env` file append the credentials and settings Mailtrap lists in your demo inbox.
@@ -148,4 +154,4 @@ If the "S3_*" variables are filled in the ".env" file, Amazon S3 will be used in
         }
     ]
 }
-```
+```

resources/assets/js/admin.js

@@ -90,7 +90,7 @@ var DataTable = function (table, details) {
         var result = {
             orderClasses: false,
             fixedHeader: true,
-            responsive: true,
+            responsive: false,
             dom: "tip",
             stateSave: true,
             stateSaveCallback: function (settings, data) {

resources/views/partials/forms/household.blade.php

@@ -244,7 +244,7 @@
 
   <div v-for="record in household.child" class="box box-success">
     <div class="box-header with-border">
-      <h1 class="box-title">Child @{{$index+1}} <span v-if="(record.name_first || record.name_last) && (record.name_first.length > 0 || record.name_last.length > 0)">-</span> @{{record.name_first}} @{{record.name_last}}</h1>
+      <h1 class="box-title">Child @{{$index+1}} <span v-if="record.name_first.length > 0 || record.name_last.length > 0">-</span> @{{record.name_first}} @{{record.name_last}}</h1>
     </div>