From 923108162444580bbaf94de0784ee574e37f6d96 Mon Sep 17 00:00:00 2001
From: NGPixel <github@ngpixel.com>
Date: Sat, 8 Jul 2017 21:01:07 -0400
Subject: [PATCH] fix: mongoose connect fix + allpages nav theming

---
 client/scss/components/collapsable-nav.scss | 13 +++++++++++++
 package.json                                |  2 +-
 server/libs/db.js                           |  2 +-
 yarn.lock                                   | 19 ++++++++++++++++++-
 4 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/client/scss/components/collapsable-nav.scss b/client/scss/components/collapsable-nav.scss
index 0629776d..f190b0a2 100644
--- a/client/scss/components/collapsable-nav.scss
+++ b/client/scss/components/collapsable-nav.scss
@@ -107,3 +107,16 @@
   }
 
 }
+
+/* THEME OVERRIDE - START */
+
+@each $color, $colorvalue in $material-colors {
+  .is-primary-#{$color} .collapsable-nav {
+    &.has-children {
+      background-color: mc($color, '500');
+      border-left-color: mc($color, '700');
+    }
+  }
+}
+
+/* THEME OVERRIDE - END */
diff --git a/package.json b/package.json
index fb3a8372..619731d9 100644
--- a/package.json
+++ b/package.json
@@ -89,7 +89,7 @@
     "moment": "~2.18.1",
     "moment-timezone": "~0.5.13",
     "mongodb": "~2.2.30",
-    "mongoose": "4.10.8",
+    "mongoose": "^4.11.1",
     "multer": "~1.3.0",
     "node-2fa": "~1.1.2",
     "node-graceful": "~0.2.3",
diff --git a/server/libs/db.js b/server/libs/db.js
index 9169b06a..733d28a2 100644
--- a/server/libs/db.js
+++ b/server/libs/db.js
@@ -55,7 +55,7 @@ module.exports = {
 
     // Connect
 
-    self.onReady = modb.connect(appconfig.db)
+    self.onReady = modb.connect(appconfig.db, { useMongoClient: true })
 
     return self
   }
diff --git a/yarn.lock b/yarn.lock
index 7a7dff73..cab63c12 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4443,7 +4443,7 @@ mongodb@2.2.27:
     mongodb-core "2.1.14"
     readable-stream "2.2.7"
 
-mongoose@*, mongoose@4.10.8:
+mongoose@*:
   version "4.10.8"
   resolved "https://registry.yarnpkg.com/mongoose/-/mongoose-4.10.8.tgz#31f44ed7884756f9fd9b7708ddcb3fcb4250f34e"
   dependencies:
@@ -4460,6 +4460,23 @@ mongoose@*, mongoose@4.10.8:
     regexp-clone "0.0.1"
     sliced "1.0.1"
 
+mongoose@^4.11.1:
+  version "4.11.1"
+  resolved "https://registry.yarnpkg.com/mongoose/-/mongoose-4.11.1.tgz#2560b6d89e744b05857d024cab8b316066716e3e"
+  dependencies:
+    async "2.1.4"
+    bson "~1.0.4"
+    hooks-fixed "2.0.0"
+    kareem "1.4.1"
+    mongodb "2.2.27"
+    mpath "0.3.0"
+    mpromise "0.5.5"
+    mquery "2.3.1"
+    ms "2.0.0"
+    muri "1.2.1"
+    regexp-clone "0.0.1"
+    sliced "1.0.1"
+
 morgan@^1.6.1:
   version "1.8.2"
   resolved "https://registry.yarnpkg.com/morgan/-/morgan-1.8.2.tgz#784ac7734e4a453a9c6e6e8680a9329275c8b687"