Merge branch 'Recent-Activities' of WrenchBoard/Users-Wrench into master

This commit is contained in:
2023-09-04 14:37:01 +00:00
committed by Gogs
2 changed files with 126 additions and 65 deletions
+116 -65
View File
@@ -1,75 +1,126 @@
import React, { useState } from "react"; import React, { useEffect, useState } from "react";
import dataImage1 from "../../assets/images/data-table-user-1.png"; import dataImage1 from "../../assets/images/data-table-user-1.png";
import dataImage2 from "../../assets/images/data-table-user-2.png"; import usersService from "../../services/UsersService";
import dataImage3 from "../../assets/images/data-table-user-3.png";
import dataImage4 from "../../assets/images/data-table-user-4.png";
import SelectBox from "../Helpers/SelectBox";
export default function HomeActivities({ className }) { export default function HomeActivities({ className }) {
const filterCategories = ["All Categories", "Explore", "Featured"]; const [recentActivitiesData, setRecentActivitiesData] = useState({
const [selectedCategory, setCategory] = useState(filterCategories[0]); loading: false,
return ( status: false,
<div msg: "",
className={`update-table w-full p-8 bg-white dark:bg-dark-white overflow-hidden rounded-2xl section-shadow relative min-h-[520px] ${ data: null,
className || "" });
}`}
>
<div className="header w-full sm:flex justify-between items-center mb-5">
<div className="flex space-x-2 items-center mb-2 sm:mb-0">
<h1 className="text-xl font-bold text-dark-gray dark:text-white tracking-wide">
Recent Activities
</h1>
</div> const _apiCall = new usersService();
</div>
<div className="relative w-full overflow-x-auto sm:rounded-lg">
<table className="w-full text-sm text-left text-gray-500 dark:text-gray-400">
<tbody>
{/* table heading */}
{/*<tr className="text-base text-thin-light-gray whitespace-nowrap px-2 border-b dark:border-[#5356fb29] default-border-b dark:border-[#5356fb29] ottom ">*/}
{/* <td className="py-4 w-[300px] block whitespace-nowrap">*/}
{/* All Product*/}
{/* </td>*/}
{/* <td className="py-4 whitespace-nowrap text-center">.</td>*/}
{/* <td className="py-4 whitespace-nowrap text-center"></td>*/}
{/* <td className="py-4 whitespace-nowrap text-right"></td>*/} const getRecentActivities = async () => {
{/*</tr>*/} setRecentActivitiesData((prev) => ({ ...prev, loading: true }));
<tr className="bg-white dark:bg-dark-white border-b dark:border-[#5356fb29] hover:bg-gray-50"> let res;
<td className=" py-8"> try {
<div className="flex space-x-2 items-center"> res = await _apiCall.getRecentActivities(null);
<div className="w-[60px] h-[60px] rounded-full overflow-hidden flex justify-center items-center"> res = res.data;
<img if (res?.internal_return >= 0) {
src={dataImage1} setRecentActivitiesData((prev) => ({
alt="data" ...prev,
className="w-full h-full" loading: false,
/> status: true,
</div> data: res.result_list,
<div className="flex flex-col"> }));
<h1 className="font-bold text-xl text-dark-gray dark:text-white"> } else {
Title Here setRecentActivitiesData((prev) => ({
</h1> ...prev,
<span className="text-sm text-thin-light-gray"> loading: false,
Description Goes Here status: false,
</span> msg: "Something went wrong",
</div> }));
</div> }
</td> } catch (error) {
setRecentActivitiesData((prev) => ({
...prev,
loading: false,
status: false,
msg: "Unable to see this",
}));
throw new Error(`Unable to see this because: ${error}`);
}
};
useEffect(() => {
getRecentActivities();
}, []);
console.log(recentActivitiesData);
<td className="text-right py-4"> return (
<div className="flex space-x-1 items-center justify-center"> <div
className={`update-table w-full p-8 bg-white dark:bg-dark-white overflow-hidden rounded-2xl section-shadow relative min-h-[520px] ${
<span className="text-base text-dark-gray dark:text-white font-medium"> className || ""
AddedHERE }`}
</span> >
</div> <div className="header w-full sm:flex justify-between items-center mb-5">
</td> <div className="flex space-x-2 items-center mb-2 sm:mb-0">
</tr> <h1 className="text-xl font-bold text-dark-gray dark:text-white tracking-wide">
</tbody> Recent Activities
</table> </h1>
</div>
</div> </div>
); </div>
<div className="relative w-full overflow-x-auto sm:rounded-lg">
<table className="w-full text-sm text-left text-gray-500 dark:text-gray-400">
<tbody>
{/* table heading */}
{/*<tr className="text-base text-thin-light-gray whitespace-nowrap px-2 border-b dark:border-[#5356fb29] default-border-b dark:border-[#5356fb29] ottom ">*/}
{/* <td className="py-4 w-[300px] block whitespace-nowrap">*/}
{/* All Product*/}
{/* </td>*/}
{/* <td className="py-4 whitespace-nowrap text-center">.</td>*/}
{/* <td className="py-4 whitespace-nowrap text-center"></td>*/}
{/* <td className="py-4 whitespace-nowrap text-right"></td>*/}
{/*</tr>*/}
{recentActivitiesData.loading ? (
<></>
) : recentActivitiesData.data ? (
recentActivitiesData.data?.map((item) => {
let addedDate = item?.added?.split(" ")[0];
return (
<tr
className="bg-white dark:bg-dark-white border-b dark:border-[#5356fb29] hover:bg-gray-50"
key={item.uid}
>
<td className=" py-8">
<div className="flex space-x-2 items-center">
<div className="w-[60px] h-[60px] rounded-full overflow-hidden flex justify-center items-center">
<img
src={dataImage1}
alt="data"
className="w-full h-full"
/>
</div>
<div className="flex flex-col">
<h1 className="font-bold text-xl text-dark-gray dark:text-white">
{item.title ? item.title : "Title"}
</h1>
<span className="text-sm text-thin-light-gray">
{item.description ? item.description : ""}
</span>
</div>
</div>
</td>
<td className="text-right py-4">
<div className="flex space-x-1 items-center justify-center">
<span className="text-base text-dark-gray dark:text-white font-medium">
{item.added ? addedDate : ""}
</span>
</div>
</td>
</tr>
);
})
) : null}
</tbody>
</table>
</div>
</div>
);
} }
+10
View File
@@ -30,6 +30,16 @@ class usersService {
return this.postAuxEnd("/dashdata", postData); return this.postAuxEnd("/dashdata", postData);
} }
getRecentActivities(){
var postData = {
uid: localStorage.getItem("uid"),
member_id: localStorage.getItem("member_id"),
sessionid: localStorage.getItem("session_token"),
action: 11202
};
return this.postAuxEnd("/recentactivities", postData);
}
logInUser(reqData) { logInUser(reqData) {
localStorage.setItem("session_token", ``); localStorage.setItem("session_token", ``);
return this.postAuxEnd("/userlogin", reqData); return this.postAuxEnd("/userlogin", reqData);