Merge branch 'admin-ui' into 'master'

Task #197760 - UI for admin Bio See merge request educate-girls/eg-website!14
Dhanashree-Patil95 · May 5, 2023 · 92dfca2 · 92dfca2
2 parents d6d9dfa + a50ac5a
commit 92dfca2
Show file tree

Hide file tree

Showing 8 changed files with 294 additions and 280 deletions.
diff --git a/apps/front-end/src/pages/admin/facilitator/Profile.js b/apps/front-end/src/pages/admin/facilitator/Profile.js
diff --git a/apps/front-end/src/pages/admin/facilitator/Table.js b/apps/front-end/src/pages/admin/facilitator/Table.js
@@ -42,7 +42,7 @@ const columns = [
           <IconByName
             isDisabled
             name="AccountCircleLineIcon"
-            color="#888"
+            color="gray.300"
             _icon={{ size: "35" }}
           />
         )}

diff --git a/apps/front-end/src/pages/admin/facilitator/View.js b/apps/front-end/src/pages/admin/facilitator/View.js
diff --git a/lib/common-lib/src/components/admin_layout/AppBar.js b/lib/common-lib/src/components/admin_layout/AppBar.js
@@ -97,7 +97,7 @@ export default function AppBar({
                         <IconByName
                           isDisabled
                           name='AccountCircleLineIcon'
-                          color='#888'
+                          color='gray.300'
                           _icon={{ size: '24px' }}
                         />
                       )}

diff --git a/lib/common-lib/src/components/admin_layout/Layout.js b/lib/common-lib/src/components/admin_layout/Layout.js
@@ -41,7 +41,7 @@ export default function Layout({
               <AppBar
                 isEnableSearchBtn
                 isShowNotificationButton={false}
-                _box={{ bg: '#E5E5E5' }}
+                _box={{ bg: 'info.100' }}
                 color={imageUrl ? 'white' : ''}
                 {..._appBar}
               />
@@ -54,7 +54,7 @@ export default function Layout({
           <Sidebar
             _box={{
               maxW: '60px',
-              bg: 'gray.400'
+              bg: 'info.100'
             }}
             {..._sidebar}
           />

diff --git a/lib/common-lib/src/components/admin_layout/Sidebar.js b/lib/common-lib/src/components/admin_layout/Sidebar.js
@@ -70,9 +70,9 @@ export default function Sidebar({ menues, routeDynamics, _box, ...props }) {
           opacity={selected === index ? 1 : 0.5}
           p='3'
           onPress={() => setSelected(0)}
-          bg={selected === index ? 'gray.500' : 'transparent'}
+          bg={selected === index ? 'info.100' : 'transparent'}
         >
-          <Text color={selected === index ? 'primary.100' : 'black'}>
+          <Text color={selected === index ? 'info.300' : 'black'}>
             <Center>
               {item.icon ? (
                 <IconByName name={item?.icon} isDisabled />

diff --git a/lib/common-lib/src/components/layout/AppBar.js b/lib/common-lib/src/components/layout/AppBar.js
@@ -155,7 +155,7 @@ export default function AppBar({
                   <IconByName
                     isDisabled
                     name='AccountCircleLineIcon'
-                    color='#888'
+                    color='gray.300'
                     _icon={{ size: '40px' }}
                   />
                 )}

diff --git a/lib/common-lib/src/components/theme.ts b/lib/common-lib/src/components/theme.ts
@@ -316,8 +316,15 @@ const DEFAULT_THEME = {
       800: '#BDB3E7',
       900: '#BDB3E7'
     },
+    badgeColor: {
+      400: '#FDE68A',
+    },
+    progressBarColor: {
+      200 : '#10B981',
+    },
     gray:{
       100: '#616161',
+      300: '#888888',
     }
   }
 }