Merge pull request #808 from Ahmed-Nasser99/issue-settings-navigation

Issue settings tabs navigation
idurar · Nov 15, 2023 · 246f595 · 246f595
2 parents d147256 + e20cc33
commit 246f595
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 25 deletions.
diff --git a/README.md b/README.md
@@ -102,7 +102,7 @@ This command will install all the required packages specified in the package.jso
 While still in the /backend directory of the project, execute the following command to run the setup script:
 
 ```bash
-node setup/setup.js
+npm run setup
 ```
 
 This setup script may perform necessary database migrations or any other initialization tasks required for the project.
@@ -134,7 +134,7 @@ npm install
 After installing the frontend dependencies, run the following command in the same terminal to start the frontend server:
 
 ```bash
-npm run start
+npm run dev
 ```
 
 This command will start the frontend server, and you'll be able to access the website on localhost:3000 in your web browser.
@@ -203,13 +203,6 @@ Now you should be all set to run the project locally on your machine and explore
 
 7.[Questions](https://github.com/idurar/idurar-erp-crm/blob/master/CONTRIBUTING.md#questions)
 
-## Star History
-
-Here you can see the proxy of our growth on the platform and that we're only getting started.
-
-But if you'd like to check it out more news and website you can always check it out on: https://www.idurarapp.com/.
-
-[![](image.png)](https://star-history.com/#idurar/idurar-erp-crm)
 
 ## License
 

diff --git a/frontend/src/pages/Settings/Settings.jsx b/frontend/src/pages/Settings/Settings.jsx
@@ -39,43 +39,47 @@ export default function Settings() {
     {
       key: 'generalSettings',
       label: (
-        <span onClick={() => handleTabChange('generalSettings')}>
-          {translate('General Settings')}
-        </span>
+        <div onClick={() => handleTabChange('generalSettings')}>
+        <SettingOutlined />
+        <span>  {translate('General Settings')}</span>
+      </div>
       ),
-      icon: <SettingOutlined />,
     },
     {
       key: 'appSettings',
       label: (
-        <span onClick={() => handleTabChange('appSettings')}>{translate('App Settings')}</span>
+        <div onClick={() => handleTabChange('appSettings')}>
+        <SettingOutlined />
+        <span>{translate('App Settings')}</span>
+      </div>
       ),
-      icon: <SettingOutlined />,
     },
     {
       key: 'moneyFormatSettings',
       label: (
-        <span onClick={() => handleTabChange('moneyFormatSettings')}>
-          {translate('Currency Settings')}
-        </span>
+        <div onClick={() => handleTabChange('moneyFormatSettings')}>
+          <DollarOutlined />
+         <span>{translate('Currency Settings')}</span> 
+        </div>
       ),
-      icon: <DollarOutlined />,
     },
     {
       key: 'paymentSettings',
       label: (
-        <span onClick={() => handleTabChange('paymentSettings')}>
-          {translate('Finance Settings')}
-        </span>
+        <div onClick={() => handleTabChange('paymentSettings')}>
+          <CreditCardOutlined />
+          <span>{translate('Finance Settings')}</span>
+        </div>
       ),
-      icon: <CreditCardOutlined />,
     },
     {
       key: 'invoiceSettings',
       label: (
-        <span onClick={() => handleTabChange('invoiceSettings')}>{translate('Crm Settings')}</span>
+        <div onClick={() => handleTabChange('invoiceSettings')}>
+          <FileTextOutlined />
+      <span>{translate('Crm Settings')}</span>    
+        </div>
       ),
-      icon: <FileTextOutlined />,
     },
   ];
   const [tabKey, setTabKey] = useState(items[0].key);