Update app.py

app.py

@@ -1,6 +1,7 @@
 import gradio as gr
 import os
 import time
+from functools import partial
 from helper import (
     create_user, verify_user, get_user_files, upload_file, download_file,
     delete_file, empty_vault, is_admin, get_all_accounts, delete_account,
@@ -31,12 +32,12 @@ def login(username, password):
     if check_inactivity():
         return gr.update(visible=True), gr.update(visible=False), "You have been logged out due to inactivity."
     
-    if is_account_locked(username):
-        return gr.update(visible=True), gr.update(visible=False), "Account is locked. Please try again later."
-    
     if is_rate_limited(username):
         return gr.update(visible=True), gr.update(visible=False), "Too many login attempts. Please try again later."
     
+    if is_account_locked(username):
+        return gr.update(visible=True), gr.update(visible=False), "Account is locked. Please try again later."
+    
     if verify_user(username, password):
         current_user = username
         update_activity()
@@ -71,8 +72,8 @@ def upload(files):
         if file.size > MAX_FILE_SIZE:
             results.append(f"File {file.name} exceeds the 5GB limit.")
         else:
-            encrypted_content = encrypt_file(file.name, file.read())
-            result = upload_file(current_user, file.name, encrypted_content)
+            encrypted_file = encrypt_file(file.name, file.read())
+            result = upload_file(current_user, file.name, encrypted_file)
             results.append(result)
     
     update_activity()
@@ -96,9 +97,9 @@ def download(filename):
     if not current_user:
         return None
     
-    encrypted_content = download_file(current_user, filename)
-    if encrypted_content:
-        decrypted_content = decrypt_file(filename, encrypted_content)
+    file_content = download_file(current_user, filename)
+    if file_content:
+        decrypted_content = decrypt_file(filename, file_content)
         update_activity()
         return decrypted_content
     else:
@@ -146,8 +147,8 @@ def admin_delete_account(username):
     return result
 
 # Gradio interface
-with gr.Blocks() as app:
-    gr.HTML('<img src="file/logo.svg" alt="Grimvault Logo" style="width:200px; height:auto;">')
+with gr.Blocks(css="styles.css") as app:
+    gr.HTML('<img src="file/logo.svg" alt="Grimvault Logo" class="logo">')
     
     with gr.Tab("Login"):
         login_username = gr.Textbox(label="Username")
@@ -157,7 +158,7 @@ with gr.Blocks() as app:
         login_message = gr.Textbox(label="Message", interactive=False)
     
     with gr.Tab("Dashboard", visible=False) as dashboard:
-        gr.HTML('<img src="file/logo.svg" alt="Grimvault Logo" style="width:100px; height:auto;">')
+        gr.HTML('<img src="file/logo.svg" alt="Grimvault Logo" class="logo-small">')
         upload_button = gr.File(label="Upload File(s)", file_count="multiple")
         files_table = gr.Dataframe(label="Your Files", headers=["File", "Size"])
         refresh_button = gr.Button("Refresh Files")