Completed layout for family activities
This commit was merged in pull request #620.
This commit is contained in:
@@ -1,8 +1,9 @@
|
|||||||
import React, { Suspense, useMemo, useState } from "react";
|
import React, { Suspense, useMemo, useState } from "react";
|
||||||
|
import { Link } from "react-router-dom";
|
||||||
import usersService from "../../services/UsersService";
|
import usersService from "../../services/UsersService";
|
||||||
import Layout from "../Partials/Layout";
|
import Layout from "../Partials/Layout";
|
||||||
import LoadingSpinner from "../Spinners/LoadingSpinner";
|
import LoadingSpinner from "../Spinners/LoadingSpinner";
|
||||||
import FamilyTable from "./FamilyTable";
|
import FamilyTableNew from "./FamilyTableNew";
|
||||||
|
|
||||||
export default function FamilyActivities() {
|
export default function FamilyActivities() {
|
||||||
const [familyList, setFamilyList] = useState({});
|
const [familyList, setFamilyList] = useState({});
|
||||||
@@ -22,9 +23,27 @@ export default function FamilyActivities() {
|
|||||||
<span className={``}>Tasks & Chores</span>
|
<span className={``}>Tasks & Chores</span>
|
||||||
</h1>
|
</h1>
|
||||||
</div>
|
</div>
|
||||||
|
<Link className="flex items-center gap-2" to="/acc-family">
|
||||||
|
<svg
|
||||||
|
xmlns="http://www.w3.org/2000/svg"
|
||||||
|
fill="none"
|
||||||
|
viewBox="0 0 24 24"
|
||||||
|
strokeWidth={1.5}
|
||||||
|
stroke="currentColor"
|
||||||
|
className="w-4 h-4"
|
||||||
|
>
|
||||||
|
<path
|
||||||
|
strokeLinecap="round"
|
||||||
|
strokeLinejoin="round"
|
||||||
|
d="M10.5 19.5 3 12m0 0 7.5-7.5M3 12h18"
|
||||||
|
/>
|
||||||
|
</svg>
|
||||||
|
|
||||||
|
<span>Family</span>
|
||||||
|
</Link>
|
||||||
</div>
|
</div>
|
||||||
<Suspense fallback={<LoadingSpinner color="sky-blue" size="16" />}>
|
<Suspense fallback={<LoadingSpinner color="sky-blue" size="16" />}>
|
||||||
<FamilyTable
|
<FamilyTableNew
|
||||||
familyList={familyList?.result_list}
|
familyList={familyList?.result_list}
|
||||||
loader={loader}
|
loader={loader}
|
||||||
imageServer={familyList?.session_image_server}
|
imageServer={familyList?.session_image_server}
|
||||||
|
|||||||
@@ -21,7 +21,7 @@ import React, {
|
|||||||
const FamilyTasks = lazy(() => import("./Tabs/FamilyTasks"));
|
const FamilyTasks = lazy(() => import("./Tabs/FamilyTasks"));
|
||||||
const FamilyPending = lazy(() => import("./Tabs/FamilyPending"));
|
const FamilyPending = lazy(() => import("./Tabs/FamilyPending"));
|
||||||
|
|
||||||
export default function FamilyManageTabs({
|
export default function FamilyTableNew({
|
||||||
className,
|
className,
|
||||||
accountDetails,
|
accountDetails,
|
||||||
listReload,
|
listReload,
|
||||||
@@ -253,7 +253,7 @@ import React, {
|
|||||||
</div>
|
</div>
|
||||||
}
|
}
|
||||||
>
|
>
|
||||||
<div className="w-full h-full text-sm text-left text-gray-500 dark:text-gray-400 relative grid grid-cols-4 min-h-[575px]">
|
<div className="w-full h-full text-sm text-left text-gray-500 dark:text-gray-400 relative grid grid-cols-3 min-h-[575px]">
|
||||||
<div className="col-span-3 h-full w-full">
|
<div className="col-span-3 h-full w-full">
|
||||||
<div className="flex flex-col w-full">
|
<div className="flex flex-col w-full">
|
||||||
<div className="w-full pr-8 flex items-center gap-1 border-b border-b-[#FAFAF]">
|
<div className="w-full pr-8 flex items-center gap-1 border-b border-b-[#FAFAF]">
|
||||||
|
|||||||
Reference in New Issue
Block a user