app.py

@@ -79,6 +79,12 @@ def create_flow():
 def is_logged_in():
     return 'credentials' in st.session_state
 
+# Function to get user info
+def get_user_info(credentials):
+    service = build('oauth2', 'v2', credentials=credentials)
+    user_info = service.userinfo().get().execute()
+    return user_info
+
 # Load and decrypt the CSV file
 @st.cache_data
 def load_data():
@@ -97,16 +103,6 @@ def load_data():
         st.error(f"Error decrypting file: {str(e)}")
         return pd.DataFrame()
 
-# Function to get user info
-def get_user_info(credentials):
-    try:
-        service = build('oauth2', 'v2', credentials=credentials)
-        user_info = service.userinfo().get().execute()
-        return user_info
-    except Exception as e:
-        logging.error(f"Error getting user info: {str(e)}")
-        return None
-
 # Main function to run the Streamlit app
 def main():
     st.title('📚 Student Grade Lookup')
@@ -122,65 +118,58 @@ def main():
     else:
         credentials = Credentials.from_authorized_user_info(json.loads(st.session_state['credentials']))
         user_info = get_user_info(credentials)
+        st.write(f"Welcome, {user_info['name']}!")
         
-        if user_info:
-            st.write(f"Welcome, {user_info['name']}!")
-            user_email = user_info['email']
+        # Load the data
+        df = load_data()
+
+        # Look up the student's information using their email
+        student = df[df['EMAIL'].str.lower() == user_info['email'].lower()]
+
+        if not student.empty:
+            st.markdown("---")
+            st.subheader('Your Grade Information:')
             
-            # Load the data
-            df = load_data()
+            col1, col2 = st.columns(2)
             
-            # Search for the student in the dataframe
-            student = df[df['EMAIL'].str.lower() == user_email.lower()]
-
-            if not student.empty:
-                st.markdown("---")
-                st.subheader('Your Grade Information:')
-                
-                # Display student information in a more structured way
-                col1, col2 = st.columns(2)
+            with col1:
+                st.markdown("<p class='big-font'>Name</p>", unsafe_allow_html=True)
+                st.write(f"{student['NAME'].values[0]}")
                 
-                with col1:
-                    st.markdown("<p class='big-font'>Name</p>", unsafe_allow_html=True)
-                    st.write(f"{student['NAME'].values[0]}")
-                    
-                    st.markdown("<p class='big-font'>ID</p>", unsafe_allow_html=True)
-                    st.write(f"{student['ID'].values[0]}")
-
-                with col2:
-                    st.markdown("<p class='big-font'>Grade</p>", unsafe_allow_html=True)
-                    # Check if grade is NA
-                    grade = student['GRADE'].values[0]
-                    if pd.isna(grade):
-                        grade_display = "N/A"
-                    else:
-                        grade_display = f"{grade:.2f}"
-                    st.write(grade_display)
-                    
-                    st.markdown("<p class='big-font'>Remarks</p>", unsafe_allow_html=True)
-                    remarks = student['REMARKS'].values[0]
-                    if remarks == "Passed":
-                        st.success(remarks)
-                    elif remarks == "Conditional":
-                        st.warning(remarks)
-                    else:
-                        st.write(remarks)
+                st.markdown("<p class='big-font'>ID</p>", unsafe_allow_html=True)
+                st.write(f"{student['ID'].values[0]}")
+
+            with col2:
+                st.markdown("<p class='big-font'>Grade</p>", unsafe_allow_html=True)
+                grade = student['GRADE'].values[0]
+                if pd.isna(grade):
+                    grade_display = "N/A"
+                else:
+                    grade_display = f"{grade:.2f}"
+                st.write(grade_display)
                 
-                # Add personalized message based on grade
-                if not pd.isna(grade):
-                    if grade > 1.9:
-                        message = f"Keep up the good work! Your grade of {grade:.2f} shows dedication. Consider seeking additional support to further improve your performance."
-                        st.markdown(f"<p class='message'>{message}</p>", unsafe_allow_html=True)
-                    else:
-                        message = f"Congratulations! Your outstanding grade of {grade:.2f} demonstrates exceptional performance. Keep up the excellent work!"
-                        st.markdown(f"<p class='message'>{message}</p>", unsafe_allow_html=True)
-                
-                # Add warning message for Conditional remarks
-                if remarks == "Conditional":
-                    warning_message = "Warning: Your current status is Conditional. You need to pass or achieve a higher grade in the final term to improve your standing."
-                    st.markdown(f"<p class='warning-message'>{warning_message}</p>", unsafe_allow_html=True)
-            else:
-                st.error('Your email is not found in our records. Please contact the administrator.')
+                st.markdown("<p class='big-font'>Remarks</p>", unsafe_allow_html=True)
+                remarks = student['REMARKS'].values[0]
+                if remarks == "Passed":
+                    st.success(remarks)
+                elif remarks == "Conditional":
+                    st.warning(remarks)
+                else:
+                    st.write(remarks)
+            
+            if not pd.isna(grade):
+                if grade > 1.9:
+                    message = f"Keep up the good work! Your grade of {grade:.2f} shows dedication. Consider seeking additional support to further improve your performance."
+                    st.markdown(f"<p class='message'>{message}</p>", unsafe_allow_html=True)
+                else:
+                    message = f"Congratulations! Your outstanding grade of {grade:.2f} demonstrates exceptional performance. Keep up the excellent work!"
+                    st.markdown(f"<p class='message'>{message}</p>", unsafe_allow_html=True)
+            
+            if remarks == "Conditional":
+                warning_message = "Warning: Your current status is Conditional. You need to pass or achieve a higher grade in the final term to improve your standing."
+                st.markdown(f"<p class='warning-message'>{warning_message}</p>", unsafe_allow_html=True)
+        else:
+            st.error('Your email is not found in our records. Please contact the administrator.')
 
         if st.button("Logout"):
             for key in list(st.session_state.keys()):
@@ -194,7 +183,6 @@ def handle_callback():
         flow.fetch_token(code=st.query_params["code"])
         credentials = flow.credentials
         st.session_state['credentials'] = credentials.to_json()
-        st.session_state['authenticated'] = True
         logging.debug("Token fetch successful")
         st.success("Authentication successful!")
         time.sleep(2)  # Give user time to see the success message
@@ -202,15 +190,10 @@ def handle_callback():
     except Exception as e:
         logging.error(f"Error during authentication: {str(e)}")
         st.error(f"Authentication failed: {str(e)}")
-        st.session_state['authenticated'] = False
-        if 'credentials' in st.session_state:
-            del st.session_state['credentials']
 
 if __name__ == '__main__':
     logging.debug("Starting the application")
     if 'code' in st.query_params:
         logging.debug("Authorization code found in query parameters")
         handle_callback()
-    elif st.session_state.get('authenticated', False):
-        st.success("You are already authenticated.")
     main()