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

@@ -7,21 +7,7 @@ REACT_APP_APPSITE=" https://myfitapp.mermsemr.com"
 #REACT_APP_APPSITE="http://localhost:7012"
 
 
-# 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_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_AUX_ENDPOINT="https://api.myfit.ai/en/desktop/api/v2/myfit"
-REACT_APP_USERS_ENDPOINT="https://api.myfit.ai/en/desktop/api/v2/myfituser"
-
-REACT_APP_SESSION_EXPIRE_MINUTES=15
-
-REACT_APP_TRACKING="Tracking"
-REACT_APP_RESOURCES="Resources"
-REACT_APP_HISTORY="History"
-
-REACT_APP_TRACKING_SHOW=1
-REACT_APP_HISTORY_SHOW=1
-
-REACT_APP_RESOURCES_SHOW=1
-
-REACT_APP_VERSION_NO="DEF-CONFIG"
+REACT_APP_SESSION_EXPIRE_MINUTES = 5

.env.development

@@ -1,25 +0,0 @@
-SKIP_PREFLIGHT_CHECK=true 
-
-REACT_APP_FACEBOOK="https://www.facebook.com/profile.php?id=100066498622246"
-REACT_APP_TWITTER="https://twitter.com/fluxtra"
-
-REACT_APP_APPSITE=" https://myfitapp.mermsemr.com"
-#REACT_APP_APPSITE="http://localhost:7012"
-
-
-REACT_APP_AUX_ENDPOINT="https://devapi.myfit.ai/en/desktop/api/v2/myfit"
-REACT_APP_USERS_ENDPOINT="https://devapi.myfit.ai/en/desktop/api/v2/myfituser"
-# REACT_APP_PASSWORD_ENDPOINT="https://devapi.mermsemr.com/en/desktop/api/v2/myfituser/resetpass"
-
-REACT_APP_SESSION_EXPIRE_MINUTES=15
-
-REACT_APP_TRACKING="Tracking"
-REACT_APP_RESOURCES="Resources"
-REACT_APP_HISTORY="History"
-
-REACT_APP_TRACKING_SHOW=1
-REACT_APP_HISTORY_SHOW=1
-
-REACT_APP_RESOURCES_SHOW=1
-
-REACT_APP_VERSION_NO="DEV-CONFIG"

.env.production

@@ -1,25 +0,0 @@
-SKIP_PREFLIGHT_CHECK=true 
-
-REACT_APP_FACEBOOK="https://www.facebook.com/profile.php?id=100066498622246"
-REACT_APP_TWITTER="https://twitter.com/fluxtra"
-
-REACT_APP_APPSITE=" https://myfitapp.mermsemr.com"
-#REACT_APP_APPSITE="http://localhost:7012"
-
-REACT_APP_AUX_ENDPOINT="https://api.myfit.ai/en/desktop/api/v2/myfit"
-REACT_APP_USERS_ENDPOINT="https://api.myfit.ai/en/desktop/api/v2/myfituser"
-
-# REACT_APP_PASSWORD_ENDPOINT="https://api.mermsemr.com/en/desktop/api/v2/myfituser/resetpass"
-
-REACT_APP_SESSION_EXPIRE_MINUTES=15
-
-REACT_APP_TRACKING="Tracking"
-REACT_APP_RESOURCES="Resources"
-REACT_APP_HISTORY="History"
-
-REACT_APP_TRACKING_SHOW=0
-REACT_APP_HISTORY_SHOW=0
-
-REACT_APP_RESOURCES_SHOW=0
-
-REACT_APP_VERSION_NO="PROD-CONFIG"

.gitignore

@@ -5,9 +5,6 @@
 /.pnp
 .pnp.js
 
-/.idea
-/.vscode
-
 # testing
 /coverage
 

.gitlab-ci.yml

@@ -1,23 +0,0 @@
-build-job:
-  stage: build
-  script:
-    - echo "Hello, $GITLAB_USER_LOGIN!"
-
-test-job1:
-  stage: test
-  script:
-    - echo "This job tests something"
-
-test-job2:
-  stage: test
-  script:
-    - echo "This job tests something, but takes more time than test-job1."
-    - echo "After the echo commands complete, it runs the sleep command for 20 seconds"
-    - echo "which simulates a test that runs 20 seconds longer than test-job1"
-    - sleep 20
-
-deploy-prod:
-  stage: deploy
-  script:
-    - echo "This job deploys something from the $CI_COMMIT_BRANCH branch."
-  environment: production

.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": {

docker-compose.yml

@@ -1,7 +1,6 @@
 version: '3'
 services:
