Merge branch 'master' of https://gitlab.chiefsoft.net/MyFit/users-myfit

src/components/AuthPages/AuthProfile/index.jsx

@@ -145,6 +145,7 @@ export default function AuthProfile() {
             </div>
 
           </div>
+          <ActivitiesTab />
         </div>
       </Layout>
     </>

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,21 +20,30 @@ export default function Login() {
   };
 
   // email
-  const [email, setMail] = useState("support@chiefsoft.com");
+  const [email, setMail] = useState("");
   const handleEmail = (e) => {
     setMail(e.target.value);
   };
   // password
-  const [password, setPassword] = useState("123456");
+  const [password, setPassword] = useState("");
   const handlePassword = (e) => {
     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 && loginResult.data.session_token !='') { // just for a start
         localStorage.setItem("email", `${email}`);
+        localStorage.setItem("session_token", `${loginResult.data.session_token}`);
         setLoginLoading(true);
+         // userApi.getUserReminders(); //testing
         setTimeout(() => {
           toast.success("Login Successfully");
           navigate("/", { replace: true });
@@ -57,7 +67,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 +76,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 +132,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 ${
-                      loginLoading ? "active" : ""
-                    }`}
+                    className={`btn-login  rounded-[50px] mb-6 text-xl text-white font-bold flex justify-center bg-purple items-center ${loginLoading ? "active" : ""
+                      }`}
                   >
                     {loginLoading ? (
                       <div className="signup btn-loader"></div>
@@ -133,7 +142,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>