refactor

lifeparticle · Sep 26, 2023 · a92c696 · a92c696
1 parent cc5fe5b
commit a92c696
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 19 deletions.
diff --git a/ui/src/components/Hoc/withPageTitle/withPageTitle.tsx b/ui/src/components/Hoc/withPageTitle/withPageTitle.tsx
@@ -9,9 +9,14 @@ const NO_PADDING = [
 	"BinaryTree: Developer Productivity Tools",
 	"About",
 	"Terms",
+	"Cookie Policy",
 ];
 
-const NO_TITLE = ["BinaryTree: Developer Productivity Tools", "Terms"];
+const NO_TITLE = [
+	"BinaryTree: Developer Productivity Tools",
+	"Terms",
+	"Cookie Policy",
+];
 
 const withPageTitle = <T extends object>(
 	WrappedComponent: React.ComponentType<T>

diff --git a/ui/src/components/Layouts/Footer/index.tsx b/ui/src/components/Layouts/Footer/index.tsx
@@ -113,18 +113,20 @@ const Footer: React.FC = () => {
 				<Typography.Title level={4}>Legal</Typography.Title>
 				<ul className={style.footer__list}>
 					<li>
-						<a onClick={() => openLink("/terms", false)}>Terms</a>
+						<Link to={"/terms"}>
+							<a>Terms</a>
+						</Link>
 					</li>
 					<li>
-						<a onClick={() => openLink("/privacy", false)}>
-							Privacy
-						</a>
+						<Link to={"/privacy"}>
+							<a>Privacy</a>
+						</Link>
 					</li>
 
 					<li>
-						<a onClick={() => openLink("//cookie-policy", false)}>
-							Cookie Policy
-						</a>
+						<Link to={"/cookie-policy"}>
+							<a>Cookie Policy</a>
+						</Link>
 					</li>
 				</ul>
 			</Space>

diff --git a/ui/src/pages/Footer/CookiePolicy/CookiePolicy.module.scss b/ui/src/pages/Footer/CookiePolicy/CookiePolicy.module.scss
@@ -1,4 +1,4 @@
-.privacypolicy {
+.cookiepolicy {
 	padding: 64px 10% 64px 10%;
 	display: flex;
 

diff --git a/ui/src/pages/Footer/CookiePolicy/index.tsx b/ui/src/pages/Footer/CookiePolicy/index.tsx
@@ -3,12 +3,12 @@ import Footer from "components/Layouts/Footer";
 import style from "./CookiePolicy.module.scss";
 import { TABLE_COLUMNS, TABLE_DATA } from "./utils/constants";
 
-const PrivacyPolicy = () => {
+const CookiePolicy = () => {
 	return (
 		<>
-			<Space direction="vertical" className={style.privacypolicy}>
-				<div className={style.privacypolicy__header}>
-					<Typography.Title level={1}>COOKIE POLICY</Typography.Title>
+			<Space direction="vertical" className={style.cookiepolicy}>
+				<div className={style.cookiepolicy__header}>
+					<Typography.Title level={1}>Cookie Policy</Typography.Title>
 				</div>
 				<Typography.Paragraph>
 					This Cookie Policy explains how BinaryTree
@@ -217,4 +217,4 @@ const PrivacyPolicy = () => {
 	);
 };
 
-export default PrivacyPolicy;
+export default CookiePolicy;
diff --git a/ui/src/pages/Home/components/Contribution.tsx b/ui/src/pages/Home/components/Contribution.tsx
@@ -10,7 +10,9 @@ const Contribution: React.FC = () => {
 	return (
 		<section className={style.home__contribution}>
 			<Space direction="vertical">
-				<Typography.Title>Join our community</Typography.Title>
+				<Typography.Title level={2}>
+					Join our community
+				</Typography.Title>
 				<Typography.Text>
 					Join our open-source community and help shape the future of
 					Modern web

diff --git a/ui/src/pages/Home/components/Features.tsx b/ui/src/pages/Home/components/Features.tsx
@@ -3,13 +3,16 @@ import { Button, Card, Col, Row, Space, Typography } from "antd";
 import Icon from "components/General/Icon";
 import { FEATURES } from "pages/Home/utils/constants";
 import style from "pages/Home/Home.module.scss";
-import { openLink } from "lib/utils/helper";
+import { useNavigate } from "react-router-dom";
+
 const Features: React.FC = () => {
+	const navigate = useNavigate();
+
 	return (
 		<Row gutter={[16, 16]}>
 			<Col xs={24} lg={8} className={style.home__features}>
 				<Space direction="vertical">
-					<Typography.Title>
+					<Typography.Title level={2}>
 						BinaryTree comes packed with some awesome features
 					</Typography.Title>
 					<Typography.Paragraph>
@@ -27,7 +30,7 @@ const Features: React.FC = () => {
 					{FEATURES.map((feature) => (
 						<Col xs={24} lg={8} key={feature.id}>
 							<Card
-								onClick={() => openLink(feature.link, false)}
+								onClick={() => navigate(feature.link)}
 								hoverable
 							>
 								<Icon name={feature.icon} size={40} />

diff --git a/ui/src/pages/Routes/utils/constant.tsx b/ui/src/pages/Routes/utils/constant.tsx
@@ -340,7 +340,7 @@ export const routes: Route[] = [
 	{
 		id: "cookiepolicy",
 		path: "/cookie-policy",
-		title: "",
+		title: "Cookie Policy",
 		description: "",
 		component: CookiePolicy,
 	},