-  users-myfit:
-    image: registry.chiefsoft.net/users-myfit:latest
+  user-myfit:
     build:
       context: .
       dockerfile: docker/Dockerfile
@@ -17,10 +16,17 @@ services:
       - ./src/:/usr/src/app/src
       - ./vendors/:/usr/src/app/vendors
     extra_hosts:
-      - api.myfit.ai:10.10.33.15
-      - devapi.myfit.ai:10.10.33.15
+      - backend.wrenchboard.api.live:10.10.33.15
+      - backend.wrenchboard.api.test:10.10.33.15
+      # #- backend.wrenchboard.api.live:172.31.4.27
+      # #- backend.wrenchboard.api.test:10.20.30.27
+      - apigateway.wrenchboard.app.dev.fluxtra.net:10.20.30.19
+      - apigateway.wrenchboard.app.lotus.fluxtra.net:172.31.4.19
     environment:
       - CHOKIDAR_USEPOLLING=true
+   # volumes:
+   #   - ./:/app
+   #   - /app/node_modules
     tty: true
     stdin_open: true
     # working_dir: /app

package-lock.json

@@ -3011,22 +3011,6 @@
         "csstype": "^3.0.2"
       }
     },
-    "@types/react-calendar": {
-      "version": "3.9.0",
-      "resolved": "https://registry.npmjs.org/@types/react-calendar/-/react-calendar-3.9.0.tgz",
-      "integrity": "sha512-KpAu1MKAGFw5hNwlDnWsHWqI9i/igAB+8jH97YV7QpC2v7rlwNEU5i6VMFb73lGRacuejM/Zd2LklnEzkFV3XA==",
-      "requires": {
-        "@types/react": "*"
-      }
-    },
-    "@types/react-dom": {
-      "version": "18.0.10",
-      "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.0.10.tgz",
-      "integrity": "sha512-E42GW/JA4Qv15wQdqJq8DL4JhNpB3prJgjgapN3qJT9K2zO5IIAQh4VXvCEDupoqAwnz0cY4RlXeC/ajX5SFHg==",
-      "requires": {
-        "@types/react": "*"
-      }
-    },
     "@types/resolve": {
       "version": "1.17.1",
       "resolved": "https://registry.npmjs.org/@types/resolve/-/resolve-1.17.1.tgz",
@@ -3364,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",
@@ -4913,11 +4892,6 @@
       "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz",
       "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg=="
     },
-    "detect-element-overflow": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/detect-element-overflow/-/detect-element-overflow-1.3.1.tgz",
-      "integrity": "sha512-E29Axx3pyotgg3j5HUbusTTarjPUHsC02p7fZ3/cnUufyK0kx5RzRA9waBvrKFWGc/LWiRj3pD9Y3y+mymMYiQ=="
-    },
     "detect-newline": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz",
@@ -6516,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",
@@ -9507,11 +9473,6 @@
         }
       }
     },
-    "make-event-props": {
-      "version": "1.4.2",
-      "resolved": "https://registry.npmjs.org/make-event-props/-/make-event-props-1.4.2.tgz",
-      "integrity": "sha512-ZOHqRpLn2htnMd9zqhE+wticVr31PdwrJXHcvEEdKgrfjCOuSDn8urG9SDzEIqzP1ayp1uTdDJcOiTlJhqWpEQ=="
-    },
     "makeerror": {
       "version": "1.0.12",
       "resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.12.tgz",
@@ -11088,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",
@@ -11113,22 +11063,6 @@
         "countup.js": "^2.3.2"
       }
     },
-    "react-date-picker": {
-      "version": "9.2.0",
-      "resolved": "https://registry.npmjs.org/react-date-picker/-/react-date-picker-9.2.0.tgz",
-      "integrity": "sha512-kAE7HFLq1ic4pS0Pk9SyPTjejIfjTyPov04a2eZzLxfZh8ss8EPaaaX7bBUP4RUCkbxHpR0P4UHloD0/fFDCZw==",
-      "requires": {
-        "@types/react-calendar": "^3.0.0",
-        "@wojtekmaj/date-utils": "^1.0.3",
-        "clsx": "^1.2.1",
-        "get-user-locale": "^1.2.0",
-        "make-event-props": "^1.1.0",
-        "prop-types": "^15.6.0",
-        "react-calendar": "^4.0.0",
-        "react-fit": "^1.4.0",
-        "update-input-width": "^1.2.2"
-      }
-    },
     "react-dev-utils": {
       "version": "12.0.1",
       "resolved": "https://registry.npmjs.org/react-dev-utils/-/react-dev-utils-12.0.1.tgz",
@@ -11195,18 +11129,6 @@
       "resolved": "https://registry.npmjs.org/react-error-overlay/-/react-error-overlay-6.0.11.tgz",
       "integrity": "sha512-/6UZ2qgEyH2aqzYZgQPxEnz33NJ2gNsnHA2o5+o4wW9bLM/JYQitNP9xPhsXwC08hMMovfGe/8retsdDsczPRg=="
     },
