Remove the root sprinkle

Author: alexweissman

CHANGELOG.md

@@ -6,6 +6,7 @@
 - Refactor error handling.  Move responsibility for displayErrorDetails to handlers, and factor our ErrorRenderers.  Addresses (#702)
 - Move `composer.json` to root directory to allow installing UF via composer create-project
 - Move `sprinkles.json` to app directory to make it easier to find
+- Eliminate the `root` theme Sprinkle.  Custom styling for the root user is now handled with some Twig logic in the `admin` Sprinkle (#726)
 - Rename bundle.config.json -> asset-bundles.json (#726)
 - Factor out "system" classes from core Sprinkle
 - Refactor overall application lifecycle; move main lifecycle into UserFrosting\System\UserFrosting

app/sprinkles/account/src/Database/Migrations/v400/CreateAdminUser.php

@@ -66,7 +66,6 @@ public function seed()
                 "email" => $email,
                 "first_name" => $first_name,
                 "last_name" => $last_name,
-                "theme" => 'root',
                 "password" => Password::hash($password)
             ]);
 

app/sprinkles/account/src/Database/Models/User.php

@@ -81,6 +81,7 @@ class User extends Model
 
     /**
      * Determine if the property for this object exists.
+     *
      * We add relations here so that Twig will be able to find them.
      * See http://stackoverflow.com/questions/29514081/cannot-access-eloquent-attributes-on-twig/35908957#35908957
      * Every property in __get must also be implemented here for Twig to recognize it.
@@ -192,7 +193,7 @@ public static function exists($value, $identifier = 'user_name', $checkDeleted =
     /**
      * Return a cache instance specific to that user
      *
-     * @return Illuminate\\Cache\\*Store
+     * @return Illuminate\Contracts\Cache\Store
      */
     public function getCache()
     {
@@ -263,6 +264,19 @@ public function group()
         return $this->belongsTo($classMapper->getClassMapping('group'), 'group_id');
     }
 
+    /**
+     * Returns whether or not this user is the master user.
+     *
+     * @return bool
+     */
+    public function isMaster()
+    {
+        $masterId = static::$ci->config['reserved_user_ids.master'];
+
+        // Need to use loose comparison for now, because some DBs return `id` as a string
+        return ($this->id == $masterId);
+    }
+
     /**
      * Get the most recent activity for this user, based on the user's last_activity_id.
      *
@@ -317,7 +331,7 @@ public function lastActivityTime($type)
      * @param mixed[] $params Optional array of parameters used for this event handler.
      * @todo Transition to Laravel Event dispatcher to handle this
      */
-    public function onLogin($params = array())
+    public function onLogin($params = [])
     {
         // Add a sign in activity (time is automatically set by database)
         static::$ci->userActivityLogger->info("User {$this->user_name} signed in.", [
@@ -329,15 +343,15 @@ public function onLogin($params = array())
 
         if ($passwordType != "modern") {
             if (!isset($params['password'])) {
-                error_log("Notice: Unhashed password must be supplied to update to modern password hashing.");
+                Debug::debug("Notice: Unhashed password must be supplied to update to modern password hashing.");
             } else {
                 // Hash the user's password and update
                 $passwordHash = Password::hash($params['password']);
                 if ($passwordHash === null) {
-                    error_log("Notice: outdated password hash could not be updated because the new hashing algorithm is not supported.  Are you running PHP >= 5.3.7?");
+                    Debug::debug("Notice: outdated password hash could not be updated because the new hashing algorithm is not supported.  Are you running PHP >= 5.3.7?");
                 } else {
                     $this->password = $passwordHash;
-                    error_log("Notice: outdated password hash has been automatically updated to modern hashing.");
+                    Debug::debug("Notice: outdated password hash has been automatically updated to modern hashing.");
                 }
             }
         }
@@ -355,7 +369,7 @@ public function onLogin($params = array())
      * @param mixed[] $params Optional array of parameters used for this event handler.
      * @todo Transition to Laravel Event dispatcher to handle this
      */
-    public function onLogout($params = array())
+    public function onLogout($params = [])
     {
         static::$ci->userActivityLogger->info("User {$this->user_name} signed out.", [
             'type' => 'sign_out'

app/sprinkles/admin/templates/components/dashboard/navbar.html.twig

@@ -1,10 +1,15 @@
 {% block dashboard_navbar %}
     <div class="navbar-custom-menu">
         <ul class="nav navbar-nav">
-          <!-- additional elements (e.g., menus, messages) before the user account drop down -->
-          {% block dashboard_navbar_extra %} {% endblock %}
-          <!-- User Account: style can be found in dropdown.less -->
-          {% include "components/user-card.html.twig" %}
+            {% if current_user.isMaster() %}
+                <li class="hidden-xs hidden-sm"><a href="#">{{ translate("HEADER_MESSAGE_ROOT") | upper }}</a></li>
+            {% endif %}
+
+            {# additional elements (e.g., menus, messages) before the user account drop down #}
+            {% block dashboard_navbar_extra %} {% endblock %}
+
+            {# User Account: style can be found in dropdown.less #}
+            {% include "components/user-card.html.twig" %}
         </ul>
     </div>
 {% endblock %}

app/sprinkles/admin/templates/layouts/dashboard.html.twig

@@ -6,7 +6,11 @@
 {% endblock %}
 
 {% block body_attributes %}
-    class="hold-transition skin-{{site.AdminLTE.skin}} sidebar-mini"
+    {% if current_user.isMaster() %}
+        class="hold-transition skin-red sidebar-mini"
+    {% else %}
+        class="hold-transition skin-{{site.AdminLTE.skin}} sidebar-mini"
+    {% endif %}
 {% endblock %}
 
 {% block content %}