Merge remote-tracking branch
This commit is contained in:
Anton Kupriianov
commit
dd9b9c4ad6
7 changed files with 320 additions and 135 deletions
|
|
@ -1,4 +1,4 @@
|
|||
import React, { useState } from "react";
|
||||
import React, { useState, useEffect } from "react";
|
||||
import "../scss/components/_assignment.scss";
|
||||
|
||||
const AssignmentPage = () => {
|
||||
|
|
@ -13,6 +13,32 @@ const AssignmentPage = () => {
|
|||
const [showModal, setShowModal] = useState(false);
|
||||
const [editingIndex, setEditingIndex] = useState(null);
|
||||
|
||||
useEffect(() => {
|
||||
document.title = "Assignment";
|
||||
fetchAssignments();
|
||||
}, []);
|
||||
|
||||
const fetchAssignments = async () => {
|
||||
try {
|
||||
const res = await fetch("http://localhost:8082/instructor/list/9", {
|
||||
// credentials: "include",
|
||||
});
|
||||
if (!res.ok) throw new Error("Failed to fetch");
|
||||
|
||||
const data = await res.json();
|
||||
|
||||
|
||||
// Optional: Remove duplicate assignment IDs if needed
|
||||
const unique = Array.from(
|
||||
new Map(data.map((item) => [item.assignmentid, item])).values()
|
||||
);
|
||||
|
||||
setProjects(unique);
|
||||
} catch (error) {
|
||||
console.error("Error fetching assignments:", error);
|
||||
}
|
||||
};
|
||||
|
||||
const resetForm = () => {
|
||||
setStudentName("");
|
||||
setCampID("");
|
||||
|
|
@ -28,21 +54,19 @@ const AssignmentPage = () => {
|
|||
e.preventDefault();
|
||||
|
||||
const newProject = {
|
||||
studentName,
|
||||
campID,
|
||||
programID,
|
||||
studentname: studentName,
|
||||
campid: campID,
|
||||
programid: programID,
|
||||
title,
|
||||
description,
|
||||
fileName: file ? file.name : null,
|
||||
};
|
||||
|
||||
if (editingIndex !== null) {
|
||||
// Edit mode: update the project at the index
|
||||
const updatedProjects = [...projects];
|
||||
updatedProjects[editingIndex] = newProject;
|
||||
setProjects(updatedProjects);
|
||||
} else {
|
||||
// New submission
|
||||
setProjects([...projects, newProject]);
|
||||
}
|
||||
|
||||
|
|
@ -53,12 +77,12 @@ const AssignmentPage = () => {
|
|||
|
||||
const handleEdit = (index) => {
|
||||
const project = projects[index];
|
||||
setStudentName(project.studentName);
|
||||
setCampID(project.campID);
|
||||
setProgramID(project.programID);
|
||||
setTitle(project.title);
|
||||
setDescription(project.description);
|
||||
setFile(null); // File can't be set again for editing, usually. You could add note about this.
|
||||
setStudentName(project.studentname || project.studentName || "");
|
||||
setCampID(project.campid || project.campID || "");
|
||||
setProgramID(project.programid || project.programID || "");
|
||||
setTitle(project.title || "");
|
||||
setDescription(project.description || "");
|
||||
setFile(null);
|
||||
setEditingIndex(index);
|
||||
setShowModal(true);
|
||||
};
|
||||
|
|
@ -70,8 +94,10 @@ const AssignmentPage = () => {
|
|||
|
||||
return (
|
||||
<div className="assignment-page">
|
||||
<h2>📘 Assignments</h2>
|
||||
<button onClick={() => { resetForm(); setShowModal(true); }}>➕ Add New</button>
|
||||
<div className="assignment-header-box">
|
||||
<h2>Assignments</h2>
|
||||
<button onClick={() => { resetForm(); setShowModal(true); }}>➕ Add New</button>
|
||||
</div>
|
||||
|
||||
{showModal && (
|
||||
<div className="modal-overlay">
|
||||
|
|
@ -80,110 +106,83 @@ const AssignmentPage = () => {
|
|||
<form onSubmit={handleSubmit}>
|
||||
<div>
|
||||
<label>Student Name</label>
|
||||
<input
|
||||
type="text"
|
||||
value={studentName}
|
||||
onChange={(e) => setStudentName(e.target.value)}
|
||||
required
|
||||
/>
|
||||
<input type="text" value={studentName} onChange={(e) => setStudentName(e.target.value)} required />
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<label>Camp ID</label>
|
||||
<input
|
||||
type="text"
|
||||
value={campID}
|
||||
onChange={(e) => setCampID(e.target.value)}
|
||||
required
|
||||
/>
|
||||
<input type="text" value={campID} onChange={(e) => setCampID(e.target.value)} required />
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<label>Program ID</label>
|
||||
<input
|
||||
type="text"
|
||||
value={programID}
|
||||
onChange={(e) => setProgramID(e.target.value)}
|
||||
required
|
||||
/>
|
||||
<input type="text" value={programID} onChange={(e) => setProgramID(e.target.value)} required />
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<label>Password</label>
|
||||
<input
|
||||
type="password"
|
||||
value={password}
|
||||
onChange={(e) => setPassword(e.target.value)}
|
||||
required
|
||||
/>
|
||||
<input type="password" value={password} onChange={(e) => setPassword(e.target.value)} required />
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<label>Assignment Title</label>
|
||||
<input
|
||||
type="text"
|
||||
value={title}
|
||||
onChange={(e) => setTitle(e.target.value)}
|
||||
required
|
||||
/>
|
||||
<input type="text" value={title} onChange={(e) => setTitle(e.target.value)} required />
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<label>Description</label>
|
||||
<textarea
|
||||
value={description}
|
||||
onChange={(e) => setDescription(e.target.value)}
|
||||
required
|
||||
></textarea>
|
||||
<textarea value={description} onChange={(e) => setDescription(e.target.value)} required></textarea>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<label>File Upload (optional)</label>
|
||||
<input
|
||||
type="file"
|
||||
onChange={(e) => setFile(e.target.files[0])}
|
||||
/>
|
||||
<input type="file" onChange={(e) => setFile(e.target.files[0])} />
|
||||
</div>
|
||||
|
||||
<div className="modal-buttons">
|
||||
<button type="submit">{editingIndex !== null ? "Update" : "Submit"}</button>
|
||||
<button
|
||||
type="button"
|
||||
onClick={() => {
|
||||
resetForm();
|
||||
setShowModal(false);
|
||||
}}
|
||||
>
|
||||
Cancel
|
||||
</button>
|
||||
<button type="button" onClick={() => { resetForm(); setShowModal(false); }}>Cancel</button>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
)}
|
||||
|
||||
<div className="project-list">
|
||||
<h3>📋 Projects</h3>
|
||||
{projects.map((project, index) => (
|
||||
<div key={index} className="project-item">
|
||||
<div className="project-meta">
|
||||
<strong>Student Name: {project.studentName}</strong> | CampID: {project.campID} | ProgramID: {project.programID}
|
||||
</div>
|
||||
<h4>{project.title}</h4>
|
||||
<p>{project.description}</p>
|
||||
{project.fileName && (
|
||||
<p><strong>Uploaded File:</strong> {project.fileName}</p>
|
||||
{projects.length > 0 && (
|
||||
<div className="project-list">
|
||||
{projects.map((project, index) => (
|
||||
<div key={index} className="project-item">
|
||||
<div className="project-meta">
|
||||
<strong>Student Name:</strong> {project.studentname || project.studentName} |{" "}
|
||||
<strong>CampID:</strong> {project.campid || project.campID} |{" "}
|
||||
<strong>ProgramID:</strong> {project.programid || project.programID}
|
||||
</div>
|
||||
|
||||
{project.title && <h4>{project.title}</h4>}
|
||||
{project.description && <p>{project.description}</p>}
|
||||
{project.fileName && <p><strong>Uploaded File:</strong> {project.fileName}</p>}
|
||||
|
||||
{project.assignmenturl && (
|
||||
<p>
|
||||
<a href={project.assignmenturl} target="_blank" rel="noopener noreferrer">View Assignment</a>
|
||||
</p>
|
||||
)}
|
||||
{project.originalfile && (
|
||||
<p>
|
||||
<a href={project.originalfile} target="_blank" rel="noopener noreferrer">Original File</a> |{" "}
|
||||
<a href={project.editablefile} target="_blank" rel="noopener noreferrer">Editable File</a>
|
||||
</p>
|
||||
)}
|
||||
|
||||
<div className="action-buttons">
|
||||
<button onClick={() => handleEdit(index)}>✏️ Edit</button>
|
||||
<button onClick={() => handleDelete(index)}>🗑️ Delete</button>
|
||||
<button onClick={() => alert("QR feature coming soon!")}>📎 QR</button>
|
||||
</div>
|
||||
</div>
|
||||
))}
|
||||
</div>
|
||||
)}
|
||||
|
||||
<div className="action-buttons">
|
||||
<button onClick={() => handleEdit(index)}>✏️ Edit</button>
|
||||
<button onClick={() => handleDelete(index)}>🗑️ Delete</button>
|
||||
<button onClick={() => alert("QR feature coming soon!")}>📎 QR</button>
|
||||
</div>
|
||||
</div>
|
||||
))}
|
||||
</div>
|
||||
|
||||
</div>
|
||||
);
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,9 +1,11 @@
|
|||
import React from "react";
|
||||
import "@fortawesome/fontawesome-free/css/all.min.css";
|
||||
|
||||
const authUrl = import.meta.env.VITE_AUTH_URL;
|
||||
|
||||
function SignInForm() {
|
||||
const [state, setState] = React.useState({
|
||||
email: "",
|
||||
assignmentID: "",
|
||||
password: "",
|
||||
});
|
||||
const handleChange = (evt) => {
|
||||
|
|
@ -17,15 +19,33 @@ function SignInForm() {
|
|||
const handleOnSubmit = (evt) => {
|
||||
evt.preventDefault();
|
||||
|
||||
const { email, password } = state;
|
||||
alert(`You are login with email: ${email} and password: ${password}`);
|
||||
const { assignmentId, password } = state;
|
||||
console.log(`You are loggind in with email: ${assignmentId} and password: ${password}`);
|
||||
|
||||
for (const key in state) {
|
||||
setState({
|
||||
...state,
|
||||
[key]: "",
|
||||
console.log("Submitting login request with state:", state);
|
||||
fetch(`${authUrl}/auth/student/login`, {
|
||||
method: "POST",
|
||||
headers: {
|
||||
"Content-Type": "application/json",
|
||||
},
|
||||
body: JSON.stringify(state),
|
||||
credentials: "include",
|
||||
})
|
||||
.then((response) => {
|
||||
console.log("Received response:", response);
|
||||
if (!response.ok) {
|
||||
throw new Error("Network response was not ok");
|
||||
}
|
||||
return response.json();
|
||||
})
|
||||
.then((data) => {
|
||||
console.log("Success:", data);
|
||||
window.location.href = "/";
|
||||
})
|
||||
.catch((error) => {
|
||||
console.error("Error occurred during login:", error);
|
||||
alert("Login failed!");
|
||||
});
|
||||
}
|
||||
};
|
||||
|
||||
return (
|
||||
|
|
@ -39,10 +59,10 @@ function SignInForm() {
|
|||
</div> */}
|
||||
|
||||
<input
|
||||
type="email"
|
||||
placeholder="Student Name"
|
||||
name="email"
|
||||
value={state.email}
|
||||
type="assignmentId"
|
||||
placeholder="Assignment ID"
|
||||
name="assignmentId"
|
||||
value={state.assignmentId}
|
||||
onChange={handleChange}
|
||||
/>
|
||||
<input
|
||||
|
|
|
|||
|
|
@ -18,9 +18,9 @@ function SignUpForm() {
|
|||
const handleOnSubmit = (evt) => {
|
||||
evt.preventDefault();
|
||||
|
||||
const { name, email, password } = state;
|
||||
const { assignmentID, password } = state;
|
||||
alert(
|
||||
`You are signed in with name: ${name} email: ${email} and password: ${password}`
|
||||
`You are signed in with assignmentID: ${assignmentID} and password: ${password}`
|
||||
);
|
||||
|
||||
for (const key in state) {
|
||||
|
|
@ -32,7 +32,12 @@ function SignUpForm() {
|
|||
};
|
||||
|
||||
const googleAuth = () => {
|
||||
<<<<<<< HEAD
|
||||
window.open(authUrl, "_self");
|
||||
=======
|
||||
|
||||
window.open(`${authUrl}/auth/google`, "_self");
|
||||
>>>>>>> refs/remotes/origin/homepage-2nd-sprint
|
||||
};
|
||||
|
||||
return (
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue