Update app.py

app.py

@@ -6,16 +6,16 @@ import json
 import pandas as pd
 import firebase_admin
 from firebase_admin import credentials, firestore
+import streamlit.components.v1 as components
 
 # --- PAGE CONFIG ---
 st.set_page_config(page_title="Vivara Forge", page_icon="🦁", layout="wide")
 
-# --- SESSION STATE SETUP ---
+# --- SESSION STATE ---
 if 'is_creator' not in st.session_state:
     st.session_state['is_creator'] = False
 
-# --- 1. FIREBASE CONNECTION (Backend) ---
-# This allows the app to talk to your database
+# --- 1. FIREBASE CONNECTION ---
 if not firebase_admin._apps:
     key_json = os.getenv("FIREBASE_SERVICE_ACCOUNT")
     if key_json:
@@ -24,65 +24,49 @@ if not firebase_admin._apps:
             cred = credentials.Certificate(cred_dict)
             firebase_admin.initialize_app(cred)
         except Exception as e:
-            st.warning("⚠️ Firebase Key Error. Admin features disabled.")
+            st.warning("⚠️ Firebase Error. Admin features disabled.")
     else:
-        st.warning("⚠️ Admin Database Not Connected (Add FIREBASE_SERVICE_ACCOUNT secret)")
+        st.warning("⚠️ Admin DB Not Connected.")
 
 try:
     db = firestore.client()
 except:
     db = None
 
-# --- SIDEBAR: LOGIN & WALLET ---
+# --- SIDEBAR ---
 with st.sidebar:
     st.header("👤 Identity")
-    
-    # LOGIN FORM
     if not st.session_state['is_creator']:
         with st.expander("Creator Login"):
-            admin_pass = st.text_input("Admin Password", type="password")
-            if st.button("Unlock Creator Mode"):
-                # Check against the secret you saved in Hugging Face
-                if admin_pass == os.getenv("ADMIN_PASSWORD"):
+            pwd = st.text_input("Password", type="password")
+            if st.button("Unlock"):
+                if pwd == os.getenv("ADMIN_PASSWORD"):
                     st.session_state['is_creator'] = True
-                    st.success("Welcome back, Fugth.")
                     st.rerun()
                 else:
                     st.error("Wrong Password")
     else:
-        st.success("🟢 CREATOR MODE ACTIVE")
+        st.success("👑 CREATOR MODE")
         if st.button("Logout"):
             st.session_state['is_creator'] = False
             st.rerun()
 
     st.divider()
-    
-    st.header("⚙️ Network Settings")
-    rpc_url = st.text_input("RPC URL", value="https://polygon-rpc.com")
+    st.header("⚙️ Network")
+    rpc_url = st.text_input("RPC URL", "https://polygon-rpc.com")
     chain_id = st.number_input("Chain ID", value=137)
-    
-    # Wallet Status
-    pk = os.getenv("PRIVATE_KEY")
-    if pk:
-        st.info("🔑 Admin Wallet Loaded")
-    else:
-        st.warning("⚠️ No Wallet Key Found")
-
-# --- MAIN APP LOGIC ---
-
-# IF CREATOR: Show Everything (3 Tabs)
-# IF PUBLIC: Show Only Forge (1 Tab)
 
+# --- MAIN LOGIC ---
 if st.session_state['is_creator']:
     st.title("🦁 Vivara Command Center")
-    tabs = st.tabs(["⚒️ Solidity Forge", "👥 User Database", "💰 Coin & Stats"])
+    tabs = st.tabs(["⚒️ Solidity Forge", "👥 User DB", "📧 Newsletter"])
 else:
     st.title("⚒️ Vivara Forge (Public)")
-    st.caption("Open Source Smart Contract Deployment Tool")
+    st.caption("Open Source Smart Contract Studio")
     tabs = st.tabs(["⚒️ Solidity Forge"])
 
 # ==========================================
-# TAB 1: SOLIDITY FORGE (PUBLIC)
+# TAB 1: SOLIDITY FORGE (PUBLIC & ADMIN)
 # ==========================================
 with tabs[0]:
     col1, col2 = st.columns([1.5, 1])
@@ -97,104 +81,126 @@ contract MyToken is ERC20 {
     constructor() ERC20("MyToken", "MTK") {
         _mint(msg.sender, 1000 * 10**18);
     }
-}
-"""
-        code_input = st.text_area("Solidity Code", value=default_code, height=500)
+}"""
+        code_input = st.text_area("Code", value=default_code, height=500)
 
     with col2:
