Merge branch 'master' of https://gitlab.chiefsoft.net/WrenchBoard/Users-Wrench into resources-page

src/components/Resources/index.jsx

@@ -23,10 +23,10 @@ export default function Resources(props) {
   const __resources = props.MyResourceData;
 //debugger;
   // Collection Items
-  const collectionProducts = __resources?.collectiondata?.data;
-  const tab_categories = __resources?.tab_categories?.data;
-  const onSaleProducts = __resources?.marketdata?.data;
   const CreatedSell = __resources?.marketdata?.data;
+  const tab_categories = __resources?.tab_categories?.data;
+  const collectionProducts = __resources?.collectiondata?.data;
+  const onSaleProducts = __resources?.marketdata?.data;
   const CreatedBits = __resources?.productdata?.data;
   const blogItems =   __resources?.blogdata?.payload;
 
@@ -36,8 +36,6 @@ export default function Resources(props) {
     setTab(value);
   };
 
-  console.log("first")
-
   // Category Components
   const tabComponents = {
     blog: <BlogTab blogdata={blogItems} />,
@@ -56,7 +54,7 @@ export default function Resources(props) {
     activity: <ActivitiesTab />,
   };
 
-  const defaultTabComponent = <OnSaleTab products={onSaleProducts} />;
+  const defaultTabComponent = <BlogTab blogdata={blogItems} />;
 
   const selectedTabComponent = tabComponents[tab] || defaultTabComponent;
 

src/components/Resources/tabs/BlogTab.jsx

@@ -4,8 +4,7 @@ import SearchCom from "../../Helpers/SearchCom";
 import ResourceBlogCard from "../../Cards/ResourceBlogCard";
 
 export default function BlogTab({ className, blogdata }) {
-
-  console.log("Blog data here>> ", blogdata)
+  console.log("Blog data here>> ", blogdata);
   // debugger;
   return (
     <>
@@ -41,6 +40,7 @@ export default function BlogTab({ className, blogdata }) {
               {/*            </div>*/}
             </div>
           </div>
+
           <div className="content-section w-full-width">
             <div className="grid lg:grid-cols-3 sm:grid-cols-2 grid-cols-1 gap-[30px]">
               <DataIteration
@@ -49,7 +49,11 @@ export default function BlogTab({ className, blogdata }) {
                 endLength={blogdata?.blogdata.length}
               >
                 {({ datas }) => (
-                  <ResourceBlogCard key={datas.id} datas={datas} />
+                  <ResourceBlogCard
+                    key={datas.id}
+                    datas={datas}
+                    bg={blogdata.image_url}
+                  />
                 )}
               </DataIteration>
             </div>