Merge pull request #65 from nepalcodes/LogoFavicon

added favicon and logo to home page
nepalcodes · Jul 6, 2024 · 450f7f5 · 450f7f5
2 parents 137a593 + 27bd0ca
commit 450f7f5
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 3 deletions.
diff --git a/nepalingo-web/index.html b/nepalingo-web/index.html
@@ -2,7 +2,7 @@
 <html lang="en">
   <head>
     <meta charset="UTF-8" />
-    <link rel="icon" type="image/svg+xml" href="/vite.svg" />
+    <link rel="icon" type="image/svg+xml" href="/favicon.ico" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>Nepalingo</title>
 

diff --git a/nepalingo-web/public/NepaLingoLogo.png b/nepalingo-web/public/NepaLingoLogo.png
diff --git a/nepalingo-web/public/favicon.ico b/nepalingo-web/public/favicon.ico
diff --git a/nepalingo-web/src/assets/NepaLingoLogo.png b/nepalingo-web/src/assets/NepaLingoLogo.png
diff --git a/nepalingo-web/src/assets/logo.png b/nepalingo-web/src/assets/logo.png
diff --git a/nepalingo-web/src/components/userAuth/UserAuth.tsx b/nepalingo-web/src/components/userAuth/UserAuth.tsx
@@ -25,7 +25,7 @@ const User_auth: React.FC = () => {
     setError(null);
     setSuccess(false);
 
-    if (username == "") {
+    if (action === "Sign Up" && username == "") {
       setError("Please enter a username");
       return;
     }

diff --git a/nepalingo-web/src/pages/Home/Home.tsx b/nepalingo-web/src/pages/Home/Home.tsx
@@ -1,5 +1,6 @@
 import React from "react";
 import { useLocation } from "react-router-dom";
+import logo from "../../assets/logo.png";
 
 const Home: React.FC = () => {
   const location = useLocation();
@@ -14,7 +15,11 @@ const Home: React.FC = () => {
       </div>
       <div className="flex flex-col items-center">
         <div className="w-40 h-40 border-2 border-white rounded-full flex items-center justify-center">
-          <span className="text-3xl font-bold">Logo</span>
+          <img
+            src={logo}
+            alt="Nepalingo Logo"
+            className="w-full h-full object-contain"
+          />
         </div>
         <div className="text-center mt-4">
           <p className="text-3xl font-bold">Nepalingo</p>