Skip to content

Commit

Permalink
views folder organised
Browse files Browse the repository at this point in the history
  • Loading branch information
@Aishwariyaa-Anand
Aishwariyaa-Anand committed Sep 9, 2024
1 parent 43a30f2 commit 5fb47be
Show file tree
Hide file tree
Showing 21 changed files with 128 additions and 88 deletions.
156 changes: 98 additions & 58 deletions app.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ app.get("/login", async (request, response) => {
});

app.get("/edusignup", async (request, response) => {
response.render("edusignup", {
response.render("auth/edusignup", {
signUpAsEducator: i18n.__("Sign up as Educator"),
nameLabel: i18n.__("Name"),
emailLabel: i18n.__("Email"),
Expand All @@ -200,7 +200,7 @@ app.get("/edusignup", async (request, response) => {
});

app.get("/stusignup", async (request, response) => {
response.render("stusignup", {
response.render("auth/stusignup", {
signUpAsStudent: i18n.__("Sign up as Student"),
nameLabel: i18n.__("Name"),
emailLabel: i18n.__("Email"),
Expand All @@ -218,7 +218,7 @@ app.get(
eduId: request.user.id,
},
});
response.render("educator", {
response.render("edu/educator", {
courses,
myCourse: i18n.__("My Courses"),
createCourse: i18n.__("Create course"),
Expand Down Expand Up @@ -248,7 +248,7 @@ app.get(
},
},
});
response.render("student", {
response.render("stu/student", {
courses,
availCourses: i18n.__("Available Courses"),
myCourses: i18n.__("My courses"),
Expand All @@ -261,13 +261,13 @@ app.get(
app.get("/changepassedu", async (request, response) => {
const userid = request.user.id;
const user = await User.findByPk(userid);
response.render("changepass", { user, role: "e" });
response.render("auth/changepass", { user, role: "e" });
});

app.get("/changepassstu", async (request, response) => {
const userid = request.user.id;
const user = await User.findByPk(userid);
response.render("changepass", { user, role: "s" });
response.render("auth/changepass", { user, role: "s" });
});

app.get("/viewreports", isUser, async (request, response) => {
Expand Down Expand Up @@ -307,7 +307,7 @@ app.get("/viewreports", isUser, async (request, response) => {
// Sort the courseReports by popularity score in descending order
courseReports.sort((a, b) => b.popularityScore - a.popularityScore);

response.render("viewreport", {
response.render("edu/viewreport", {
courseReports,
welcomeMessage: i18n.__("Welcome!"),
changePassword: i18n.__("Change Password"),
Expand All @@ -334,7 +334,7 @@ app.get(
"/createcourse",
connectEnsureLogin.ensureLoggedIn(),
async (request, response) => {
response.render("createcourse", {
response.render("edu/creation/createcourse", {
createCourseTitle: i18n.__("Create new course"),
courseNameLabel: i18n.__("What is the name of the course?"),
submitButton: i18n.__("Submit"),
Expand All @@ -347,7 +347,14 @@ app.get(
connectEnsureLogin.ensureLoggedIn(),
async (request, response) => {
const chapterId = request.params.chapterId;
response.render("newpage", { chapterId });
console.log(chapterId);
response.render("edu/creation/newpage", {
chapterId,
newPageTitle: i18n.__("New Page"),
titleLabel: i18n.__("Title"),
contentLabel: i18n.__("Content"),
submitButton: i18n.__("Submit"),
});
},
);

Expand All @@ -356,15 +363,24 @@ app.get(
connectEnsureLogin.ensureLoggedIn(),
async (request, response) => {
const courseId = request.params.courseId;
console.log(`Fetching chapters for courseId: ${courseId}`);
const chapters = await Chapter.findAll({
where: { courseId: courseId },
});
const course = await Course.findByPk(courseId);
console.log(course.id);
if (!course) {
throw new Error(`Course with id ${courseId} not found`);
}
console.log(`Course found: ${course.name} (ID: ${course.id})`);
const edu = await User.findByPk(course.eduId);
if (!edu) {
throw new Error(`Educator with id ${course.eduId} not found`);
}
console.log(`Educator found: ${edu.name}`);

// Get the locale from i18n
const userLocale = i18n.getLocale(); // Get the current locale
console.log(`Current locale: ${userLocale}`);

// Create a date formatter for the user's locale
const dateFormatter = new Intl.DateTimeFormat(userLocale, {
Expand All @@ -379,8 +395,18 @@ app.get(

// Format the createdAt date
const formattedDate = dateFormatter.format(new Date(course.createdAt));

response.render("viewcourse", {
console.log(`Formatted Date: ${formattedDate}`);
if (!course) {
return response.status(404).send("Course not found.");
}
if (!edu) {
return response.status(404).send("Educator not found.");
}
if (!chapters) {
return response.status(404).send("Chapters not found.");
}
console.log("abc");
response.render("stu/viewing/viewcourse", {
coursename: course.name,
courseid: course.id,
date: formattedDate,
Expand All @@ -396,39 +422,58 @@ app.get(
"/viewencourse/:courseId",
connectEnsureLogin.ensureLoggedIn(),
async (request, response) => {
const courseId = request.params.courseId;
const chapters = await Chapter.findAll({
where: { courseId: courseId },
});
const course = await Course.findByPk(courseId);
console.log(course.id);
const edu = await User.findByPk(course.eduId);

// Get the locale from i18n
const userLocale = i18n.getLocale(); // Get the current locale
console.log(userLocale);
// Create a date formatter for the user's locale
const dateFormatter = new Intl.DateTimeFormat(userLocale, {
year: "numeric",
month: "long",
day: "numeric",
hour: "2-digit",
minute: "2-digit",
second: "2-digit",
hour12: false, // Set to true for 12-hour format
});
console.log(dateFormatter);
// Format the createdAt date
const formattedDate = dateFormatter.format(new Date(course.createdAt));
try {
const courseId = request.params.courseId;
console.log(`Fetching chapters for courseId: ${courseId}`);
const chapters = await Chapter.findAll({
where: { courseId: courseId },
});
const course = await Course.findByPk(courseId);
if (!course) {
throw new Error(`Course with id ${courseId} not found`);
}
console.log(`Course found: ${course.name} (ID: ${course.id})`);
const edu = await User.findByPk(course.eduId);
if (!edu) {
throw new Error(`Educator with id ${course.eduId} not found`);
}
console.log(`Educator found: ${edu.name}`);

// Get the locale from i18n
const userLocale = i18n.getLocale(); // Get the current locale
console.log(`Current locale: ${userLocale}`);

// Create a date formatter for the user's locale
const dateFormatter = new Intl.DateTimeFormat(userLocale, {
year: "numeric",
month: "long",
day: "numeric",
hour: "2-digit",
minute: "2-digit",
second: "2-digit",
hour12: false, // Set to true for 12-hour format
});
console.log(dateFormatter);
// Format the createdAt date
const formattedDate = dateFormatter.format(new Date(course.createdAt));
console.log(`Formatted Date: ${formattedDate}`);

response.render("viewencourse", {
coursename: course.name,
courseid: course.id,
date: formattedDate,
chapters,
eduname: edu.name,
chapterTitle: i18n.__("Chapters"),
});
response.render("stu/viewing/viewencourse", {
coursename: course.name,
courseid: course.id,
date: formattedDate,
chapters,
eduname: edu.name,
chapterTitle: i18n.__("Chapters"),
});
} catch (err) {
// Capture the error in Sentry
Sentry.captureException(err);
console.error(`Error: ${err.message}`, err);
response
.status(500)
.send("An error occurred while setting the language.");
}
},
);

Expand All @@ -441,7 +486,7 @@ app.get(
const pages = await Page.findAll({
where: { chapterId: chapterId },
});
response.render("viewchap", {
response.render("stu/viewing/viewchap", {
chapname: chaps.name,
chapdesc: chaps.desc,
pages,
Expand Down Expand Up @@ -478,7 +523,7 @@ app.get(
}),
);

response.render("mycourses", {
response.render("stu/mycourses", {
courses: coursesWithProgress,
});
} catch (error) {
Expand All @@ -504,7 +549,7 @@ app.get(
studentId: studentId,
},
});
response.render("viewpage", {
response.render("stu/viewing/viewpage", {
pagetitle: page.title,
pagecont: page.content,
pageid: page.id,
Expand All @@ -528,7 +573,7 @@ app.get(
where: { courseId: courseId },
});
const pages = await Page.findAll();
response.render("educourse", {
response.render("edu/educourse", {
coursename: course.name,
chapters,
pages,
Expand All @@ -543,7 +588,7 @@ app.get(
const chapid = request.params.chapterId;
const chapter = await Chapter.findByPk(chapid);
const courseId = chapter.courseId;
response.render("createchapter", { courseId });
response.render("edu/creation/createchapter", { courseId });
},
);

Expand Down Expand Up @@ -687,7 +732,7 @@ app.post(
eduId: request.user.id,
});
const courseId = createdCourse.id;
response.render("createchapter", { courseId });
response.render("edu/creation/createchapter", { courseId });
} catch (error) {
console.error(error);
response.status(500).json({ error: "Internal Server Error" });
Expand All @@ -712,7 +757,7 @@ app.post(
const pages = await Page.findAll({
where: { chapterId: chapterid },
});
response.render("createpage", { chapter, pages });
response.render("edu/creation/createpage", { chapter, pages });
} catch (error) {
console.error(error);
response.status(500).json({ error: "Internal Server Error" });
Expand All @@ -736,7 +781,7 @@ app.post(
const pages = await Page.findAll({
where: { chapterId },
});
response.render("createpage", { chapter, pages });
response.render("edu/creation/createpage", { chapter, pages });
} catch (error) {
console.error(error);
response.status(500).json({ error: "Internal Server Error" });
Expand All @@ -763,12 +808,7 @@ app.post(
studentId: studentId,
courseId: courseId,
});
response.render("viewencourse", {
courseId,
coursename: course.name,
eduname: edu.name,
chapters,
});
response.redirect(`/viewencourse/${courseId}`);
} catch (error) {
console.error(error);
response.status(500).json({ error: "Internal Server Error" });
Expand Down
6 changes: 3 additions & 3 deletions views/changepass.ejs → views/auth/changepass.ejs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,12 @@
<button type="submit">Change Password</button>
</form>
</div>
<%- include('flash.ejs') %>
<%- include('../flash.ejs') %>
<br>
<% if (role === 'e') { %>
<%- include('edufooter.ejs') %>
<%- include('../edu/edufooter.ejs') %>
<% } else { %>
<%- include('stufooter.ejs') %>
<%- include('../stu/stufooter.ejs') %>
<% } %>
</body>
</html>
4 changes: 2 additions & 2 deletions views/edusignup.ejs → views/auth/edusignup.ejs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<link rel="stylesheet" href="/styles.css">
</head>
<body>
<%- include('header.ejs') %>
<%- include('../header.ejs') %>
<br><br><br>
<div class="signup">
<h3><%= signUpAsEducator %></h3>
Expand All @@ -21,6 +21,6 @@
<center><button type="submit"><%= submitButton %></button></center>
</form>
</div>
<%- include('flash.ejs') %>
<%- include('../flash.ejs') %>
</body>
</html>
4 changes: 2 additions & 2 deletions views/stusignup.ejs → views/auth/stusignup.ejs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<link rel="stylesheet" href="/styles.css">
</head>
<body>
<%- include('header.ejs') %>
<%- include('../header.ejs') %>
<br><br><br>
<div class="signup">
<h3><%= signUpAsStudent %></h3>
Expand All @@ -21,6 +21,6 @@
<center><button type="submit"><%= submitButton %></button></center>
</form>
</div>
<%- include('flash.ejs') %>
<%- include('../flash.ejs') %>
</body>
</html>
4 changes: 2 additions & 2 deletions views/createchapter.ejs → views/edu/creation/createchapter.ejs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<link rel="stylesheet" href="/styles.css">
</head>
<body>
<%- include('eduheader.ejs') %>
<%- include('../eduheader.ejs') %>
<h1 class="head">Create chapter</h1>
<br><br>
<form action="/courses/<%= courseId %>/chapters" method="post">
Expand All @@ -17,6 +17,6 @@
<textarea rows="4" cols="50" name="desc"></textarea><br><br>
<button type="submit">submit</button>
</form>
<%- include('edufooter.ejs') %>
<%- include('../edufooter.ejs') %>
</body>
</html>
Loading

0 comments on commit 5fb47be

Please sign in to comment.