Merge branch 'master' of https://gitlab.chiefsoft.net/MyFit/users-myfit into straight-underline-no-curvy_michael

# Conflicts:
#	src/components/AuthPages/Login/index.jsx

.env

@@ -9,9 +9,5 @@ REACT_APP_APPSITE=" https://myfitapp.mermsemr.com"
 
 REACT_APP_AUX_ENDPOINT = "https://devapi.mermsemr.com/en/desktop/api/v2/myfit"
 REACT_APP_USERS_ENDPOINT = "https://devapi.mermsemr.com/en/desktop/api/v2/myfituser"
-# REACT_APP_PASSWORD_ENDPOINT = "https://devapi.mermsemr.com/en/desktop/api/v2/myfituser/resetpass"
 
-REACT_APP_SESSION_EXPIRE_MINUTES = 5
-
-REACT_APP_TRACKING = "Tracking"
-REACT_APP_RESOURCES = "Resources"
+REACT_APP_SESSION_EXPIRE_MINUTES = 5

.idea/.gitignore

@@ -1,8 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml
-# Datasource local storage ignored files
-/dataSources/
-/dataSources.local.xml
-# Editor-based HTTP Client requests
-/httpRequests/

.idea/inspectionProfiles/Project_Default.xml

@@ -1,6 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0">
-    <option name="myName" value="Project Default" />
-    <inspection_tool class="Eslint" enabled="true" level="WARNING" enabled_by_default="true" />
-  </profile>
-</component>

.idea/vcs.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
-  </component>
-</project>

.vscode/settings.json

@@ -8,7 +8,7 @@
   },
   "[javascriptreact]": {
     "editor.formatOnSave": true,
-    "editor.defaultFormatter": "esbenp.prettier-vscode"
+    "editor.defaultFormatter": null
   },
   "javascript.validate.enable": false, //disable all built-in syntax checking
   "editor.codeActionsOnSave": {

package-lock.json

@@ -3348,11 +3348,6 @@
         "@xtuc/long": "4.2.2"
       }
     },
-    "@wojtekmaj/date-utils": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@wojtekmaj/date-utils/-/date-utils-1.1.2.tgz",
-      "integrity": "sha512-06PQad/6pyYDjInBW2ih4Oy30EAg0mtXTCz+b/fGwzN2JB2X2Zsa4QtHl4I8M+IaCKN8bwj61OW3XAWxh+D9hA=="
-    },
     "@xtuc/ieee754": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
@@ -6495,14 +6490,6 @@
         "get-intrinsic": "^1.1.1"
       }
     },
-    "get-user-locale": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/get-user-locale/-/get-user-locale-1.5.1.tgz",
-      "integrity": "sha512-WiNpoFRcHn1qxP9VabQljzGwkAQDrcpqUtaP0rNBEkFxJdh4f3tik6MfZsMYZc+UgQJdGCxWEjL9wnCUlRQXag==",
-      "requires": {
-        "lodash.memoize": "^4.1.1"
-      }
-    },
     "glob": {
       "version": "7.2.3",
       "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
@@ -11062,17 +11049,6 @@
         }
       }
     },
-    "react-calendar": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/react-calendar/-/react-calendar-4.0.0.tgz",
-      "integrity": "sha512-y9Q5Oo3Mq869KExbOCP3aJ3hEnRZKZ0TqUa9QU1wJGgDZFrW1qTaWp5v52oZpmxTTrpAMTUcUGaC0QJcO1f8Nw==",
-      "requires": {
-        "@wojtekmaj/date-utils": "^1.0.2",
-        "clsx": "^1.2.1",
-        "get-user-locale": "^1.2.0",
-        "prop-types": "^15.6.0"
-      }
-    },
     "react-chartjs-2": {
       "version": "4.3.1",
       "resolved": "https://registry.npmjs.org/react-chartjs-2/-/react-chartjs-2-4.3.1.tgz",

package.json

@@ -14,7 +14,6 @@
     "cors": "^2.8.5",
     "faker": "^6.6.6",
     "react": "^18.0.0",
-    "react-calendar": "^4.0.0",
     "react-chartjs-2": "^4.1.0",
     "react-countup": "^6.2.0",
     "react-dom": "^18.0.0",

src/App.jsx

@@ -1,4 +1,4 @@
-// import Toaster from "./components/Helpers/Toaster";
+import Toaster from "./components/Helpers/Toaster";
 import Routers from "./Routers";
 import Default from "./components/Partials/Default";
 
@@ -7,7 +7,7 @@ function App() {
       <Default>
           <>
               <Routers />
-              {/* <Toaster /> */}
+              <Toaster />
           </>
       </Default>
   );

src/Routers.jsx

@@ -24,7 +24,6 @@ import UserProfilePage from "./views/UserProfilePage";
 import VerifyYouPages from "./views/VerifyYouPages";
 
 import RemindersPage from './views/RemindersPage';
-import RemindersAddPage from './views/RemindersAddPage';
 import TrackingPage from "./views/TrackingPage";
 import CalendarPage from "./views/CalendarPage";
 import ResourcePage from "./views/ResourcePage";
@@ -58,7 +57,6 @@ export default function Routers() {
           <Route exact path="/my-wallet" element={<MyWalletPage />} />
           <Route exact path="/my-collection" element={<MyCollection />} />*/}
           <Route exact path="/reminders" element={<RemindersPage />} />
-          <Route exact path="/add-reminder" element={<RemindersAddPage />} />
           <Route exact path="/tracking" element={<TrackingPage />} />
           <Route exact path="/calendar" element={<CalendarPage />} />
           <Route exact path="/resources" element={<ResourcePage />} />