Update app.py

app.py

@@ -1,22 +1,20 @@
+import gradio as gr
 import pandas as pd
 import gspread
 from oauth2client.service_account import ServiceAccountCredentials
-import gradio as gr
 import plotly.express as px
 
-# === Allowed Users ===
-allowed_users = {
+# ------------------ Authentication ------------------
+VALID_USERS = {
     "andrew@lortechnologies.com": "Pass.123",
     "phonnie@carfind.co.za": "Pass.123",
     "monique@carfind.co.za": "Pass.123"
 }
 
-# === Google Sheets Auth ===
+# ------------------ Data Setup ------------------
 scope = ["https://spreadsheets.google.com/feeds", "https://www.googleapis.com/auth/drive"]
 creds = ServiceAccountCredentials.from_json_keyfile_name("tough-star.json", scope)
 client = gspread.authorize(creds)
-
-# === Load and clean sheet data ===
 sheet_url = "https://docs.google.com/spreadsheets/d/1bpeFS6yihb6niCavpwjWmVEypaSkGxONGg2jZfKX_sA"
 sheet = client.open_by_url(sheet_url).worksheet("Calls")
 data = sheet.get_all_records()
@@ -35,15 +33,14 @@ df = df.sort_values(by=['Rep Name', 'Timestamp'])
 df['Time Diff (min)'] = df.groupby(['Rep Name', 'Date'])['Timestamp'].diff().dt.total_seconds().div(60).fillna(0)
 df['Visit Order'] = df.groupby(['Rep Name', 'Date']).cumcount() + 1
 
-# === All reps ===
-all_reps = sorted(df['Rep Name'].dropna().unique())
+ALL_REPS = sorted(df['Rep Name'].dropna().unique())
 
-# === Dashboard Logic ===
+# ------------------ App Logic ------------------
 def generate_summary(date_str):
     day_df = df[df['Date'] == date_str]
     active = day_df.groupby('Rep Name').size().reset_index(name='Total Visits')
     active_list = active['Rep Name'].tolist()
-    inactive_list = [rep for rep in all_reps if rep not in active_list]
+    inactive_list = [rep for rep in ALL_REPS if rep not in active_list]
     inactive_df = pd.DataFrame({'Inactive Reps': inactive_list})
     return active, inactive_df
 
@@ -93,8 +90,8 @@ def show_map(date_str, rep):
 
     fig.update_layout(mapbox_style="open-street-map", title=f"📍 {rep}'s Route on {date_str}")
 
-    table = subset[[ 
-        'Visit Order', 'Dealership Name', 'Time', 'Time Diff (min)', 
+    table = subset[[
+        'Visit Order', 'Dealership Name', 'Time', 'Time Diff (min)',
         'Type of call', 'Sales or service'
     ]].rename(columns={
         'Dealership Name': '🧭 Dealer',
@@ -114,57 +111,47 @@ def show_map(date_str, rep):
         '💼 Category': ''
     }])
     table = pd.concat([table, summary_row], ignore_index=True)
-
     return table, fig
 
-# === Login Auth ===
-def check_login(email, password):
-    if email in allowed_users and allowed_users[email] == password:
-        return True
-    return False
-
-# === MAIN APP ===
-def main_app():
-    with gr.Blocks() as app:
-        gr.Markdown("## 🗂️ Carfind Rep Tracker")
-
-        with gr.Tab("📊 Summary"):
-            date_summary = gr.Dropdown(label="Select Date", choices=sorted(df['Date'].unique(), reverse=True))
-            active_table = gr.Dataframe(label="✅ Active Reps (with total visits)")
-            inactive_table = gr.Dataframe(label="⚠️ Inactive Reps")
-            date_summary.change(fn=generate_summary, inputs=date_summary, outputs=[active_table, inactive_table])
-
-        with gr.Tab("👤 KAM's"):
-            with gr.Row():
-                with gr.Column(scale=1):
-                    date_picker = gr.Dropdown(label="Select Date", choices=sorted(df['Date'].unique(), reverse=True))
-                    rep_picker = gr.Dropdown(label="Select Rep")
-                    btn = gr.Button("Show Route")
-                with gr.Column(scale=2):
-                    table = gr.Dataframe(label="Call Table")
-
-            map_plot = gr.Plot(label="Map")
-
-            date_picker.change(fn=get_reps, inputs=date_picker, outputs=rep_picker)
-            btn.click(fn=show_map, inputs=[date_picker, rep_picker], outputs=[table, map_plot])
-    return app
-
-# === LOGIN WRAPPER ===
-with gr.Blocks() as login_app:
-    gr.Markdown("## 🔐 Login to Access Carfind Dashboard")
-    email = gr.Textbox(label="Email")
-    password = gr.Textbox(label="Password", type="password")
-    login_btn = gr.Button("Login")
-    login_status = gr.Markdown("")
-
-    def do_login(user_email, user_password):
-        if check_login(user_email, user_password):
-            import gradio as gr2
-            login_app.close()
-            main_app().launch(share=False)  # launch the main app
+# ------------------ Login + Protected UI ------------------
+with gr.Blocks() as app:
+    state = gr.State(False)
+
+    with gr.Row():
+        with gr.Column(scale=1):
+            login_title = gr.Markdown("## 🔐 Login Required")
+            email = gr.Textbox(label="Email")
+            password = gr.Textbox(label="Password", type="password")
+            login_btn = gr.Button("Login")
+            login_msg = gr.Markdown("")
+
+        with gr.Column(visible=False) as main_ui:
+            gr.Markdown("## 🗂️ Carfind Rep Tracker")
+            with gr.Tab("📊 Summary"):
+                date_summary = gr.Dropdown(label="Select Date", choices=sorted(df['Date'].unique(), reverse=True))
+                active_table = gr.Dataframe(label="✅ Active Reps (with total visits)")
+                inactive_table = gr.Dataframe(label="⚠️ Inactive Reps")
+                date_summary.change(fn=generate_summary, inputs=date_summary, outputs=[active_table, inactive_table])
+
+            with gr.Tab("👤 KAM's"):
+                with gr.Row():
+                    with gr.Column(scale=1):
+                        date_picker = gr.Dropdown(label="Select Date", choices=sorted(df['Date'].unique(), reverse=True))
+                        rep_picker = gr.Dropdown(label="Select Rep")
+                        btn = gr.Button("Show Route")
+                    with gr.Column(scale=2):
+                        table = gr.Dataframe(label="Call Table")
+
+                map_plot = gr.Plot(label="Map")
+                date_picker.change(fn=get_reps, inputs=date_picker, outputs=rep_picker)
+                btn.click(fn=show_map, inputs=[date_picker, rep_picker], outputs=[table, map_plot])
+
+    def check_login(u, p):
+        if VALID_USERS.get(u) == p:
+            return gr.update(visible=False), gr.update(visible=True), ""
         else:
-            return "❌ Invalid credentials. Try again."
+            return gr.update(), gr.update(), "❌ Incorrect email or password."
 
-    login_btn.click(fn=do_login, inputs=[email, password], outputs=[login_status])
+    login_btn.click(fn=check_login, inputs=[email, password], outputs=[login_title, main_ui, login_msg])
 
-login_app.launch()
+app.launch()