From e612698c225a0854d8493fce71489675b735f3ea Mon Sep 17 00:00:00 2001
From: Lav Kush <170819619+Lav-developer@users.noreply.github.com>
Date: Wed, 6 May 2026 21:38:33 +0530
Subject: [PATCH 1/2] Revamp admin flows for add/edit modes and contributor
 visibility

---
 admin.html | 28 ++++++++++++++++++++++++++-
 admin.js   | 56 ++++++++++++++++++++++++++++++++++++++++++++----------
 script.js  | 13 ++-----------
 3 files changed, 75 insertions(+), 22 deletions(-)

diff --git a/admin.html b/admin.html
index 92b7c7a..a874158 100644
--- a/admin.html
+++ b/admin.html
@@ -786,7 +786,22 @@ <h1 class="hero-title">DSMNRU content dashboard</h1>
                         </div>
                     </div>
                     <div class="card-body">
-                        <form id="addPyqForm" class="resource-form">
+                        <div class="mb-3">
+                            <label class="form-label d-block">Action Mode</label>
+                            <div class="d-flex gap-3">
+                                <div class="form-check"><input class="form-check-input" type="radio" name="adminMode" id="modeAdd" value="add" checked><label class="form-check-label" for="modeAdd">Add New</label></div>
+                                <div class="form-check"><input class="form-check-input" type="radio" name="adminMode" id="modeEdit" value="edit"><label class="form-check-label" for="modeEdit">Edit Current</label></div>
+                            </div>
+                        </div>
+                        <div class="mb-3" id="entitySelectorWrap">
+                            <label for="adminEntitySelect" class="form-label">Choose section</label>
+                            <select id="adminEntitySelect" class="form-select">
+                                <option value="pyq">PYQ</option>
+                                <option value="contributor">Contributor</option>
+                                <option value="user">User</option>
+                            </select>
+                        </div>
+                        <form id="addPyqForm" class="resource-form admin-form-block">
                             <div class="mb-3">
                                 <label for="pyqCourse" class="form-label">Course</label>
                                 <select class="form-select" id="pyqCourse" required>
@@ -837,6 +852,10 @@ <h1 class="hero-title">DSMNRU content dashboard</h1>
                                 <label for="pyqSubject" class="form-label">Subject Name</label>
                                 <input type="text" class="form-control" id="pyqSubject" placeholder="e.g., Effective Tech. Communication" required>
                             </div>
+                            <div class="mt-3 mb-3">
+                                <label for="pyqBranch" class="form-label">Branch (optional)</label>
+                                <input type="text" class="form-control" id="pyqBranch" placeholder="e.g., CSE">
+                            </div>
                             <div class="mb-3">
                                 <label for="pyqFile" class="form-label">File URL</label>
                                 <input type="url" class="form-control" id="pyqFile" required>
@@ -929,6 +948,13 @@ <h1 class="hero-title">DSMNRU content dashboard</h1>
                                         <option value="PYQs + Syllabus Provider">PYQs + Syllabus Provider</option>
                                     </select>
                                 </div>
+                                <div class="mb-3">
+                                    <label for="contributorShowOnWebsite" class="form-label">Show on website</label>
+                                    <select class="form-select" id="contributorShowOnWebsite" required>
+                                        <option value="yes" selected>Yes</option>
+                                        <option value="no">No</option>
+                                    </select>
+                                </div>
                                 <button type="submit" class="btn btn-primary w-100">
                                     <i class="fas fa-plus me-2"></i> Add Contributor
                                 </button>
