Update app.py

app.py

@@ -196,21 +196,27 @@ with tabs[0]:
     st.markdown('<div class="tab-content">', unsafe_allow_html=True)
     st.header("Generate New Citation")
 
+    # User Information Section
+    st.subheader("User Information")
     col1, col2 = st.columns(2)
-    
     with col1:
         username = st.text_input("Username", help="Your username for tracking purposes", placeholder="e.g., john_doe")
-        task_name = st.text_input("Task Name", help="The name of the task or project", placeholder="e.g., Literature Review Assignment")
-        author_name = st.text_input("Author Name", help="The author(s) of the source", placeholder="e.g., Smith or Smith et al.")
-    
     with col2:
+        task_name = st.text_input("Task Name", help="The name of the task or project", placeholder="e.g., Literature Review Assignment")
+
+    # Citation Info Section
+    st.subheader("Citation Info")
+    col3, col4 = st.columns(2)
+    with col3:
+        author_name = st.text_input("Author(s) Name", help="The author(s) of the source", placeholder="e.g., Smith or Smith et al.")
+    with col4:
         publication_year = st.text_input("Publication Year", help="The year of publication", placeholder="e.g., 2023")
-        source_url = st.text_input("Source URL", help="The full URL of the source", placeholder="https://example.com/article")
     
-    cited_text = st.text_area("Quoted or Paraphrased Text", 
-                             help="The exact text quoted or paraphrased from the source", 
-                             placeholder="e.g., Thermal comfort thresholds are exceeded frequently in Australian schools",
-                             height=100)
+    col5, col6 = st.columns(2)
+    with col5:
+        source_url = st.text_input("Source URL", help="The full URL of the source", placeholder="https://example.com/article")
+    with col6:
+        annotated_text = st.text_input("Annotated Text", help="The text quoted or paraphrased from the source", placeholder="e.g., Thermal comfort thresholds...")
 
     # Get current date and time in Melbourne timezone
     melbourne_tz = pytz.timezone(MELBOURNE_TIMEZONE)
@@ -220,16 +226,14 @@ with tabs[0]:
 
     st.markdown(f"""
     <div class="datetime-display">
-        <strong>Current Date & Time (Melbourne, Australia):</strong><br>
-        Date: {current_date}<br>
-        Time: {current_time}
+        {current_date} {current_time}
     </div>
     """, unsafe_allow_html=True)
 
     generate_button = st.button("Generate Citation", type="primary", use_container_width=True)
 
     if generate_button:
-        if not all([username, task_name, author_name, publication_year, source_url, cited_text]):
+        if not all([username, task_name, author_name, publication_year, source_url, annotated_text]):
             st.error("Please fill in all fields before generating a citation.")
         elif check_for_fragment(source_url):
             st.markdown("""
@@ -240,13 +244,13 @@ with tabs[0]:
             </div>
             """, unsafe_allow_html=True)
         else:
-            scc_hash = generate_citation_hash(author_name, publication_year, source_url, cited_text, cited_text, username, task_name, current_date, current_time)
+            scc_hash = generate_citation_hash(author_name, publication_year, source_url, annotated_text, annotated_text, username, task_name, current_date, current_time)
 
             st.markdown("## Generated Citations")
 
             # HTML Citation - Start of text
             st.markdown("### HTML Citation (Start of Text)")
-            html_citation_start = f'"{cited_text}" ' + format_citation_html(source_url, cited_text, author_name, publication_year, scc_hash)
+            html_citation_start = f'"{annotated_text}" ' + format_citation_html(source_url, annotated_text, author_name, publication_year, scc_hash)
             
             st.markdown('<div class="citation-output">', unsafe_allow_html=True)
             st.code(html_citation_start, language='html')
@@ -255,7 +259,7 @@ with tabs[0]:
 
             # HTML Citation - End of text
             st.markdown("### HTML Citation (End of Text)")
-            html_citation_end = format_citation_html(source_url, cited_text, author_name, publication_year, scc_hash) + f' "{cited_text}"'
+            html_citation_end = format_citation_html(source_url, annotated_text, author_name, publication_year, scc_hash) + f' "{annotated_text}"'
             
             st.markdown('<div class="citation-output">', unsafe_allow_html=True)
             st.code(html_citation_end, language='html')
