WrenchBoard/Users-Wrench
3
0
Fork 0
Code Issues Pull Requests Releases Activity

Digits Fixed and SignOut text variable

Browse Source
This commit is contained in:
Chukwumdiebube Ojinta
2023-07-17 15:52:28 +01:00
parent 42e80c7a11
commit 8530b2d1a0
9 changed files with 93 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.env
+2
View File
@@ -68,6 +68,8 @@ REACT_APP_APPLE_REDIRECT_URL='http://localhost:9082/login/auth/apple'
REACT_APP_MAX_FILE_SIZE=1000000 REACT_APP_MAX_FILE_SIZE=1000000
REACT_APP_TOTAL_NUM_FILE=4 REACT_APP_TOTAL_NUM_FILE=4
REACT_APP_LOGOUT_TEXT="Sign Out"
#apigate.lotus.g1.wrenchboard.com:76.209.103.227 #apigate.lotus.g1.wrenchboard.com:76.209.103.227
#apigate.orion.g1.wrenchboard.com:76.209.103.227 #apigate.orion.g1.wrenchboard.com:76.209.103.227
.env.development
+3 -1
View File
@@ -41,4 +41,6 @@ REACT_APP_GOOGLE_CLIENT_SCOPE="https://www.googleapis.com/auth/plus.login https:
REACT_APP_GOOGLE_REDIRECT_URL=http://localhost:9082/login/auth/ REACT_APP_GOOGLE_REDIRECT_URL=http://localhost:9082/login/auth/
REACT_APP_MAX_FILE_SIZE=1000000 REACT_APP_MAX_FILE_SIZE=1000000
REACT_APP_TOTAL_NUM_FILE=4 REACT_APP_TOTAL_NUM_FILE=4
REACT_APP_LOGOUT_TEXT="Sign Out"
.env.production
+5 -3
View File
@@ -12,8 +12,8 @@ REACT_APP_APPSITE="https://myfitapp.mermsemr.com"
#REACT_APP_AUX_ENDPOINT="https://apigate.orion.g1.wrenchboard.com/svs/user" #REACT_APP_AUX_ENDPOINT="https://apigate.orion.g1.wrenchboard.com/svs/user"
#REACT_APP_USERS_ENDPOINT="https://apigate.orion.g1.wrenchboard.com/svs/user" #REACT_APP_USERS_ENDPOINT="https://apigate.orion.g1.wrenchboard.com/svs/user"
REACT_APP_AUX_ENDPOINT="https://apigate.orion.g1.wrenchboard.com/en/wrench/api/v1" REACT_APP_AUX_ENDPOINT="https://apigate.lotus.g1.wrenchboard.com/en/wrench/api/v1"
REACT_APP_USERS_ENDPOINT="https://apigate.orion.g1.wrenchboard.com/en/wrench/api/v1" REACT_APP_USERS_ENDPOINT="https://apigate.lotus.g1.wrenchboard.com/en/wrench/api/v1"
#"https://devapi.mermsemr.com/en/desktop/api/v2/myfituser" #"https://devapi.mermsemr.com/en/desktop/api/v2/myfituser"
@@ -48,4 +48,6 @@ REACT_APP_FACEBOOK_REDIRECT_URL="https://users.wrenchboard.com/login/auth/flogin
DISABLE_ESLINT_PLUGIN=true DISABLE_ESLINT_PLUGIN=true
REACT_APP_MAX_FILE_SIZE=1000000 REACT_APP_MAX_FILE_SIZE=1000000
REACT_APP_TOTAL_NUM_FILE=4 REACT_APP_TOTAL_NUM_FILE=4
REACT_APP_LOGOUT_TEXT="Sign Out"
src/components/MyWallet/Popup/AddFundDollars.jsx
+5 -1
View File
@@ -382,7 +382,11 @@ function AddFundDollars(props) {
expireMonth.map((item, index) => ( expireMonth.map((item, index) => (
<option <option
key={index} key={index}
value={item.value} value={
Number(item.value) < 10
? "0" + item.value
: item.value
}
> >
{item.name} {item.name}
</option> </option>
src/components/MyWallet/Popup/CompleteConfirmCredit.jsx
+7 -4
View File
@@ -9,7 +9,12 @@ function CompleteConfirmCredit({ onClose, confirmCredit }) {
<div className="add-fund w-full bg-white dark:bg-dark-white rounded-2xl"> <div className="add-fund w-full bg-white dark:bg-dark-white rounded-2xl">
<div className="px-4 md:p-8 py-4 add-fund-info"> <div className="px-4 md:p-8 py-4 add-fund-info">
<div className="field w-full mb-3 min-h-[45px]"> <div className="field w-full mb-3 min-h-[45px]">
<div className="flex flex-col gap-4"> <div
className={`flex flex-col gap-4 ${
data?.result !== "Charge success" &&
"h-[328px] items-center justify-center"
}`}
>
{/* Success Icon for now */} {/* Success Icon for now */}
<div className="flex items-center w-full justify-center"> <div className="flex items-center w-full justify-center">
{data?.result == "Charge success" ? ( {data?.result == "Charge success" ? (
@@ -87,9 +92,7 @@ function CompleteConfirmCredit({ onClose, confirmCredit }) {
</span> </span>
</div> </div>
</> </>
) : ( ) : null}
<div className="h-[160px]"></div>
)}
</div> </div>
</div> </div>
</div> </div>
src/components/MyWallet/Popup/ConfirmAddFund.jsx
+1 -1
View File
@@ -223,7 +223,7 @@ function ConfirmAddFund({
amount: amount * 100, amount: amount * 100,
cardnumber: cardNum.replace(/\s/g, ""), cardnumber: cardNum.replace(/\s/g, ""),
credit_reference, credit_reference,
cvc: String(cvv).length === 1 ? `0${cvv}` : String(cvv), cvc: cvv,
description: address, description: address,
exp_month: expirationMonth, exp_month: expirationMonth,
exp_year: expirationYear, exp_year: expirationYear,
src/components/Partials/Layout.jsx
+1 -2
View File
@@ -8,7 +8,6 @@ import Header from "./Header";
import MobileSidebar from "./MobileSideBar"; import MobileSidebar from "./MobileSideBar";
import RightSideBar from "./RightSideBar"; import RightSideBar from "./RightSideBar";
import Sidebar from "./Sidebar"; import Sidebar from "./Sidebar";
import usersService from "../../services/UsersService";
export default function Layout({ children }) { export default function Layout({ children }) {
const { drawer } = useSelector((state) => state.drawer); const { drawer } = useSelector((state) => state.drawer);
@@ -179,7 +178,7 @@ export default function Layout({ children }) {
type="button" type="button"
className="text-white primary-gradient text-18 tracking-wide px-4 py-3 rounded-full" className="text-white primary-gradient text-18 tracking-wide px-4 py-3 rounded-full"
> >
Yes Logout {`Yes ${process.env.REACT_APP_LOGOUT_TEXT}`}
</button> </button>
<button <button
onClick={logoutModalHandler} onClick={logoutModalHandler}
src/components/Partials/MobileSideBar.jsx
+67 -64
View File
@@ -8,7 +8,12 @@ import {
import DarkModeContext from "../Contexts/DarkModeContext"; import DarkModeContext from "../Contexts/DarkModeContext";
import Icons from "../Helpers/Icons"; import Icons from "../Helpers/Icons";
export default function MobileSidebar({ sidebar, action, logoutModalHandler, myJobList }) { export default function MobileSidebar({
sidebar,
action,
logoutModalHandler,
myJobList,
}) {
let { userDetails } = useSelector((state) => state.userDetails); let { userDetails } = useSelector((state) => state.userDetails);
const darkMode = useContext(DarkModeContext); const darkMode = useContext(DarkModeContext);
@@ -110,74 +115,72 @@ export default function MobileSidebar({ sidebar, action, logoutModalHandler, myJ
{/* menu and settings item */} {/* menu and settings item */}
{userDetails?.account_type !== "FAMILY" && ( {userDetails?.account_type !== "FAMILY" && (
<div <div
className={`menu-item transition-all duration-300 ease-in-out ${ className={`menu-item transition-all duration-300 ease-in-out ${
sidebar ? "mb-5" : "mb-2" sidebar ? "mb-5" : "mb-2"
}`} }`}
> >
<div className="heading mb-5"> <div className="heading mb-5">
<h1 className="title text-xl font-bold text-sky-blue"> <h1 className="title text-xl font-bold text-sky-blue">Family</h1>
Family </div>
</h1> <div className="items">
</div> <ul className="flex flex-col space-y-6">
<div className="items"> <ListItem
<ul className="flex flex-col space-y-6"> title="Family Corner"
<ListItem route="/acc-family"
title="Family Corner" iconName="new-family"
route="/acc-family" sidebar={sidebar}
iconName="new-family" />
sidebar={sidebar} </ul>
/> </div>
</ul> </div>
</div>
</div>
)} )}
{userDetails?.account_type !== "FAMILY" && ( {userDetails?.account_type !== "FAMILY" && (
<> <>
{!userDetails?.post_jobs ? ( {!userDetails?.post_jobs ? (
<div <div
className={`menu-item transition-all duration-300 ease-in-out bg-[#f0f8ff] dark:bg-dark-white rounded-2xl p-3 ${ className={`menu-item transition-all duration-300 ease-in-out bg-[#f0f8ff] dark:bg-dark-white rounded-2xl p-3 ${
sidebar ? "mb-5" : "mb-2 rounded-none p-0" sidebar ? "mb-5" : "mb-2 rounded-none p-0"
}`} }`}
> >
<div className="heading mb-5"> <div className="heading mb-5">
<h1 className="title text-xl font-bold text-sky-blue"> <h1 className="title text-xl font-bold text-sky-blue">
Job Post Job Post
</h1> </h1>
</div> </div>
<div className="items"> <div className="items">
<ul className="flex flex-col space-y-6"> <ul className="flex flex-col space-y-6">
<li className="item group"> <li className="item group">
<NavLink <NavLink
to="/start-job" to="/start-job"
className={`nav-item flex items-center ${ className={`nav-item flex items-center ${
((navData) => (navData.isActive ? "active" : ""), ((navData) => (navData.isActive ? "active" : ""),
sidebar sidebar
? "justify-start space-x-3.5" ? "justify-start space-x-3.5"
: "justify-center") : "justify-center")
}`}
>
<span className="item-icon group-hover:bg-purple group-hover:text-white w-8 h-8 flex justify-center items-center transition-all duration-300 ease-in-out bg-light-purple dark:bg-dark-light-purple rounded-full text-dark-gray dark:text-white dark:text-lighter-gray">
<Icons name="people-two" />
</span>
<span
className={`item-content group-hover:text-sky-blue text-[18px] transition-all duration-300 ease-in-out text-lighter-gray relative font-medium ${
sidebar ? "active flex-1" : "w-0"
}`} }`}
> >
<span className="item-icon group-hover:bg-purple group-hover:text-white w-8 h-8 flex justify-center items-center transition-all duration-300 ease-in-out bg-light-purple dark:bg-dark-light-purple rounded-full text-dark-gray dark:text-white dark:text-lighter-gray"> Enable Job Post
<Icons name="people-two" /> </span>
</span> </NavLink>
<span </li>
className={`item-content group-hover:text-sky-blue text-[18px] transition-all duration-300 ease-in-out text-lighter-gray relative font-medium ${ </ul>
sidebar ? "active flex-1" : "w-0"
}`}
>
Enable Job Post
</span>
</NavLink>
</li>
</ul>
</div>
</div> </div>
</div>
) : myJobList?.data?.result_list?.length ? ( ) : myJobList?.data?.result_list?.length ? (
<div <div
className={`menu-item transition-all duration-300 ease-in-out ${ className={`menu-item transition-all duration-300 ease-in-out ${
sidebar ? "mb-5" : "mb-2" sidebar ? "mb-5" : "mb-2"
}`} }`}
> >
<div className="heading mb-5"> <div className="heading mb-5">
<h1 className="title text-xl font-bold text-sky-blue"> <h1 className="title text-xl font-bold text-sky-blue">
@@ -212,9 +215,9 @@ export default function MobileSidebar({ sidebar, action, logoutModalHandler, myJ
</div> </div>
) : ( ) : (
<div <div
className={`menu-item transition-all duration-300 ease-in-out ${ className={`menu-item transition-all duration-300 ease-in-out ${
sidebar ? "mb-5" : "mb-2" sidebar ? "mb-5" : "mb-2"
}`} }`}
> >
<div className="heading mb-5"> <div className="heading mb-5">
<h1 className="title text-xl font-bold text-sky-blue"> <h1 className="title text-xl font-bold text-sky-blue">
@@ -245,14 +248,14 @@ export default function MobileSidebar({ sidebar, action, logoutModalHandler, myJ
className="signout-btn flex items-center space-x-1 p-2.5 w-2/3 h-[52px] bg-sky-blue transition duration-300 ease-in-out hover:bg-gray-900 rounded-full" className="signout-btn flex items-center space-x-1 p-2.5 w-2/3 h-[52px] bg-sky-blue transition duration-300 ease-in-out hover:bg-gray-900 rounded-full"
> >
<span className=""> <span className="">
<Icons name='new-logout' /> <Icons name="new-logout" />
</span> </span>
<span <span
className={`signout-btn-content text-white text-xl font-bold ${ className={`signout-btn-content text-white text-xl font-bold ${
sidebar ? "active" : "" sidebar ? "active" : ""
}`} }`}
> >
Signout {process.env.REACT_APP_LOGOUT_TEXT}
</span> </span>
</button> </button>
) : ( ) : (
src/components/Partials/Sidebar.jsx
+2 -2
View File
@@ -273,14 +273,14 @@ export default function Sidebar({
className="signout-btn flex items-center space-x-1 p-2.5 w-2/3 h-[52px] bg-sky-blue transition duration-300 ease-in-out hover:bg-gray-900 rounded-full" className="signout-btn flex items-center space-x-1 p-2.5 w-2/3 h-[52px] bg-sky-blue transition duration-300 ease-in-out hover:bg-gray-900 rounded-full"
> >
<span className=""> <span className="">
<Icons name='new-logout' /> <Icons name="new-logout" />
</span> </span>
<span <span
className={`signout-btn-content text-white text-xl font-bold ${ className={`signout-btn-content text-white text-xl font-bold ${
sidebar ? "active" : "" sidebar ? "active" : ""
}`} }`}
> >
Signout {process.env.REACT_APP_LOGOUT_TEXT}
</span> </span>
</button> </button>
) : ( ) : (