Merge pull request #4 from Kevin-Umali/feature/TL-DYS-13

[TL-DYS-13][TL-DYS-14]
Kevin-Umali · Sep 19, 2023 · e3e00f9 · e3e00f9
2 parents bc33b25 + e189447
commit e3e00f9
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 8 deletions.
diff --git a/client/src/components/Navbar.tsx b/client/src/components/Navbar.tsx
@@ -1,6 +1,7 @@
-import { Box, Flex, Heading, IconButton, useColorMode } from "@chakra-ui/react";
+import { Box, Flex, Heading, IconButton, Link, useColorMode } from "@chakra-ui/react";
 import { FaGithub } from "react-icons/fa";
 import { SunIcon, MoonIcon } from "@chakra-ui/icons";
+import { Link as RouterLink } from "react-router-dom";
 
 const Navbar: React.FC = () => {
   const { colorMode, toggleColorMode } = useColorMode();
@@ -20,12 +21,16 @@ const Navbar: React.FC = () => {
       <Flex align="center" mr={5}>
         <Box display={{ base: "block", md: "none" }} mr="2"></Box>
         <Box>
-          <Heading size={{ base: "sm", md: "md" }}>MakeMeDIYspire</Heading>
+          <Heading size={{ base: "sm", md: "md" }}>
+            <Link as={RouterLink} to={{ pathname: "/" }} _hover={{ textDecoration: "none" }} cursor={"pointer"}>
+              MakeMeDIYspire
+            </Link>
+          </Heading>
         </Box>
       </Flex>
 
       <Box display="flex" alignItems="center">
-        <IconButton as="a" href="https://github.com/yourusername/yourrepo" target="_blank" rel="noopener noreferrer" aria-label="GitHub repository" icon={<FaGithub />} size="sm" mr={2} />
+        <IconButton as="a" href="https://github.com/Kevin-Umali/make-me" target="_blank" rel="noopener noreferrer" aria-label="GitHub repository" icon={<FaGithub />} size="sm" mr={2} />
         <IconButton
           aria-label={`Switch to ${colorMode === "light" ? "dark" : "light"} mode`}
           variant="ghost"

diff --git a/client/src/constants/index.ts b/client/src/constants/index.ts
@@ -60,9 +60,9 @@ export const footerData: Footer[] = [
     label: "Social",
     hash: "#",
     links: [
-      { label: "Email", href: "https://react-icons.github.io/react-icons/search?q=ellip" },
-      { label: "Twitter", href: "#" },
-      { label: "Linkedin", href: "#" },
+      { label: "Email", href: "https://mail.google.com/" },
+      { label: "Twitter", href: "https://twitter.com/" },
+      { label: "Linkedin", href: "https://www.linkedin.com/" },
     ],
   },
 ];

diff --git a/client/src/pages/FAQ.tsx b/client/src/pages/FAQ.tsx
@@ -33,7 +33,7 @@ const FAQPage = () => {
           <>
             Utilizing the capabilities of OpenAI, our platform generates distinct DIY project ideas based on a variety of factors and categories. Once you select a project, you will receive a detailed
             list of materials needed and a step-by-step guide to complete the project. Refer to
-            <Link as={RouterLink} to={{ pathname: "/how-to-guide" }} isExternal color="blue.500" ml={1} mr={1} textDecorationLine="underline">
+            <Link as={RouterLink} to={{ pathname: "/how-to-guide" }} color="blue.500" ml={1} mr={1} textDecorationLine="underline">
               How to use the MakeMeDIYspire DIY Idea Generator
             </Link>
             guide.
@@ -43,7 +43,7 @@ const FAQPage = () => {
         return (
           <>
             It's straightforward! Visit the{" "}
-            <Link as={RouterLink} to={{ pathname: "/" }} isExternal color="blue.500" ml={1} mr={1} textDecorationLine="underline">
+            <Link as={RouterLink} to={{ pathname: "/" }} color="blue.500" ml={1} mr={1} textDecorationLine="underline">
               MakeMeDIYspire homepage
             </Link>
             , input your preferences, such as materials and other options, and we'll generate a unique DIY project suggestion tailored for you. No sign-up required!