diff --git a/admin.js b/admin.js
index 1e8385f..aa729fc 100644
--- a/admin.js
+++ b/admin.js
@@ -87,6 +87,7 @@ document.addEventListener('DOMContentLoaded', function() {
         const course = document.getElementById('pyqCourse').value.trim();
         const semester = document.getElementById('pyqSemester').value.trim();
         const subject = document.getElementById('pyqSubject').value.trim();
+        const branch = document.getElementById('pyqBranch').value.trim();
         const session = document.getElementById('pyqSession').value.trim();
         const file = document.getElementById('pyqFile').value;
 
@@ -96,7 +97,7 @@ document.addEventListener('DOMContentLoaded', function() {
         }
 
         let currentSubject = subject;
-        let title = buildPyqTitle(course, semester, currentSubject, session);
+        let title = buildPyqTitle(course, branch, semester, currentSubject, session);
         let duplicateExists = await pyqTitleExists(title);
 
         if (duplicateExists === null) {
@@ -123,7 +124,7 @@ document.addEventListener('DOMContentLoaded', function() {
                 continue;
             }
 
-            title = buildPyqTitle(course, semester, currentSubject, session);
+            title = buildPyqTitle(course, branch, semester, currentSubject, session);
 
             duplicateExists = await pyqTitleExists(title);
             if (duplicateExists === null) {
@@ -131,10 +132,14 @@ document.addEventListener('DOMContentLoaded', function() {
             }
         }
 
-        addItem('pyqs', { title, file, course, semester, subject: currentSubject, session });
+        addItem('pyqs', { title, file, course, branch, semester, subject: currentSubject, session });
         this.reset();
     });
 
+
+
+    setupAdminModeSwitcher();
+
     // Edit form
     document.getElementById('editForm').addEventListener('submit', function(e) {
         e.preventDefault();
@@ -463,8 +468,9 @@ function saveData() {
     console.warn('saveData() called - this project now uses Firestore. Use addItem/editItem/deleteItem instead.');
 }
 
-function buildPyqTitle(course, semester, subject, session) {
-    return `${normalizePyqText(course)} ${normalizePyqText(semester)} Sem ${normalizePyqText(subject)} {${normalizePyqText(session)}}`;
+function buildPyqTitle(course, branch, semester, subject, session) {
+    const branchPart = normalizePyqText(branch);
+    return `${normalizePyqText(course)}${branchPart ? ` ${branchPart}` : ''} ${normalizePyqText(semester)} Sem ${normalizePyqText(subject)} {${normalizePyqText(session)}}`;
 }
 
 function normalizePyqText(value) {
@@ -765,7 +771,7 @@ function renderContributors(contributors) {
                     </div>
                 </div>
                 <div class="resource-actions">
-                    <button class="btn btn-sm btn-outline-primary" onclick="editContributor('${contributor.id}', '${contributor.name}', '${contributor.avatar}', '${contributor.role}')">
+                    <button class="btn btn-sm btn-outline-primary" onclick="editContributor('${contributor.id}', '${contributor.name}', '${contributor.avatar}', '${contributor.role}', ${contributor.showOnWebsite !== false})">
                         <i class="fas fa-edit me-1"></i>Edit
                     </button>
                     <button class="btn btn-sm btn-outline-danger" onclick="deleteContributor('${contributor.id}', '${contributor.name}')">
@@ -816,6 +822,7 @@ document.addEventListener('DOMContentLoaded', function() {
             const name = nameInput.value.trim();
             const avatar = getContributorInitials(name);
             const role = roleInput.value;
+            const showOnWebsite = document.getElementById('contributorShowOnWebsite').value === 'yes';
 
             if (!name || !avatar || !role) {
                 alert('Please fill all fields');
@@ -830,7 +837,8 @@ document.addEventListener('DOMContentLoaded', function() {
             db.collection('contributors').add({
                 name,
                 avatar,
-                role
+                role,
+                showOnWebsite
             })
             .then(() => {
                 addContributorForm.reset();
@@ -847,7 +855,7 @@ document.addEventListener('DOMContentLoaded', function() {
     }
 });
 
-window.editContributor = function(id, name, avatar, role) {
+window.editContributor = function(id, name, avatar, role, showOnWebsite) {
     const newName = prompt('Edit name:', name);
     if (newName === null) return;
 
@@ -856,6 +864,9 @@ window.editContributor = function(id, name, avatar, role) {
 
     const trimmedName = newName.trim();
     const trimmedRole = newRole.trim();
+    const showAnswer = prompt('Show on website? (yes/no):', showOnWebsite ? 'yes' : 'no');
+    if (showAnswer === null) return;
+    const newShowOnWebsite = showAnswer.trim().toLowerCase() === 'yes';
     const newAvatar = getContributorInitials(trimmedName);
 
     if (!trimmedName || !newAvatar || !trimmedRole) {
@@ -871,7 +882,8 @@ window.editContributor = function(id, name, avatar, role) {
     db.collection('contributors').doc(id).set({
         name: trimmedName,
         avatar: newAvatar,
-        role: trimmedRole
+        role: trimmedRole,
+        showOnWebsite: newShowOnWebsite
     })
     .then(() => {
         loadContributors();
@@ -893,4 +905,28 @@ window.deleteContributor = function(id, name) {
                 alert('Error deleting contributor: ' + error.message);
             });
     }
-};
\ No newline at end of file
+};
+
+function setupAdminModeSwitcher() {
+    const addRadio = document.getElementById('modeAdd');
+    const editRadio = document.getElementById('modeEdit');
+    const entity = document.getElementById('adminEntitySelect');
+    if (!addRadio || !editRadio || !entity) return;
+
+    const refresh = () => {
+        const mode = editRadio.checked ? 'edit' : 'add';
+        const target = entity.value;
+        const pyqForm = document.getElementById('addPyqForm');
+        const contributorForm = document.getElementById('addContributorForm');
+        const pyqsCollapse = document.getElementById('pyqsCollapse');
+        const contributorsCollapse = document.getElementById('contributorsCollapse');
+        const usersCollapse = document.getElementById('usersCollapse');
+        if (pyqForm) pyqForm.style.display = mode === 'add' && target === 'pyq' ? 'block' : 'none';
+        if (contributorForm) contributorForm.style.display = mode === 'add' && target === 'contributor' ? 'block' : 'none';
+        if (mode === 'edit' && target === 'pyq') loadPyqsOnDemand();
+        if (mode === 'edit' && target === 'contributor') loadContributorsOnDemand();
+        if (mode === 'edit' && target === 'user') loadUsersOnDemand();
+    };
+    [addRadio, editRadio, entity].forEach(el => el.addEventListener('change', refresh));
+    refresh();
+}
diff --git a/script.js b/script.js
index 42c3e4f..23f4533 100644
--- a/script.js
+++ b/script.js
@@ -1091,7 +1091,7 @@ document.addEventListener('DOMContentLoaded', function() {
 
     // Load and render contributors from Firestore
     function loadContributors() {
-        const contributorsQuery = db.collection('contributors').orderBy('name').limit(12);
+        const contributorsQuery = db.collection('contributors').where('showOnWebsite', '==', true).orderBy('name').limit(12);
 
         contributorsQuery.get({ source: 'cache' })
             .then(snapshot => {
@@ -1126,16 +1126,7 @@ document.addEventListener('DOMContentLoaded', function() {
                     contributorsGrid.appendChild(card);
                 });
 
-                // Add the "Join our team" card at the end
-                const joinCard = document.createElement('div');
-                joinCard.className = 'contributor-more';
-                joinCard.innerHTML = `
-                    <div class="more-avatar">+</div>
-                    <h5>Join our team!</h5>
-                    <p class="contributor-role">Become a contributor</p>
-                `;
-                contributorsGrid.appendChild(joinCard);
-    }
+                    }
 
     async function loadAggregatedStats() {
         try {

From cae151fea5244b20882e30dd12285248e49fc2be Mon Sep 17 00:00:00 2001
From: Lav Kush <170819619+Lav-developer@users.noreply.github.com>
Date: Wed, 6 May 2026 21:46:37 +0530
Subject: [PATCH 2/2] Fix admin modal backdrop cleanup to prevent UI blocking

---
 admin.js | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/admin.js b/admin.js
index aa729fc..5740bfe 100644
--- a/admin.js
+++ b/admin.js
@@ -150,7 +150,9 @@ document.addEventListener('DOMContentLoaded', function() {
         const course = document.getElementById('editCourse').value;
         const semester = document.getElementById('editSemester').value;
         editItem(type, index, { title, file, course, semester });
-        bootstrap.Modal.getInstance(document.getElementById('editModal')).hide();
+        const editModalEl = document.getElementById('editModal');
+        window.bootstrap.Modal.getOrCreateInstance(editModalEl).hide();
+        cleanupModalArtifacts();
     });
 });
 
@@ -174,6 +176,15 @@ function setupSectionCollapseBehavior() {
     });
 }
 
+
+function cleanupModalArtifacts() {
+    document.body.classList.remove('modal-open');
+    document.body.style.removeProperty('padding-right');
+    document.querySelectorAll('.modal-backdrop').forEach(el => el.remove());
+}
+
+document.addEventListener('hidden.bs.modal', cleanupModalArtifacts);
+
 function loadData() {
     // Auto-load pending uploads and registered users so counts and panels show immediately.
     loadPendingOnDemand();