merged with main

This commit is contained in:
JBB0807 2025-05-07 13:44:53 -07:00
parent 6141e6d1d9
commit 3bcbe4cd6b

View file

@ -130,6 +130,7 @@ const AssignmentPage = () => {
const handleSubmit = async (e) => { const handleSubmit = async (e) => {
e.preventDefault(); e.preventDefault();
setLoading(true);
if (!user.userId) return alert("Please login to submit an assignment."); if (!user.userId) return alert("Please login to submit an assignment.");
@ -143,13 +144,14 @@ const AssignmentPage = () => {
formData.append("description", description); formData.append("description", description);
setTimeout(() => { setTimeout(() => {
if (editingIndex !== null) { //replace with api
const updatedProjects = [...projects]; // if (editingIndex !== null) {
updatedProjects[editingIndex] = newProject; // const updatedProjects = [...projects];
setProjects(updatedProjects); // updatedProjects[editingIndex] = newProject;
} else { // setProjects(updatedProjects);
setProjects([...projects, newProject]); // } else {
} // setProjects([...projects, newProject]);
// }
alert(editingIndex !== null ? "Assignment updated!" : "Assignment submitted!"); alert(editingIndex !== null ? "Assignment updated!" : "Assignment submitted!");
resetForm(); resetForm();
@ -280,15 +282,6 @@ const AssignmentPage = () => {
/> />
</div> </div>
<div className="assignment-search-box">
<input
type="text"
placeholder="🔍︎ Search"
value={searchTerm}
onChange={(e) => setSearchTerm(e.target.value)}
/>
</div>
{showModal && ( {showModal && (
<div className="modal-overlay"> <div className="modal-overlay">
<div className="modal"> <div className="modal">
@ -338,19 +331,22 @@ const AssignmentPage = () => {
/> />
</div> </div>
<div> <div className="password-field">
<label>Password</label>
<input type="password" value={password} onChange={(e) => setPassword(e.target.value)} required />
</div>
<div>
<label>Password</label> <label>Password</label>
<div className="input-wrapper">
<input <input
type="password" type={showPassword ? "text" : "password"}
value={password} value={password}
onChange={(e) => setPassword(e.target.value)} onChange={(e) => setPassword(e.target.value)}
required required
/> />
<span
className="eye-icon"
onClick={() => setShowPassword((prev) => !prev)}
>
{showPassword ? "Hide" : "Show"}
</span>
</div>
</div> </div>
<div> <div>
@ -367,9 +363,20 @@ const AssignmentPage = () => {
<input type="file" onChange={(e) => setFile(e.target.files[0])} /> <input type="file" onChange={(e) => setFile(e.target.files[0])} />
</div> </div>
{loading && (
<div className="spinner-container">
<div className="spinner"></div>
<p>Uploading...</p>
</div>
)}
<div className="modal-buttons"> <div className="modal-buttons">
<button type="submit">{editingIndex !== null ? "Update" : "Submit"}</button> <button type="submit" disabled={loading}>
<button type="button" onClick={() => { resetForm(); setShowModal(false); }}>Cancel</button> {editingIndex !== null ? "Update" : "Submit"}
</button>
<button type="button" onClick={() => { resetForm(); setShowModal(false); }} disabled={loading}>
Cancel
</button>
</div> </div>
</form> </form>
</div> </div>
@ -378,12 +385,28 @@ const AssignmentPage = () => {
{projects.length > 0 && ( {projects.length > 0 && (
<div className="project-list"> <div className="project-list">
{projects.map((project, index) => ( {projects
.filter((project) => {
if (!searchTerm.trim()) return true;
const regex = new RegExp(searchTerm, "i");
return (
regex.test(project.studentname || project.studentName || "") ||
regex.test(project.campid || project.campID || "") ||
regex.test(project.programid || project.programID || "") ||
regex.test(project.title || "") ||
regex.test(project.description || "") ||
regex.test(project.fileName || "") ||
regex.test(project.assignmenturl || "") ||
regex.test(project.originalfile || "") ||
regex.test(project.editablefile || "")
);
})
.map((project, index) => (
<div key={index} className="project-item"> <div key={index} className="project-item">
<div className="project-meta"> <div className="project-meta">
<strong>Student Name:</strong> {project.studentname || project.studentName} |{" "} <p><strong>Student Name:</strong> {project.studentname || project.studentName}</p>
<strong>CampID:</strong> {project.campid || project.campID} |{" "} <p><strong>CampID:</strong> {project.campid || project.campID}</p>
<strong>ProgramID:</strong> {project.programid || project.programID} <p><strong>ProgramID:</strong> {project.programid || project.programID}</p>
</div> </div>
{project.title && <h4>{project.title}</h4>} {project.title && <h4>{project.title}</h4>}