@@ -277,8 +281,8 @@ with tabs[0]:
                 "author": author_name,
                 "year": publication_year,
                 "url": source_url,
-                "fragment_text": cited_text,
-                "cited_text": cited_text,
+                "fragment_text": annotated_text,
+                "cited_text": annotated_text,
                 "username": username,
                 "task_name": task_name,
                 "date": current_date,
@@ -329,34 +333,46 @@ with tabs[1]:
     if 'verified_hashes' not in st.session_state:
         st.session_state.verified_hashes = []
 
+    # User Information Section
+    st.subheader("User Information")
     col1, col2 = st.columns(2)
-    
     with col1:
         verify_username = st.text_input("Username (for verification)", placeholder="e.g., john_doe")
+    with col2:
         verify_task_name = st.text_input("Task Name (for verification)", placeholder="e.g., Literature Review Assignment")
-        verify_author_name = st.text_input("Author Name (for verification)", placeholder="e.g., Smith or Smith et al.")
+
+    # Citation Info Section
+    st.subheader("Citation Info")
+    col3, col4 = st.columns(2)
+    with col3:
+        verify_author_name = st.text_input("Author(s) Name (for verification)", placeholder="e.g., Smith or Smith et al.")
+    with col4:
         verify_publication_year = st.text_input("Publication Year (for verification)", placeholder="e.g., 2023")
     
-    with col2:
+    col5, col6 = st.columns(2)
+    with col5:
         verify_source_url = st.text_input("Source URL (for verification)", placeholder="https://example.com/article")
+    with col6:
+        verify_annotated_text = st.text_input("Annotated Text (for verification)", placeholder="e.g., Thermal comfort thresholds...")
+    
+    col7, col8 = st.columns(2)
+    with col7:
         verify_date = st.text_input("Date (YYYY-MM-DD) (for verification)", placeholder="e.g., 2025-01-08")
+    with col8:
         verify_time = st.text_input("Time (HH:MM:SS) (for verification)", placeholder="e.g., 14:30:25")
-        expected_hash = st.text_input("Expected Hash (from the citation)", placeholder="Enter the full hash from the citation")
     
-    verify_cited_text = st.text_area("Quoted or Paraphrased Text (for verification)", 
-                                    placeholder="e.g., Thermal comfort thresholds are exceeded frequently in Australian schools",
-                                    height=100)
+    expected_hash = st.text_input("Expected Hash (from the citation)", placeholder="Enter the full hash from the citation")
 
     verify_button = st.button("Verify Hash", type="primary", use_container_width=True)
 
     if verify_button:
         if not all([verify_username, verify_task_name, verify_author_name, verify_publication_year, 
-                   verify_source_url, verify_cited_text, verify_date, verify_time, expected_hash]):
+                   verify_source_url, verify_annotated_text, verify_date, verify_time, expected_hash]):
             st.error("Please fill in all fields before verifying the hash.")
         else:
             recomputed_hash = generate_citation_hash(
                 verify_author_name, verify_publication_year, verify_source_url,
-                verify_cited_text, verify_cited_text, verify_username, verify_task_name,
+                verify_annotated_text, verify_annotated_text, verify_username, verify_task_name,
                 verify_date, verify_time
             )
 
@@ -371,8 +387,8 @@ with tabs[1]:
                     "Author": verify_author_name,
                     "Year": verify_publication_year,
                     "URL": verify_source_url,
-                    "Fragment text": verify_cited_text,
-                    "Cited text": verify_cited_text,
+                    "Fragment text": verify_annotated_text,
+                    "Cited text": verify_annotated_text,
                     "Username": verify_username,
                     "Task name": verify_task_name,
                     "Date": verify_date,
@@ -392,8 +408,8 @@ with tabs[1]:
                     "Author": verify_author_name,
                     "Year": verify_publication_year,
                     "URL": verify_source_url,
-                    "Fragment text": verify_cited_text,
-                    "Cited text": verify_cited_text,
+                    "Fragment text": verify_annotated_text,
+                    "Cited text": verify_annotated_text,
                     "Username": verify_username,
                     "Task name": verify_task_name,
                     "Date": verify_date,