OpenConceptLab/ocl_issues#1156 | members summary | added icon colors

OpenConceptLab · Jan 10, 2022 · 396b67a · 396b67a
1 parent d203ff3
commit 396b67a
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 17 deletions.
diff --git a/src/components/orgs/Members.jsx b/src/components/orgs/Members.jsx
@@ -6,7 +6,7 @@ import {
   AdminPanelSettings as AdminIcon
 } from '@mui/icons-material';
 import { map, chunk, isEmpty } from 'lodash';
-import { DARKGRAY } from '../../common/constants'
+import { GREEN, ORANGE } from '../../common/constants'
 import { getUserInitials } from '../../common/utils';
 import HtmlToolTipRaw from '../common/HtmlToolTipRaw';
 
@@ -36,7 +36,7 @@ const IdentityBadge = ({member, size}) => {
         <Badge
           overlap="circular"
           anchorOrigin={{ vertical: 'bottom', horizontal: 'right' }}
-          badgeContent={<AdminIcon style={{color: DARKGRAY}} />}
+          badgeContent={<AdminIcon style={{color: ORANGE}} />}
           >
           <Identity member={member} size={size} />
         </Badge> :
@@ -69,7 +69,7 @@ const Info = ({ member }) => {
           <div className='col-xs-12 no-side-padding flex-vertical-center' style={{fontSize: '14px'}}>
             <Link to={`${member.url}sources`} className='no-anchor-styles flex-vertical-center'>
               <React.Fragment>
-                <SourceIcon color='disabled' style={{marginRight: '5px', width: '18px'}} />
+                <SourceIcon style={{marginRight: '5px', width: '18px', color: GREEN}} />
                 <span>{`Owner of ${member.sources} public sources`}</span>
               </React.Fragment>
             </Link>
@@ -80,7 +80,7 @@ const Info = ({ member }) => {
           <div className='col-xs-12 no-side-padding flex-vertical-center' style={{fontSize: '14px'}}>
             <Link to={`${member.url}collections`} className='no-anchor-styles flex-vertical-center'>
               <React.Fragment>
-                <CollectionIcon color='disabled' style={{marginRight: '5px', width: '18px'}} />
+                <CollectionIcon style={{marginRight: '5px', width: '18px', color: GREEN}} />
                 <span>{`Owner of ${member.collections} public collections`}</span>
               </React.Fragment>
             </Link>
@@ -92,8 +92,7 @@ const Info = ({ member }) => {
           <div className='col-xs-12 no-side-padding flex-vertical-center' style={{fontSize: '14px'}}>
             <Link to={`${member.url}organizations`} className='no-anchor-styles flex-vertical-center'>
               <React.Fragment>
-
-                <OrgIcon color='disabled' style={{marginRight: '5px', width: '18px'}} />
+                <OrgIcon style={{marginRight: '5px', width: '18px', color: ORANGE}} />
                 <span>{`Member of ${member.organizations} organizations`}</span>
               </React.Fragment>
             </Link>

diff --git a/src/components/users/UserHomeDetails.jsx b/src/components/users/UserHomeDetails.jsx
@@ -16,6 +16,7 @@ import APIService from '../../services/APIService';
 import {
   formatDate, currentUserToken, formatWebsiteLink, copyToClipboard, getCurrentUserUsername
 } from '../../common/utils';
+import { ORANGE } from '../../common/constants';
 import HeaderLogo from '../common/HeaderLogo';
 import CommonFormDrawer from '../common/CommonFormDrawer';
 import UserForm from './UserForm';
@@ -79,13 +80,13 @@ const UserHomeDetails = ({ user, isLoading }) => {
             {
               user.is_superuser &&
               <Tooltip title='OCL Super Admin'>
-                <AdminIcon />
+                <AdminIcon style={{color: ORANGE}} />
               </Tooltip>
             }
             {
               user.is_staff && !user.is_superuser &&
               <Tooltip title='OCL Admin'>
-                <AdminIcon />
+                <AdminIcon style={{color: ORANGE}} />
               </Tooltip>
             }
           </div>
@@ -154,15 +155,15 @@ const UserHomeDetails = ({ user, isLoading }) => {
           {
             token && isSameAsCurrentUser &&
             <React.Fragment>
-            <Divider style={{width: '100%', margin: '5px 0'}} />
-            <p>
-              <strong>API Token</strong>
-              <Tooltip arrow title="Click to copy Token" placement='right'>
-                <IconButton style={{marginLeft: '10px'}} size="small" onClick={() => copyToClipboard(token, 'Token copied to clipboard!')}>
-                  <CopyIcon fontSize="small" />
-                </IconButton>
-              </Tooltip>
-            </p>
+              <Divider style={{width: '100%', margin: '5px 0'}} />
+              <p>
+                <strong>API Token</strong>
+                <Tooltip arrow title="Click to copy Token" placement='right'>
+                  <IconButton style={{marginLeft: '10px'}} size="small" onClick={() => copyToClipboard(token, 'Token copied to clipboard!')}>
+                    <CopyIcon fontSize="small" />
+                  </IconButton>
+                </Tooltip>
+              </p>
             </React.Fragment>
           }
         </div>