Merge branch 'main' of github.com:WBG-Coach/coach-admin-sl

WBG-Coach · Aug 2, 2023 · 112c7e5 · 112c7e5
2 parents 8d1890e + ed572cb
commit 112c7e5
Show file tree

Hide file tree

Showing 4 changed files with 50 additions and 27 deletions.
diff --git a/src/pages/Settings/EditUser/index.tsx b/src/pages/Settings/EditUser/index.tsx
@@ -21,7 +21,7 @@ const EditUser = () => {
         General
       </Text>
       <Text fontWeight={400} mt={'4px'} color={'Gray.$700'}>
-        Update your photo and your information.
+        Update your information.
       </Text>
 
       <Center w={'100%'} my={'40px'}>

diff --git a/src/pages/Settings/Users/Form/index.tsx b/src/pages/Settings/Users/Form/index.tsx
@@ -10,7 +10,6 @@ import {
   DrawerFooter,
   DrawerHeader,
   DrawerOverlay,
-  FormControl,
   FormErrorMessage,
   FormLabel,
   Input,
@@ -41,21 +40,33 @@ const UserForm: React.FC<Props> = ({ defaultValues, handleSubmitForm, handleClos
           <DrawerHeader>{defaultValues && 'id' in defaultValues ? 'Update user' : 'New user'}</DrawerHeader>
 
           <DrawerBody>
-            <FormControl isInvalid={!!errors.name}>
-              <FormLabel htmlFor="name">Name</FormLabel>
-              <Controller
-                rules={{ required: true }}
-                control={control}
-                name="name"
-                render={({ field, fieldState }) => (
-                  <Input id="name" {...field} value={field.value} isInvalid={!!fieldState.error} />
-                )}
-              />
+            <FormLabel htmlFor="name">Name</FormLabel>
+            <Controller
+              rules={{ required: true }}
+              control={control}
+              name="name"
+              render={({ field, fieldState }) => (
+                <Input id="name" {...field} value={field.value} isInvalid={!!fieldState.error} />
+              )}
+            />
 
-              <FormErrorMessage>
-                {errors.name && errors.name.type === 'required' && 'Name is required'}
-              </FormErrorMessage>
-            </FormControl>
+            <FormErrorMessage>{errors.name && errors.name.type === 'required' && 'Name is required'}</FormErrorMessage>
+
+            <FormLabel htmlFor="name" style={{ marginTop: '8px' }}>
+              Email
+            </FormLabel>
+            <Controller
+              rules={{ required: true }}
+              control={control}
+              name="email"
+              render={({ field, fieldState }) => (
+                <Input id="email" {...field} value={field.value} isInvalid={!!fieldState.error} />
+              )}
+            />
+
+            <FormErrorMessage>
+              {errors.email && errors.email.type === 'required' && 'Email is required'}
+            </FormErrorMessage>
           </DrawerBody>
 
           <DrawerFooter mt="auto">

diff --git a/src/pages/Settings/index.tsx b/src/pages/Settings/index.tsx
@@ -1,15 +1,17 @@
 import { Box, HStack, Text, VStack } from '@chakra-ui/react';
-import { useState } from 'react';
+import { useContext, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import EditUser from './EditUser';
 import ChangePassword from './ChangePassword';
 import Users from './Users';
 import Icon from '@/components/Base/Icon';
 import HeaderPage from '@/components/HeaderPage';
 import Logs from './Logs';
+import { UserContext } from '@/contexts/UserContext';
 
 const SettingsPage: React.FC = () => {
   const { t } = useTranslation();
+  const { user } = useContext(UserContext);
   const [currentOption, setCurrentOption] = useState(0);
   const options = [
     {
@@ -22,16 +24,25 @@ const SettingsPage: React.FC = () => {
       icon: 'lock',
       component: <ChangePassword />,
     },
-    {
-      label: t('settings.tabs.users.title'),
-      icon: 'user',
-      component: <Users />,
-    },
-    {
-      label: t('settings.tabs.logs.title'),
-      icon: 'receipt-alt',
-      component: <Logs />,
-    },
+    ...(user?.role === 'admin'
+      ? [
+          {
+            label: t('settings.tabs.users.title'),
+            icon: 'user',
+            component: <Users />,
+          },
+        ]
+      : []),
+
+    ...(user?.role === 'admin'
+      ? [
+          {
+            label: t('settings.tabs.logs.title'),
+            icon: 'receipt-alt',
+            component: <Logs />,
+          },
+        ]
+      : []),
   ];
 
   return (

diff --git a/src/types/index.ts b/src/types/index.ts
@@ -25,6 +25,7 @@ export interface IUser {
   id: string;
   email: string;
   name: string;
+  role: 'analist' | 'admin';
   password: string;
 }