Update app.py

app.py

@@ -554,50 +554,24 @@ def get_analytics_summary():
 # SHARE LINKS GENERATOR
 # ============================================================
 
-def get_share_links(birds, breed, weeks, days, total_days, bag_size, total_bags, rounded_bags,
-                    starter_bags, finisher_bags, total_cost, price_per_bag,
-                    currency_symbol, expected_weight, flock_weight, app_url="https://howmuchfeed.com"):
+def get_share_links(app_url="https://howmuchfeed.com"):
     """Generate share links for WhatsApp, Email, Facebook, Twitter."""
     
-    # Build share message (NO EMOJIS for WhatsApp compatibility)
-    message = f"""{app_url} - Results
-
->> QUICK ANSWER:
-Exact feed needed: {total_bags:.1f} bags of {bag_size} kg feed
-Approximately {rounded_bags} bags needed 
-to raise {birds:,} broilers to {weeks} weeks{f" + {days} days" if days > 0 else ""} ({total_days} days)
-
->> FEED BREAKDOWN:
-Starter: {starter_bags:.1f} bags
-Finisher: {finisher_bags:.1f} bags
-TOTAL: {rounded_bags} bags
-
->> FEED COST:
-{currency_symbol}{total_cost:,.0f}
-({rounded_bags} bags x {currency_symbol}{price_per_bag:,.0f} per bag)
-
->> EXPECTED PERFORMANCE:
-Body weight per bird: {expected_weight:.3f} kg
-
-Click and share to calculate your Poultry feed needs:
-{app_url}"""
+    share_text = f"🐔 Calculate your poultry feed needs at {app_url}"
+    encoded = urllib.parse.quote(share_text)
     
-    # URL encode
-    encoded = urllib.parse.quote(message)
-    
-    # Share links
     links = {
         "whatsapp": f"https://wa.me/?text={encoded}",
-        "email": f"mailto:?subject=How Much Feed? - Results&body={encoded}",
-        "facebook": f"https://www.facebook.com/sharer/sharer.php?u={urllib.parse.quote(app_url)}&quote={urllib.parse.quote(message[:500])}",
-        "twitter": f"https://twitter.com/intent/tweet?text={urllib.parse.quote(message[:280])}",
+        "email": f"mailto:?subject=How Much Feed? - Poultry Feed Calculator&body={encoded}",
+        "facebook": f"https://www.facebook.com/sharer/sharer.php?u={urllib.parse.quote(app_url)}",
+        "twitter": f"https://twitter.com/intent/tweet?text={encoded}",
     }
     
     return links
 
 
 # ============================================================
-# FEED CALCULATION - WITH BOXED NUMBERS
+# FEED CALCULATION - CLEAN INTERFACE
 # ============================================================
 
 def calculate_feed(birds, weeks, days, bag_size, price_per_bag, email, country_code, breed, request: gr.Request):
