Updated Texts

.env

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

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

src/components/AuthPages/ForgotPassword/index.jsx

@@ -1,40 +1,10 @@
-import React, { useState, useEffect } from "react";
-import { Link, useNavigate } from 'react-router-dom';
+import React from "react";
+import { Link } from 'react-router-dom';
 import titleShape from "../../../assets/images/shape/title-shape-two.svg";
 import InputCom from "../../Helpers/Inputs/InputCom";
 import AuthLayout from "../AuthLayout";
 
 export default function ForgotPassword() {
-
-  const navigate = useNavigate();
-  const [validation, setValidation] = useState("")
-  const [buttonDisabled, setButtonDisabled] = useState(true)
-
-  // email
-  const [email, setEmail] = useState("");
-  const handleEmail = (e) => {
-    setEmail(e.target.value);
-  };
-
-
-  function validationChecker(email) {
-    const emailCheck = /^[^0-9][a-zA-Z0-9._%+-]+@[a-zA-Z]+(\.[a-zA-Z]+)+$/;
-    if (email === "") {
-      setValidation("email is required");
-
-    } else if (!email.match(emailCheck)) {
-      setValidation('Please input a valid email address');
-
-    } else {
-      setValidation("");
-      setButtonDisabled(false)
-    }
-  }
-
-  useEffect(() => {
-    validationChecker(email)
-  }, [email])
-
   return (
     <>
       <AuthLayout
@@ -58,24 +28,19 @@ export default function ForgotPassword() {
                   name="email"
                   type="email"
                   iconName="message"
-                  inputHandler={handleEmail}
-                  value={email}
                 />
-                {validation && <p className="my-5 font-bold  text-red-500">{validation}</p>}
               </div>
-
               <div className="signin-area mb-3.5">
-
-                <button
+                <a
+                  href="/verify-you"
                   className="w-full rounded-[50px] mb-5 h-[58px] text-xl text-white font-bold flex justify-center bg-purple items-center"
-                  disabled={buttonDisabled}
-                  onClick={() => navigate("/verify-you")}
                 >
                   Send Code
-                </button>
+                </a>
+
 
                 <Link to="/"
-                  className="my-40 font-bold flex justify-center text-red-500 items-center"
+                  className=" my-40 font-bold flex justify-center text-red-500 items-center"
                 >
                   Back to Home
                 </Link>

src/components/Settings/index.jsx

@@ -95,7 +95,7 @@ export default function Settings() {
             <div className="content-container w-full pt-10 rounded-2xl bg-white dark:bg-dark-white  ">
               <div className="content-heading w-full mb-8 lg:px-10 px-4">
                 <h1 className="text-xl font-bold text-dark-gray dark:text-white antialiased">
-                  Parsonal Informaiton
+                  Personal Information
                 </h1>
               </div>
               <div className="content-body w-full lg:flex lg:px-10 px-4">
@@ -144,7 +144,7 @@ export default function Settings() {
                       </div>
                       <div>
                         <p className="text-18 tracking-wide">
-                          Notifiction Setting
+                          Notification Settings
                         </p>
                       </div>
                     </li>

src/services/UsersService.js

@@ -15,7 +15,6 @@ class usersService {
         return this.postAuxEnd("/login", reqData);
     }
 
-
     getUserReminders(){
         return this.getAuxEnd("/reminders", null);
     }
@@ -56,16 +55,14 @@ class usersService {
             });
     }
 
-
     postAuxEnd(uri, reqData) {
         const endPoint = process.env.REACT_APP_USERS_ENDPOINT + uri;
-        const token = '..your token..'
+        const session_token = localStorage.getItem("session_token");
         let axiosConfig = {
             headers: {
                 'Accept': 'application/json',
-                'Access-Control-Allow-Origin': '*',
                 'Content-Type': 'application/json;charset=UTF-8',
-                'Authorization': `Basic ${token}`,
+                'Authorization': `Basic ${session_token}`,
             }
         };
         //Access-Control-Allow-Origin
@@ -75,7 +72,7 @@ class usersService {
         };
       //  Axios.defaults.headers.post['Content-Type'] ='application/json;charset=utf-8';
       //  Axios.defaults.headers.post['Access-Control-Allow-Origin'] = '*'; //,axiosConfig
-        return Axios.post(endPoint, reqData)
+        return Axios.post(endPoint, reqData,axiosConfig)
             .then((response) => {
                 console.log(response);
                 // res = response;

tailwind.config.js

@@ -19,6 +19,9 @@ module.exports = {
         "dark-light-purple":"#5356fb29"
       },
     },
+    listStyleType: {
+      roman: 'upper-roman'
+    },
   },
   plugins: [require("@tailwindcss/line-clamp")],
 };