ok

src/App.js

@@ -24,8 +24,19 @@ function HomePage({
   setShowedModal,
   productSectionRef,
   courseSectionRef,
+  scrollToProduct,
+  scrollToCourse,
   setWillDo
 }) {
+
+  useEffect(() => {
+    const params = new URLSearchParams(window.location.search);
+    const tab = params.get('tab');
+
+    if(tab === 'products') scrollToProduct();
+    if(tab === 'academy') scrollToCourse();
+  }, [productSectionRef, courseSectionRef]);
+
   return (
     <>
       <HeroSection />
@@ -46,6 +57,7 @@ function HomePage({
       />
       <KnowledgeBaseSection />
       <ClientsSection />
+      <Footer />
     </>
   );
 }
@@ -130,6 +142,7 @@ function App() {
   useEffect(() => {
     const params = new URLSearchParams(window.location.search);
     const modalType = params.get('modal');
+    const tab = params.get('tab');
     const productId = params.get('product_id');
     const authorizedUri = params.get('authorized_uri');
     const unauthorizedUri = params.get('unauthorized_uri');
@@ -148,6 +161,9 @@ function App() {
       }
       // Jika sudah login, tidak langsung fetch di sini — akan diproses saat subscriptions tersedia
     }
+
+    if(tab === 'products') scrollToProduct();
+    if(tab === 'academy') scrollToCourse();
   }, []);
 
   useEffect(() => {
@@ -299,12 +315,14 @@ function App() {
                 productSectionRef={productSectionRef}
                 courseSectionRef={courseSectionRef}
                 setWillDo={setWillDo}
+                scrollToProduct={scrollToProduct}
+                scrollToCourse={scrollToCourse}
               />
             }
           />
           <Route path="/dashboard" element={<ProductsPage 
                 setShowedModal={setShowedModal}
- setSelectedProduct={setSelectedProduct} subscriptions={subscriptions} />} />
+ setSelectedProduct={setSelectedProduct} subscriptions={subscriptions} setWillDo={setWillDo} />} />
           <Route
             path="/admin"
             element={
@@ -317,7 +335,6 @@ function App() {
             }
           />
         </Routes>
-        <Footer />
 
         {/* Modal */}
         {showedModal && (

src/components/ProductDetailPage.js

@@ -79,15 +79,14 @@ const ProductDetail = ({ willDo, setWillDo, subscriptions, product, requestLogin
   };
 
   const onConfirmChildren = () => {
-    if (matchingSubscriptions.length > 0) {
+    if (matchingSubscriptions.length > 0 && !product.executeCheckout) {
       setShowChildSelector(false);
       setShowSubscriptionSelector(true);
       return;
     }
-    else {
+    else if (!product.executeCheckout){
       setShowChildSelector(false);
       setShowNamingInput(true);
-      return;
     }
 
     const tokenCookie = document.cookie.split('; ').find(row => row.startsWith('token='));
@@ -97,9 +96,9 @@ const ProductDetail = ({ willDo, setWillDo, subscriptions, product, requestLogin
       alert('Pilih minimal satu produk');
       return;
     }
-
+    const encodedName = encodeURIComponent(product.executeCheckout);
     const itemsParam = selectedChildIds.length > 0 ? JSON.stringify(selectedChildIds) : JSON.stringify([product.id]);
-    window.location.href = `https://checkout.kediritechnopark.com/?token=${token}&itemsId=${itemsParam}&redirect_uri=https://kediritechnopark.com/products&redirect_failed=https://kediritechnopark.com`;
+    window.location.href = `https://checkout.kediritechnopark.com/?token=${token}&itemsId=${itemsParam}&set_name=${encodedName}&redirect_uri=https://kediritechnopark.com/products&redirect_failed=https://kediritechnopark.com`;
   };
 
   const onFinalCheckoutNewProduct = () => {

src/components/Styles.module.css

@@ -304,7 +304,7 @@
 }
 
 .currentPrice {
-    font-size: 0.9rem;
+    font-size: 1.2rem;
     font-weight: bold;
     color: #2563eb;
 }
@@ -670,3 +670,139 @@
   max-width: 150px; /* biar logo tidak terlalu besar */
   height: auto;
 }
+
+/* Navigation Tabs */
+.navTabs {
+  display: flex;
+  align-items: center;
+  background-color: #2a4fd6; /* blue bar like screenshot */
+  padding: 0;
+  border-radius: 6px 6px 0 0;
+  overflow: hidden;
+}
+
+.floatMenuItem {
+  flex: 1;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  gap: 6px;
+  padding: 12px 16px;
+  font-size: 14px;
+  font-weight: 500;
+  color: #ffffffcc; /* light white text */
+  background: transparent;
+  border: none;
+  cursor: pointer;
+  transition: background 0.2s ease, color 0.2s ease;
+}
+
+.floatMenuItem:hover {
+  background-color: rgba(255, 255, 255, 0.1);
+  color: #fff;
+}
+
+.floatMenuItemActive {
+  background-color: #ffffff;
+  color: #2a4fd6; /* active text color */
+  font-weight: 600;
+}
+
+.floatMenuTitle {
+  display: inline-block;
+}
+
+.floatMenuIcon {
+  stroke-width: 2;
+}
+
+/* Sections */
+.Section {
+  padding: 24px;
+  background: #fff;
+  border-radius: 0 0 6px 6px;
+  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.05);
+}
+
+/* Settings Page Layout */
+.profileSection {
+  background: #fff;
+  border-radius: 8px;
+  padding: 24px;
+}
+
+.profileHeading {
+  font-size: 20px;
+  font-weight: 600;
+  color: #1f2937;
+  margin-bottom: 8px;
+}
+
+.sectionDivider {
+  height: 2px;
+  background-color: #2a4fd6;
+  width: 40px;
+  margin: 8px 0 20px 0;
+}
+
+.formGrid {
+  display: grid;
+  grid-template-columns: 1fr 1fr;
+  gap: 16px;
+  background-color: #f6f9fc;
+  padding: 20px;
+  border-radius: 8px;
+}
+
+.fullWidth {
+  grid-column: span 2;
+}
+
+.label {
+  font-size: 14px;
+  font-weight: 500;
+  color: #374151;
+  margin-bottom: 6px;
+  display: block;
+}
+
+.inputField,
+.selectField {
+  width: 100%;
+  padding: 10px 12px;
+  border: 1px solid #d1d5db;
+  border-radius: 6px;
+  background-color: #fff;
+  font-size: 14px;
+}
+
+.selectField {
+  appearance: none;
+}
+
+.saveButton {
+  background-color: #2a4fd6;
+  color: white;
+  font-size: 14px;
+  font-weight: 500;
+  padding: 10px 24px;
+  border-radius: 50px;
+  border: none;
+  cursor: pointer;
+  margin-top: 16px;
+  transition: background 0.2s ease;
+}
+
+.saveButton:hover {
+  background-color: #223fa9;
+}
+
+/* Change Password Section */
+.changePasswordSection {
+  margin-top: 32px;
+}
+
+.buttonRow {
+  display: flex;
+  gap: 8px;
+}

src/components/pages/ProductsPage.js

@@ -1,33 +1,47 @@
-import React, { useState, useEffect } from 'react';
-import ProductDetailPage from '../ProductDetailPage';
-import Login from '../Login';
-import styles from '../Styles.module.css';
+import React, { useState, useEffect } from "react";
+import styles from "../Styles.module.css";
+import { Box, Settings, ShoppingCart } from "lucide-react";
+import { useNavigate } from 'react-router-dom';
 
-const CoursePage = ({ subscriptions, setSelectedProduct, setShowedModal}) => {
+
+const Dashboard = ({
+  subscriptions,
+  setSelectedProduct,
+  setShowedModal,
+  userData,
+  setWillDo
+}) => {
+  const navigate = useNavigate();
+  const [activeTab, setActiveTab] = useState("products");
   const [hoveredCard, setHoveredCard] = useState(null);
   const [products, setProducts] = useState([]);
 
-    // Buka modal otomatis berdasarkan query
-    useEffect(() => {
-        const urlParams = new URLSearchParams(window.location.search);
-        const modal = urlParams.get('modal');
-        const productId = urlParams.get('product_id');
+  // User Settings form state
+  const [settings, setSettings] = useState({
+    username: "",
+    email: "",
+    password: "",
+    profile_data: {
+      name: "",
+      image: "",
+      phone: "",
+      address: "",
+      company: ""
+    }
+  });
 
-        if (modal === 'product' && productId && products.length > 0) {
-            const product = products.find(p => String(p.id) === productId);
-            if (product) {
-                setSelectedProduct(product);
-                setShowedModal('product');
+  useEffect(() => {
+    if (userData) {
+      setSettings(userData);
     }
-        }
-    }, [products]);
+  }, [userData]);
 
   useEffect(() => {
     if (!subscriptions) return;
 
     function groupSubscriptionsByProductName(subs) {
       const result = {};
-            subs.forEach(sub => {
+      subs.forEach((sub) => {
         const name = sub.product_name;
         const productId = sub.product_id;
         if (!result[name]) {
@@ -47,7 +61,7 @@ const CoursePage = ({ subscriptions, setSelectedProduct, setShowedModal}) => {
           result[name].end_date = sub.end_date;
         }
 
-                if (sub.unit_type == 'token') {
+        if (sub.unit_type === "token") {
           result[name].quantity += sub.quantity ?? 0;
         } else {
           result[name].quantity += 1;
@@ -60,113 +74,352 @@ const CoursePage = ({ subscriptions, setSelectedProduct, setShowedModal}) => {
     }
 
     const groupedSubs = groupSubscriptionsByProductName(subscriptions);
-        const productIds = [...new Set(subscriptions.map(s => s.product_id))];
+    const productIds = [...new Set(subscriptions.map((s) => s.product_id))];
 
-        fetch('https://bot.kediritechnopark.com/webhook/store-production/products', {
-            method: 'POST',
+    fetch(
+      "https://bot.kediritechnopark.com/webhook/store-production/products",
+      {
+        method: "POST",
         headers: {
-                'Content-Type': 'application/json',
+          "Content-Type": "application/json"
         },
-            body: JSON.stringify({ itemsId: productIds }),
-        })
-            .then(res => res.json())
-            .then(data => {
-                const enrichedData = Object.values(groupedSubs)
-                    .filter(group => data.some(p => p.id === group.product_id))
-                    .map(group => {
-                        const productData = data.find(p => p.id == group.product_id);
-                        let image = productData?.image || '';
-                        let description = productData?.description || '';
-                        let site_url = productData?.site_url || '';
-                        if (!image && productData?.sub_product_of) {
-                            const parent = data.find(p => p.id === productData.sub_product_of);
-                            console.log(parent)
-                            image = parent?.image || '';
-                            description = parent?.description || '';
-                            site_url = parent?.site_url || '';
+        body: JSON.stringify({ itemsId: productIds})
+      }
+    )
+      .then((res) => res.json())
+      .then((data) => {
+        // Step 1: Enrich base products (without children yet)
+        const enrichedData = Object.values(groupedSubs)
+          .filter((group) => data.some((p) => p.id === group.product_id))
+          .map((group) => {
+            const productData = data.find((p) => p.id == group.product_id);
+            let image = productData?.image || "";
+            let description = productData?.description || "";
+            let site_url = productData?.site_url || "";
+            if (!image && productData?.sub_product_of) {
+              const parent = data.find(
+                (p) => p.id === productData.sub_product_of
+              );
+              image = parent?.image || "";
+              description = parent?.description || "";
+              site_url = parent?.site_url || "";
             }
-                        console.log(site_url)
             return {
+              executeCheckout: group.product_name,
               id: group.product_id,
               name: group.product_name,
-                            type: productData?.type || 'product',
-                            image: image,
-                            description: description,
-                            site_url: site_url,
+              type: productData?.type || "product",
+              image,
+              description,
+              site_url,
               price: productData?.price || 0,
-                            currency: productData?.currency || 'IDR',
+              currency: productData?.currency || "IDR",
               duration: productData?.duration || {},
               sub_product_of: productData?.sub_product_of || null,
               is_visible: productData?.is_visible ?? true,
               unit_type: productData?.unit_type || group.unit_type,
               quantity: group.quantity,
               end_date: group.end_date,
-                            children: [],
+              children: []
             };
           });
+
+        // Step 2: Create a quick lookup table for enrichedData
+        const productMap = {};
+        enrichedData.forEach((p) => {
+          console.log(p)
+          productMap[p.name.split("%%%")[1]] = p;
+        });
+
+        // Step 3: Find children in API `data` and attach to parents
+        data
+          .filter((p) => p.sub_product_of) // only those with a parent
+          .forEach((child) => {
+            // ✅ Current logic — attach to the real parent
+            const parent = productMap[child.sub_product_of];
+            if (parent) {
+              parent.children.push(child);
+            }
+            // ➕ New logic — attach to other products with the same sub_product_of
+            Object.values(productMap).forEach((possibleParent) => {
+              if (
+                possibleParent.id !== child.id && // not itself
+                possibleParent.sub_product_of === child.sub_product_of // same parent reference
+              ) {
+                possibleParent.children.push(child);
+              }
+            });
+          });
         console.log(enrichedData)
         setProducts(enrichedData);
       })
-            .catch(err => console.error('Fetch error:', err));
+      .catch((err) => console.error("Fetch error:", err));
+
   }, [subscriptions]);
 
-    const features = [/* ... (tidak diubah) ... */];
+  const handleSettingsChange = (field, value, nested = false) => {
+    if (nested) {
+      setSettings((prev) => ({
+        ...prev,
+        profile_data: { ...prev.profile_data, [field]: value }
+      }));
+    } else {
+      setSettings((prev) => ({ ...prev, [field]: value }));
+    }
+  };
+
+  const saveSettings = () => {
+    fetch(
+      "https://bot.kediritechnopark.com/webhook-test/user-production/data",
+      {
+        method: "PUT",
+        headers: {
+          "Content-Type": "application/json"
+        },
+        body: JSON.stringify(settings)
+      }
+    )
+      .then((res) => res.json())
+      .then(() => {
+        alert("Settings updated successfully!");
+      })
+      .catch((err) => alert("Error updating settings: " + err));
+  };
 
   return (
-        <div style={{ fontFamily: 'Inter, system-ui, sans-serif' }}>
-            {/* Courses Section */}
+    <div style={{ fontFamily: "Inter, system-ui, sans-serif" }}>
+      {/* Tabs Navigation */}
+      <div className={styles.navTabs}>
+        <button
+          className={`${styles.floatMenuItem} ${activeTab === "products" ? styles.floatMenuItemActive : ""
+            }`}
+          onClick={() => setActiveTab("products")}
+        >
+          <span className={styles.floatMenuTitle}>Produk Saya</span>
+          <Box size={16} className={styles.floatMenuIcon} />
+        </button>
+
+        <button
+          className={`${styles.floatMenuItem} ${activeTab === "settings" ? styles.floatMenuItemActive : ""
+            }`}
+          onClick={() => setActiveTab("settings")}
+        >
+          <span className={styles.floatMenuTitle}>Profil Pengguna</span>
+          <Settings size={16} className={styles.floatMenuIcon} />
+        </button>
+
+        <button
+          className={`${styles.floatMenuItem} ${activeTab === "orders" ? styles.floatMenuItemActive : ""
+            }`}
+          onClick={() => setActiveTab("orders")}
+        >
+          <span className={styles.floatMenuTitle}>Pembelian</span>
+          <ShoppingCart size={16} className={styles.floatMenuIcon} />
+        </button>
+      </div>
+
+      {/* Tab Content */}
+      {activeTab === "products" && (
         <section className={styles.Section}>
           <div className={styles.coursesContainer}>
-                    <h2 className={styles.coursesTitle}>MY PRODUCTS</h2>
             <div className={styles.coursesGrid}>
-                        {products &&
-                            products[0]?.name &&
-                            products.map(product => (
+              {products.map((product) => (
                 <div
                   key={product.name}
-                                    className={`${styles.courseCard} ${hoveredCard === product.name ? styles.courseCardHover : ''}`}
+                  className={`${styles.courseCard} ${hoveredCard === product.name ? styles.courseCardHover : ""
+                    }`}
                   onClick={() => {
                     setSelectedProduct(product);
-                                        setShowedModal('product');
+                    setShowedModal("product");
                   }}
                   onMouseEnter={() => setHoveredCard(product.name)}
                   onMouseLeave={() => setHoveredCard(null)}
                 >
                   <div>
-                                        <div className={styles.courseImage} style={{ backgroundImage: `url(${product.image})` }} />
+                    <div
+                      className={styles.courseImage}
+                      style={{
+                        backgroundImage: `url(${product.image})`
+                      }}
+                    />
                     <div className={styles.courseContentTop}>
-                                            <h3 className={styles.courseTitle}>{product.name.split('%%%')[0]}</h3>
-                                            <p className={styles.courseDesc}>{product.description}</p>
+                      <h3 className={styles.courseTitle}>
+                        {product.name.split("%%%")[0]}
+                      </h3>
+                      <p className={styles.courseDesc}>
+                        {product.description}
+                      </p>
                     </div>
                   </div>
                   <div className={styles.courseContentBottom}>
                     <div className={styles.coursePrice}>
                       <span
                         className={
-                                                    product.price == 0
+                          product.price === 0
                             ? styles.freePrice
                             : styles.currentPrice
                         }
                       >
-                                                {product.unit_type === 'duration'
-                                                    ? `Valid until: ${product.end_date ? new Date(product.end_date).toLocaleDateString() : 'N/A'}`
+                        {product.unit_type === "duration"
+                          ? `Valid until: ${product.end_date
+                            ? new Date(
+                              product.end_date
+                            ).toLocaleDateString()
+                            : "N/A"
+                          }`
                           : `SISA TOKEN ${product.quantity || 0}`}
                       </span>
                     </div>
 
-                                        <button className="px-4 py-2 rounded-pill text-white" style={{ background: 'linear-gradient(to right, #6a59ff, #8261ee)', border: 'none' }}
+                    <button
+                      className="px-4 py-2 rounded-pill text-white"
+                      style={{
+                        background:
+                          "linear-gradient(to right, #6a59ff, #8261ee)",
+                        border: "none"
+                      }}
                       onClick={() => {
                         setSelectedProduct(product);
-                                                setShowedModal('product');
-                                            }}>Perpanjang</button>
+                        setShowedModal("product");
+                        setWillDo('checkout');
+                      }}
+                    >
+                      Perpanjang
+                    </button>
                   </div>
                 </div>
               ))}
+              <div
+                className={`${styles.courseCard} ${hoveredCard === 0 ? styles.courseCardHover : ""
+                  }`}
+                onMouseEnter={() => setHoveredCard(0)}
+                onMouseLeave={() => setHoveredCard(null)}
+                onClick={() => navigate('/?tab=products')
+                }
+              >
+                <div>
+                  + Tambah produk baru</div>
+              </div>
             </div>
           </div>
         </section>
-        </div >
+      )}
+
+      {activeTab === "settings" && (
+        <section className={styles.profileSection}>
+          <h2 className={styles.profileHeading}>Profil</h2>
+          <div className={styles.sectionDivider}></div>
+
+          <div className={styles.formGrid}>
+            <div>
+              <label className={styles.label}>Username</label>
+              <input
+                className={styles.inputField}
+                value={settings.username}
+                onChange={(e) =>
+                  handleSettingsChange("username", e.target.value)
+                }
+              />
+            </div>
+            <div>
+              <label className={styles.label}>Email</label>
+              <input
+                className={styles.inputField}
+                value={settings.email}
+                onChange={(e) =>
+                  handleSettingsChange("email", e.target.value)
+                }
+              />
+            </div>
+            <div>
+              <label className={styles.label}>Full Name</label>
+              <input
+                className={styles.inputField}
+                value={settings.profile_data.name}
+                onChange={(e) =>
+                  handleSettingsChange("name", e.target.value, true)
+                }
+              />
+            </div>
+            <div>
+              <label className={styles.label}>Phone</label>
+              <input
+                className={styles.inputField}
+                value={settings.profile_data.phone}
+                onChange={(e) =>
+                  handleSettingsChange("phone", e.target.value, true)
+                }
+              />
+            </div>
+            <div className={styles.fullWidth}>
+              <label className={styles.label}>Address</label>
+              <input
+                className={styles.inputField}
+                value={settings.profile_data.address}
+                onChange={(e) =>
+                  handleSettingsChange("address", e.target.value, true)
+                }
+              />
+            </div>
+            <div>
+              <label className={styles.label}>Company</label>
+              <input
+                className={styles.inputField}
+                value={settings.profile_data.company}
+                onChange={(e) =>
+                  handleSettingsChange("company", e.target.value, true)
+                }
+              />
+            </div>
+            <div>
+              <label className={styles.label}>Profile Image URL</label>
+              <input
+                className={styles.inputField}
+                value={settings.profile_data.image}
+                onChange={(e) =>
+                  handleSettingsChange("image", e.target.value, true)
+                }
+              />
+            </div>
+          </div>
+
+          <h2 className={styles.profileHeading}>Ganti password</h2>
+          <div className={styles.sectionDivider}></div>
+          <div className={styles.formGrid}>
+            <div>
+              <label className={styles.label}>New Password</label>
+              <input
+                className={styles.inputField}
+                type="password"
+                value={settings.password}
+                onChange={(e) =>
+                  handleSettingsChange("password", e.target.value)
+                }
+              />
+            </div>
+            <div>
+              <label className={styles.label}>Re-type New Password</label>
+              <input
+                className={styles.inputField}
+                type="password"
+              />
+            </div>
+          </div>
+
+          <button className={styles.saveButton} onClick={saveSettings}>
+            Save Changes
+          </button>
+        </section>
+      )}
+
+      {activeTab === "orders" && (
+        <section className={styles.Section}>
+          <h2>My Orders</h2>
+          <p>Orders list will be displayed here.</p>
+        </section>
+      )}
+    </div>
   );
 };
 
-export default CoursePage;
+export default Dashboard;