From efbde10517c8e5b59fc574e77851330a448f30be Mon Sep 17 00:00:00 2001
From: lifeparticle <mahbubzaman17@gmail.com>
Date: Fri, 22 Sep 2023 19:21:44 +1000
Subject: [PATCH] refactor

---
 .../General/ListItems/News/News.tsx           |  7 ++-
 ui/src/pages/About/index.tsx                  |  2 +-
 ui/src/pages/Feedback/index.tsx               | 48 ++++++++++---------
 ui/src/pages/Home/components/Contribution.tsx |  2 +-
 ui/src/pages/Home/components/Hero.tsx         |  2 +-
 ui/src/pages/Home/components/Values.tsx       | 48 -------------------
 ui/src/pages/Home/index.tsx                   |  2 -
 ui/src/pages/Newsfeed/utils/constants.ts      |  5 +-
 ui/src/pages/Newsfeed/utils/hooks.ts          |  4 +-
 9 files changed, 40 insertions(+), 80 deletions(-)
 delete mode 100644 ui/src/pages/Home/components/Values.tsx

diff --git a/ui/src/components/General/ListItems/News/News.tsx b/ui/src/components/General/ListItems/News/News.tsx
index 2ce4677a..abefd2ea 100644
--- a/ui/src/components/General/ListItems/News/News.tsx
+++ b/ui/src/components/General/ListItems/News/News.tsx
@@ -15,7 +15,12 @@ const News: React.FC<ListItemProps<NewsType>> = ({
 			<Skeleton loading={isLoading}>
 				<Space size={"middle"} align="start">
 					{image && (
-						<Image width={200} preview={false} src={image} alt="" />
+						<Image
+							width="10vw"
+							preview={false}
+							src={image}
+							alt=""
+						/>
 					)}
 					<div>
 						<Title level={4}>{title}</Title>
diff --git a/ui/src/pages/About/index.tsx b/ui/src/pages/About/index.tsx
index 245aad62..8fb914d6 100644
--- a/ui/src/pages/About/index.tsx
+++ b/ui/src/pages/About/index.tsx
@@ -9,7 +9,7 @@ import {
 import { Card, List, Table, Typography } from "antd";
 import style from "./About.module.scss";
 import about from "assets/about.jpg";
-import Footer from "../../components/Layouts/Footer";
+import Footer from "components/Layouts/Footer";
 
 const About = () => {
 	return (
diff --git a/ui/src/pages/Feedback/index.tsx b/ui/src/pages/Feedback/index.tsx
index 363d04f5..33c73c66 100644
--- a/ui/src/pages/Feedback/index.tsx
+++ b/ui/src/pages/Feedback/index.tsx
@@ -1,34 +1,38 @@
 import { useState } from "react";
 import style from "./Feedback.module.scss";
 import { Skeleton } from "antd";
+import Footer from "components/Layouts/Footer";
 
 const AirtableEmbed = () => {
 	const [loading, setLoading] = useState(true);
 
 	return (
-		<div className={style.feedback}>
-			{loading && (
-				<div className={style.feedback__skeletons}>
-					<Skeleton active title paragraph={{ rows: 10 }} />
-					<Skeleton.Input active />
-					<Skeleton title active />
-					<Skeleton active paragraph={{ rows: 10 }} />
-					<Skeleton.Input active />
-					<Skeleton active paragraph={{ rows: 10 }} />
-					<Skeleton.Input active />
-					<Skeleton active paragraph={{ rows: 10 }} />
-					<Skeleton.Input active />
-					<Skeleton.Button active />
-				</div>
-			)}
+		<>
+			<div className={style.feedback}>
+				{loading && (
+					<div className={style.feedback__skeletons}>
+						<Skeleton active title paragraph={{ rows: 10 }} />
+						<Skeleton.Input active />
+						<Skeleton title active />
+						<Skeleton active paragraph={{ rows: 10 }} />
+						<Skeleton.Input active />
+						<Skeleton active paragraph={{ rows: 10 }} />
+						<Skeleton.Input active />
+						<Skeleton active paragraph={{ rows: 10 }} />
+						<Skeleton.Input active />
+						<Skeleton.Button active />
+					</div>
+				)}
 
-			<iframe
-				className={`airtable-embed airtable-dynamic-height ${style.iframe}`}
-				src="https://airtable.com/embed/appbcH1EyjqD8PXkK/shrm5RlUHdworbgSz?backgroundColor=blue"
-				height="1949.375"
-				onLoad={() => setLoading(false)}
-			></iframe>
-		</div>
+				<iframe
+					className={`airtable-embed airtable-dynamic-height ${style.iframe}`}
+					src="https://airtable.com/embed/appbcH1EyjqD8PXkK/shrm5RlUHdworbgSz?backgroundColor=blue"
+					height="1949.375"
+					onLoad={() => setLoading(false)}
+				></iframe>
+			</div>
+			<Footer />
+		</>
 	);
 };
 
diff --git a/ui/src/pages/Home/components/Contribution.tsx b/ui/src/pages/Home/components/Contribution.tsx
index 07d80c88..004090aa 100644
--- a/ui/src/pages/Home/components/Contribution.tsx
+++ b/ui/src/pages/Home/components/Contribution.tsx
@@ -1,5 +1,5 @@
 import React from "react";
-import style from "../Home.module.scss";
+import style from "pages/Home/Home.module.scss";
 import { Space, Typography } from "antd";
 import { ResponsiveButton } from "components/General/FormComponents";
 
diff --git a/ui/src/pages/Home/components/Hero.tsx b/ui/src/pages/Home/components/Hero.tsx
index 7f078df9..ad2887f6 100644
--- a/ui/src/pages/Home/components/Hero.tsx
+++ b/ui/src/pages/Home/components/Hero.tsx
@@ -1,5 +1,5 @@
 import React from "react";
-import style from "../Home.module.scss";
+import style from "pages/Home/Home.module.scss";
 import { Typography } from "antd";
 import { FEATURE_DATA } from "pages/About/utils/constants";
 
diff --git a/ui/src/pages/Home/components/Values.tsx b/ui/src/pages/Home/components/Values.tsx
deleted file mode 100644
index d9f679b7..00000000
--- a/ui/src/pages/Home/components/Values.tsx
+++ /dev/null
@@ -1,48 +0,0 @@
-import React from "react";
-import style from "pages/Home/Home.module.scss";
-import { Card, Col, Row, Space } from "antd";
-import { APP_VALUES } from "pages/About/utils/constants";
-import verification from "assets/home/verification.svg";
-import share from "assets/home/share.svg";
-import detection from "assets/home/detection.svg";
-import { Typography } from "antd";
-
-const Values: React.FC = () => {
-	return (
-		<Space direction="vertical" size={"large"}>
-			<Typography.Title className={style.home__values}>
-				Value
-			</Typography.Title>
-			<Row gutter={[16, 16]}>
-				<Col xs={24} lg={8}>
-					<Card
-						cover={<img src={share} alt="logo" />}
-						style={{ minHeight: 550 }}
-					>
-						{APP_VALUES[0]}
-					</Card>
-				</Col>
-
-				<Col xs={24} lg={8}>
-					<Card
-						cover={<img src={verification} alt="logo" />}
-						style={{ minHeight: 550 }}
-					>
-						{APP_VALUES[1]}
-					</Card>
-				</Col>
-
-				<Col xs={24} lg={8}>
-					<Card
-						cover={<img src={detection} alt="logo" />}
-						style={{ minHeight: 550 }}
-					>
-						{APP_VALUES[2]}
-					</Card>
-				</Col>
-			</Row>
-		</Space>
-	);
-};
-
-export default Values;
diff --git a/ui/src/pages/Home/index.tsx b/ui/src/pages/Home/index.tsx
index 473acaa4..896cb270 100644
--- a/ui/src/pages/Home/index.tsx
+++ b/ui/src/pages/Home/index.tsx
@@ -3,7 +3,6 @@ import Footer from "components/Layouts/Footer";
 import Features from "./components/Features";
 import Hero from "./components/Hero";
 import Contribution from "./components/Contribution";
-import Values from "./components/Values";
 
 const Home = () => {
 	return (
@@ -11,7 +10,6 @@ const Home = () => {
 			<div className={style.home__container}>
 				<Hero />
 				<Features />
-				<Values />
 				<Contribution />
 			</div>
 			<Footer />
diff --git a/ui/src/pages/Newsfeed/utils/constants.ts b/ui/src/pages/Newsfeed/utils/constants.ts
index e837118a..ac2e8b55 100644
--- a/ui/src/pages/Newsfeed/utils/constants.ts
+++ b/ui/src/pages/Newsfeed/utils/constants.ts
@@ -35,10 +35,11 @@ const TAB_ITEMS: TabsProps["items"] = [
 		show: true,
 	},
 ].filter((item) => item.show);
-const ROOT_URL = import.meta.env.DEV
+
+const BASE_URL = import.meta.env.DEV
 	? "http://localhost:5000/rss?name="
 	: "https://binarytree-rssfeed-api.vercel.app/rss?name=";
 
 const QUERY_KEY_NEWS = "news";
 
-export { SITE_OPTIONS, TAB_ITEMS, ROOT_URL, QUERY_KEY_NEWS };
+export { SITE_OPTIONS, TAB_ITEMS, BASE_URL, QUERY_KEY_NEWS };
diff --git a/ui/src/pages/Newsfeed/utils/hooks.ts b/ui/src/pages/Newsfeed/utils/hooks.ts
index 02059328..78f477d4 100644
--- a/ui/src/pages/Newsfeed/utils/hooks.ts
+++ b/ui/src/pages/Newsfeed/utils/hooks.ts
@@ -1,6 +1,6 @@
 import { useState } from "react";
 import { parseXML } from "./helper";
-import { ROOT_URL, SITE_OPTIONS } from "./constants";
+import { BASE_URL, SITE_OPTIONS } from "./constants";
 import useFetchList from "lib/utils/hooks/useFetchList";
 
 const useNewsFeed = () => {
@@ -11,7 +11,7 @@ const useNewsFeed = () => {
 
 	const { data, isLoading, isError } = useFetchList(
 		url,
-		isFeedItem ? `${ROOT_URL}${url}` : url
+		isFeedItem ? `${BASE_URL}${url}` : url
 	);
 	let items = undefined;
 	if (data) {