Compare commits

...

2 Commits

Author SHA1 Message Date
victorAnumudu a598aa3898 on cancel, takes user back to my item 2023-08-10 12:51:54 +01:00
ameye 9d190916a8 Merge branch 'wallet-styles' of WrenchBoard/Users-Wrench into master 2023-08-09 21:14:17 +00:00
3 changed files with 13 additions and 4 deletions
+7 -3
View File
@@ -77,7 +77,8 @@ export default function Resources(props) {
getUploadedFiles(); getUploadedFiles();
}, [uploadsTable]); }, [uploadsTable]);
const [tab, setTab] = useState(tab_categories ? tab_categories[0]?.name : ""); // const [tab, setTab] = useState(tab_categories ? tab_categories[0]?.name : "");
const [tab, setTab] = useState(props.activeTab? props.activeTab : tab_categories ? tab_categories[0]?.name : "");
const tabHandler = (value) => { const tabHandler = (value) => {
setTab(value); setTab(value);
@@ -99,9 +100,12 @@ export default function Resources(props) {
activity: <ActivitiesTab />, activity: <ActivitiesTab />,
}; };
const defaultTabComponent = <BlogTab blogdata={blogItems} />; // const defaultTabComponent = <BlogTab blogdata={blogItems} />;
const selectedTabComponent = tabComponents[tab] || defaultTabComponent; // const selectedTabComponent = tabComponents[tab] || defaultTabComponent;
const defaultTabComponent = props.activeTab ? tabComponents[props.activeTab] : <BlogTab blogdata={blogItems} />;
const selectedTabComponent = tabComponents[tab] || defaultTabComponent;
// Tab Item Component // Tab Item Component
const TabItem = ({ tabValue, isActive }) => { const TabItem = ({ tabValue, isActive }) => {
+3
View File
@@ -7,10 +7,12 @@ import Layout from "../Partials/Layout";
import ProductUploadField from "./ProductUploadField"; import ProductUploadField from "./ProductUploadField";
import LoadingSpinner from "../Spinners/LoadingSpinner"; import LoadingSpinner from "../Spinners/LoadingSpinner";
import usersService from "../../services/UsersService"; import usersService from "../../services/UsersService";
import { useNavigate } from "react-router-dom";
export default function UploadProduct({uploadTypes}) { export default function UploadProduct({uploadTypes}) {
const apiCall = new usersService() const apiCall = new usersService()
const [requestStatus, setRequestStatus] = useState({loading: false, status: null, message: ''}) // DETERMINES THE STATUS OF UPLOAD const [requestStatus, setRequestStatus] = useState({loading: false, status: null, message: ''}) // DETERMINES THE STATUS OF UPLOAD
const navigate = useNavigate()
// preview modal // preview modal
const [previewProductModal, setPreviewProductModal] = useState(false); const [previewProductModal, setPreviewProductModal] = useState(false);
@@ -246,6 +248,7 @@ export default function UploadProduct({uploadTypes}) {
setPurchase(false); setPurchase(false);
cancelUploadModalHandler(); cancelUploadModalHandler();
setImg(null); setImg(null);
navigate('/resources', {state:{tab:'created'}})
}; };
return ( return (
<> <>
+3 -1
View File
@@ -1,7 +1,9 @@
import React, { useState, useEffect } from "react"; import React, { useState, useEffect } from "react";
import Resources from "../components/Resources"; import Resources from "../components/Resources";
import usersService from "../services/UsersService"; import usersService from "../services/UsersService";
import { useLocation } from "react-router-dom";
export default function ResourcePage() { export default function ResourcePage() {
const {state, pathname} = useLocation() // CHECKS IF THERE IS AN ACTIVE TAB WITH LINK BACK TO RESOURCES
const [MyResourceData, setMyResourceData] = useState([]); const [MyResourceData, setMyResourceData] = useState([]);
const api = new usersService(); const api = new usersService();
@@ -17,5 +19,5 @@ export default function ResourcePage() {
getMyResourceData(); getMyResourceData();
}, []); }, []);
return <Resources MyResourceData={MyResourceData} />; return <Resources MyResourceData={MyResourceData} activeTab={state ? state.tab : ''} />;
} }