fixed merge conflict

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
 };

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({