Registry switch

This reverts commit d13ddd5cec.

.env

@@ -7,5 +7,21 @@ 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/myfitusers"
+# 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"

.env.development

@@ -0,0 +1,25 @@
+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

@@ -0,0 +1,25 @@
+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,6 +5,9 @@
 /.pnp
 .pnp.js
 
+/.idea
+/.vscode
+
 # testing
 /coverage
 

.gitlab-ci.yml

@@ -0,0 +1,23 @@
+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

@@ -0,0 +1,8 @@
+# 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

@@ -0,0 +1,6 @@
+<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

@@ -0,0 +1,6 @@
+<?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": null
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
   },
   "javascript.validate.enable": false, //disable all built-in syntax checking
   "editor.codeActionsOnSave": {

docker-compose.yml

@@ -1,6 +1,7 @@
 version: '3'
 services:
-  user-myfit:
+  users-myfit:
+    image: registry.chiefsoft.net/users-myfit:latest
     build:
       context: .
       dockerfile: docker/Dockerfile
@@ -16,17 +17,10 @@ services:
       - ./src/:/usr/src/app/src
       - ./vendors/:/usr/src/app/vendors
     extra_hosts:
-      - 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
+      - api.myfit.ai:10.10.33.15
+      - devapi.myfit.ai:10.10.33.15
     environment:
       - CHOKIDAR_USEPOLLING=true
-   # volumes:
-   #   - ./:/app
-   #   - /app/node_modules
     tty: true
     stdin_open: true
     # working_dir: /app

package.json

@@ -1,5 +1,5 @@
 {
-  "name": "nft-max-react",
+  "name": "myFit-App",
   "version": "0.1.0",
   "private": true,
   "dependencies": {
@@ -8,12 +8,16 @@
     "@testing-library/jest-dom": "^5.11.4",
     "@testing-library/react": "^11.1.0",
     "@testing-library/user-event": "^12.1.10",
+    "axios": "^0.24.0",
     "chart.js": "^3.7.1",
     "chartjs": "^0.3.24",
+    "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",

public/index.html

@@ -2,13 +2,10 @@
 <html lang="en">
   <head>
     <meta charset="utf-8" />
-    <link rel="icon" href="%PUBLIC_URL%/favicon.svg" />
+    <link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <meta name="theme-color" content="#000000" />
-    <meta
-      name="description"
-      content="Web site created using create-react-app"
-    />
+    <meta name="description" content="Cloud-based electronic health record platform for all users. patient health record, family health record">
     <meta name="developed" content="MERMS-myFit" />
     <meta name="published" content="MERMS-myFit" />
     <link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />

src/Routers.jsx

@@ -3,6 +3,7 @@ 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";
@@ -22,6 +23,16 @@ 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 (
@@ -40,17 +51,36 @@ 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 />}>
           <Route exact path="/" element={<HomePages />} />
-          <Route exact path="/active-bids" element={<AcitveBidsPage />} />
+          {/*  <Route exact path="/active-bids" element={<AcitveBidsPage />} />
           <Route exact path="/notification" element={<Notification />} />
           <Route exact path="/market-place" element={<MarketPlacePage />} />
           <Route exact path="/shop-details" element={<ShopDetailsPage />} />
           <Route exact path="/my-wallet" element={<MyWalletPage />} />
-          <Route exact path="/my-collection" element={<MyCollection />} />
+          <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"