diff --git a/.env b/.env index 4fcdc31..2c78ad5 100644 --- a/.env +++ b/.env @@ -7,7 +7,11 @@ 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/myfituser" +REACT_APP_AUX_ENDPOINT = "http://10.20.30.32:9083/svs/user" +REACT_APP_USERS_ENDPOINT = "http://10.20.30.32:9083/svs/user" +#"https://devapi.mermsemr.com/en/desktop/api/v2/myfituser" -REACT_APP_SESSION_EXPIRE_MINUTES = 5 \ No newline at end of file +REACT_APP_SESSION_EXPIRE_MINUTES = 5 + +#apigate.lotus.g1.wrenchboard.com:76.209.103.227 +#apigate.orion.g1.wrenchboard.com:76.209.103.227 diff --git a/.gitignore b/.gitignore index 4d29575..40b3a5e 100644 --- a/.gitignore +++ b/.gitignore @@ -10,7 +10,8 @@ # production /build - +/.idea +/.vscode # misc .DS_Store .env.local diff --git a/.vscode/settings.json b/.vscode/settings.json index 83c1aa6..cae0529 100644 --- a/.vscode/settings.json +++ b/.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": { diff --git a/docker-compose.yml b/docker-compose.yml index fe1749d..cf98c6d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,12 +1,12 @@ version: '3' services: - user-myfit: + user-wrench: build: context: . dockerfile: docker/Dockerfile restart: unless-stopped ports: - - 7012:3000 + - 5010:3000 # - 3800:3011 # stdin_open: true working_dir: /usr/src/app diff --git a/public/index.html b/public/index.html index 5c9eeea..9d6644e 100644 --- a/public/index.html +++ b/public/index.html @@ -5,38 +5,21 @@ - - - - - - - - myFit + + + + +
+ + + + WrenchBoard
- diff --git a/src/Routers.jsx b/src/Routers.jsx index b4092f8..a1f558a 100644 --- a/src/Routers.jsx +++ b/src/Routers.jsx @@ -62,6 +62,9 @@ export default function Routers() { } /> } /> } /> + } /> + } /> + } />
-
- {/* -
- logo -
- */} -
- {/* login-thumb*/} -
-
-

- {slogan} -

