feat(admin-ui): design the layout for api role management #327

GluuFederation · Dec 3, 2021 · d121479 · d121479
1 parent 2403ff0
commit d121479
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 9 deletions.
diff --git a/app/components/SidebarMenu/SidebarMenuItem.js b/app/components/SidebarMenu/SidebarMenuItem.js
@@ -12,7 +12,11 @@ import { MenuContext } from './MenuContext'
 const SidebarMenuItemLink = (props) =>
   props.to || props.href ? (
     props.to ? (
-      <Link to={props.to} style={props.textStyle} className={`${props.classBase}__entry__link`}>
+      <Link
+        to={props.to}
+        style={props.textStyle}
+        className={`${props.classBase}__entry__link`}
+      >
         {props.children}
       </Link>
     ) : (
@@ -42,7 +46,7 @@ SidebarMenuItemLink.propTypes = {
   onToggle: PropTypes.func,
   children: PropTypes.node,
   classBase: PropTypes.string,
-  textStyle: PropTypes.object
+  textStyle: PropTypes.object,
 }
 
 /**
@@ -68,7 +72,7 @@ export class SidebarMenuItem extends React.Component {
     href: PropTypes.string,
     exact: PropTypes.bool,
     noCaret: PropTypes.bool,
-    textStyle: PropTypes.object
+    textStyle: PropTypes.object,
   }
 
   static defaultProps = {
@@ -119,11 +123,11 @@ export class SidebarMenuItem extends React.Component {
       active: entry && entry.active,
     })
     const activeMenu = {
-      color: 'white !important',
-      backgroundColor: 'rgb(3, 169, 109)',
-    }
-    const nonaActiveMenu = {
+      color: '#ffffff',
+      background: 'linear-gradient(90deg, #00C9FF 0%, #92FE9D 100%)',
+      fontWeight: 'bold',
     }
+    const nonaActiveMenu = {}
 
     function getStyle(itemClass) {
       if (
@@ -135,6 +139,17 @@ export class SidebarMenuItem extends React.Component {
       }
       return nonaActiveMenu
     }
+
+    function getTextStyle(itemClass) {
+      if (
+        itemClass.includes('active', 0) &&
+        itemClass.includes('submenu__entry', 0) &&
+        !itemClass.includes('open', 0)
+      ) {
+        return { color: 'white', fontWeight: 'inherit' }
+      }
+      return null
+    }
     return (
       <li
         style={getStyle(itemClass)}
@@ -148,7 +163,7 @@ export class SidebarMenuItem extends React.Component {
             href={this.props.href || null}
             onToggle={this.toggleNode.bind(this)}
             classBase={classBase}
-            textStyle={this.props.textStyle}
+            textStyle={getTextStyle(itemClass) || this.props.textStyle}
           >
             {this.props.icon &&
               React.cloneElement(this.props.icon, {

diff --git a/app/routes/index.js b/app/routes/index.js
@@ -26,7 +26,6 @@ export const RoutedContent = () => {
     state.token ? state.token.scopes : state.authReducer.permissions,
   )
   const [pluginMenus, setPluginMenus] = useState([])
-  //console.log('==============' + JSON.stringify(scopes))
   useEffect(() => {
     setPluginMenus(processRoutes())
   }, [])