-        st.subheader("🚀 Compiler")
-        if st.button("COMPILE"):
-            with st.spinner("Installing Compiler..."):
+        st.subheader("🚀 Actions")
+        if st.button("1. COMPILE"):
+            with st.spinner("Compiling..."):
                 try:
                     install_solc('0.8.20')
                     compiled = compile_source(code_input, output_values=['abi', 'bin'], solc_version='0.8.20')
                     contract_id, iface = list(compiled.items())[-1]
                     st.session_state['abi'] = iface['abi']
                     st.session_state['bin'] = iface['bin']
+                    st.session_state['name'] = contract_id
                     st.success(f"✅ Compiled: {contract_id}")
                 except Exception as e:
                     st.error(f"Error: {e}")
-        
+
         st.divider()
         
-        # DEPLOY BUTTON (Only enabled if Creator logged in OR use Metamask injection trick)
-        # Since this is Python-based, usually only the Admin deploys via the server key.
-        if st.session_state['is_creator']:
-            if st.button("DEPLOY (Admin Wallet)"):
-                if not pk:
-                    st.error("No Private Key!")
-                else:
-                    try:
-                        w3 = Web3(Web3.HTTPProvider(rpc_url))
-                        acct = w3.eth.account.from_key(pk)
-                        Contract = w3.eth.contract(abi=st.session_state['abi'], bytecode=st.session_state['bin'])
-                        tx = Contract.constructor().build_transaction({
-                            'from': acct.address,
-                            'nonce': w3.eth.get_transaction_count(acct.address),
-                            'gas': 3000000,
-                            'gasPrice': w3.to_wei('50', 'gwei'),
-                            'chainId': int(chain_id)
-                        })
-                        signed = w3.eth.account.sign_transaction(tx, pk)
-                        tx_hash = w3.eth.send_raw_transaction(signed.rawTransaction)
-                        st.success(f"🚀 Deployed! TX: {w3.to_hex(tx_hash)}")
-                    except Exception as e:
-                        st.error(f"Deploy Error: {e}")
-        else:
-            st.info("🔒 Server-side deployment is restricted to Admins. Public deployment via MetaMask coming soon.")
+        # DEPLOYMENT OPTIONS
+        if 'abi' in st.session_state:
+            st.write(f"**Target:** {st.session_state['name']}")
+            
+            # OPTION A: PUBLIC (MetaMask Injection)
+            abi_str = json.dumps(st.session_state['abi'])
+            bin_str = st.session_state['bin']
+            
+            html_code = f"""
+            <html>
+            <head><script src="https://cdn.ethers.io/lib/ethers-5.2.umd.min.js"></script></head>
+            <body>
+                <button onclick="deploy()" style="background:#f6851b; color:white; border:none; padding:10px 20px; border-radius:5px; font-weight:bold; cursor:pointer; width:100%;">🦊 DEPLOY WITH METAMASK</button>
+                <div id="log" style="margin-top:10px; font-family:monospace; color:white; font-size:12px;"></div>
+                <script>
+                    async function deploy() {{
+                        const log = document.getElementById("log");
+                        if (!window.ethereum) {{ log.innerText = "MetaMask not found!"; return; }}
+                        try {{
+                            log.innerText = "Connecting...";
+                            const provider = new ethers.providers.Web3Provider(window.ethereum);
+                            await provider.send("eth_requestAccounts", []);
+                            const signer = provider.getSigner();
+                            const factory = new ethers.ContractFactory({abi_str}, "{bin_str}", signer);
+                            log.innerText = "Please confirm in Wallet...";
+                            const contract = await factory.deploy();
+                            log.innerText = "Sent! Hash: " + contract.deployTransaction.hash;
+                            await contract.deployed();
+                            log.innerText = "✅ Deployed: " + contract.address;
+                        }} catch (e) {{ log.innerText = "Error: " + e.message; }}
+                    }}
+                </script>
+            </body></html>
+            """
+            components.html(html_code, height=150)
+            
+            # OPTION B: ADMIN (Server Wallet)
+            if st.session_state['is_creator']:
+                st.caption("--- OR ---")
+                if st.button("🤖 DEPLOY WITH ADMIN KEY"):
+                    pk = os.getenv("PRIVATE_KEY")
+                    if not pk:
+                        st.error("No Private Key in Secrets")
+                    else:
+                        try:
+                            w3 = Web3(Web3.HTTPProvider(rpc_url))
+                            acct = w3.eth.account.from_key(pk)
+                            Contract = w3.eth.contract(abi=st.session_state['abi'], bytecode=st.session_state['bin'])
+                            tx = Contract.constructor().build_transaction({
+                                'from': acct.address,
+                                'nonce': w3.eth.get_transaction_count(acct.address),
+                                'gas': 3000000,
+                                'gasPrice': w3.to_wei('50', 'gwei'),
+                                'chainId': int(chain_id)
+                            })
+                            signed = w3.eth.account.sign_transaction(tx, pk)
+                            tx_hash = w3.eth.send_raw_transaction(signed.rawTransaction)
+                            st.success(f"🚀 Admin Deploy: {w3.to_hex(tx_hash)}")
+                        except Exception as e:
+                            st.error(f"Admin Error: {e}")
 
 # ==========================================