-
-
+
{children && children}
diff --git a/src/components/AuthPages/Login/index.jsx b/src/components/AuthPages/Login/index.jsx index f3fa819..da5b444 100644 --- a/src/components/AuthPages/Login/index.jsx +++ b/src/components/AuthPages/Login/index.jsx @@ -35,13 +35,26 @@ export default function Login() { if (email !== "" && password !== "") { var postData = { username: email, - password: password + password: password, + sessionid: 'STARTING' }; const loginResult = await userApi.logInUser(postData); // just for a test + //debugger; // 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}`); + if (loginResult.data.status > 0 && loginResult.data.internal_return ==100 && loginResult.data.session !='') { // just for a start + localStorage.setItem("email", `${loginResult.data.email}`); + localStorage.setItem("member_id", `${loginResult.data.member_id}`); + localStorage.setItem("uid", `${loginResult.data.uid}`); + localStorage.setItem("session_token", `${loginResult.data.session}`); + localStorage.setItem("added", `${loginResult.data.added}`); + localStorage.setItem("city", `${loginResult.data.city}`); + localStorage.setItem("country", `${loginResult.data.country}`); + localStorage.setItem("firstname", `${loginResult.data.firstname}`); + localStorage.setItem("last_login", `${loginResult.data.last_login}`); + localStorage.setItem("lastname", `${loginResult.data.lastname}`); + localStorage.setItem("state", `${loginResult.data.state}`); + localStorage.setItem("zip_code", `${loginResult.data.zip_code}`); + localStorage.setItem("session", `${loginResult.data.session}`); setLoginLoading(true); // userApi.getUserReminders(); //testing setTimeout(() => { @@ -67,9 +80,6 @@ export default function Login() {

Log In

-
- shape -
@@ -143,6 +153,7 @@ export default function Login() {
{loginError &&

Invalid username or password

} +
+
+ +

diff --git a/src/components/AuthPages/SignUp/index.jsx b/src/components/AuthPages/SignUp/index.jsx index 72d2426..b63bdd7 100644 --- a/src/components/AuthPages/SignUp/index.jsx +++ b/src/components/AuthPages/SignUp/index.jsx @@ -15,21 +15,6 @@ export default function SignUp() {

-
- {/* -
- logo -
- */} -
- {/*login-thumb */} -
-
-

- Welcome to myFit -

-
-
diff --git a/src/components/Cards/HomeJobCard.jsx b/src/components/Cards/HomeJobCard.jsx new file mode 100644 index 0000000..e17938d --- /dev/null +++ b/src/components/Cards/HomeJobCard.jsx @@ -0,0 +1,26 @@ +import React from "react"; +import { Link } from "react-router-dom"; +import localImgLoad from "../../lib/localImgLoad"; + +export default function HomeJobCard(props) { + return ( + +
+
+
+

+ <>{props?.title} +

+
+ {/**/} +
+
+ BEST IMAGE IN THE WORLLD +
+
+ + ); +} diff --git a/src/components/Home/HomeTaskDisplay.jsx b/src/components/Home/HomeTaskDisplay.jsx new file mode 100644 index 0000000..8e20d2e --- /dev/null +++ b/src/components/Home/HomeTaskDisplay.jsx @@ -0,0 +1,53 @@ +import React, { useState } from "react"; +import MarketVisitorAnalytic from "../Charts/MarketVisitorAnalytic"; +import SelectBox from "../Helpers/SelectBox"; +import SellHistoryWidget from "./SellHistoryWidget"; +import HomeJobCard from "../Cards/HomeJobCard"; + +export default function HomeTaskDisplay({ jobData,className }) { + + return ( +
+
+
+
+ +
+
+ +
+
+ +
+
+
+ +
+
+
+ +
+
+ +
+
+ +
+
+
+ +
+ ); +} diff --git a/src/components/Home/index.jsx b/src/components/Home/index.jsx index 12c2837..d11733a 100644 --- a/src/components/Home/index.jsx +++ b/src/components/Home/index.jsx @@ -7,18 +7,29 @@ import SellHistoryMarketVisitorAnalytic from "./SellHistoryMarketVisitorAnalytic import TopSellerTopBuyerSliderSection from "./TopSellerTopBuyerSliderSection"; import TrendingSection from "./TrendingSection"; import UpdateTable from "./UpdateTable"; +import HomeTaskDisplay from "./HomeTaskDisplay"; +import UsersService from "../../services/UsersService"; +import usersService from "../../services/UsersService"; export default function Home() { const trending = datas.datas; + const jobData = datas.datas; // api calls or cache + //getHomeDate + const userApi = new usersService(); + const homeData = userApi.getHomeDate(); return (
- {/* - + + {/* */} - {/* */} - + + {/* + + */}
); diff --git a/src/components/Partials/RightSideBar.jsx b/src/components/Partials/RightSideBar.jsx index bbc4d9f..67f758b 100644 --- a/src/components/Partials/RightSideBar.jsx +++ b/src/components/Partials/RightSideBar.jsx @@ -43,6 +43,155 @@ export default function RightSideBar() { return ( <>
+
+ {/* heading */} +
+

+ Quick Links +

+
+
+
+ +
+
+ {/* image */} +
+ + + + +
+ {/* name */} +
+

+ OpenSea +

+
+ {/* action */} +
+
+ {/* image */} +
+ + + + +
+ {/* name */} +
+

+ Rarible +

+
+ {/* action */} +
+
+ {/* image */} +
+ + + + + + + + + + +
+ {/* name */} +
+

+ Myth Market +

+
+
+
+ {/* image */} +
+ + + + + +
+ {/* name */} +
+

+ KnownOrigin +

+
+
+
+
@@ -165,157 +314,7 @@ export default function RightSideBar() {
- - {/* top-platform */} -
- {/* heading */} -
-

- Quick Links -

-
-
-
-
-
- {/* image */} -
- - - - -
- {/* name */} -
-

- OpenSea -

-
- {/* action */} -
-
- {/* image */} -
- - - - -
- {/* name */} -
-

- Rarible -

-
- {/* action */} -
-
- {/* image */} -
- - - - - - - - - - -
- {/* name */} -
-

- Myth Market -

-
-
-
- {/* image */} -
- - - - - -
- {/* name */} -
-

- KnownOrigin -

-
-
-
-
); diff --git a/src/components/Partials/Sidebar.jsx b/src/components/Partials/Sidebar.jsx index 2b29924..c3a33bb 100644 --- a/src/components/Partials/Sidebar.jsx +++ b/src/components/Partials/Sidebar.jsx @@ -1,7 +1,7 @@ import React, { useContext, useEffect } from "react"; import { NavLink } from "react-router-dom"; -import logo from "../../assets/images/myfit-logo-2.png"; //logo-2.svg"; -import logo3 from "../../assets/images/myfit-logo-2.png"; //logo-3.svg"; +import logo from "../../assets/images/wrenchboard.png"; //logo-2.svg"; +import logo3 from "../../assets/images/wrenchboard.png"; //logo-3.svg"; import DarkModeContext from "../Contexts/DarkModeContext"; import Icons from "../Helpers/Icons"; @@ -115,7 +115,7 @@ export default function Sidebar({ sidebar, action, logoutModalHandler }) {
  • (navData.isActive ? "active" : ""), sidebar ? "justify-start space-x-3.5" : "justify-center") @@ -129,7 +129,7 @@ export default function Sidebar({ sidebar, action, logoutModalHandler }) { sidebar ? "active flex-1" : "w-0" }`} > - Reminders + Market 0 @@ -138,7 +138,7 @@ export default function Sidebar({ sidebar, action, logoutModalHandler }) {
  • (navData.isActive ? "active" : ""), sidebar ? "justify-start space-x-3.5" : "justify-center") @@ -152,13 +152,13 @@ export default function Sidebar({ sidebar, action, logoutModalHandler }) { sidebar ? "active flex-1" : "w-0" }`} > - Tracking + Messages
  • (navData.isActive ? "active" : ""), sidebar ? "justify-start space-x-3.5" : "justify-center") @@ -172,7 +172,7 @@ export default function Sidebar({ sidebar, action, logoutModalHandler }) { sidebar ? "active flex-1" : "w-0" }`} > - Calendar + My Wallet
    • @@ -222,7 +222,7 @@ export default function Sidebar({ sidebar, action, logoutModalHandler }) {
    -

    Settings

    +

    My Jobs

      diff --git a/src/index.css b/src/index.css index 8526655..4ae5bdd 100644 --- a/src/index.css +++ b/src/index.css @@ -31,6 +31,11 @@ --toastify-color-success: #f539f8; } + +/* ===================== EXTRA ===================== */ +.bottomMargin{ + margin-bottom: 15px; +} /* TODO: =================================default================================ */ body { background-image: url("./assets/images/background.svg"); diff --git a/src/services/UsersService.js b/src/services/UsersService.js index 5d78009..7e61208 100644 --- a/src/services/UsersService.js +++ b/src/services/UsersService.js @@ -3,17 +3,109 @@ import Axios from "axios"; class usersService { constructor() { - console.log("Er are here anyway"); + console.log("WRB Service Entry"); } - logInUser(reqData) { - // debugger; - /* - clean up the request data here - */ - localStorage.setItem("session_token", ``); - return this.postAuxEnd("/login", reqData); + getHomeDate(){ + // localStorage.setItem("session_token", ``); + return this.postAuxEnd("/dashdata", null); } + logInUser(reqData) { + localStorage.setItem("session_token", ``); + return this.postAuxEnd("/userlogin", reqData); + } + marketJobData(reqData) { + return this.postAuxEnd("/getjobsdata", reqData); + } + + getApiGate(){ + // localStorage.setItem("session_token", ``); + return this.postAuxEnd("/apigate", null); + } + + CreateUser(){ + // localStorage.setItem("session_token", ``); + return this.postAuxEnd("/createuser", null); + } + + getLoadProfile(){ + // localStorage.setItem("session_token", ``); + return this.postAuxEnd("/loadprofile", null); + } + + getOffersList(){ + // localStorage.setItem("session_token", ``); + return this.postAuxEnd("/offerslist", null); + } + getPendingJob(){ + // localStorage.setItem("session_token", ``); + return this.postAuxEnd("/pendingjob", null); + } + getActiveJobList(){ + // localStorage.setItem("session_token", ``); + return this.postAuxEnd("/activejoblist", null); + } + + getGetPendingJobs(){ + // localStorage.setItem("session_token", ``); + return this.postAuxEnd("/getpendingjobs", null); + } + getUsersCards(){ + // localStorage.setItem("session_token", ``); + return this.postAuxEnd("/userscards", null); + } + getCouponPending(){ + // localStorage.setItem("session_token", ``); + return this.postAuxEnd("/couponpending", null); + } + + + /* + - 20:27:30.118 FLOG_MAX [757411]: REQ_STRING(username) + - 20:27:30.118 FLOG_MAX [757411]: REQ_STRING(password) + - 20:27:30.118 FLOG_MAX [757411]: REQ_STRING(sessionid) + + + $endpoints = array( + 'apigate' => array('POST'), + 'generics' => array('POST'), + 'createuser' => array('POST'), + 'createmobileuser' => array('POST'), + 'completemobileuser' => array('POST'), + 'startresetpasword' => array('POST'), + 'userlogin' => array('POST'), + 'startjoblist' => array('POST'), + 'dashdata' => array('POST'), + 'getjobsdata' => array('POST'), + 'offerslist' => array('POST'), + 'activejoblist' => array('POST'), + 'loadprofile' => array('POST'), + 'account' => array('POST'), + 'message' => array('POST'), + 'pendingjob' => array('POST'), + 'paymenthx' => array('POST'), + 'getjob' => array('POST'), + 'mybanklist' => array('POST'), + 'sendmoney' => array('POST'), + 'sendinterest' => array('POST'), + 'sendmoneyfee' => array('POST'), + 'getpendingjobs' => array('POST'), + 'taskmessage' => array('POST'), + 'sendtaskmessage' => array('POST'), + 'getwallets' => array('POST'), + 'sitecontact' => array('POST'), + 'signupcountry' => array('POST'), + 'userscards' => array('POST'), + 'blogdata' => array('POST'), + 'blogitem' => array('POST'), + 'couponhx' => array('POST'), + 'couponpending' => array('POST'), + 'couponredeem' => array('POST'), + 'sendinterestmessage' => array('POST'), + 'replyinterestmessage' => array('POST') + ); + + */ getUserReminders(){ return this.getAuxEnd("/reminders", null); @@ -24,7 +116,6 @@ class usersService { //---------------------------------------- ----- //---------------------------------------- ----- getAuxEnd(uri, reqData) { - debugger; const session_token = localStorage.getItem("session_token"); let axiosConfig = { headers: { @@ -34,11 +125,12 @@ class usersService { } }; const endPoint = process.env.REACT_APP_USERS_ENDPOINT + uri; - return Axios.get(endPoint,axiosConfig) + return Axios.get(endPoint,{ + params: { + reqData + }}) .then((response) => { - // console.log(response); - // res = response; - // console.log("~~~~~~~ Toks2 GET ~~~~~~~~"); + console.log("~~~~~~~ Toks2 GET ~~~~~~~~"); return response; }) .catch((error) => { @@ -55,24 +147,21 @@ class usersService { }); } + postAuxEnd(uri, reqData) { const endPoint = process.env.REACT_APP_USERS_ENDPOINT + uri; 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 ${session_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,axiosConfig) + // 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;