Dev (#571)

* feat: new payment invoice module * fix edit btn on read page * fix amount showing balance * cleaning consoles and unused var * changing the amount input * constraint added on tax feild * create offer frontend feature * create lead frontend feature * revert frontend .env * revert frontend .env * revert offer model, create offer document * feature:#548 craeted new email editor page :backend init * feature:#548 craeted new email editor page :frontend init * feature:#548 created new email editor page :frontend init * feature:#548 created new email editor page :changes made * feature:#548 created new email editor page :changes made * feat: Create new component multi step select async (#469) * feat: Create new component multi step select async * feat: refactor multi-step select component to get its initial values dynamic * feat: made the multi step component more flexible --------- Co-authored-by: Maruf <thesharifi.maruf@gmail.com> * Feat: Create New Redux Settings Store (#556) * 💄 Improve UI of Settings Menu * ⚡️ improve settings performance * 🔧 Setup Redux Settings --------- Co-authored-by: Salah Eddine Lalami <50052356+idurar@users.noreply.github.com> * move backend to separate folder (#557) Co-authored-by: Salah Eddine Lalami <50052356+idurar@users.noreply.github.com> * update getting started in readme.md w.r.t recent folder structure change (#564) * 🐛 Fixing redirection to no found (#565) Co-authored-by: Salah Eddine Lalami <50052356+idurar@users.noreply.github.com> * 🚀 Settings Page : user can update (#559) * 💩 working on Dynamic Form * 🎨 layout and files Settings improved * ✨ New Settings Module * 🗃️ redux updateMany settings done * 🚀 Settings Module Done --------- Co-authored-by: Salah Eddine Lalami <50052356+idurar@users.noreply.github.com> * 🐛 fix bug caused by settings loading * 🚨 Fix Settings & persist in Local storage (#569) * 🚨 Fix Settings & persist in Local storage * 🔇 remove logs --------- Co-authored-by: Salah Eddine Lalami <50052356+idurar@users.noreply.github.com> * ⚡️ performance settings * 💄 fix menuNav minor bug * 🗃️ fix settings model minor bugs --------- Co-authored-by: polymahh <otman.elkantaoui@gmail.com> Co-authored-by: Ovilash Moitra <96794196+OvilashMoitra@users.noreply.github.com> Co-authored-by: Erando Putra <ando.putra@live.com> Co-authored-by: Erando Putra <38315094+Ando22@users.noreply.github.com> Co-authored-by: ritik kumar <sinharitik589> Co-authored-by: Maruf Sharifi <116145571+themarufsharifi@users.noreply.github.com> Co-authored-by: Maruf <thesharifi.maruf@gmail.com> Co-authored-by: Salah Eddine Lalami <50052356+idurar@users.noreply.github.com> Co-authored-by: sagar-joshi <42578673+sagar-joshi@users.noreply.github.com>
idurar · Sep 25, 2023 · f8a1efe · f8a1efe
1 parent d46c17c
commit f8a1efe
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/backend/models/coreModels/Setting.js b/backend/models/coreModels/Setting.js
@@ -13,7 +13,6 @@ const settingSchema = new mongoose.Schema({
   settingCategory: {
     type: String,
     required: true,
-    unique: true,
     lowercase: true,
   },
   settingKey: {

diff --git a/frontend/src/settings/useMoney.jsx b/frontend/src/settings/useMoney.jsx
@@ -1,10 +1,18 @@
 import React, { useState } from 'react';
 import currency from 'currency.js';
 
+import { useSelector } from 'react-redux';
+import storePersist from '@/redux/storePersist';
+
+
 import storePersist from '@/redux/storePersist';
 
 const useMoney = () => {
-  const settingsState = storePersist.get('settings') ? storePersist.get('settings') : undefined;
+
+  const moneyFormat = useSelector(selectMoneyFormat);
+
+  const settingsState = storePersist.get('settings') ? storePersist.get('settings') : moneyFormat;
+
 
   const {
     currency_symbol,

diff --git a/frontend/src/style/partials/customAntd.less b/frontend/src/style/partials/customAntd.less
@@ -74,6 +74,10 @@ h6 {
   font-weight: 700 !important;
 }
 
+.ant-menu-inline {
+  padding-bottom: 50px;
+}
+
 @media (prefers-reduced-motion: no-preference) {
   .App-logo {
     animation: App-logo-spin infinite 20s linear;