From a9ef6feebd4a5a1ed1d0e7f768214ad58b4528cb Mon Sep 17 00:00:00 2001
From: Connor Turland <connorturland@gmail.com>
Date: Mon, 24 Oct 2016 13:42:26 +0000
Subject: [PATCH] mapper page bug fix and styling

---
 app/assets/stylesheets/base.css.erb        |  2 +-
 frontend/src/Metamaps/Views/ExploreMaps.js | 18 ++++++++++--------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/app/assets/stylesheets/base.css.erb b/app/assets/stylesheets/base.css.erb
index aa2c96db..2e266272 100644
--- a/app/assets/stylesheets/base.css.erb
+++ b/app/assets/stylesheets/base.css.erb
@@ -965,7 +965,7 @@ font-family: 'din-regular', helvetica, sans-serif;
     overflow: visible;
     background: #E0E0E0;
     border-radius:2px;
-    margin:16px 16px 16px 19px;
+    margin:16px;
     box-shadow: 0px 3px 3px rgba(0,0,0,0.23), 0 3px 3px rgba(0,0,0,0.16);
 }
 
diff --git a/frontend/src/Metamaps/Views/ExploreMaps.js b/frontend/src/Metamaps/Views/ExploreMaps.js
index 441f3ca2..aa74626c 100644
--- a/frontend/src/Metamaps/Views/ExploreMaps.js
+++ b/frontend/src/Metamaps/Views/ExploreMaps.js
@@ -14,6 +14,7 @@ import Maps from '../../components/Maps'
 
 const ExploreMaps = {
   pending: false,
+  mapper: null,
   setCollection: function (collection) {
     var self = ExploreMaps
 
@@ -27,23 +28,18 @@ const ExploreMaps = {
     self.collection.on('successOnFetch', self.handleSuccess)
     self.collection.on('errorOnFetch', self.handleError)
   },
-  render: function (mapperObj, cb) {
+  render: function (cb) {
     var self = ExploreMaps
 
     if (!self.collection) return
 
-    if (typeof mapperObj === 'function') {
-      cb = mapperObj
-      mapperObj = null
-    }
-
     var exploreObj = {
       currentUser: Active.Mapper,
       section: self.collection.id,
       maps: self.collection,
       juntoState: Realtime.juntoState,
       moreToLoad: self.collection.page != 'loadedAll',
-      user: mapperObj,
+      user: self.collection.id === 'mapper' ? self.mapper : null,
       loadMore: self.loadMore,
       pending: self.pending,
       onStar: function (map) {
@@ -93,11 +89,17 @@ const ExploreMaps = {
   fetchUserThenRender: function (cb) {
     var self = ExploreMaps
 
+    if (self.mapper && self.mapper.id === self.collection.mapperId) {
+      self.render(cb)
+      return Metamaps.Loading.hide()
+    }
+
     // first load the mapper object and then call the render function
     $.ajax({
       url: '/users/' + self.collection.mapperId + '/details.json',
       success: function (response) {
-        self.render(response, cb)
+        self.mapper = response
+        self.render(cb)
         Metamaps.Loading.hide()
       },
       error: function () {