Merge b8d860d into 09908a0

andela · Oct 9, 2018 · cde122f · cde122f
2 parents 09908a0 + b8d860d
commit cde122f
Show file tree

Hide file tree

Showing 3 changed files with 51 additions and 9 deletions.
diff --git a/client/src/modules/common/Navbar/index.jsx b/client/src/modules/common/Navbar/index.jsx
@@ -59,6 +59,7 @@ class Navbar extends Component {
 
   render() {
     const { showSearchBar, name } = this.state;
+    const role = localStorage.getItem("role");
     const {
       showTabs, switchContent, showIcon, gotoHome
     } = this.props;
@@ -102,6 +103,27 @@ class Navbar extends Component {
                   </a>
                 </li>
               )}
+              {
+                role === 'admin' ?
+                  <li>
+                    <NavLink to="/teams/create">
+                      {/* Create team */}
+                      <i className="material-icons" data-tip="Create teams">
+                        group_add
+                      </i>
+                    </NavLink>
+                  </li> :
+                  <li>
+                    <button className="admin-request-btn">
+                      <i
+                        className="tiny material-icons"
+                        data-tip="Only LFs can make this request">
+                        info
+                      </i>
+                      Request admin privilege
+                    </button>
+                  </li>
+              }
               <li>
                 <NavLink to="/teams" onClick={this.props.gotoHome}>
                   {/* Teams */}
@@ -110,15 +132,6 @@ class Navbar extends Component {
                   </i>
                 </NavLink>
               </li>
-
-              <li>
-                <NavLink to="/teams/create">
-                  {/* Create team */}
-                  <i className="material-icons" data-tip="Create teams">
-                    group_add
-                  </i>
-                </NavLink>
-              </li>
               <li>
                 <NavLink to="/teams/favorites">
                   {/* Favorite teams */}

diff --git a/client/src/redux/actions/auth/index.js b/client/src/redux/actions/auth/index.js
@@ -21,8 +21,10 @@ export const signIn = data => dispatch => {
           }
         } = response;
         const { data: { data: { user: { id } } } } = response;
+        const { data: { data: { user: { role } } } } = response;
         localStorage.setItem('aTeamsToken', userToken);
         localStorage.setItem('userId', id);
+        localStorage.setItem('role', role);
         successMessage('Login successful');
       }
 
@@ -48,7 +50,9 @@ export const signUp = data => dispatch => {
             data: { userToken }
           }
         } = response;
+        const { data: { data: { user: { role } } } } = response;
         localStorage.setItem('aTeamsToken', userToken);
+        localStorage.setItem('role', role);
         successMessage('Registration successful');
         dispatch(success(SIGN_UP, response.data));
         return;
@@ -68,6 +72,7 @@ export const signUp = data => dispatch => {
 export const signOut = data => dispatch => {
   dispatch(isLoading(true));
   localStorage.removeItem('aTeamsToken');
+  localStorage.removeItem('role');
   dispatch(isLoading(false));
   dispatch(isAuthenticated());
   successMessage('Signed out successfully');

diff --git a/client/styles/components/_navbar.scss b/client/styles/components/_navbar.scss
@@ -91,3 +91,27 @@
 .tabs .tab a:focus.active {
   background: transparent;
 } 
+
+
+.admin-request-btn {
+  position: relative;
+  margin-right: 20px;
+  padding: 8px 30px 8px 15px;
+  border-radius: 15px;
+  cursor: pointer;
+  background-color: #385cd7;
+  color: #ffffff;
+}
+
+
+.admin-request-btn {
+  .material-icons {
+    position: absolute;
+    top: 50%;
+    right: 3px;
+    transform: translateY(-50%);
+    color: #ffffff;
+    font-size:18px !important;
+    margin-right: 5px;
+  }
+}