Merge pull request #317 from ashik-75/work

update changes
lifeparticle · Sep 16, 2023 · 03cc2d1 · 03cc2d1
2 parents cff1e7c + ba7bb0e
commit 03cc2d1
Show file tree

Hide file tree

Showing 7 changed files with 48 additions and 656 deletions.
diff --git a/ui/package.json b/ui/package.json
@@ -15,7 +15,7 @@
 		"@types/file-saver": "^2.0.5",
 		"@types/jest": "^29.5.1",
 		"@types/react-router-dom": "^5.3.3",
-		"@uiw/react-markdown-editor": "^5.11.2",
+		"@uiw/react-markdown-preview": "^4.1.15",
 		"@uiw/react-md-editor": "^3.23.5",
 		"antd": "^5.4.7",
 		"buffer": "^6.0.3",

diff --git a/ui/src/components/Layouts/Menu/Menu.module.scss b/ui/src/components/Layouts/Menu/Menu.module.scss
@@ -1,8 +1,6 @@
 .menu {
 	height: calc(100dvh - 204px);
 	overflow-y: auto;
-	display: flex;
-	flex-direction: column;
 
 	&__collapsed {
 		height: calc(100dvh - 202px);

diff --git a/ui/src/components/Layouts/Menu/utils/constants.ts b/ui/src/components/Layouts/Menu/utils/constants.ts
@@ -9,8 +9,14 @@ export const MENU_ITEMS = [
 		name: "Newsfeed",
 		icon: "Newspaper",
 		show: true,
-		url: "/newsfeed",
-		children: [],
+		children: [
+			{
+				name: "News",
+				url: "/newsfeed",
+				icon: "Mailbox",
+				show: true,
+			},
+		],
 	},
 	{
 		name: "Colors",
@@ -260,7 +266,7 @@ const ITEMS: MenuProps["items"] = [
 	...MENU_ITEMS.filter((rootItem) => rootItem.show).map((item) => {
 		return getItem(
 			item.name,
-			item?.url ?? (item.name as React.Key),
+			item.name as React.Key,
 			item.icon as IconName,
 			item.children.length > 0
 				? item.children

diff --git a/ui/src/pages/About/components/Footer/Footer.module.scss b/ui/src/pages/About/components/Footer/Footer.module.scss
@@ -10,23 +10,26 @@
 	&__left {
 		display: flex;
 		align-items: center;
-		&_legal {
-			ul {
-				list-style-type: none;
-				display: flex;
-				gap: var(--bt-size-10);
-			}
+		gap: var(--bt-size-20);
+		&_list {
+			list-style-type: none;
+			display: flex;
+			gap: var(--bt-size-10);
+			padding: 0px;
 		}
 	}
 
 	@media (max-width: 767px) {
 		gap: var(--bt-size-10);
 		flex-direction: column;
 		align-items: center;
+		justify-items: center;
 
 		&__left {
 			display: flex;
 			flex-direction: column;
+			justify-items: center;
+			align-items: center;
 			gap: var(--bt-size-10);
 		}
 	}

diff --git a/ui/src/pages/About/components/Footer/index.tsx b/ui/src/pages/About/components/Footer/index.tsx
@@ -17,34 +17,31 @@ const Footer: React.FC = () => {
 			<div className={style.footer__left}>
 				<div className={style.footer__left_year}>
 					<Typography.Text>
-						&copy; {new Date().getFullYear()}
+						&copy; {new Date().getFullYear()} Binarytree
 					</Typography.Text>
 				</div>
+				<ul className={style.footer__left_list}>
+					<li>
+						<a
+							href="https://github.com/lifeparticle/binarytree/blob/main/CODE_OF_CONDUCT.md"
+							target="_blank"
+						>
+							Code of Conduct
+						</a>
+					</li>
 
-				<div className={style.footer__left_legal}>
-					<ul>
-						<li>
-							<a
-								href="https://github.com/lifeparticle/binarytree/blob/main/CODE_OF_CONDUCT.md"
-								target="_blank"
-							>
-								Code of Conduct
-							</a>
-						</li>
-
-						<li>
-							<a href="#">Privacy</a>
-						</li>
-						<li>
-							<a href="#">Terms</a>
-						</li>
-						<li>
-							<a href="https://github.com/lifeparticle/binarytree#status">
-								Status
-							</a>
-						</li>
-					</ul>
-				</div>
+					<li>
+						<a href="#">Privacy</a>
+					</li>
+					<li>
+						<a href="#">Terms</a>
+					</li>
+					<li>
+						<a href="https://github.com/lifeparticle/binarytree#status">
+							Status
+						</a>
+					</li>
+				</ul>
 			</div>
 
 			<ResponsiveButton

diff --git a/ui/src/pages/CSS/BorderRadius/BorderRadius.module.scss b/ui/src/pages/CSS/BorderRadius/BorderRadius.module.scss
@@ -1,18 +1,21 @@
 .br {
+	display: flex;
+	flex-direction: column;
+	gap: var(--bt-size-20);
 	&__input,
 	&__output {
 		height: 100%;
 	}
 
 	&__output {
 		display: flex;
-		gap: 10px;
 		justify-content: center;
 		align-items: center;
 
 		&_container {
 			display: flex;
 			flex-direction: row;
+			gap: var(--bt-size-20);
 
 			&_text,
 			&_img {