login implemented

.env

@@ -8,4 +8,4 @@ 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/myfitusers"
+REACT_APP_USERS_ENDPOINT = "https://devapi.mermsemr.com/en/desktop/api/v2/myfituser"

package.json

@@ -1,5 +1,5 @@
 {
-  "name": "nft-max-react",
+  "name": "myFit-App",
   "version": "0.1.0",
   "private": true,
   "dependencies": {
@@ -8,8 +8,10 @@
     "@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-chartjs-2": "^4.1.0",

src/components/AuthPages/Login/index.jsx

@@ -4,6 +4,7 @@ import { toast } from "react-toastify";
 import googleLogo from "../../../assets/images/google-logo.svg";
 // import titleShape from "../../../assets/images/shape/title-shape.svg";
 import titleShape from "../../../assets/images/shape/login_straight_underline.svg";
+import usersService from "../../../services/UsersService";
 import InputCom from "../../Helpers/Inputs/InputCom";
 import AuthLayout from "../AuthLayout";
 
@@ -19,7 +20,7 @@ export default function Login() {
   };
 
   // email
-  const [email, setMail] = useState("support@chiefsoft.com");
+  const [email, setMail] = useState("support@mermsemr.com");
   const handleEmail = (e) => {
     setMail(e.target.value);
   };
@@ -29,9 +30,16 @@ export default function Login() {
     setPassword(e.target.value);
   };
   const navigate = useNavigate();
-  const doLogin = () => {
+  const userApi = new usersService();
+  const doLogin = async () => {
     if (email !== "" && password !== "") {
-      if (email === "support@chiefsoft.com") {
+      var postData = {
+        username: email,
+        password: password
+      };
+      const loginResult = await userApi.logInUser(postData);  // just for a test
+      // if (email === "support@mermsemr.com") {
+      if (loginResult.data.status > 0) { // just for a start
         localStorage.setItem("email", `${email}`);
         setLoginLoading(true);
         setTimeout(() => {
@@ -57,7 +65,7 @@ export default function Login() {
               <h1 className="text-5xl font-bold leading-[74px]   text-dark-gray dark:text-white">
                 Log In
               </h1>
-              <div className="shape -mt-2">
+              <div className="shape mb-[10px]">
                 <img src={titleShape} alt="shape" />
               </div>
             </div>
@@ -66,7 +74,7 @@ export default function Login() {
                 <InputCom
                   value={email}
                   inputHandler={handleEmail}
-                  placeholder="support@chiefsoft.com"
+                  placeholder="support@mermsemr.com"
                   label="Email Address"
                   name="email"
                   type="email"
@@ -122,9 +130,8 @@ export default function Login() {
                   <button
                     onClick={doLogin}
                     type="button"
-                    className={`btn-login  rounded-[50px] mb-6 text-xl text-white font-bold flex justify-center bg-purple items-center ${
+                    className={`btn-login  rounded-[50px] mb-6 text-xl text-white font-bold flex justify-center bg-purple items-center ${loginLoading ? "active" : ""
-                      loginLoading ? "active" : ""
+                      }`}
-                    }`}
                   >
                     {loginLoading ? (
                       <div className="signup btn-loader"></div>
@@ -133,7 +140,7 @@ export default function Login() {
                     )}
                   </button>
                 </div>
-                {loginError && <p class="text-center text-red-600 pb-4">Invalid Credential</p>}
+                {loginError && <p class="text-center text-red-700 pb-4">Invalid username or password</p>}
                 <a
                   href="#"
                   className="w-full border border-light-purple dark:border-[#5356fb29]  rounded-[50px] h-[58px] flex justify-center bg-[#FAFAFA] dark:bg-[#11131F]  items-center"

src/components/AuthPages/SignUp/index.jsx

@@ -22,11 +22,11 @@ export default function SignUp() {
               </div>
               */}
               <div className="thumbnail flex justify-center">
-               {/*<img src={loginThumb} alt="login-thumb" /> */} 
+                {/*<img src={loginThumb} alt="login-thumb" /> */}
               </div>
               <div className="article w-[600px]">
                 <p className="text-[60px] font-bold leading-[72px] text-white">
-                Welcome to myFit
+                  Welcome to myFit
                 </p>
               </div>
             </div>
@@ -37,7 +37,7 @@ export default function SignUp() {
                     <h1 className="sm:text-5xl text-4xl font-bold  text-dark-gray dark:text-white leading-2">
                       Create Account
                     </h1>
-                    <div className="shape sm:w-[377px] w-[280px] -mt-2.5 ml-5">
+                    <div className="shape sm:w-[377px] w-[280px] mb-[10px] ml-5">
                       <img src={titleShape} alt="shape" />
                     </div>
                   </div>

src/services/SiteService.js

@@ -0,0 +1,83 @@
+import React from "react";
+import Axios from "axios";
+
+class SiteService {
+    constructor() {
+        console.log("Er are here anyway");
+    }
+    // Blog Data {Get}
+    blogData() {
+        return this.getAuxEnd("/blogdata", null);
+    }
+
+    // Country Data {GET}
+    countryData() {
+        return this.getAuxEnd("/country", null);
+    }
+
+    // Contact Data{POST}
+    contactData() {
+        return this.postAuxEnd("/contact", null)
+    }
+
+    faqData() {
+        return this.getAuxEnd("/faq", null);
+    }
+
+    priceData() {
+        return this.getAuxEnd("/pricing", null);
+    }
+
+    //----------------------------------------  -----
+    //----------------------------------------  -----
+    // Unified call below
+    //----------------------------------------  -----
+    //----------------------------------------  -----
+    getAuxEnd(uri, reqData) {
+        const endPoint = process.env.REACT_APP_AUX_ENDPOINT + uri;
+        return Axios.get(endPoint)
+            .then((response) => {
+                // console.log(response);
+                // res = response;
+                // console.log("~~~~~~~ Toks2 GET ~~~~~~~~");
+                return response;
+            })
+            .catch((error) => {
+                if (error.response) {
+                    //response status is an error code
+                    console.log(error.response.status);
+                } else if (error.request) {
+                    //response not received though the request was sent
+                    console.log(error.request);
+                } else {
+                    //an error occurred when setting up the request
+                    console.log(error.message);
+                }
+            });
+    }
+
+    postAuxEnd(uri, reqData) {
+        const endPoint = process.env.REACT_APP_AUX_ENDPOINT + uri;
+        return Axios.post(endPoint, reqData)
+            .then((response) => {
+                console.log(response);
+                // res = response;
+                console.log("~~~~~~~ Toks2 POST ~~~~~~~~");
+                return response;
+            })
+            .catch((error) => {
+                if (error.response) {
+                    //response status is an error code
+                    console.log(error.response.status);
+                } else if (error.request) {
+                    //response not received though the request was sent
+                    console.log(error.request);
+                } else {
+                    //an error occurred when setting up the request
+                    console.log(error.message);
+                }
+            });
+    }
+}
+
+export default SiteService;

src/services/UsersService.js

@@ -0,0 +1,91 @@
+import React from "react";
+import Axios from "axios";
+
+class usersService {
+    constructor() {
+        console.log("Er are here anyway");
+    }
+
+    logInUser(reqData) {
+       // debugger;
+        /*
+        clean up the request data here
+         */
+        return this.postAuxEnd("/login", reqData);
+    }
+
+    //----------------------------------------  -----
+    //----------------------------------------  -----
+    // Unified call below
+    //----------------------------------------  -----
+    //----------------------------------------  -----
+    getAuxEnd(uri, reqData) {
+        const endPoint = process.env.REACT_APP_USERS_ENDPOINT + uri;
+        return Axios.get(endPoint)
+            .then((response) => {
+                // console.log(response);
+                // res = response;
+                // console.log("~~~~~~~ Toks2 GET ~~~~~~~~");
+                return response;
+            })
+            .catch((error) => {
+                if (error.response) {
+                    //response status is an error code
+                    console.log(error.response.status);
+                } else if (error.request) {
+                    //response not received though the request was sent
+                    console.log(error.request);
+                } else {
+                    //an error occurred when setting up the request
+                    console.log(error.message);
+                }
+            });
+    }
+
+    postAuxEnd(uri, reqData) {
+        const endPoint = process.env.REACT_APP_USERS_ENDPOINT + uri;
+        const token = '..your token..'
+        let axiosConfig = {
+            headers: {
+                'Accept': 'application/json',
+                'Access-Control-Allow-Origin': '*',
+                'Content-Type': 'application/json;charset=UTF-8',
+                'Authorization': `Basic ${token}`,
+            }
+        };
+        //Access-Control-Allow-Origin
+        var postData = {
+            email: "test@test.com",
+            password: "password"
+        };
+      //  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)
+            .then((response) => {
+                console.log(response);
+                // res = response;
+                console.log("~~~~~~~ Toks2 POST ~~~~~~~~");
+                return response;
+            })
+            .catch((error) => {
+                if (error.response) {
+                    //response status is an error code
+                    console.log("ERROR-------------------------------------------------------");
+                    console.log(error.response.status);
+                    console.log("ERROR-------------------------------------------------------");
+                } else if (error.request) {
+                    //response not received though the request was sent
+                    console.log("ERROR2-------------------------------------------------------");
+                    console.log(error.request);
+                    console.log("ERROR2-------------------------------------------------------");
+                } else {
+                    //an error occurred when setting up the request
+                    console.log("ERROR3-------------------------------------------------------");
+                    console.log(error.message);
+                    console.log("ERROR3-------------------------------------------------------");
+                }
+            });
+    }
+}
+
+export default usersService;