Merge pull request #1 from PoliceScorecard/staging

v1.2.0 Release

.gitignore

@@ -27,3 +27,5 @@ bootstrap/cache
 storage/framework/cache
 storage/logs
 dist
+!police-scorecard.code-workspace
+!.nvmrc

.nvmrc

@@ -0,0 +1 @@
+12.12.0

app/Http/Controllers/ApiController.php

@@ -85,6 +85,21 @@ public function fetchLocationScorecard($state, $type, $location = null) {
             : $this->makeRequest("scorecard/report/{$state}/{$type}");
     }
 
+    /**
+     * Fetch State Overview
+     *
+     * <code>
+     * $api = new ApiController();
+     * $scorecard = api->fetchStateOverview('ny');
+     * </code>
+     *
+     * @param $state
+     * @return mixed
+     */
+    public function fetchStateOverview($state) {
+        return $this->makeRequest("scorecard/overview/{$state}");
+    }
+
     /**
      * Fetch Scorecard Grades for a Given Location
      *

app/Http/Controllers/WebController.php

@@ -217,14 +217,14 @@ public function usSheriffDepartment() {
 
     public function state($state) {
         $api = new ApiController();
-        $grades = $api->fetchGrades($state, 'police-department');
-        $scorecard = $api->fetchLocationScorecard($state, 'police-department');
+        $grades = $api->fetchGrades($state, 'state');
+        $scorecard = $api->fetchStateOverview($state);
         $stateData = $api->fetchStateData($state);
         $states = $api->fetchStates();
         $total = getStateTotal($states, $state);
         $location = $scorecard['agency']['slug'];
 
-        return view('report', [
+        return view('state', [
             'title' => "Police Scorecard: {$scorecard['geo']['state']['name']}",
             'description' => "Get the facts about police violence and accountability in {$scorecard['geo']['state']['name']}. Evaluate each department and hold them accountable at PoliceScorecard.org",
             'grades' => sortGrades($grades),
@@ -233,7 +233,7 @@ public function state($state) {
             'state' => $state,
             'states' => $states,
             'stateData' => $stateData,
-            'type' => 'police-department',
+            'type' => 'state',
             'total' => $total
         ]);
     }

app/View/Components/Partial/ApproachToPolicing/ApproachTitle.php

@@ -8,16 +8,18 @@ class ApproachTitle extends Component
 {
     public $location;
     public $scorecard;
+    public $type;
 
     /**
      * Create a new component instance.
      *
      * @return void
      */
-    public function __construct($location = null, $scorecard = [])
+    public function __construct($location = null, $scorecard = [], $type = null)
     {
         $this->location = $location;
         $this->scorecard = $scorecard;
+        $this->type = $type;
     }
 
     /**

app/View/Components/Partial/ApproachToPolicing/ChartArrestsByType.php

@@ -8,16 +8,18 @@ class ChartArrestsByType extends Component
 {
     public $location;
     public $scorecard;
+    public $type;
 
     /**
      * Create a new component instance.
      *
      * @return void
      */
-    public function __construct($location = null, $scorecard = [])
+    public function __construct($location = null, $scorecard = [], $type = null)
     {
         $this->location = $location;
         $this->scorecard = $scorecard;
+        $this->type = $type;
     }
 
     /**

app/View/Components/Partial/ApproachToPolicing/ChartArrestsByYear.php

@@ -8,16 +8,18 @@ class ChartArrestsByYear extends Component
 {
     public $location;
     public $scorecard;
+    public $type;
 
     /**
      * Create a new component instance.
      *
      * @return void
      */
-    public function __construct($location = null, $scorecard = [])
+    public function __construct($location = null, $scorecard = [], $type = null)
     {
         $this->location = $location;
         $this->scorecard = $scorecard;
+        $this->type = $type;
     }
 
     /**

app/View/Components/Partial/ApproachToPolicing/ChartArrestsLowLevel.php

@@ -8,16 +8,18 @@ class ChartArrestsLowLevel extends Component
 {
     public $location;
     public $scorecard;
+    public $type;
 
     /**
      * Create a new component instance.
      *
      * @return void
      */
-    public function __construct($location = null, $scorecard = [])
+    public function __construct($location = null, $scorecard = [], $type = null)
     {
         $this->location = $location;
         $this->scorecard = $scorecard;
+        $this->type = $type;
     }
 
     /**

app/View/Components/Partial/ApproachToPolicing/ChartDisparitiesLowLevel.php

@@ -8,16 +8,18 @@ class ChartDisparitiesLowLevel extends Component
 {
     public $location;
     public $scorecard;
+    public $type;
 
     /**
      * Create a new component instance.
      *
      * @return void
      */
-    public function __construct($location = null, $scorecard = [])
+    public function __construct($location = null, $scorecard = [], $type = null)
     {
         $this->location = $location;
         $this->scorecard = $scorecard;
+        $this->type = $type;
     }
 
     /**

app/View/Components/Partial/ApproachToPolicing/ChartHomicidesUnsolved.php

@@ -8,16 +8,18 @@ class ChartHomicidesUnsolved extends Component
 {
     public $location;
     public $scorecard;
+    public $type;
 
     /**
      * Create a new component instance.
      *
      * @return void
      */
-    public function __construct($location = null, $scorecard = [])
+    public function __construct($location = null, $scorecard = [], $type = null)
     {
         $this->location = $location;
         $this->scorecard = $scorecard;
+        $this->type = $type;
     }
 
     /**

app/View/Components/Partial/ApproachToPolicing/ChartHomicidesUnsolvedByRace.php

@@ -8,16 +8,18 @@ class ChartHomicidesUnsolvedByRace extends Component
 {
     public $location;
     public $scorecard;
+    public $type;
 
     /**
      * Create a new component instance.
      *
      * @return void
      */