-    "react-fit": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/react-fit/-/react-fit-1.5.0.tgz",
-      "integrity": "sha512-U9RxtM55RrNlGZp76r3QPWwSZ74r8NUOvwxwNOk+0vLlu/oJwP+6vjCkaOTw1hf8SzY0tmI07HwDdW/2CXYeLQ==",
-      "requires": {
-        "@types/react": "*",
-        "@types/react-dom": "*",
-        "detect-element-overflow": "^1.3.1",
-        "prop-types": "^15.6.0",
-        "tiny-warning": "^1.0.0"
-      }
-    },
     "react-is": {
       "version": "18.2.0",
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz",
@@ -12792,11 +12714,6 @@
       "resolved": "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz",
       "integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA=="
     },
-    "tiny-warning": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/tiny-warning/-/tiny-warning-1.0.3.tgz",
-      "integrity": "sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA=="
-    },
     "tmp": {
       "version": "0.0.33",
       "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
@@ -13011,11 +12928,6 @@
         "picocolors": "^1.0.0"
       }
     },
-    "update-input-width": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/update-input-width/-/update-input-width-1.3.1.tgz",
-      "integrity": "sha512-hV2DGiSn7FKerjIXaI3s0EG/AnmAeoRTV5cvpsFcygzUzKreYj5qSu7rVihzUOEXF/MP2mjJpUzwi14sZdp0nw=="
-    },
     "uri-js": {
       "version": "4.4.1",
       "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",

package.json

@@ -14,10 +14,8 @@
     "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-date-picker": "^9.2.0",
     "react-dom": "^18.0.0",
     "react-lottie": "^1.2.3",
     "react-redux": "^8.0.2",

src/Routers.jsx

@@ -3,7 +3,6 @@ import FourZeroFour from "./components/FourZeroFour";
 import ScrollToTop from "./components/Helpers/ScrollToTop";
 import MyCollection from "./components/MyCollection";
 import Notification from "./components/Notification";
-import ThankYou from "./components/AuthPages/ThankYou";
 import AuthRoute from "./middleware/AuthRoute";
 import AcitveBidsPage from "./views/AcitveBidsPage";
 import AuthProfilePage from "./views/AuthProfilePage";
@@ -23,16 +22,11 @@ import UpdatePasswordPages from "./views/UpdatePasswordPages";
 import UploadProductPage from "./views/UploadProductPage";
 import UserProfilePage from "./views/UserProfilePage";
 import VerifyYouPages from "./views/VerifyYouPages";
-import VerifySignupPage from "./views/VerifySignupPage";
 
 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";
-import TrackActionPage from "./views/TrackActionPage";
-import SubscriptionPage from "./views/SubscriptionPage";
-import VerifySignupCompletePage from "./views/VerifySignupCompletePage";
 
 export default function Routers() {
   return (
@@ -51,14 +45,7 @@ export default function Routers() {
           path="/update-password"
           element={<UpdatePasswordPages />}
         />
-        <Route
-          exact
-          path="/confirm-reset"
-          element={<ThankYou />}
-        />
         <Route exact path="/verify-you" element={<VerifyYouPages />} />
-        <Route exact path="/verify-signup" element={<VerifySignupPage />} />
-        <Route exact path="/complete-signup" element={<VerifySignupCompletePage />} />
 
         {/* private route */}
         <Route element={<AuthRoute />}>
@@ -70,17 +57,11 @@ 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="/add-reminder/:reminder_uuid" element={<RemindersAddPage />} />
           <Route exact path="/tracking" element={<TrackingPage />} />
           <Route exact path="/calendar" element={<CalendarPage />} />
           <Route exact path="/resources" element={<ResourcePage />} />
           <Route exact path="/my-wallet" element={<MyWalletPage />} />
           <Route exact path="/notification" element={<Notification />} />
-          <Route exact path="/subscription" element={<SubscriptionPage />} />
-
-          <Route exact path="/t-weight" element={<TrackingPage />} />
-          <Route exact path="/track-action/:trackpage" element={<TrackActionPage />} />
           <Route
             exact
             path="/my-collection/collection-item"