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

Resources page fix #852

Merged
ameye merged 1 commits from resource-page-fix into master 2024-11-22 13:42:03 +00:00
Conversation 0 Commits 1 Files Changed 8
+80 -80
8 changed files with 80 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/AddJob/AddJob.jsx
+5 -5
View File
@@ -3,7 +3,7 @@ import {
useDispatch,
useSelector,
usersService,
initialValues as IV,
// initialValues as IV,
initialReqState,
useState,
tableReload,
@@ -75,7 +75,7 @@ function AddJob({ popUpHandler, categories }) {
// For form initial values
const initialValues = {
// initial values for formik
country: walletDetails.data.length == 1 ? walletDetails.data[0].country : '',
country: walletDetails.data.length === 1 ? walletDetails.data[0].country : '',
price: "",
title: "",
description: "",
@@ -117,7 +117,7 @@ function AddJob({ popUpHandler, categories }) {
className={`input-field p-2 mt-3 rounded-full placeholder:text-base text-dark-gray w-full h-[42px] bg-slate-100 focus:ring-0 focus:outline-none border`}
onChange={props.handleChange}
onBlur={props.handleBlur}
disabled={walletDetails.data.length == 1}
disabled={walletDetails.data.length === 1}
>
{walletDetails?.loading ? (
<option className="text-slate-500 text-lg" value="">
@@ -138,7 +138,7 @@ function AddJob({ popUpHandler, categories }) {
</option>
))}
</>
) : walletDetails.data.length == 1 ?
) : walletDetails.data.length === 1 ?
<>
{walletDetails.data?.map((item, index) => (
<option
@@ -367,7 +367,7 @@ function AddJob({ popUpHandler, categories }) {
{/* ERROR DISPLAY AND SUBMIT BUTTON */}
<div className="content-footer w-full">
{/* error or success display */}
{requestStatus.message != "" &&
{requestStatus.message !== "" &&
(!requestStatus.status ? (
<div
className={`relative p-4 my-4 text-[#912741] bg-[#fcd9e2] border-[#fbc6d3] mb-4 rounded-[0.475rem] text-md font-light leading-[19.5px] text-[13px]`}
src/components/AuthPages/AuthLayout2.jsx
+2 -2
View File
@@ -6,7 +6,7 @@ import WrenchBoard from "../../assets/images/wrenchboard-logo-text.png";
import DarkModeContext from "../Contexts/DarkModeContext";
export default function LoginLayout({ slogan, children }) {
const bgImg = localImgLoad("images/left-wrenchboard.jpg");
// const bgImg = localImgLoad("images/left-wrenchboard.jpg");
const bgImgNig = localImgLoad("images/wrench-home-back-nigeria.jpg");
const bgImgCom = localImgLoad("images/wrench-home-back-common.jpg");
@@ -16,7 +16,7 @@ export default function LoginLayout({ slogan, children }) {
<div
className={`relative min-h-screen overflow-y-auto bg-cover bg-center flex flex-col items-center`}
style={{
backgroundImage: `url(${countryMode == "NG" ? bgImgNig : bgImgCom})`,
backgroundImage: `url(${countryMode === "NG" ? bgImgNig : bgImgCom})`,
}}
>
<div className="my-5">
src/components/AuthPages/AuthProfile/index.jsx
+50 -50
View File
@@ -1,63 +1,63 @@
import React, { useState } from "react";
import React from "react";
import { Link } from "react-router-dom";
import authProfilePic from "../../../assets/images/auth-profile-picture.png";
import profileBanner from "../../../assets/images/profile-cover.png";
import collections from "../../../data/collectionplan_data.json";
import marketPlace from "../../../data/marketplace_data.json";
import products from "../../../data/product_data.json";
import Layout from "../../Partials/Layout";
import ActivitiesTab from "./ActivitiesTab";
import CollectionTab from "./CollectionTab";
import CreatedTab from "./CreatedTab";
import HiddenProductsTab from "./HiddenProductsTab";
import OnSaleTab from "./OnSaleTab";
import OwnTab from "./OwnTab";
// import collections from "../../../data/collectionplan_data.json";
// import marketPlace from "../../../data/marketplace_data.json";
// import products from "../../../data/product_data.json";
// import CollectionTab from "./CollectionTab";
// import CreatedTab from "./CreatedTab";
// import HiddenProductsTab from "./HiddenProductsTab";
// import OnSaleTab from "./OnSaleTab";
// import OwnTab from "./OwnTab";
export default function AuthProfile() {
const onSaleProducts = marketPlace.data;
const CreatedSell = marketPlace.data;
const CreatedBits = products.datas;
// const onSaleProducts = marketPlace.data;
// const CreatedSell = marketPlace.data;
// const CreatedBits = products.datas;
// const mainProducts = products.datas;
const ownProducts = products.datas;
const collectionProducts = collections.data;
// const ownProducts = products.datas;
// const collectionProducts = collections.data;
const tabs = [
{
id: 1,
name: "onsale",
content: "On Sale",
},
{
id: 2,
name: "owned",
content: "Owned",
},
{
id: 3,
name: "created",
content: "Created",
},
{
id: 4,
name: "hidden",
content: "Hidden",
},
{
id: 5,
name: "collection",
content: "Collection",
},
{
id: 6,
name: "activity",
content: "Activity",
},
];
// const tabs = [
// {
// id: 1,
// name: "onsale",
// content: "On Sale",
// },
// {
// id: 2,
// name: "owned",
// content: "Owned",
// },
// {
// id: 3,
// name: "created",
// content: "Created",
// },
// {
// id: 4,
// name: "hidden",
// content: "Hidden",
// },
// {
// id: 5,
// name: "collection",
// content: "Collection",
// },
// {
// id: 6,
// name: "activity",
// content: "Activity",
// },
// ];
const [tab, setTab] = useState(tabs[0].name);
const tabHandler = (value) => {
setTab(value);
};
// const [tab, setTab] = useState(tabs[0].name);
// const tabHandler = (value) => {
// setTab(value);
// };
return (
<>
<Layout>
src/components/AuthPages/AuthRedirect/AppleRedirect.jsx
+11 -11
View File
@@ -1,15 +1,15 @@
import React, { useEffect } from 'react';
import { useLocation, useNavigate } from 'react-router-dom';
import usersService from '../../../services/UsersService';
import {updateUserDetails} from "../../../store/UserDetails";
import { useDispatch } from "react-redux";
// import usersService from '../../../services/UsersService';
// import {updateUserDetails} from "../../../store/UserDetails";
// import { useDispatch } from "react-redux";
import AuthLayout from "../AuthLayout";
function AppleRedirect() {
const location = useLocation();
const navigate = useNavigate();
const userApi = new usersService();
const dispatch = useDispatch()
// const userApi = new usersService();
// const dispatch = useDispatch()
const queryParams = new URLSearchParams(location?.search);
const codeResponse = queryParams.get("code");
@@ -36,11 +36,11 @@ function AppleRedirect() {
redirect_uri=https%3A//oauth2.example.com/code&
grant_type=authorization_code
*/
var reqData = {
auth_type: "APPLE",
code: codeResponse,
redirect_uri: process.env.REACT_APP_GOOGLE_REDIRECT_URL,
};
// var reqData = {
// auth_type: "APPLE",
// code: codeResponse,
// redirect_uri: process.env.REACT_APP_GOOGLE_REDIRECT_URL,
// };
// userApi
// .authStart(reqData)
// .then((res) => {
@@ -58,7 +58,7 @@ function AppleRedirect() {
// navigate('/login', {state: {error: true}})
// console.log(error);
// });
},[])
},[codeResponse, navigate])
return (
<AuthLayout>
<div className='min-h-[70vh]'>Redirecting ... </div>
src/components/AuthPages/AuthRedirect/FbookRedirect.jsx
+4 -4
View File
@@ -1,4 +1,4 @@
import React, { useEffect } from 'react';
import React, { useMemo, useEffect } from 'react';
import { useDispatch } from "react-redux";
import { useLocation, useNavigate } from 'react-router-dom';
import usersService from '../../../services/UsersService';
@@ -8,7 +8,7 @@ import AuthLayout from "../AuthLayout";
function FbookRedirect() {
const location = useLocation();
const navigate = useNavigate();
const userApi = new usersService();
const userApi = useMemo(()=>{new usersService()},[]);
const dispatch = useDispatch()
const queryParams = new URLSearchParams(location?.search);
@@ -52,7 +52,7 @@ function FbookRedirect() {
userApi
.authStart(reqData)
.then((res) => {
if (res.status == 200 && res.data.internal_return >= 0 && res.data.member_id && res.data.uid && res.data.session) {
if (res.status === 200 && res.data.internal_return >= 0 && res.data.member_id && res.data.uid && res.data.session) {
localStorage.setItem("member_id", `${res.data.member_id}`);
localStorage.setItem("uid", `${res.data.uid}`);
localStorage.setItem("session_token", `${res.data.session}`);
@@ -66,7 +66,7 @@ function FbookRedirect() {
navigate('/login', {state: {error: true}})
console.log(error);
});
},[])
},[codeResponse, userApi, dispatch, navigate])
return (
<AuthLayout>
<div className='min-h-[70vh]'>Redirecting ... </div>
src/components/AuthPages/AuthRedirect/Redirect.jsx
+4 -4
View File
@@ -1,4 +1,4 @@
import React, { useEffect } from "react";
import React, { useEffect, useMemo } from "react";
import { useDispatch } from "react-redux";
import { useLocation, useNavigate } from "react-router-dom";
import usersService from "../../../services/UsersService";
@@ -8,7 +8,7 @@ import AuthLayout from "../AuthLayout";
function Redirect() {
const location = useLocation();
const navigate = useNavigate();
const userApi = new usersService();
const userApi = useMemo(()=>{new usersService()},[]);
const dispatch = useDispatch();
const queryParams = new URLSearchParams(location?.search);
@@ -40,7 +40,7 @@ function Redirect() {
.authStart(reqData)
.then((res) => {
if (
res.status == 200 &&
res.status === 200 &&
res.data.internal_return >= 0 &&
res.data.member_id &&
res.data.uid &&
@@ -59,7 +59,7 @@ function Redirect() {
navigate("/login", { state: { error: true } });
console.log(error);
});
}, []);
}, [codeResponse, userApi, dispatch, navigate]);
return (
<AuthLayout>
<div className="min-h-[70vh]">Redirecting ... </div>
src/components/AuthPages/ForgotPassword/index.jsx
+1 -1
View File
@@ -38,7 +38,7 @@ export default function ForgotPassword() {
}
const resetHandler = async () => {
if (email == "") {
if (email === "") {
setMsgError("An email is required");
return setTimeout(() => {
setMsgError(null);
src/components/AuthPages/ForgotPassword/index2.jsx
+3 -3
View File
@@ -1,6 +1,6 @@
import React, { useState } from "react";
import { Link, useNavigate } from "react-router-dom";
import WrenchBoard from "../../../assets/images/wrenchboard-logo-text.png";
import { useNavigate } from "react-router-dom";
// import WrenchBoard from "../../../assets/images/wrenchboard-logo-text.png";
import usersService from "../../../services/UsersService";
import InputCom from "../../Helpers/Inputs/InputCom";
import AuthLayout from "../AuthLayout2";
@@ -38,7 +38,7 @@ export default function ForgotPassword() {
}
const resetHandler = async () => {
if (email == "") {
if (email === "") {
setMsgError("An email is required");
return setTimeout(() => {
setMsgError(null);