Update app.py

app.py

@@ -9,9 +9,18 @@ API_KEY = "AIzaSyCHmsNAEP7I-ASxt8uS2kxc8O5P2x_-KQY"
 SEARCH_API_KEY = "AIzaSyCHmsNAEP7I-ASxt8uS2kxc8O5P2x_-KQY"
 CX = "561935e384c5e4a19"  # Your Custom Search Engine ID
 
-# Initialize Google Maps client
 gmaps = googlemaps.Client(key=API_KEY)
 
+# -------------------- SESSION STATE INIT --------------------
+if "current_step" not in st.session_state:
+    st.session_state.current_step = 1
+
+if "selected_business" not in st.session_state:
+    st.session_state.selected_business = None
+if "business_place_id" not in st.session_state:
+    st.session_state.business_place_id = None
+
+# -------------------- FUNCTIONS --------------------
 def get_business_suggestions(query, location):
     try:
         if not query or len(query) < 3:
@@ -131,15 +140,9 @@ def save_to_excel(data, filename="my_website_rankings.xlsx"):
                 combined_data[keyword]["SERP Link"] = entry.get("Link", "-")
 
         df = pd.DataFrame(list(combined_data.values()))
-        column_order = [
-            "Date", "Time", "Keyword",
-            "Google Maps Rank", "Google Maps Business Name", "Google Maps Address",
-            "SERP Rank", "SERP Title", "SERP Link"
-        ]
-        df = df[column_order]
         df.to_excel(filename, index=False, engine='openpyxl')
 