-    public function __construct($location = null, $scorecard = [])
+    public function __construct($location = null, $scorecard = [], $type = null)
     {
         $this->location = $location;
         $this->scorecard = $scorecard;
+        $this->type = $type;
     }
 
     /**

app/View/Components/Partial/Jail/ChartDeathsInJail.php

@@ -8,16 +8,18 @@ class ChartDeathsInJail extends Component
 {
     public $location;
     public $scorecard;
+    public $type;
 
     /**
      * Create a new component instance.
      *
      * @return void
      */
-    public function __construct($location = null, $scorecard = [])
+    public function __construct($location = null, $scorecard = [], $type = null)
     {
         $this->location = $location;
         $this->scorecard = $scorecard;
+        $this->type = $type;
     }
 
     /**

app/View/Components/Partial/Jail/ChartTransferredToIce.php

@@ -8,16 +8,18 @@ class ChartTransferredToIce extends Component
 {
     public $location;
     public $scorecard;
+    public $type;
 
     /**
      * Create a new component instance.
      *
      * @return void
      */
-    public function __construct($location = null, $scorecard = [])
+    public function __construct($location = null, $scorecard = [], $type = null)
     {
         $this->location = $location;
         $this->scorecard = $scorecard;
+        $this->type = $type;
     }
 
     /**

app/View/Components/Partial/PoliceAccountability/AccountabilityTitle.php

@@ -8,16 +8,18 @@ class AccountabilityTitle extends Component
 {
     public $location;
     public $scorecard;
+    public $type;
 
     /**
      * Create a new component instance.
      *
      * @return void
      */
-    public function __construct($location = null, $scorecard = [])
+    public function __construct($location = null, $scorecard = [], $type = null)
     {
         $this->location = $location;
         $this->scorecard = $scorecard;
+        $this->type = $type;
     }
 
     /**

app/View/Components/Partial/PoliceAccountability/ChartAllegedCrimes.php

@@ -8,16 +8,18 @@ class ChartAllegedCrimes extends Component
 {
     public $location;
     public $scorecard;
+    public $type;
 
     /**
      * Create a new component instance.
      *
      * @return void
      */
-    public function __construct($location = null, $scorecard = [])
+    public function __construct($location = null, $scorecard = [], $type = null)
     {
         $this->location = $location;
         $this->scorecard = $scorecard;
+        $this->type = $type;
     }
 
     /**

app/View/Components/Partial/PoliceAccountability/ChartCivilianComplaints.php

@@ -8,16 +8,18 @@ class ChartCivilianComplaints extends Component
 {
     public $location;
     public $scorecard;
+    public $type;
 
     /**
      * Create a new component instance.
      *
      * @return void
      */
-    public function __construct($location = null, $scorecard = [])
+    public function __construct($location = null, $scorecard = [], $type = null)
     {
         $this->location = $location;
         $this->scorecard = $scorecard;
+        $this->type = $type;
     }
 
     /**

app/View/Components/Partial/PoliceAccountability/ChartMisconduct.php

@@ -8,16 +8,18 @@ class ChartMisconduct extends Component
 {
     public $location;
     public $scorecard;
+    public $type;
 
     /**
      * Create a new component instance.
      *
      * @return void
      */
-    public function __construct($location = null, $scorecard = [])
+    public function __construct($location = null, $scorecard = [], $type = null)
     {
         $this->location = $location;
         $this->scorecard = $scorecard;
+        $this->type = $type;
     }
 
     /**

app/View/Components/Partial/PoliceAccountability/ChartPoliceDiscrimination.php

@@ -8,16 +8,18 @@ class ChartPoliceDiscrimination extends Component
 {
     public $location;
     public $scorecard;
+    public $type;
 
     /**
      * Create a new component instance.
      *
      * @return void
      */
-    public function __construct($location = null, $scorecard = [])
+    public function __construct($location = null, $scorecard = [], $type = null)
     {
         $this->location = $location;
         $this->scorecard = $scorecard;
+        $this->type = $type;
     }
 
     /**

app/View/Components/Partial/PoliceAccountability/ChartUseOfForce.php

@@ -8,16 +8,18 @@ class ChartUseOfForce extends Component
 {
     public $location;
     public $scorecard;
+    public $type;
 
     /**
      * Create a new component instance.
      *
      * @return void
      */
-    public function __construct($location = null, $scorecard = [])
+    public function __construct($location = null, $scorecard = [], $type = null)
     {
         $this->location = $location;
         $this->scorecard = $scorecard;
+        $this->type = $type;
     }
 
     /**

app/View/Components/Partial/PoliceFunding/ChartFundsSpent.php

@@ -8,16 +8,18 @@ class ChartFundsSpent extends Component
 {
     public $location;
     public $scorecard;
+    public $type;
 
     /**
      * Create a new component instance.
      *
      * @return void
      */
-    public function __construct($location = null, $scorecard = [])
+    public function __construct($location = null, $scorecard = [], $type = null)
     {
         $this->location = $location;
         $this->scorecard = $scorecard;
+        $this->type = $type;
     }
 
     /**

app/View/Components/Partial/PoliceFunding/ChartFundsTaken.php

@@ -8,16 +8,18 @@ class ChartFundsTaken extends Component
 {
     public $location;
     public $scorecard;
+    public $type;
 
     /**
      * Create a new component instance.
      *
      * @return void
      */
-    public function __construct($location = null, $scorecard = [])
+    public function __construct($location = null, $scorecard = [], $type = null)
     {
         $this->location = $location;
         $this->scorecard = $scorecard;
+        $this->type = $type;
     }
 
     /**