From 5ef44c4b24eff88a3de98ca1db6c86a623e1793d Mon Sep 17 00:00:00 2001 From: AceYang123 Date: Thu, 10 Aug 2023 10:25:55 -0400 Subject: [PATCH 1/4] title & description add the title and description --- index.js | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 index.js diff --git a/index.js b/index.js new file mode 100644 index 0000000..77fc02d --- /dev/null +++ b/index.js @@ -0,0 +1,12 @@ +export default function Home() { + return ( +
+
+ Course Wiki +
+
+ Knowledge is the cheapest and most rewarding investment +
+
+ ); +} From 75120a17b970b1fa798e8caf301f7d186a84f8f4 Mon Sep 17 00:00:00 2001 From: mgrddsj Date: Fri, 18 Aug 2023 20:30:32 -0400 Subject: [PATCH 2/4] feat(frontend): Update NavigationBar to new design Updated the navigation bar to match the design specified in the figma sample. https://www.figma.com/file/MOSsfrxz01UqA94gO4eEc2/Untitled?type=design&node-id=0%3A1&mode=design&t=aIj3fmQBP15udH7g-1 --- client/src/components/NavigationBar.js | 72 +++++++++----------------- 1 file changed, 25 insertions(+), 47 deletions(-) diff --git a/client/src/components/NavigationBar.js b/client/src/components/NavigationBar.js index fac1c24..cc52670 100644 --- a/client/src/components/NavigationBar.js +++ b/client/src/components/NavigationBar.js @@ -29,32 +29,43 @@ export default function NavigationBar(props) { - + Course Wiki {navItems.map((item) => ( - ))} { @@ -85,42 +96,9 @@ export default function NavigationBar(props) { ))} - - - Course Wiki - - - Knowledge is the cheapest and most rewarding investment - - - - + + {props.children} From dc676f55ce26cac28066a5da4614532cc16b4a93 Mon Sep 17 00:00:00 2001 From: mgrddsj Date: Fri, 18 Aug 2023 22:16:52 -0400 Subject: [PATCH 3/4] feat(frontend): Completed Home Page --- client/src/components/Home/index.js | 67 ++++++++++++++++++++++++++++- 1 file changed, 66 insertions(+), 1 deletion(-) diff --git a/client/src/components/Home/index.js b/client/src/components/Home/index.js index 65a485b..1e14b9c 100644 --- a/client/src/components/Home/index.js +++ b/client/src/components/Home/index.js @@ -1,5 +1,70 @@ +import {Box, IconButton} from '@mui/material'; +import {TextField} from '@mui/material'; +import SearchIcon from '@mui/icons-material/Search'; + +function SearchBar() { + return ( +
+ + + + + + +
+ ); +} + export default function Home() { return ( - 'this is the home page' +
+
+

+ Course Wiki +

+

+ Knowledge is the cheapest and most rewarding investment +

+ +
+ home +
+
+
+
); } From f136983242f26bb1b61882c1c53cf0684aa7c41a Mon Sep 17 00:00:00 2001 From: mgrddsj Date: Fri, 18 Aug 2023 22:33:19 -0400 Subject: [PATCH 4/4] Remove misplaced file This reverts commit 5ef44c4b24eff88a3de98ca1db6c86a623e1793d. --- index.js | 12 ------------ 1 file changed, 12 deletions(-) delete mode 100644 index.js diff --git a/index.js b/index.js deleted file mode 100644 index 77fc02d..0000000 --- a/index.js +++ /dev/null @@ -1,12 +0,0 @@ -export default function Home() { - return ( -
-
- Course Wiki -
-
- Knowledge is the cheapest and most rewarding investment -
-
- ); -}