From 29bf2a23e8f937041c096fd5a73fe05fec890019 Mon Sep 17 00:00:00 2001
From: Connor Turland <connorturland@gmail.com>
Date: Tue, 12 Sep 2017 17:01:08 -0400
Subject: [PATCH] review changes

---
 app/assets/images/arrowperms_sprite.png           | Bin 543 -> 0 bytes
 app/assets/stylesheets/application.scss.erb       |   4 ----
 app/views/layouts/_foot.html.erb                  |   2 +-
 ...olors.html.erb => _metacodeCssColors.html.erb} |   3 ++-
 frontend/src/components/TopicCard/Follow.js       |  14 ++++++++++++--
 frontend/src/components/TopicCard/Info.js         |   3 ++-
 frontend/src/components/TopicCard/Links.js        |   2 +-
 frontend/src/components/TopicCard/index.js        |   6 +++---
 8 files changed, 21 insertions(+), 13 deletions(-)
 delete mode 100644 app/assets/images/arrowperms_sprite.png
 rename app/views/shared/{_metacodeBgColors.html.erb => _metacodeCssColors.html.erb} (51%)

diff --git a/app/assets/images/arrowperms_sprite.png b/app/assets/images/arrowperms_sprite.png
deleted file mode 100644
index eff00341973b69fc75f27f31f32ecc4f0aed0132..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 543
zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3HE3&8=$zQk(@Ik;M!Q+`=Ht$S`Y;1W-`2
z#5JNMI6tkVJh3R1!7(L2DOJHUH!(dmC^a#qvhZZ84Fdz?8c!F;kcwMxA|4ht8Hlin
zYe-+=?GpA#Y`Dc)(tL@xfcb8NUw~}GYCna%1oI5_1@FJ^yH^>*!P!}Vs=EBXtLLYu
zPfs6r=9#^W^O(%!geQtj9Slkh910N1Kx30mx5Rd@bL{4YKKV)vg6dadB!0Z9{>)vV
zFJn=Zl_l$*@msGUSd&A4?K<7~^{ZZ;p3I<X>RnT-{AAgk6NT<G{-0gGQ#+kqpzutW
zmYMv6s9r<6N58I2d*J6Yw|MJMv+D+o9W(s@y6m{l^LU@|v0caf4*qq#BkgPZ$nt&5
zZaKZr(G2RR%4z~i_B*`|+W2DT2Bp_m`$`u~mp-Q<+Wxt>@Gy&mpeB#d45h}MN{s8c
zrH`vK7Tas?y56$l@w7Y2?zwkgh%|`VX_$T4tuaw-T9a(1-=heT-8-1YFP54vh&^M+
z*&jRm`GG~8GK(H>;wvydA86e3J4yPuFHiRcu_NrwF4;~z)!)Pvy#@6OF6}xzle7Qh
zSMLILYg^&Wyx%qL!D$73;*279(i4^yFEiW0R-)*8+2i_ud4W^=4}CJzKnltO9*^A{
a7#T!w7q91RJYEWnTn0~9KbLh*2~7a^EY{Tk

diff --git a/app/assets/stylesheets/application.scss.erb b/app/assets/stylesheets/application.scss.erb
index f0c3bd5a..15eacb3a 100644
--- a/app/assets/stylesheets/application.scss.erb
+++ b/app/assets/stylesheets/application.scss.erb
@@ -1914,14 +1914,10 @@ input.collaboratorSearchField {
     background-position: -32px 0;
 }
 .yourMap .mapPermission:hover {
-    background-image: url(<%= asset_data_uri('arrowperms_sprite.png') %>);
     cursor: pointer;
-    background-position: -32px 0;
 }
 .yourMap .mapPermission.minimize {
-    background-image: url(<%= asset_data_uri('arrowperms_sprite.png') %>) !important;
     cursor: pointer;
-    background-position: 0 0;
 }
 .mapInfoBox .mapPermission .permissionSelect {
     list-style: none;
diff --git a/app/views/layouts/_foot.html.erb b/app/views/layouts/_foot.html.erb
index fd35e765..bc3d4223 100644
--- a/app/views/layouts/_foot.html.erb
+++ b/app/views/layouts/_foot.html.erb
@@ -15,7 +15,7 @@
 </script>
 <%= render :partial => 'layouts/lightboxes' %>
 <%= render :partial => 'layouts/templates' %>
-<%= render :partial => 'shared/metacodeBgColors' %>
+<%= render :partial => 'shared/metacodeCssColors' %>
 <%= render :partial => 'layouts/googleanalytics' if ENV["GA_TRACKING_CODE"].present? %>
 </body>
 </html>
diff --git a/app/views/shared/_metacodeBgColors.html.erb b/app/views/shared/_metacodeCssColors.html.erb
similarity index 51%
rename from app/views/shared/_metacodeBgColors.html.erb
rename to app/views/shared/_metacodeCssColors.html.erb
index 0fcf86dc..5ef6119e 100644
--- a/app/views/shared/_metacodeBgColors.html.erb
+++ b/app/views/shared/_metacodeCssColors.html.erb
@@ -1,7 +1,8 @@
 <style>
+<% # give text the color of the metacode by adding the class .metacodeColor{metacode-id} %>
 <% Metacode.all.each do |m| %>
 	<% if m.color %>
-		<%= ".mbg" + m.id.to_s + "{" %>
+		<%= ".metacodeColor" + m.id.to_s + "{" %>
 		<%= "color:" + m.color + " !important;" %>
 		<%= "}" %>
 	<% end %>
diff --git a/frontend/src/components/TopicCard/Follow.js b/frontend/src/components/TopicCard/Follow.js
index 509855e8..1aec6525 100644
--- a/frontend/src/components/TopicCard/Follow.js
+++ b/frontend/src/components/TopicCard/Follow.js
@@ -4,8 +4,18 @@ import PropTypes from 'prop-types'
 class Follow extends Component {
   render = () => {
     const { ActiveMapper, isFollowing, onTopicFollow } = this.props
-    return <div className='topicFollow' onClick={() => ActiveMapper && onTopicFollow()}>
-      {ActiveMapper ? isFollowing ? 'Unfollow' : 'Follow' : ''}
+    function onClick () {
+      if (ActiveMapper) {
+        onTopicFollow()
+      }
+    }
+    let innerValue
+    // only display either option if there is a user signed in
+    if (ActiveMapper) {
+      innerValue = isFollowing ? 'Unfollow' : 'Follow'
+    }
+    return <div className='topicFollow' onClick={onClick}>
+      {innerValue}
     </div>
   }
 }
diff --git a/frontend/src/components/TopicCard/Info.js b/frontend/src/components/TopicCard/Info.js
index 03d5da89..22c51189 100644
--- a/frontend/src/components/TopicCard/Info.js
+++ b/frontend/src/components/TopicCard/Info.js
@@ -1,6 +1,7 @@
 /* global $ */
 
-import React, { PropTypes, Component } from 'react'
+import React, { Component } from 'react'
+import PropTypes from 'prop-types'
 import { Link } from 'react-router'
 
 class Info extends Component {
diff --git a/frontend/src/components/TopicCard/Links.js b/frontend/src/components/TopicCard/Links.js
index d245e945..1c822c34 100644
--- a/frontend/src/components/TopicCard/Links.js
+++ b/frontend/src/components/TopicCard/Links.js
@@ -40,7 +40,7 @@ class Links extends Component {
     return (
       <div className="links">
         <div className="linkItem icon metacodeItem">
-          <div className={`metacodeTitle mbg${metacode.get('id')}`}
+          <div className={`metacodeTitle metacodeColor${metacode.get('id')}`}
             onClick={() => authorizedToEdit && this.handleMetacodeBarClick()}
           >
             {metacode.get('name')}
diff --git a/frontend/src/components/TopicCard/index.js b/frontend/src/components/TopicCard/index.js
index 7a6723f4..69ffa4e7 100644
--- a/frontend/src/components/TopicCard/index.js
+++ b/frontend/src/components/TopicCard/index.js
@@ -29,8 +29,8 @@ class ReactTopicCard extends Component {
     if (topic.authorizePermissionChange(currentUser)) classname += ' yourTopic'
 
     return (
-      <Draggable handle=".metacodeImage" defaultPosition={{x: 100, y: 100}}>
-        <div className="showcard mapElement mapElementHidden">
+      <Draggable handle='.metacodeImage' defaultPosition={{x: 100, y: 100}}>
+        <div className='showcard mapElement mapElementHidden'>
           <div className={classname}>
             <div className={`CardOnGraph ${hasAttachment ? 'hasAttachment' : ''}`} id={`topic_${topic.id}`}>
               <Links topic={topic}
@@ -53,7 +53,7 @@ class ReactTopicCard extends Component {
                 updateTopic={wrappedUpdateTopic}
               />
               <Info topic={topic} />
-              <div className="clearfloat"></div>
+              <div className='clearfloat' />
             </div>
           </div>
         </div>