From 72c443aa38b313f7672a80979c40ba6980406943 Mon Sep 17 00:00:00 2001
From: NancyAanchal <nancyjha2006@gmail.com>
Date: Fri, 5 Jul 2024 20:03:31 +0545
Subject: [PATCH] fixed merge conflict

---
 nepalingo-web/postcss.config.js               | 21 -------------------
 .../src/components/userAuth/UserAuth.tsx      |  5 +++++
 2 files changed, 5 insertions(+), 21 deletions(-)

diff --git a/nepalingo-web/postcss.config.js b/nepalingo-web/postcss.config.js
index 7207da5..af86863 100644
--- a/nepalingo-web/postcss.config.js
+++ b/nepalingo-web/postcss.config.js
@@ -1,25 +1,4 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
-export default {
-  plugins: {
-    tailwindcss: {},
-    autoprefixer: {},
-  },
-=======
-=======
-
->>>>>>> e5199f6b80088fe392b668a0b00cc22b14bc5ba9
-// Using cjs instead of this file because vite is still using postcss-load-config v4 which
-// does not support esm with typescript
-// https://github.com/postcss/postcss-load-config/issues/239 (fix added in v4)
-// https://github.com/vitejs/vite/issues/15869#issuecomment-1939414914
-// https://github.com/vitejs/vite/pull/15235
-
 export const plugins = {
   tailwindcss: {},
   autoprefixer: {},
-<<<<<<< HEAD
->>>>>>> c6c93b34a5f2dd40d68e9b26d39868ae1c41f0cb
-=======
->>>>>>> e5199f6b80088fe392b668a0b00cc22b14bc5ba9
 };
\ No newline at end of file
diff --git a/nepalingo-web/src/components/userAuth/UserAuth.tsx b/nepalingo-web/src/components/userAuth/UserAuth.tsx
index 1329396..78820d1 100644
--- a/nepalingo-web/src/components/userAuth/UserAuth.tsx
+++ b/nepalingo-web/src/components/userAuth/UserAuth.tsx
@@ -25,6 +25,11 @@ const User_auth: React.FC = () => {
     setError(null);
     setSuccess(false);
 
+    if (username == "") {
+      setError("Please enter a username");
+      return;
+    }
+
     if (action === "Sign Up" && username != "") {
       // Attempt to sign up the user with the provided email and password
       const { error } = await supabase.auth.signUp({