-        st.success(f"✅ Your website rankings saved to **{filename}**")
+        st.success(f"✅ Rankings saved to **{filename}**")
         st.download_button(
             label="📥 Download Excel File",
             data=open(filename, "rb").read(),
@@ -149,103 +152,85 @@ def save_to_excel(data, filename="my_website_rankings.xlsx"):
     except Exception as e:
         st.error(f"Error saving Excel file: {str(e)}")
 
-# Streamlit UI
+# -------------------- UI --------------------
 st.set_page_config(page_title="Business Rank Checker", layout="wide")
 st.title("📊 Business Rank Checker")
-st.markdown("Check your business ranking on Google Maps and search results")
 
-if 'business_selection' not in st.session_state:
-    st.session_state.business_selection = None
-if 'business_place_id' not in st.session_state:
-    st.session_state.business_place_id = None
-
-with st.form("search_form"):
-    col1, col2 = st.columns(2)
-    with col1:
+# Step 1 - Business Selection
+if st.session_state.current_step == 1:
+    with st.form("step1_form"):
         location = st.text_input("📍 Target Location", "Nottingham, MD, USA")
-    with col2:
         search_radius_km = st.slider("🔍 Search Radius (km)", 1, 20, 2)
+        business_query = st.text_input("🏢 Your Business Name", "")
 
-    business_query = st.text_input("🏢 Your Business Name", "", key="business_query")
+        suggestions = []
+        if business_query and len(business_query) >= 3:
+            suggestions = get_business_suggestions(business_query, location)
 
-    if st.session_state.business_query and len(st.session_state.business_query) >= 3:
-        suggestions = get_business_suggestions(st.session_state.business_query, location)
+        selected_option = None
         if suggestions:
-            selected_option = st.selectbox(
-                "🔎 Select your business from suggestions",
-                options=[s["name"] for s in suggestions],
-                index=0,
-                key="business_suggestion_select",
-                label_visibility="collapsed"
-            )
-            if selected_option:
-                st.session_state.business_selection = selected_option
-                st.session_state.business_place_id = next(
-                    s["place_id"] for s in suggestions 
-                    if s["name"] == selected_option
-                )
-        elif len(st.session_state.business_query) >= 3:
-            st.warning("No matching businesses found")
-
-    website_url = st.text_input("🌐 Your Website URL", "", help="Enter your website to check if it appears in search results")
+            selected_option = st.selectbox("🔎 Select your business", [s["name"] for s in suggestions])
+
+        confirm_btn = st.form_submit_button("✅ Confirm Selection")
+        if confirm_btn and selected_option:
+            selected_place_id = next(s["place_id"] for s in suggestions if s["name"] == selected_option)
+            st.session_state.selected_business = selected_option
+            st.session_state.business_place_id = selected_place_id
+            st.session_state.location = location
+            st.session_state.search_radius_km = search_radius_km
+            st.session_state.current_step = 2
+
+# Step 2 - Ranking Check
+if st.session_state.current_step == 2:
+    st.subheader(f"📌 Business Selected: {st.session_state.selected_business}")
+    website_url = st.text_input("🌐 Your Website URL")
     keywords_input = st.text_input("📌 Search Keywords (comma separated)", "Phone repair, mobile repair")
-    
-    submitted = st.form_submit_button("🚀 Check Rankings")
-
-if submitted and st.session_state.business_selection and st.session_state.business_place_id:
-    keywords = [kw.strip() for kw in keywords_input.split(",") if kw.strip()]
-
-    if not keywords:
-        st.warning("Please enter at least one search keyword")
-        st.stop()
-
-    my_website_rankings = []
-
-    with st.spinner("Analyzing rankings..."):
-        for keyword in keywords:
-            st.subheader(f"🔍 Results for keyword: '{keyword}'")
-            
-            st.markdown("### 📌 Google Maps Rankings")
-            maps_rankings = get_google_maps_rank(
-                keyword, location, 
-                st.session_state.business_selection, st.session_state.business_place_id, 
-                search_radius_km
-            )
-
-            if "error" in maps_rankings:
-                st.error(f"Error: {maps_rankings['error']}")
-            else:
-                my_website_rankings.append({
-                    "Keyword": keyword,
-                    "Source": "Google Maps",
-                    "Rank": maps_rankings["rank"],
-                    "Business Name": maps_rankings["name"],
-                    "Address": maps_rankings["address"]
-                })
-                st.markdown(f"#### Your Business: **{st.session_state.business_selection}**")
-                st.write(f"Rank: {maps_rankings['rank']}")
-                st.write(f"Address: {maps_rankings['address']}")
-
-            st.markdown(f"### 🌐 Search Results for '{keyword}' in {location}")
-            serp_results = get_serp_rankings(keyword, location, website_url)
-
-            if "error" in serp_results:
-                st.error(serp_results["error"])
-            else:
-                my_website_rankings.append({
-                    "Keyword": keyword,
-                    "Source": "Google Search",
-                    "Rank": serp_results["rank"],
-                    "Title": serp_results["title"],
-                    "Link": serp_results["link"]
-                })
+    back_btn, check_btn = st.columns([1, 3])
 
-                st.write(f"Rank: {serp_results['rank']}")
-                if serp_results['rank'] != f"Not in top {10}":
-                    st.write(f"Title: {serp_results['title']}")
-                    st.write(f"Link: {serp_results['link']}")
+    if back_btn.button("🔙 Change Business"):
+        st.session_state.current_step = 1
 
-            st.markdown("---")
+    if check_btn.button("🚀 Check Rankings"):
+        keywords = [kw.strip() for kw in keywords_input.split(",") if kw.strip()]
+        rankings_data = []
+
+        with st.spinner("Analyzing..."):
+            for keyword in keywords:
+                st.markdown(f"### 🔍 {keyword}")
+
+                maps_result = get_google_maps_rank(
+                    keyword,
+                    st.session_state.location,
+                    st.session_state.selected_business,
+                    st.session_state.business_place_id,
+                    st.session_state.search_radius_km
+                )
 
-        if my_website_rankings:
-            save_to_excel(my_website_rankings)
+                if "error" in maps_result:
+                    st.error(maps_result["error"])
+                else:
+                    st.write(f"**Google Maps Rank:** {maps_result['rank']}")
+                    st.write(f"**Address:** {maps_result['address']}")
+                    rankings_data.append({
+                        "Keyword": keyword,
+                        "Source": "Google Maps",
+                        "Rank": maps_result['rank'],
+                        "Business Name": maps_result['name'],
+                        "Address": maps_result['address']
+                    })
+
+                serp_result = get_serp_rankings(keyword, st.session_state.location, website_url)
+                if "error" in serp_result:
+                    st.error(serp_result["error"])
+                else:
+                    st.write(f"**SERP Rank:** {serp_result['rank']}")
+                    rankings_data.append({
+                        "Keyword": keyword,
+                        "Source": "Google Search",
+                        "Rank": serp_result['rank'],
+                        "Title": serp_result['title'],
+                        "Link": serp_result['link']
+                    })
+
+            if rankings_data:
+                save_to_excel(rankings_data)