Update app.py

app.py

@@ -10,48 +10,6 @@ import json
 # --- Constants ---
 MELBOURNE_TIMEZONE = 'Australia/Melbourne'
 
-# --- Custom CSS for simplified UI ---
-def load_css():
-    st.markdown("""
-    <style>
-    .main-header {
-        padding: 2rem;
-        text-align: center;
-        margin-bottom: 2rem;
-    }
-    
-    .citation-output {
-        background: #f8f8f8;
-        border: 1px solid #e0e0e0;
-        border-radius: 4px;
-        padding: 1rem;
-        margin: 1rem 0;
-        font-family: 'Courier New', monospace;
-    }
-    
-    .copy-button {
-        background: #e0e0e0;
-        color: black;
-        border: none;
-        padding: 0.5rem 1rem;
-        border-radius: 4px;
-        cursor: pointer;
-        font-size: 0.9rem;
- Gentiles
-
-System: <xaiArtifact artifact_id="9742b08f-bd1c-4ab1-9763-3ba142fe8ff2" artifact_version_id="905b7ac0-d0b9-4b2e-b9ad-4814e3320ff5" title="app.py" contentType="text/python">
-import streamlit as st
-import streamlit.components.v1 as components
-import hashlib
-import urllib.parse
-from datetime import datetime
-import pytz
-import pandas as pd
-import json
-
-# --- Constants ---
-MELBOURNE_TIMEZONE = 'Australia/Melbourne'
-
 # --- Custom CSS for simplified UI ---
 def load_css():
     st.markdown("""
@@ -112,7 +70,8 @@ def load_css():
     
     .footer {
         text-align: center;
-        padding: 2rem margin-top: 2rem;
+        padding: 2rem;
+        margin-top: 2rem;
         border-top: 1px solid #e0e0e0;
         font-size: 0.9rem;
     }
@@ -158,21 +117,21 @@ def generate_citation_hash(author, year, url, fragment_text, cited_text, usernam
     data = f"{author}, {year} | {url} | {fragment_text} | {cited_text} | {username} | {task_name} | {current_date} | {current_time}"
     return hashlib.sha256(data.encode('utf-8')).hexdigest()
 
-def format_citation_html(url, fragment_text, display_text, scc_hash):
+def format_citation_html(url, fragment_text, author, year, scc_hash):
     encoded_fragment = urllib.parse.quote(fragment_text)
     full_url = f"{url}#:~:text={encoded_fragment}"
-    return f'<a href="{full_url}" data-hash="{scc_hash}" target="_blank">{display_text}</a>'
+    return f'<a href="{full_url}" data-hash="{scc_hash}">{author} ({year})</a>'
 
 def check_for_fragment(url):
     return '#:~:text=' in url
 
-def copy_to_clipboard_js(html_text, button_id):
-    """Generate JavaScript for copying HTML content to clipboard."""
-    # Encode the full HTML content as a JavaScript-safe string
-    escaped_html = json.dumps(html_text, ensure_ascii=False)[1:-1].replace('</', '<\\/')
+def copy_to_clipboard_js(text, button_id):
+    """Generate JavaScript for copying text to clipboard using a textarea."""
+    # Encode the text as a JavaScript-safe string
+    escaped_text = json.dumps(text, ensure_ascii=False)[1:-1].replace('</', '<\\/')
     return f"""
     <div>
-        <textarea id="copy_text_{button_id}" style="display: none;">{escaped_html}</textarea>
+        <textarea id="copy_text_{button_id}" style="display: none;">{escaped_text}</textarea>
         <button onclick="copyToClipboard_{button_id}()" class="copy-button">Copy to Clipboard</button>
         <span id="copy_status_{button_id}" style="margin-left: 10px; font-weight: bold;"></span>
     </div>
@@ -180,47 +139,33 @@ def copy_to_clipboard_js(html_text, button_id):
     function copyToClipboard_{button_id}() {{
         console.log('Copy function triggered for {button_id}');
         const textElement = document.getElementById('copy_text_{button_id}');
-        const htmlToCopy = textElement ? textElement.value : '';
-        if (!htmlToCopy) {{
+        const textToCopy = textElement ? textElement.value : '';
+        if (!textToCopy) {{
             console.error('No text to copy for {button_id}');
             const statusElement = document.getElementById('copy_status_{button_id}');
             if (statusElement) statusElement.innerHTML = 'No text to copy';
             return;
         }}
-        // Create a temporary div to hold the HTML content
-        const tempDiv = document.createElement('div');
-        tempDiv.innerHTML = htmlToCopy;
-        document.body.appendChild(tempDiv);
-        
-        // Select the content
-        const range = document.createRange();
-        range.selectNodeContents(tempDiv);
-        const selection = window.getSelection();
-        selection.removeAllRanges();
-        selection.addRange(range);
-        
-        // Copy to clipboard as HTML
-        try {{
-            const successful = document.execCommand('copy');
-            console.log('Copy command executed for {button_id}: ' + (successful ? 'success' : 'failed'));
-            const statusElement = document.getElementById('copy_status_{button_id}');
-            if (statusElement) {{
-                statusElement.innerHTML = successful ? 'Copied!' : 'Copy failed';
-                if (successful) {{
-                    setTimeout(() => {{
+        if (navigator.clipboard) {{
+            navigator.clipboard.writeText(textToCopy).then(function() {{
+                console.log('Text copied successfully for {button_id}: ' + textToCopy);
+                const statusElement = document.getElementById('copy_status_{button_id}');
+                if (statusElement) {{
+                    statusElement.innerHTML = 'Copied!';
+                    setTimeout(function() {{
                         statusElement.innerHTML = '';
                     }}, 2000);
                 }}
-            }}
-        }} catch (err) {{
-            console.error('Copy failed for {button_id}: ', err);
+            }}, function(err) {{
+                console.error('Copy failed for {button_id}: ', err);
+                const statusElement = document.getElementById('copy_status_{button_id}');
+                if (statusElement) statusElement.innerHTML = 'Copy failed';
+            }});
+        }} else {{
+            console.error('Clipboard API not supported');
             const statusElement = document.getElementById('copy_status_{button_id}');
-            if (statusElement) statusElement.innerHTML = 'Copy failed';
+            if (statusElement) statusElement.innerHTML = 'Clipboard API not supported';
         }}
-        
-        // Clean up
-        selection.removeAllRanges();
-        document.body.removeChild(tempDiv);
     }}
     </script>
     """
@@ -363,8 +308,8 @@ with tabs[0]:
             """, unsafe_allow_html=True)
         else:
             scc_hash = generate_citation_hash(author_name, publication_year, source_url, annotated_text, annotated_text, username, task_name, current_date, current_time)
-            citation_link_start = format_citation_html(source_url, annotated_text, f"{author_name} ({publication_year})", scc_hash)
-            citation_link_end = format_citation_html(source_url, annotated_text, f"({author_name}, {publication_year})", scc_hash)
+            citation_link_start = f'<a href="{source_url}#:~:text={urllib.parse.quote(annotated_text)}" data-hash="{scc_hash}">{author_name} ({publication_year})</a>'
+            citation_link_end = f'<a href="{source_url}#:~:text={urllib.parse.quote(annotated_text)}" data-hash="{scc_hash}">({author_name}, {publication_year})</a>'
 
             st.markdown("## Generated Citations")
             col_html1, col_html2 = st.columns(2)
@@ -479,7 +424,7 @@ with tabs[1]:
                     "Year": verify_publication_year,
                     "URL": verify_source_url,
                     "Fragment text": verify_annotated_text,
-                    "Cited text": verify_annotated_text,
+                    "Outlined text": verify_annotated_text,
                     "Username": verify_username,
                     "Task name": verify_task_name,
                     "Date": verify_date,
@@ -536,7 +481,7 @@ with tabs[1]:
         # Clear history button
         if st.button("Clear Verification History", type="secondary"):
             st.session_state.verified_hashes = []
-            st.rerun()
+            st.experimental_rerun()
     
     st.markdown('</div>', unsafe_allow_html=True)