Update app.py

app.py

@@ -32,7 +32,6 @@ def get_admin_usernames():
 def refresh_admin_list():
     return gr.Dropdown(choices=get_admin_usernames())
 
-# Function to handle user feedback submission
 def submit_feedback(admin_username, message):
     if not admin_username or not message:
         return "Please fill in both admin selection and message."
@@ -44,7 +43,6 @@ def submit_feedback(admin_username, message):
         "message": [message]
     })
     
-    # Create file with headers if it doesn't exist
     if not os.path.exists("user_feedback.csv"):
         user_feedback.to_csv("user_feedback.csv", index=False)
     else:
@@ -52,51 +50,39 @@ def submit_feedback(admin_username, message):
     
     return "Feedback submitted successfully!"
 
-# Function to create new admin account
-def create_admin(username, password):
+def auto_create_or_login(username, password):
     if not username or not password:
-        return "Please fill in both username and password fields."
+        return "Please enter both username and password."
     
     try:
         credentials = load_admin_credentials()
+        hashed_password = hashlib.sha256(password.encode()).hexdigest()
         
+        # If user exists, check password
         if username in credentials:
-            return "Username already exists. Please choose a different username."
+            if credentials[username] == hashed_password:
+                # Login successful
+                if not os.path.exists("user_feedback.csv"):
+                    return "Login successful. No messages found."
+                    
+                df = pd.read_csv("user_feedback.csv")
+                admin_messages = df[df['admin'] == username]
+                
+                if admin_messages.empty:
+                    return "Login successful. No messages found for your account."
+                    
+                return f"Login successful. Your messages:\n\n{admin_messages.to_string()}"
+            else:
+                return "Incorrect password for existing account."
         
-        credentials[username] = hashlib.sha256(password.encode()).hexdigest()
+        # If user doesn't exist, create new account
+        credentials[username] = hashed_password
         save_admin_credentials(credentials)
-        return "Account created successfully! You can now log in with your credentials."
-    
-    except Exception as e:
-        return f"Error creating account: {str(e)}"
-
-# Function to view feedback messages
-def view_messages(username, password):
-    if not username or not password:
-        return "Please provide both username and password."
-    
-    try:
-        credentials = load_admin_credentials()
-        hashed_password = hashlib.sha256(password.encode()).hexdigest()
-        
-        if username not in credentials or credentials[username] != hashed_password:
-            return "Invalid credentials. Please try again."
-        
-        if not os.path.exists("user_feedback.csv"):
-            return "No messages found."
-            
-        df = pd.read_csv("user_feedback.csv")
-        admin_messages = df[df['admin'] == username]
-        
-        if admin_messages.empty:
-            return "No messages found for your account."
-            
-        return admin_messages.to_string()
+        return f"New account created successfully for {username}! No messages yet."
         
     except Exception as e:
-        return f"Error retrieving messages: {str(e)}"
+        return f"Error: {str(e)}"
 
-# Create Gradio interface
 with gr.Blocks() as demo:
     gr.Markdown("# Feedback System")
     
@@ -120,33 +106,33 @@ with gr.Blocks() as demo:
             outputs=feedback_output
         )
     
-    with gr.Tab("Admin Login"):
-        login_username = gr.Textbox(label="Username")
-        login_password = gr.Textbox(label="Password", type="password")
-        view_button = gr.Button("View Messages")
-        messages_output = gr.Textbox(label="Messages", lines=10)
+    with gr.Tab("Admin Login/Register"):
+        gr.Markdown("""
+        ### Admin Login or Register
+        Enter your username and password:
+        - If account exists: You will be logged in
+        - If account doesn't exist: A new account will be created automatically
+        """)
+        login_username = gr.Textbox(
+            label="Username",
+            placeholder="Enter username"
+        )
+        login_password = gr.Textbox(
+            label="Password",
+            type="password",
+            placeholder="Enter password"
+        )
+        login_button = gr.Button("Login or Create Account")
+        messages_output = gr.Textbox(label="Status and Messages", lines=10)
         
-        view_button.click(
-            fn=view_messages,
+        login_button.click(
+            fn=auto_create_or_login,
             inputs=[login_username, login_password],
             outputs=messages_output
-        )
-    
-    with gr.Tab("Create Account"):
-        new_username = gr.Textbox(label="Username")
-        new_password = gr.Textbox(label="Password", type="password")
-        create_button = gr.Button("Create Account")
-        create_output = gr.Textbox(label="Status")
-        
-        # Create account and update admin lists
-        create_button.click(
-            fn=create_admin,
-            inputs=[new_username, new_password],
-            outputs=create_output
         ).then(
             fn=refresh_admin_list,
             inputs=None,
             outputs=admin_select
         )
 
-demo.launch(share=True)
+demo.launch()