@@ -669,14 +643,9 @@ def calculate_feed(birds, weeks, days, bag_size, price_per_bag, email, country_c
     breed_color = breed_info["color"]
 
     # Generate share links
-    share_links = get_share_links(
-        birds, breed, weeks, days, total_days, bag_size, 
-        total_bags, rounded_bags,
-        starter_bags, finisher_bags, total_cost, price_per_bag,
-        currency_symbol, expected_weight, flock_weight
-    )
+    share_links = get_share_links()
 
-    # Output HTML with BOXED NUMBERS
+    # Output HTML - CLEAN INTERFACE
     starter_bags_display = f"{starter_bags:.1f}"
     finisher_bags_display = f"{finisher_bags:.1f}"
 
@@ -685,116 +654,88 @@ def calculate_feed(birds, weeks, days, bag_size, price_per_bag, email, country_c
         age_text += f" + {days} day{'s' if days != 1 else ''}"
 
     html = f"""
-    <div style="font-size: 17px; line-height: 1.8; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, sans-serif;">
+    <div style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, sans-serif; font-size: 16px; line-height: 1.6; color: #1a1a1a;">
 
-    <div style="background: #f0fdf4; padding: 18px 22px; border-radius: 14px; border-left: 6px solid #22c55e; margin-bottom: 20px;">
-        <div style="font-size: 13px; color: #16a34a; font-weight: 700; text-transform: uppercase; letter-spacing: 0.8px; margin-bottom: 8px;">Quick Answer</div>
-        
-        <!-- EXACT FEED - Boxed -->
+    <!-- Quick Answer -->
+    <div style="background: #f0fdf4; border: 1px solid #bbf7d0; border-radius: 12px; padding: 20px 24px; margin-bottom: 20px;">
+        <div style="font-size: 13px; font-weight: 700; color: #16a34a; text-transform: uppercase; letter-spacing: 0.5px; margin-bottom: 6px;">Here Is Your Result</div>
         <div style="font-size: 20px; font-weight: 700; color: #166534;">
-            Exact feed needed:
-            <span style="display: inline-block; background: #166534; color: white; border-radius: 12px; padding: 4px 18px; font-size: 30px; font-weight: 900; box-shadow: 0 2px 8px rgba(22, 101, 52, 0.3);">
-                {total_bags:.1f}
-            </span>
-            bags of {bag_size:g} kg feed
+            You need <span style="background: #166534; color: white; border-radius: 8px; padding: 2px 14px; font-size: 24px;">{total_bags:.1f}</span> bags of {bag_size} kg poultry feed<br>
+            to raise <strong>{birds:,}</strong> {breed} broilers from day-old to <strong>{age_text} ({total_days} days)</strong>
         </div>
-        
-        <!-- APPROXIMATE BAGS - Boxed -->
-        <div style="font-size: 20px; font-weight: 700; color: #1e40af; margin-top: 6px;">
-            Approximately:
-            <span style="display: inline-block; background: #1e40af; color: white; border-radius: 12px; padding: 4px 18px; font-size: 26px; font-weight: 800; box-shadow: 0 2px 8px rgba(30, 64, 175, 0.3);">
-                {rounded_bags}
-            </span>
-            bags to purchase (rounded up)
+        <div style="margin-top: 8px; font-size: 18px; font-weight: 700; color: #1e40af;">
+            Buy <span style="background: #1e40af; color: white; border-radius: 8px; padding: 2px 14px; font-size: 22px;">{rounded_bags}</span> bags to make sure you have enough feed.
         </div>
-        
-        <!-- BIRD COUNT - Boxed -->
-        <div style="color: #374151; font-size: 16px; margin-top: 8px;">
-            To raise
-            <span style="display: inline-block; background: #fef3c7; border: 2px solid #f59e0b; border-radius: 10px; padding: 2px 14px; font-size: 18px; font-weight: 700; color: #92400e;">
-                {birds:,}
-            </span>
-            {breed} broilers to
-            <span style="display: inline-block; background: #fce4ec; border: 2px solid #ef4444; border-radius: 10px; padding: 2px 14px; font-size: 18px; font-weight: 700; color: #991b1b;">
-                {age_text} ({total_days} days)
-            </span>
+        <div style="margin-top: 8px; display: flex; gap: 16px; flex-wrap: wrap; font-size: 14px; color: #4b5563;">
+            <span>🐔 Birds: <strong>{birds:,} broilers</strong></span>
+            <span>📅 Age: <strong>{age_text} ({total_days} days)</strong></span>
+            <span>🏷️ Breed: <strong>{breed}</strong></span>
         </div>
-        
-        <div style="margin-top: 8px; font-size: 13px;">
-            <span style="background: {breed_color}; color: white; padding: 3px 12px; border-radius: 14px; font-weight: 600;">{breed}</span>
-            <span style="background: #6b7280; color: white; padding: 3px 12px; border-radius: 14px; font-weight: 600; margin-left: 8px;">{country_name}</span>
+        <div style="margin-top: 8px; display: flex; gap: 8px; font-size: 13px;">
+            <span style="background: {breed_color}; color: white; padding: 2px 12px; border-radius: 12px; font-weight: 600;">{breed}</span>
+            <span style="background: #6b7280; color: white; padding: 2px 12px; border-radius: 12px; font-weight: 600;">{country_name}</span>
         </div>
     </div>
 
+    <!-- Feed Breakdown -->
     <div style="margin-bottom: 16px;">
-        <div style="font-size: 13px; color: #6b7280; font-weight: 700; text-transform: uppercase; letter-spacing: 0.5px;">Feed Breakdown</div>
-        <table style="width: 100%; border-collapse: collapse; margin-top: 6px; font-size: 16px;">
+        <div style="font-size: 14px; font-weight: 700; color: #6b7280; text-transform: uppercase; letter-spacing: 0.5px; margin-bottom: 8px;">Feed Breakdown</div>
+        <table style="width: 100%; border-collapse: collapse; font-size: 15px;">
             <tr style="border-bottom: 1px solid #e5e7eb;">
-                <td style="padding: 10px 4px;"><strong>Starter</strong></td>
-                <td style="padding: 10px 4px; text-align: right;">{starter_kg:,.1f} kg</td>
-                <td style="padding: 10px 4px; text-align: right; font-weight: 700; font-size: 18px; color: #1e293b;">{starter_bags_display} bags</td>
+                <td style="padding: 8px 4px;"><strong>Starter (0 – 4 weeks)</strong></td>
+                <td style="padding: 8px 4px; text-align: right;">{starter_kg:,.1f} kg</td>
+                <td style="padding: 8px 4px; text-align: right; font-weight: 700; color: #1e293b;">{starter_bags_display} bags</td>
             </tr>
             <tr style="border-bottom: 1px solid #e5e7eb;">
-                <td style="padding: 10px 4px;"><strong>Finisher</strong></td>
-                <td style="padding: 10px 4px; text-align: right;">{finisher_kg:,.1f} kg</td>
-                <td style="padding: 10px 4px; text-align: right; font-weight: 700; font-size: 18px; color: #1e293b;">{finisher_bags_display} bags</td>
+                <td style="padding: 8px 4px;"><strong>Finisher (4 – 8 weeks)</strong></td>
+                <td style="padding: 8px 4px; text-align: right;">{finisher_kg:,.1f} kg</td>
+                <td style="padding: 8px 4px; text-align: right; font-weight: 700; color: #1e293b;">{finisher_bags_display} bags</td>
             </tr>
             <tr>
-                <td style="padding: 10px 4px; font-weight: 700;">TOTAL</td>
-                <td style="padding: 10px 4px; text-align: right; font-weight: 700;">{total_feed_kg:,.1f} kg</td>
-                <td style="padding: 10px 4px; text-align: right; font-weight: 700; font-size: 18px; color: #166534;">{total_bags:.1f}</td>
+                <td style="padding: 8px 4px; font-weight: 700;">TOTAL</td>
+                <td style="padding: 8px 4px; text-align: right; font-weight: 700;">{total_feed_kg:,.1f} kg</td>
+                <td style="padding: 8px 4px; text-align: right; font-weight: 700; font-size: 18px; color: #166534;">{total_bags:.1f} bags</td>
             </tr>
         </table>
     </div>
 
-    <div style="margin-bottom: 16px; background: #eff6ff; padding: 14px 18px; border-radius: 10px; border-left: 4px solid #3b82f6;">
-        <div style="font-size: 13px; color: #6b7280; font-weight: 700; text-transform: uppercase; letter-spacing: 0.5px;">Feed Cost</div>
-        <div style="font-size: 32px; font-weight: 900; color: white;">
-            <span style="display: inline-block; background: #1e40af; color: white; border-radius: 12px; padding: 6px 22px; box-shadow: 0 2px 10px rgba(30, 64, 175, 0.3);">
-                {currency_symbol}{total_cost:,.0f}
-            </span>
+    <!-- Feed Cost -->
+    <div style="background: #eff6ff; border: 1px solid #bfdbfe; border-radius: 12px; padding: 16px 20px; margin-bottom: 16px;">
+        <div style="font-size: 14px; font-weight: 700; color: #6b7280; text-transform: uppercase; letter-spacing: 0.5px; margin-bottom: 4px;">Feed Cost Estimate</div>
+        <div style="display: flex; align-items: baseline; gap: 8px; flex-wrap: wrap;">
+            <span style="font-size: 16px; color: #4b5563;">Approximately</span>
+            <span style="background: #1e40af; color: white; border-radius: 8px; padding: 2px 16px; font-size: 20px; font-weight: 700;">{rounded_bags} bags</span>
+            <span style="font-size: 16px; color: #4b5563;">× {currency_symbol}{price_per_bag:,.0f} per bag</span>
         </div>
-        <div style="color: #6b7280; font-size: 14px; margin-top: 4px;">
-            Approximately {rounded_bags} bags x {currency_symbol}{price_per_bag:,.0f} per bag
+        <div style="font-size: 28px; font-weight: 800; color: #1e40af; margin-top: 4px;">
+            {currency_symbol}{total_cost:,.0f}
         </div>
     </div>
 
-    <div style="border-top: 1px solid #e5e7eb; padding-top: 14px;">
-        <div style="font-size: 13px; color: #6b7280; font-weight: 700; text-transform: uppercase; letter-spacing: 0.5px;">Expected Performance</div>
-        <table style="width: 100%; border-collapse: collapse; margin-top: 6px; font-size: 16px;">
-            <tr style="border-bottom: 1px solid #e5e7eb;">
-                <td style="padding: 8px 4px;">Body weight per bird</td>
-                <td style="padding: 8px 4px; text-align: right; font-weight: 700; font-size: 18px;">
-                    <span style="display: inline-block; background: #f1f5f9; border: 1px solid #cbd5e1; border-radius: 8px; padding: 2px 14px;">
-                        {expected_weight:.3f} kg
-                    </span>
-                </td>
-            </tr>
-            <tr>
-                <td style="padding: 8px 4px;">Flock live weight</td>
-                <td style="padding: 8px 4px; text-align: right; font-weight: 700; font-size: 18px;">
-                    <span style="display: inline-block; background: #f1f5f9; border: 1px solid #cbd5e1; border-radius: 8px; padding: 2px 14px;">
-                        {flock_weight:,.1f} kg
-                    </span>
-                </td>
-            </tr>
-        </table>
+    <!-- Expected Performance -->
+    <div style="border-top: 1px solid #e5e7eb; padding-top: 14px; margin-bottom: 16px;">
+        <div style="font-size: 14px; font-weight: 700; color: #6b7280; text-transform: uppercase; letter-spacing: 0.5px; margin-bottom: 6px;">Expected Performance</div>
+        <div style="display: flex; gap: 24px; flex-wrap: wrap; font-size: 15px;">
+            <div>Body weight per bird: <span style="font-weight: 700; font-size: 17px;">{expected_weight:.3f} kg</span></div>
+            <div>Flock live weight: <span style="font-weight: 700; font-size: 17px;">{flock_weight:,.1f} kg</span></div>
+        </div>
     </div>
 
-    <div style="margin-top: 16px; border-top: 1px solid #e5e7eb; padding-top: 14px;">
-        <div style="font-size: 13px; color: #6b7280; font-weight: 600; margin-bottom: 8px;">Share Results:</div>
+    <!-- Share Results -->
+    <div style="border-top: 1px solid #e5e7eb; padding-top: 14px;">
+        <div style="font-size: 14px; font-weight: 700; color: #6b7280; text-transform: uppercase; letter-spacing: 0.5px; margin-bottom: 8px;">Share Results</div>
         <div style="display: flex; gap: 10px; flex-wrap: wrap;">
             <a href="{share_links['whatsapp']}" target="_blank" style="text-decoration: none;">
-                <button style="background: #25D366; color: white; padding: 8px 16px; border: none; border-radius: 8px; cursor: pointer; font-size: 14px; font-weight: 600;">WhatsApp</button>
+                <button style="background: #25D366; color: white; padding: 8px 18px; border: none; border-radius: 8px; cursor: pointer; font-size: 14px; font-weight: 600;">WhatsApp</button>
             </a>
             <a href="{share_links['email']}" target="_blank" style="text-decoration: none;">
-                <button style="background: #ea4335; color: white; padding: 8px 16px; border: none; border-radius: 8px; cursor: pointer; font-size: 14px; font-weight: 600;">Email</button>
+                <button style="background: #ea4335; color: white; padding: 8px 18px; border: none; border-radius: 8px; cursor: pointer; font-size: 14px; font-weight: 600;">Email</button>
             </a>
             <a href="{share_links['facebook']}" target="_blank" style="text-decoration: none;">
-                <button style="background: #1877f2; color: white; padding: 8px 16px; border: none; border-radius: 8px; cursor: pointer; font-size: 14px; font-weight: 600;">Facebook</button>
+                <button style="background: #1877f2; color: white; padding: 8px 18px; border: none; border-radius: 8px; cursor: pointer; font-size: 14px; font-weight: 600;">Facebook</button>
             </a>
             <a href="{share_links['twitter']}" target="_blank" style="text-decoration: none;">
-                <button style="background: #000000; color: white; padding: 8px 16px; border: none; border-radius: 8px; cursor: pointer; font-size: 14px; font-weight: 600;">Twitter/X</button>
+                <button style="background: #000000; color: white; padding: 8px 18px; border: none; border-radius: 8px; cursor: pointer; font-size: 14px; font-weight: 600;">Twitter/X</button>
             </a>
         </div>
     </div>
@@ -1033,10 +974,9 @@ body { background: #f6f8f4; }
 .answer-box { 
     background: white; 
     border-radius: 16px; 
-    padding: 16px 20px; 
+    padding: 20px 24px; 
     border: 1px solid #e5e7eb; 
     box-shadow: 0 1px 3px rgba(0,0,0,0.05); 
-    min-height: 400px; 
 }
 
 .email-box {