feat(societies): add userInfo prop

- add userinfo prop when authenticating society pages - modify color of points subscript
andela · Mar 8, 2019 · 4c3a60f · 4c3a60f
1 parent c9b4d99
commit 4c3a60f
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 11 deletions.
diff --git a/src/app/Dashboard/styles/societyStats.scss b/src/app/Dashboard/styles/societyStats.scss
@@ -9,9 +9,8 @@
 }
 
 .progress {
-  width: 100%;
+  @include widthAndHeight(100%, rem(10px));
   align-self: center;
-  height: rem(10px) !important;
   margin-top: rem(17px);
   margin-bottom: rem(24px);
   border-radius: 0;
@@ -40,12 +39,12 @@
     color: $andelaBlue;
 
     span {
-      color: $darkGray;
+      color: $pointsSubscriptColor;
     }
   }
 
   #activities-logged {
-    color: $darkGray;
+    color: $pointsSubscriptColor;
   }
 
   #used-points {

diff --git a/src/app/Societies/styles/societies.scss b/src/app/Societies/styles/societies.scss
@@ -11,29 +11,30 @@
 .profile-overview__image--society {
   @include widthAndHeight(rem(662px), rem(205px));
   margin-right: rem(18px);
-  background-size: cover;
-  background-position: top;
+  background-size: contain;
+  background-position: center;
+  background-repeat: no-repeat;
   box-sizing: border-box;
   background-color: $lightAccent;
   border: rem(1.08px) solid $lightAccent;
   box-shadow: 0 rem(7px) rem(14px) 0 $darkShadow, 0 rem(11px) rem(36px) 0 $grayShadow;
 
   &.phoenix {
-    background-image: url(../../../images/society_istelle.jpg)
+    background-image: url(../../../images/societyLogos/phoenix.png)
   }
   &.sparks {
-    background-image: url(../../../images/society_istelle.jpg);
+    background-image: url(../../../images/societyLogos/sparks.png);
   }
   &.invictus {
-    background-image: url(../../../images/society_istelle.jpg)
+    background-image: url(../../../images/societyLogos/invictus.jpg)
   }
   &.istelle {
-    background-image: url(../../../images/society_istelle.jpg)
+    background-image: url(../../../images/societyLogos/istelle.png)
   }
 }
 
 .society__tabs--underline {
-  border: 1px solid $lightAccent;
+  border: rem(1px) solid $lightAccent;
   position: absolute;
   bottom: 0;
   left: 0;

diff --git a/src/routes.js b/src/routes.js
@@ -36,6 +36,7 @@ const Router = () => (
       />
       <AuthenticateRoute
         isAuthenticated={tokenIsValid(token)}
+        userInfo={token.UserInfo}
         path='/:society'
         component={SocietiesContainer}
       />

diff --git a/src/styles/_vars.scss b/src/styles/_vars.scss
@@ -18,3 +18,4 @@ $inReviewStatusYellow: #F8E71C;
 $purple: #8954BA;
 $profileBoxShadow: rgba(0,0,0,0.8);
 $separatorBgColor: #e9ecef;
+$pointsSubscriptColor: #9797A6;