From e3736b3273453cc6681416d0058410a5680401aa Mon Sep 17 00:00:00 2001
From: Brian Wang <brian.wang@student.unsw.edu.au>
Date: Tue, 18 Jul 2023 17:27:38 +1000
Subject: [PATCH 1/2] initial implementation of passing name to blog

---
 .../components/FileRenderer/FileContainer.tsx |  9 +++---
 next/src/pages/blog/[bid].tsx                 | 30 +++++++++++++++++--
 2 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/frontend/src/packages/dashboard/components/FileRenderer/FileContainer.tsx b/frontend/src/packages/dashboard/components/FileRenderer/FileContainer.tsx
index 38fe094eb..f56c7e4e7 100644
--- a/frontend/src/packages/dashboard/components/FileRenderer/FileContainer.tsx
+++ b/frontend/src/packages/dashboard/components/FileRenderer/FileContainer.tsx
@@ -48,12 +48,13 @@ function FileContainer({ name, id, selectedFile, setSelectedFile }: Props) {
     console.log(id);
     setSelectedFile(id);
     if (selectedFile !== null) {
-      navigate("/editor/" + selectedFile, { 
+      navigate("/editor/" + selectedFile, {
         replace: false,
         state: {
-          filename: name
-        } 
-      }), [navigate];
+          filename: name,
+        },
+      }),
+        [navigate];
     }
   };
 
diff --git a/next/src/pages/blog/[bid].tsx b/next/src/pages/blog/[bid].tsx
index 4b52d12e7..e77c2a13d 100644
--- a/next/src/pages/blog/[bid].tsx
+++ b/next/src/pages/blog/[bid].tsx
@@ -22,7 +22,11 @@ const MainContainer = styled.div`
   min-height: 80vh;
 `;
 
-const BlogPage: NextPage<{ data: Block[] }> = ({ data }) => {
+const BlogPage: NextPage<{ data: Block[]; blogName: any }> = ({
+  data,
+  blogName,
+}) => {
+  console.log("data", data);
   return (
     <PageContainer>
       <Navbar
@@ -32,7 +36,7 @@ const BlogPage: NextPage<{ data: Block[] }> = ({ data }) => {
       />{" "}
       {/** ignore the styling */}
       <MainContainer>
-        <BlogHeading>Blog Title</BlogHeading>
+        <BlogHeading>{blogName}</BlogHeading>
         <Blog blocks={data} />
       </MainContainer>
       <Footer />
@@ -49,7 +53,27 @@ export const getServerSideProps: GetServerSideProps = async ({ params }) => {
       method: "GET",
     }
   ).then((res) => res.text());
-  return { props: { data: JSON.parse(data).Contents } };
+
+  const blogInfo = await fetch(
+    `http://backend:8080/api/filesystem/info?EntityID=${params && params.bid}`,
+    {
+      method: "GET",
+    }
+  );
+
+  if (!blogInfo.ok) {
+    const message = `An error has occured: ${blogInfo.status}`;
+    throw new Error(message);
+  }
+
+  const blogInfo_json = await blogInfo.json();
+
+  return {
+    props: {
+      data: JSON.parse(data).Contents,
+      blogName: blogInfo_json.Response.EntityName,
+    },
+  };
 };
 
 export default BlogPage;

From 4e61d154f18e7f00a18ca2c44cef8aea66effccb Mon Sep 17 00:00:00 2001
From: Brian Wang <brian.wang@student.unsw.edu.au>
Date: Tue, 18 Jul 2023 18:08:48 +1000
Subject: [PATCH 2/2] cleaned up code

---
 next/src/pages/blog/[bid].tsx | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/next/src/pages/blog/[bid].tsx b/next/src/pages/blog/[bid].tsx
index e77c2a13d..2f9b01354 100644
--- a/next/src/pages/blog/[bid].tsx
+++ b/next/src/pages/blog/[bid].tsx
@@ -22,11 +22,10 @@ const MainContainer = styled.div`
   min-height: 80vh;
 `;
 
-const BlogPage: NextPage<{ data: Block[]; blogName: any }> = ({
+const BlogPage: NextPage<{ data: Block[]; blogName: string }> = ({
   data,
   blogName,
 }) => {
-  console.log("data", data);
   return (
     <PageContainer>
       <Navbar
@@ -45,6 +44,7 @@ const BlogPage: NextPage<{ data: Block[]; blogName: any }> = ({
 };
 
 export const getServerSideProps: GetServerSideProps = async ({ params }) => {
+  // get blog data
   const data = await fetch(
     `http://backend:8080/api/filesystem/get/published?DocumentID=${
       params && params.bid
@@ -52,26 +52,25 @@ export const getServerSideProps: GetServerSideProps = async ({ params }) => {
     {
       method: "GET",
     }
-  ).then((res) => res.text());
+  )
+    .then((res) => res.text())
+    .then((res) => JSON.parse(res).Contents);
 
-  const blogInfo = await fetch(
+  // get blog name
+  const blogName = await fetch(
     `http://backend:8080/api/filesystem/info?EntityID=${params && params.bid}`,
     {
       method: "GET",
     }
-  );
-
-  if (!blogInfo.ok) {
-    const message = `An error has occured: ${blogInfo.status}`;
-    throw new Error(message);
-  }
-
-  const blogInfo_json = await blogInfo.json();
+  )
+    .then((blogInfo) => blogInfo.json())
+    .then((blogInfo_json) => blogInfo_json.Response.EntityName)
+    .catch((err) => console.log("ERROR fetching blogInfo: ", err));
 
   return {
     props: {
-      data: JSON.parse(data).Contents,
-      blogName: blogInfo_json.Response.EntityName,
+      data: data,
+      blogName: blogName,
     },
   };
 };