Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 ChineseChikki
|
568de8c8ec |
@@ -8,7 +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/myfituser"
|
||||
# REACT_APP_PASSWORD_ENDPOINT = "https://devapi.mermsemr.com/en/desktop/api/v2/myfituser/resetpass"
|
||||
|
||||
REACT_APP_SESSION_EXPIRE_MINUTES = 5
|
||||
REACT_APP_USERS_ENDPOINT = "https://devapi.mermsemr.com/en/desktop/api/v2/myfitusers"
|
||||
Generated
-13751
File diff suppressed because it is too large
Load Diff
+1
-3
@@ -1,5 +1,5 @@
|
||||
{
|
||||
"name": "myFit-App",
|
||||
"name": "nft-max-react",
|
||||
"version": "0.1.0",
|
||||
"private": true,
|
||||
"dependencies": {
|
||||
@@ -8,10 +8,8 @@
|
||||
"@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",
|
||||
|
||||
@@ -145,7 +145,6 @@ export default function AuthProfile() {
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<ActivitiesTab />
|
||||
</div>
|
||||
</Layout>
|
||||
</>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -4,7 +4,6 @@ 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";
|
||||
|
||||
@@ -20,30 +19,21 @@ export default function Login() {
|
||||
};
|
||||
|
||||
// email
|
||||
const [email, setMail] = useState("");
|
||||
const [email, setMail] = useState("support@chiefsoft.com");
|
||||
const handleEmail = (e) => {
|
||||
setMail(e.target.value);
|
||||
};
|
||||
// password
|
||||
const [password, setPassword] = useState("");
|
||||
const [password, setPassword] = useState("123456");
|
||||
const handlePassword = (e) => {
|
||||
setPassword(e.target.value);
|
||||
};
|
||||
const navigate = useNavigate();
|
||||
const userApi = new usersService();
|
||||
const doLogin = async () => {
|
||||
const doLogin = () => {
|
||||
if (email !== "" && password !== "") {
|
||||
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
|
||||
if (email === "support@chiefsoft.com") {
|
||||
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 });
|
||||
@@ -67,7 +57,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 mb-[10px]">
|
||||
<div className="shape -mt-2">
|
||||
<img src={titleShape} alt="shape" />
|
||||
</div>
|
||||
</div>
|
||||
@@ -76,7 +66,7 @@ export default function Login() {
|
||||
<InputCom
|
||||
value={email}
|
||||
inputHandler={handleEmail}
|
||||
placeholder="support@mermsemr.com"
|
||||
placeholder="support@chiefsoft.com"
|
||||
label="Email Address"
|
||||
name="email"
|
||||
type="email"
|
||||
|
||||
@@ -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] mb-[10px] ml-5">
|
||||
<div className="shape sm:w-[377px] w-[280px] -mt-2.5 ml-5">
|
||||
<img src={titleShape} alt="shape" />
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -104,7 +104,9 @@ export default function SellHistoryMarketVisitorAnalytic({ className }) {
|
||||
}`}
|
||||
>
|
||||
<div className="content-wrapper w-full lg:flex xl:space-x-8 lg:space-x-4">
|
||||
|
||||
<div className="lg:w-1/2 w-full mb-10 lg:mb-0">
|
||||
<SellHistoryWidget />
|
||||
</div>
|
||||
<div className="flex-1 ">
|
||||
<div className="market-visitor w-full md:p-8 p-4 h-full bg-white dark:bg-dark-white overflow-hidden rounded-2xl section-shadow">
|
||||
<div className="flex flex-col justify-between h-full">
|
||||
@@ -125,11 +127,6 @@ export default function SellHistoryMarketVisitorAnalytic({ className }) {
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div className="lg:w-1/2 w-full mb-10 lg:mb-0">
|
||||
<SellHistoryWidget />
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -1,29 +1,12 @@
|
||||
import React from 'react'
|
||||
import HistoryAnalyticsCard from '../Cards/HistoryAnalyticsCard'
|
||||
import Layout from '../Partials/Layout'
|
||||
import ReminderTable from './ReminderTable'
|
||||
import { Link } from 'react-router-dom'
|
||||
import React from "react";
|
||||
import HistoryAnalyticsCard from "../Cards/HistoryAnalyticsCard";
|
||||
import Layout from "../Partials/Layout";
|
||||
import ReminderTable from "./ReminderTable";
|
||||
|
||||
export default function Reminders() {
|
||||
return (
|
||||
<>
|
||||
<Layout>
|
||||
<div className="content-wrapper-profile-only w-full mb-6">
|
||||
<div className="auth-tab-content relative mb-10">
|
||||
<div className="lg:flex justify-between">
|
||||
<div className="tab-items"></div>
|
||||
<div style={{ transform: 'translateY(-22px)' }}>
|
||||
<Link
|
||||
to="/add-reminder"
|
||||
className="btn-gradient lg:flex hidden w-[153px] h-[46px] rounded-full text-white justify-center items-center"
|
||||
>
|
||||
Add Reminder
|
||||
</Link>
|
||||
</div>
|
||||
</div>
|
||||
<div className="hidden lg:block w-full h-[1px] bg-[#DCD5FE] dark:bg-[#5356fb29] absolute top-[42px] left-0"></div>
|
||||
</div>
|
||||
</div>
|
||||
<div className="history-wrapper w-full mb-10">
|
||||
<div className="main-wrapper w-full">
|
||||
<ReminderTable />
|
||||
@@ -31,5 +14,5 @@ export default function Reminders() {
|
||||
</div>
|
||||
</Layout>
|
||||
</>
|
||||
)
|
||||
);
|
||||
}
|
||||
|
||||
@@ -8,135 +8,246 @@ export default function LoginActivityTab() {
|
||||
<table className="w-full text-sm text-left text-gray-500 dark:text-gray-400">
|
||||
<tbody>
|
||||
<tr className="text-base text-thin-light-gray border-b dark:border-[#5356fb29] default-border-b dark:border-[#5356fb29] ottom ">
|
||||
<td className="py-4 text-center">Channel</td>
|
||||
<td className="py-4 text-center">Date</td>
|
||||
<td className="py-4 text-center">OS</td>
|
||||
<td className="py-4 text-center">Browser</td>
|
||||
<td className="py-4 text-center">Location</td>
|
||||
<td className="py-4 text-center">Last session</td>
|
||||
<td className="py-4 text-center">Status</td>
|
||||
<td className="py-4 text-center"></td>
|
||||
</tr>
|
||||
<tr className="bg-white dark:bg-dark-white border-b dark:border-[#5356fb29] hover:bg-gray-50">
|
||||
<td className="text-center py-4">
|
||||
<div className="flex items-center justify-center">
|
||||
<span className="text-base text-dark-gray dark:text-white font-medium whitespace-nowrap px-2">
|
||||
Desktop
|
||||
Windows
|
||||
</span>
|
||||
</div>
|
||||
</td>
|
||||
<td className="text-center py-4">
|
||||
<div className="flex space-x-1 items-center justify-center">
|
||||
<span className="text-base text-dark-gray dark:text-white font-medium whitespace-nowrap px-2">
|
||||
10-10-2035
|
||||
Google Chrome
|
||||
</span>
|
||||
</div>
|
||||
</td>
|
||||
<td className="text-center py-4">
|
||||
<span className="text-base text-dark-gray dark:text-white whitespace-nowrap px-2">
|
||||
10.0.0.1000
|
||||
Dhaka , Bangladesh
|
||||
</span>
|
||||
</td>
|
||||
<td className="text-center py-4">
|
||||
<span className="text-base text-thin-light-gray font-medium whitespace-nowrap px-2">
|
||||
2 days ago
|
||||
</span>
|
||||
</td>
|
||||
<td className="text-center py-4">
|
||||
<span className="text-sm px-[10px] py-[6px] rounded-full bg-light-green text-white capitalize">
|
||||
active
|
||||
</span>
|
||||
</td>
|
||||
<td className="text-center py-4">
|
||||
<button
|
||||
type="button"
|
||||
className=" text-thin-light-gray hover:text-red-400"
|
||||
>
|
||||
<Icons name="deep-delete" />
|
||||
</button>
|
||||
</td>
|
||||
</tr>
|
||||
<tr className="bg-white dark:bg-dark-white border-b dark:border-[#5356fb29] hover:bg-gray-50">
|
||||
<td className="text-center py-4">
|
||||
<div className="flex items-center justify-center">
|
||||
<span className="text-base text-dark-gray dark:text-white font-medium whitespace-nowrap px-2">
|
||||
Desktop
|
||||
Mac
|
||||
</span>
|
||||
</div>
|
||||
</td>
|
||||
<td className="text-center py-4">
|
||||
<div className="flex space-x-1 items-center justify-center">
|
||||
<span className="text-base text-dark-gray dark:text-white font-medium whitespace-nowrap px-2">
|
||||
10-10-2035
|
||||
Firefox
|
||||
</span>
|
||||
</div>
|
||||
</td>
|
||||
<td className="text-center py-4">
|
||||
<span className="text-base text-dark-gray dark:text-white whitespace-nowrap px-2">
|
||||
10.0.0.1000
|
||||
Tokyo,japan
|
||||
</span>
|
||||
</td>
|
||||
<td className="text-center py-4">
|
||||
<span className="text-base text-thin-light-gray font-medium whitespace-nowrap px-2">
|
||||
5 days ago
|
||||
</span>
|
||||
</td>
|
||||
<td className="text-center py-4">
|
||||
<span className="text-sm px-[10px] py-[6px] rounded-full bg-light-red text-white capitalize">
|
||||
Inactive
|
||||
</span>
|
||||
</td>
|
||||
<td className="text-center py-4">
|
||||
<button
|
||||
type="button"
|
||||
className=" text-thin-light-gray hover:text-red-400"
|
||||
>
|
||||
<Icons name="deep-delete" />
|
||||
</button>
|
||||
</td>
|
||||
</tr>
|
||||
<tr className="bg-white dark:bg-dark-white border-b dark:border-[#5356fb29] hover:bg-gray-50">
|
||||
<td className="text-center py-4">
|
||||
<div className="flex items-center justify-center">
|
||||
<span className="text-base text-dark-gray dark:text-white font-medium whitespace-nowrap px-2">
|
||||
Desktop
|
||||
App
|
||||
</span>
|
||||
</div>
|
||||
</td>
|
||||
<td className="text-center py-4">
|
||||
<div className="flex space-x-1 items-center justify-center">
|
||||
<span className="text-base text-dark-gray dark:text-white font-medium whitespace-nowrap px-2">
|
||||
10-10-2035
|
||||
App
|
||||
</span>
|
||||
</div>
|
||||
</td>
|
||||
<td className="text-center py-4">
|
||||
<span className="text-base text-dark-gray dark:text-white whitespace-nowrap px-2">
|
||||
10.0.0.1000
|
||||
Barhin,Dubai
|
||||
</span>
|
||||
</td>
|
||||
<td className="text-center py-4">
|
||||
<span className="text-base text-thin-light-gray font-medium whitespace-nowrap px-2">
|
||||
2 days ago
|
||||
</span>
|
||||
</td>
|
||||
<td className="text-center py-4">
|
||||
<span className="text-sm px-[10px] py-[6px] rounded-full bg-light-green text-white capitalize">
|
||||
active
|
||||
</span>
|
||||
</td>
|
||||
<td className="text-center py-4">
|
||||
<button
|
||||
type="button"
|
||||
className=" text-thin-light-gray hover:text-red-400"
|
||||
>
|
||||
<Icons name="deep-delete" />
|
||||
</button>
|
||||
</td>
|
||||
</tr>
|
||||
<tr className="bg-white dark:bg-dark-white border-b dark:border-[#5356fb29] hover:bg-gray-50">
|
||||
<td className="text-center py-4">
|
||||
<div className="flex items-center justify-center">
|
||||
<span className="text-base text-dark-gray dark:text-white font-medium whitespace-nowrap px-2">
|
||||
Desktop
|
||||
Windows
|
||||
</span>
|
||||
</div>
|
||||
</td>
|
||||
<td className="text-center py-4">
|
||||
<div className="flex space-x-1 items-center justify-center">
|
||||
<span className="text-base text-dark-gray dark:text-white font-medium whitespace-nowrap px-2">
|
||||
10-10-2035
|
||||
Google Chrome
|
||||
</span>
|
||||
</div>
|
||||
</td>
|
||||
<td className="text-center py-4">
|
||||
<span className="text-base text-dark-gray dark:text-white whitespace-nowrap px-2">
|
||||
10.0.0.1000
|
||||
Dhaka , Bangladesh
|
||||
</span>
|
||||
</td>
|
||||
<td className="text-center py-4">
|
||||
<span className="text-base text-thin-light-gray font-medium whitespace-nowrap px-2">
|
||||
2 days ago
|
||||
</span>
|
||||
</td>
|
||||
<td className="text-center py-4">
|
||||
<span className="text-sm px-[10px] py-[6px] rounded-full bg-light-green text-white capitalize">
|
||||
active
|
||||
</span>
|
||||
</td>
|
||||
<td className="text-center py-4">
|
||||
<button
|
||||
type="button"
|
||||
className=" text-thin-light-gray hover:text-red-400"
|
||||
>
|
||||
<Icons name="deep-delete" />
|
||||
</button>
|
||||
</td>
|
||||
</tr>
|
||||
<tr className="bg-white dark:bg-dark-white border-b dark:border-[#5356fb29] hover:bg-gray-50">
|
||||
<td className="text-center py-4">
|
||||
<div className="flex items-center justify-center">
|
||||
<span className="text-base text-dark-gray dark:text-white font-medium whitespace-nowrap px-2">
|
||||
Desktop
|
||||
Mac
|
||||
</span>
|
||||
</div>
|
||||
</td>
|
||||
<td className="text-center py-4">
|
||||
<div className="flex space-x-1 items-center justify-center">
|
||||
<span className="text-base text-dark-gray dark:text-white font-medium whitespace-nowrap px-2">
|
||||
10-10-2035
|
||||
Firefox
|
||||
</span>
|
||||
</div>
|
||||
</td>
|
||||
<td className="text-center py-4">
|
||||
<span className="text-base text-dark-gray dark:text-white whitespace-nowrap px-2">
|
||||
10.0.0.1000
|
||||
Tokyo,japan
|
||||
</span>
|
||||
</td>
|
||||
<td className="text-center py-4">
|
||||
<span className="text-base text-thin-light-gray font-medium whitespace-nowrap px-2">
|
||||
5 days ago
|
||||
</span>
|
||||
</td>
|
||||
<td className="text-center py-4">
|
||||
<span className="text-sm px-[10px] py-[6px] rounded-full bg-light-red text-white capitalize">
|
||||
Inactive
|
||||
</span>
|
||||
</td>
|
||||
<td className="text-center py-4">
|
||||
<button
|
||||
type="button"
|
||||
className=" text-thin-light-gray hover:text-red-400"
|
||||
>
|
||||
<Icons name="deep-delete" />
|
||||
</button>
|
||||
</td>
|
||||
</tr>
|
||||
<tr className="bg-white dark:bg-dark-white border-b dark:border-[#5356fb29] hover:bg-gray-50">
|
||||
<td className="text-center py-4">
|
||||
<div className="flex items-center justify-center">
|
||||
<span className="text-base text-dark-gray dark:text-white font-medium whitespace-nowrap px-2">
|
||||
Mobile
|
||||
App
|
||||
</span>
|
||||
</div>
|
||||
</td>
|
||||
<td className="text-center py-4">
|
||||
<div className="flex space-x-1 items-center justify-center">
|
||||
<span className="text-base text-dark-gray dark:text-white font-medium whitespace-nowrap px-2">
|
||||
10-10-2035
|
||||
App
|
||||
</span>
|
||||
</div>
|
||||
</td>
|
||||
<td className="text-center py-4">
|
||||
<span className="text-base text-dark-gray dark:text-white whitespace-nowrap px-2">
|
||||
10.0.0.1000
|
||||
Barhin,Dubai
|
||||
</span>
|
||||
</td>
|
||||
<td className="text-center py-4">
|
||||
<span className="text-base text-thin-light-gray font-medium whitespace-nowrap px-2">
|
||||
2 days ago
|
||||
</span>
|
||||
</td>
|
||||
<td className="text-center py-4">
|
||||
<span className="text-sm px-[10px] py-[6px] rounded-full bg-light-green text-white capitalize">
|
||||
active
|
||||
</span>
|
||||
</td>
|
||||
<td className="text-center py-4">
|
||||
<button
|
||||
type="button"
|
||||
className=" text-thin-light-gray hover:text-red-400"
|
||||
>
|
||||
<Icons name="deep-delete" />
|
||||
</button>
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
@@ -1,83 +0,0 @@
|
||||
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;
|
||||
@@ -1,106 +0,0 @@
|
||||
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
|
||||
*/
|
||||
localStorage.setItem("session_token", ``);
|
||||
return this.postAuxEnd("/login", reqData);
|
||||
}
|
||||
|
||||
|
||||
getUserReminders(){
|
||||
return this.getAuxEnd("/reminders", null);
|
||||
}
|
||||
//---------------------------------------- -----
|
||||
//---------------------------------------- -----
|
||||
// Unified call below
|
||||
//---------------------------------------- -----
|
||||
//---------------------------------------- -----
|
||||
getAuxEnd(uri, reqData) {
|
||||
debugger;
|
||||
const session_token = localStorage.getItem("session_token");
|
||||
let axiosConfig = {
|
||||
headers: {
|
||||
'Accept': 'application/json',
|
||||
'Content-Type': 'application/json;charset=UTF-8',
|
||||
'Authorization': `Basic ${session_token}`,
|
||||
}
|
||||
};
|
||||
const endPoint = process.env.REACT_APP_USERS_ENDPOINT + uri;
|
||||
return Axios.get(endPoint,axiosConfig)
|
||||
.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;
|
||||
Reference in New Issue
Block a user