Update app.py

app.py

@@ -5,6 +5,7 @@ from typing import Dict, List, Tuple
 import os
 import base64
 
+
 PROCESSED_DATA_DIR = Path(".")
 DATA_DIR = Path("./data")
 # Embed logo as a base64 data URI to avoid Gradio toolbar interactions
@@ -201,102 +202,81 @@ def download_annotations() -> str:
 # --------------
 def build_gradio_app():
     with gr.Blocks() as demo:
-        with gr.Row():
-            with gr.Column(scale=1):
-                # Static logo, non-interactive
+        # a flag in State for whether the user is logged in
+        is_auth = gr.State(False)
+
+        # ————————
+        # LOGIN SCREEN
+        # ————————
+        with gr.Column(visible=not is_auth.value) as login_box:
+            user_in  = gr.Textbox(label="Username")
+            pass_in  = gr.Textbox(label="Password", type="password")
+            login_btn= gr.Button("🔒 Log me in")
+            login_msg= gr.Markdown("", visible=False)
+
+        def check_creds(u, p):
+            # load your secrets from env
+            USER = os.environ.get("APP_USER", "")
+            PWD  = os.environ.get("APP_PASS", "")
+            if u == USER and p == PWD:
+                return gr.update(visible=False), gr.update(visible=True), gr.update(value=True, visible=False)
+            else:
+                return gr.update(visible=True, value="❌ Bad credentials!"), None, None
+
+        login_btn.click(
+            check_creds,
+            inputs=[user_in, pass_in],
+            outputs=[login_msg, login_box, is_auth]
+        )
+
+        # ————————
+        # MAIN APP (hidden until auth)
+        # ————————
+        with gr.Column(visible=is_auth.value) as app_box:
+            # your logo + title + everything else goes here…
+            with gr.Row():
+                # embed your base64 logo exactly where you want
                 gr.HTML(
-                    f'<img src="data:image/png;base64,{logo_b64}" width="200" style="pointer-events:none; user-select:none; display:block;" />'
+                    f'<img src="data:image/png;base64,{logo_b64}" '
+                    'style="pointer-events:none; user-select:none; width:200px; display:block;" />'
                 )
-        with gr.Row():
             gr.Markdown("# ISCO Annotation", elem_id="isco-title")
-        gr.HTML("""
-        <style>
-            #isco-title {
-                text-align: center;
-                width: 100%;
-                margin: 0.5em 0;
-            }
-            footer { display: none !important; }
-            .gradio-container .api-link, .gradio-container .share-link { display: none !important; }
-        </style>
-        """)
 
-        idx_state = gr.State(0)
-
-        with gr.Group():
+            # then all your States, buttons, radios, callbacks…
+            idx_state = gr.State(0)
             record_md = gr.Markdown()
             status_md = gr.Markdown()
-
-        with gr.Row():
             prev_btn = gr.Button("⬅ Previous")
             next_btn = gr.Button("✅ Next")
-
-        with gr.Row():
-            with gr.Column():
-                major_radio = gr.Radio(label="Level 1: Major", choices=[], interactive=True)
-            with gr.Column():
-                sub_radio = gr.Radio(label="Level 2: Sub-major", choices=[], interactive=True)
-            with gr.Column():
-                minor_radio = gr.Radio(label="Level 3: Minor", choices=[], interactive=True)
-            with gr.Column():
-                unit_radio = gr.Radio(label="Level 4: Unit", choices=[], interactive=True)
-
-        download_btn = gr.Button("📥 Download Annotations")
-        download_file = gr.File(label="Annotated CSV", visible=False)
-
-        # Initial load
-        demo.load(
-            lambda: (0,) + load_record(0),
-            outputs=[idx_state, record_md, status_md, major_radio, sub_radio, minor_radio, unit_radio],
-        )
-
-        next_btn.click(lambda i: save_and_jump(i, "next"),
-                       inputs=[idx_state],
-                       outputs=[idx_state, record_md, status_md, major_radio, sub_radio, minor_radio, unit_radio])
-
-        prev_btn.click(lambda i: save_and_jump(i, "prev"),
-                       inputs=[idx_state],
-                       outputs=[idx_state, record_md, status_md, major_radio, sub_radio, minor_radio, unit_radio])
-
-        # Change handlers (also update status)
-        major_radio.change(
-            on_major_change,
-            inputs=[major_radio, idx_state],
-            outputs=[major_radio, sub_radio, minor_radio, unit_radio, status_md],
-        )
-
-        sub_radio.change(
-            on_sub_change,
-            inputs=[sub_radio, idx_state, major_radio],
-            outputs=[sub_radio, minor_radio, unit_radio, status_md],
-        )
-
-        minor_radio.change(
-            on_minor_change,
-            inputs=[minor_radio, idx_state, major_radio, sub_radio],
-            outputs=[minor_radio, unit_radio, status_md],
-        )
-
-        unit_radio.change(
-            on_unit_change,
-            inputs=[unit_radio, idx_state, major_radio, sub_radio, minor_radio],
-            outputs=[unit_radio, status_md],
-        )
-
-        # Download
-        download_btn.click(download_annotations, outputs=[download_file]).then(
-            lambda: gr.update(visible=True), None, [download_file]
-        )
+            major_radio = gr.Radio(label="Major", choices=[], interactive=True)
+            sub_radio   = gr.Radio(label="Sub-major", choices=[], interactive=True)
+            minor_radio = gr.Radio(label="Minor", choices=[], interactive=True)
+            unit_radio  = gr.Radio(label="Unit", choices=[], interactive=True)
+            download_btn = gr.Button("📥 Download")
+            download_file= gr.File(visible=False)
+
+            # wire up your existing load_record, on_change, save_and_jump, etc.
+            demo.load(lambda: (0,) + load_record(0),
+                      outputs=[idx_state, record_md, status_md,
+                               major_radio, sub_radio, minor_radio, unit_radio])
+            next_btn.click(lambda i: save_and_jump(i, "next"),
+                           inputs=[idx_state],
+                           outputs=[idx_state, record_md, status_md,
+                                    major_radio, sub_radio, minor_radio, unit_radio])
+            # … and so on for prev_btn, radio.change handlers, download_btn …
+
+        # hide Gradio footer & share links:
+        gr.HTML("""
+        <style>
+          footer { display: none !important; }
+          .gradio-container .api-link,
+          .gradio-container .share-link { display: none !important; }
+          #isco-title { text-align: center; margin-top: 1em; }
+        </style>
+        """)
 
     return demo
 
 if __name__ == "__main__":
-    USER = os.environ.get("APP_USER", "")
-    PWD  = os.environ.get("APP_PASS", "")
     demo = build_gradio_app()
-    demo.queue().launch(
-        server_name="0.0.0.0",        # in a space or your own server
-        show_api=False,               # hides the “Use via API” link
-        #auth=(USER, PWD),             # basic-auth from env
-        share=True                    # generate a public link
-    )
+    demo.queue().launch(show_api=False, share=True, server_name="0.0.0.0")