-# TAB 2: USER DATABASE (CREATOR ONLY)
+# TAB 2 & 3: CREATOR TOOLS
 # ==========================================
 if st.session_state['is_creator']:
     with tabs[1]:
-        st.header("👥 User Management")
+        st.header("👥 User Database")
         if db:
-            users_ref = db.collection("users")
-            all_users = list(users_ref.stream())
-            
-            founders = 0
-            alphas = 0
-            
+            users = list(db.collection("users").stream())
             data = []
-            for doc in all_users:
-                u = doc.to_dict()
-                inv = u.get("inventory", [])
-                
+            founders = 0
+            for u in users:
+                d = u.to_dict()
                 tier = "Free"
-                if "FOUNDER" in inv: 
-                    tier = "🏆 GOLD"
-                    founders += 1
-                elif "ALPHA" in inv: 
+                if "FOUNDER" in d.get("inventory", []): 
+                    tier = "🏆 GOLD"; founders += 1
+                elif "ALPHA" in d.get("inventory", []):
                     tier = "🥈 SILVER"
-                    alphas += 1
-                    
-                data.append({
-                    "Name": u.get("displayName", "Unknown"),
-                    "Email": u.get("email", "-"),
-                    "Tier": tier,
-                    "Rank": u.get("redeem_rank", "-")
-                })
-            
-            k1, k2, k3 = st.columns(3)
-            k1.metric("Total Users", len(all_users))
-            k2.metric("Founders", founders)
-            k3.metric("Revenue", f"${(founders + alphas) * 5}")
+                
+                data.append({"Name": d.get("displayName"), "Email": d.get("email"), "Tier": tier, "Rank": d.get("redeem_rank")})
             
+            st.metric("Total Founders", founders, f"${founders*5} Revenue")
             st.dataframe(pd.DataFrame(data), use_container_width=True)
             
-            # NEWSLETTER EXPORT
-            st.subheader("📧 Newsletter List")
-            news_docs = list(db.collection("newsletters").stream())
-            emails = [d.to_dict().get("email") for d in news_docs]
-            st.write(f"collected {len(emails)} emails")
-            st.download_button("Download CSV", pd.DataFrame(emails, columns=["Email"]).to_csv(), "emails.csv")
+            # Manual Grant
+            st.divider()
+            email_grant = st.text_input("Grant Founder to Email:")
+            if st.button("GRANT"):
+                q = db.collection("users").where("email", "==", email_grant).limit(1).get()
+                if q:
+                    q[0].reference.update({"inventory": firestore.ArrayUnion(["FOUNDER", "LICENSE_V1", "MANUAL_GRANT"])})
+                    st.success("Granted!")
+                else:
+                    st.error("User not found.")
 
-# ==========================================
-# TAB 3: COIN & STATS (CREATOR ONLY)
-# ==========================================
-if st.session_state['is_creator']:
     with tabs[2]:
-        st.header("💰 Vivara Coin Stats")
-        # You can add coin burning logic here later
-        st.info("Connect Token Contract to see live burn stats.")
+        st.header("📧 Newsletter")
+        if db:
+            news = list(db.collection("newsletters").stream())
+            emails = [{"Email": d.to_dict().get("email"), "Date": d.to_dict().get("timestamp")} for d in news]
+            df = pd.DataFrame(emails)
+            st.dataframe(df, use_container_width=True)
+            st.download_button("Download CSV", df.to_csv(), "emails.csv")