Merge branch 'main' into revert-378-update_jatin

Author: Jatzz26

staticfiles/mainfiles/myaccount/cv_upload/script.js

@@ -1,72 +1,108 @@
-let userEmail;
-// Check if the user is signed in
-auth.onAuthStateChanged((user) => {
-    if (user) {
-        userEmail = user.email;
-    } else {
-        // No user is signed in
-        console.log("No user is signed in");
-       window.location.href = `/login/?redirect_url=${encodeURIComponent(window.location.href)}`;
+import {
+  getAuth,
+  onAuthStateChanged
+} from "firebase/auth";
 
-    }
-});
+import {
+  getFirestore,
+  doc,
+  getDoc,
+  setDoc,
+  updateDoc
+} from "firebase/firestore";
 
-const email = localStorage.getItem("email");
+import {
+  getStorage,
+  ref,
+  uploadBytes,
+  getDownloadURL
+} from "firebase/storage";
 
-let cvUrl = "";
+// Firebase initialization (you must already have this in your main project setup)
+const auth = getAuth();
+const db = getFirestore();
+const storage = getStorage();
 
-async function uploadCV(file) {
-    const cvRef = ref(storage, "user_cv/" + file.name);
-    await uploadBytes(cvRef, file);
+let userEmail = null;
+
+// ✅ AUTH CHECK
+onAuthStateChanged(auth, (user) => {
+  if (user) {
+    userEmail = user.email;
+  } else {
+    console.log("No user is signed in");
+    // Redirect to login with full return URL
+    window.location.href = `/login/?redirect_url=${encodeURIComponent(window.location.href)}`;
+  }
+});
 
-    const url = await getDownloadURL(cvRef);
-    return url; // Return empty string if URL is undefined
+// ✅ UPLOAD CV TO STORAGE
+async function uploadCV(file) {
+  const sanitizedFileName = file.name.replace(/[^a-zA-Z0-9_.-]/g, "_");
+  const storageRef = ref(storage, `user_cv/${userEmail}_${sanitizedFileName}`);
+  await uploadBytes(storageRef, file);
+  return await getDownloadURL(storageRef);
 }
 
+// ✅ SAVE CV URL TO FIRESTORE
 async function saveCVToDatabase() {
-    const uploadButton = document.getElementById("btn");
-    uploadButton.innerHTML = "Uploading...";
-    uploadButton.disabled = true;
-    const cvFile = document.getElementById("cv").files[0];
-    if (cvFile) {
-        cvUrl = await uploadCV(cvFile);
-
-        const userProfileRef = doc(db, "user_profile", userEmail);
-        
-        // Ensure the user profile document exists before updating it
-        const docSnap = await getDoc(userProfileRef);
-        if (!docSnap.exists()) {
-            await setDoc(userProfileRef, { "about": {} });
-        }
-
-        await updateDoc(userProfileRef, { "about.cv": cvUrl })
-            .then(() => {
-                Toastify({
-                    text: "CV Successfully Submitted",
-                    duration: 3000,
-                    newWindow: true,
-                    close: true,
-                    gravity: "top",
-                    position: "right",
-                    stopOnFocus: true,
-                    style: {
-                        background: "linear-gradient(to right, #0d6efd, #586ba6)",
-                        borderRadius: "10px"
-                    }
-                }).showToast();
-                setTimeout(() => {
-                    window.location.href = "/myaccount/";
-                }, 3000);
-            })
-            .catch((error) => {
-                console.error("Error writing document: ", error);
-            });
+  const uploadButton = document.getElementById("btn");
+  const fileInput = document.getElementById("cv");
+  const file = fileInput.files[0];
+
+  if (!file) {
+    Toastify({
+      text: "Please select a file",
+      duration: 3000,
+      style: { background: "red" }
+    }).showToast();
+    return;
+  }
+
+  uploadButton.disabled = true;
+  uploadButton.innerText = "Uploading...";
+
+  try {
+    const cvUrl = await uploadCV(file);
+    const userRef = doc(db, "user_profile", userEmail);
+
+    const userSnap = await getDoc(userRef);
+    if (!userSnap.exists()) {
+      await setDoc(userRef, { about: {} });
     }
-    
-    uploadButton.innerHTML = "UPLOAD RESUME";
-    uploadButton.disabled = false;
+
+    await updateDoc(userRef, {
+      "about.cv": cvUrl
+    });
+
+    Toastify({
+      text: "CV Successfully Submitted",
+      duration: 3000,
+      close: true,
+      gravity: "top",
+      position: "right",
+      style: {
+        background: "linear-gradient(to right, #0d6efd, #586ba6)",
+        borderRadius: "10px"
+      }
+    }).showToast();
+
+    setTimeout(() => {
+      window.location.href = "/myaccount/";
+    }, 3000);
+
+  } catch (err) {
+    console.error("Upload failed:", err);
+    Toastify({
+      text: "Upload failed",
+      duration: 3000,
+      style: { background: "red" }
+    }).showToast();
+  }
+
+  uploadButton.disabled = false;
+  uploadButton.innerText = "UPLOAD RESUME";
 }
 
-$("#btn").on("click", function () {
-    saveCVToDatabase();
-});
+// ✅ HANDLE BUTTON CLICK
+document.getElementById("btn").addEventListener("click", saveCVToDatabase);