Merge pull request #58 from Eevee-Elites-Capstone/Final-Touch

Final touch
Eevee-Elites-Capstone · Feb 14, 2022 · 1807ff3 · 1807ff3
2 parents c5b7b6d + 4668569
commit 1807ff3
Show file tree

Hide file tree

Showing 8 changed files with 17,784 additions and 57 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/public/Color Hunt Palette 2e4c6d396eb0daddfcfc997c.png b/public/Color Hunt Palette 2e4c6d396eb0daddfcfc997c.png
diff --git a/public/Color%20Hunt%20Palette%202e4c6d396eb0daddfcfc997c.png b/public/Color%20Hunt%20Palette%202e4c6d396eb0daddfcfc997c.png
diff --git a/public/ColorHuntPalette2e4c6d396eb0daddfcfc997c.png b/public/ColorHuntPalette2e4c6d396eb0daddfcfc997c.png
diff --git a/public/Geek Hunt-logos_white.png → public/Geek_Hunt-logos_white.png b/public/Geek Hunt-logos_white.png → public/Geek_Hunt-logos_white.png
diff --git a/src/components/UI/Navbar.js b/src/components/UI/Navbar.js
@@ -19,10 +19,10 @@ function Navbar() {
   return (
     <nav className="flex items-center justify-between flex-wrap h-32 bg-[#2E4C6D]">
       <div className="mb-2 px-3 sm:mb-0">
-        <a href="/">
+        <a href="/" className="self-center">
           <img
-            className="sm:object-fill w-52 self-center"
-            src="./Geek Hunt-logos_white.png"
+            className="sm:object-fill w-56"
+            src="./Geek_Hunt-logos_white.png"
             alt=""
           />
         </a>
@@ -67,7 +67,7 @@ function Navbar() {
                 className="text-xl no-underline
               text-white"
               >
-                Hello!, {user.displayName}!
+                Hello!, {user.displayName}
               </p>
             ) : (
               <p

diff --git a/src/components/UI/NavbarCopy.js b/src/components/UI/NavbarCopy.js
@@ -4,7 +4,7 @@ import { useDocument } from "../../hooks/useDocument";
 import { useAuthContext } from "../../hooks/useAuthContext";
 import { useSignout } from "../../hooks/useSignout";
 
-function Navbar() {
+function NavbarCopy() {
   const { signout, isPending } = useSignout();
   const { user } = useAuthContext();
   const id = user ? user.uid : undefined;
@@ -129,4 +129,4 @@ function Navbar() {
   );
 }
 
-export default Navbar;
+export default NavbarCopy;
diff --git a/src/components/Users/PublicProfile.js b/src/components/Users/PublicProfile.js
@@ -76,7 +76,7 @@ const PublicProfile = () => {
       <Navbar />
       <div className="flex flex-col justify-center px-5 md:px-16 w-full xl:px-80 z-10 text-gray-700">
         <div className="flex flex-col justify-center">
-          <div className="flex flex-row justify-center   md:flex-rows mdw-3/4 lg:h-70  mt-2 p-4 border-8 border-[#DADDFC] rounded-xl shadow-lg">
+          <div className="flex flex-row justify-center md:flex-rows mdw-3/4 lg:h-70  mt-2 p-4 border-8 border-[#DADDFC] rounded-xl shadow-lg">
             <div className="flex flex-col lg:flex-row items-center">
               <div className="flex md:justify-left items-center rounded-lg">
                 <img
@@ -118,7 +118,7 @@ const PublicProfile = () => {
                   alt="Avatar"
                 />
                 </div>
-                <div class="swiper-slide object-cover ">
+                <div className="swiper-slide object-cover ">
                 <img
                   src={photos[1]}
                   className="object-cover w-full h-96 z-0"
@@ -141,7 +141,6 @@ const PublicProfile = () => {
             </div>
           </div>
         </div>
-
         <div className="flex flex-col rounded-xl shadow-lg  md:flex-rows w-full h-40  mt-2 p-2 bg-white border-4 border-[#DADDFC]">
           <h2 className="text-xl font-bold">Skills</h2>
           <p className="rounded-lg m-2 w-full h-fullpy-1.5 text-base font-normal">