diff --git a/src/assets/images/premium-one.png b/src/assets/images/premium-one.png new file mode 100644 index 0000000..6bb9f4b Binary files /dev/null and b/src/assets/images/premium-one.png differ diff --git a/src/assets/images/premium.png b/src/assets/images/premium.png new file mode 100644 index 0000000..69e7789 Binary files /dev/null and b/src/assets/images/premium.png differ diff --git a/src/assets/images/standard-one.png b/src/assets/images/standard-one.png new file mode 100644 index 0000000..9bf8128 Binary files /dev/null and b/src/assets/images/standard-one.png differ diff --git a/src/assets/images/standard.png b/src/assets/images/standard.png new file mode 100644 index 0000000..ac294b4 Binary files /dev/null and b/src/assets/images/standard.png differ diff --git a/src/assets/images/unlimited-one.png b/src/assets/images/unlimited-one.png new file mode 100644 index 0000000..9dd320f Binary files /dev/null and b/src/assets/images/unlimited-one.png differ diff --git a/src/assets/images/unlimited.png b/src/assets/images/unlimited.png new file mode 100644 index 0000000..52cdf7a Binary files /dev/null and b/src/assets/images/unlimited.png differ diff --git a/src/components/Partials/Layout.jsx.rej b/src/components/Partials/Layout.jsx.rej new file mode 100644 index 0000000..a5f21f9 --- /dev/null +++ b/src/components/Partials/Layout.jsx.rej @@ -0,0 +1,10 @@ +diff a/src/components/Partials/Layout.jsx b/src/components/Partials/Layout.jsx (rejected hunks) +@@ -143,7 +143,7 @@ + +
+

+- Are you sure you want to Logout of your myFit account? ++ Are you sure you want to Logout of your myFit account ? +

+
+
diff --git a/src/components/Resources/BlogTab.jsx b/src/components/Resources/BlogTab.jsx new file mode 100644 index 0000000..c4cee3c --- /dev/null +++ b/src/components/Resources/BlogTab.jsx @@ -0,0 +1,58 @@ +import React from "react"; +import ProductCardStyleTwo from "../Cards/ProductCardStyleTwo"; +import DataIteration from "../Helpers/DataIteration"; +import SearchCom from "../Helpers/SearchCom"; + +export default function BlogTab({ className, products }) { + return ( + <> +
+
+
+ {/* filter-search */} +
+ +
+ {/* filer-dropdown */} +
+
+ + Recently Received + + + + + + +
+
+
+
+
+ + {({ datas }) => ( + + )} + +
+
+
+
+ + ); +} diff --git a/src/components/Resources/index.jsx b/src/components/Resources/index.jsx index df18c24..ce5c6e1 100755 --- a/src/components/Resources/index.jsx +++ b/src/components/Resources/index.jsx @@ -13,6 +13,8 @@ import HiddenProductsTab from "./HiddenProductsTab"; import OnSaleTab from "./OnSaleTab"; import OwnTab from "./OwnTab"; +import BlogTab from "./BlogTab"; + import usersService from "../../services/UsersService"; export default function Resources() { @@ -26,8 +28,8 @@ export default function Resources() { const tabs = [ { id: 1, - name: "onsale", - content: "On Sale", + name: "blog", + content: "Blogs", }, { id: 2, @@ -67,8 +69,7 @@ export default function Resources() { const getUserResources = async () => { try { const res = await api.getUserResources(); - - // setUserResource(res.data.reminders); + setUserResource(res.data.resources); setIsLoading(false) }catch(error) { @@ -139,8 +140,8 @@ export default function Resources() {
- {tab === "onsale" ? ( - + {tab === "blog" ? ( + ) : tab === "owned" ? ( ) : tab === "created" ? (