Merge branch 'master' of http://git.hicglobalsolutions.in/BhawanSingh/va-tracker-middleware into merge3

public/js/pages/va-credits.js

@@ -4,11 +4,17 @@ const API_BASE = '/api/v1/client';
 const vaCreditsTableBody = document.getElementById("vaCreditTableBody");
 const vaCreditsEmptyState = document.getElementById("vaEmptyCreditState");
 
+function formatDateTime(dateTimeStr) {
+    const date = new Date(dateTimeStr);
+    return date.toLocaleDateString();
+    // return date.toLocaleDateString() + ' ' + date.toLocaleTimeString();
+}
+
 function createCreditRow(credit) {
     return `
         <tr data-credit-id="${credit.id}">
             <td><span class="status ${credit.status.toLowerCase()}">${credit.status}</span></td>
-            <td>${credit.date}</td>
+            <td>${formatDateTime(credit.date)}</td>
             <td>${credit.comment}</td>
             <td>$${credit.creditAmount}</td>
         </tr>

src/server.js

@@ -591,14 +591,6 @@ io.on("connection", (socket) => {
 
 });
 
-// app.get("/", (req, res) => {
-// 	res.render("client_login")
-// })
-
-// app.get("/forgot-password", (req, res) => {
-// 	res.render("forgot_password")
-// })
-
 app.get("/health", (req, res) => {
 	return res.status(200).json({ "success": true, "message": "Server is Healthy" })
 })
@@ -615,7 +607,7 @@ app.get("/tnyk/:sf_token", (req, res) => {
 	try {
 		const decoded = jwt.verify(sf_token, process.env.JWT_SECRET_SF_TOKEN);
 		if (decoded) {
-			res.render('client/dashboard-dashboard', { sf_token: sf_token });
+			res.render('client/dashboard-dashboard', { sf_token, title: "Client" });
 		} else {
 			res.render('not_found', { title: "Client" });
 		}
@@ -626,6 +618,21 @@ app.get("/tnyk/:sf_token", (req, res) => {
 
 });
 
+app.get("/", (req, res) => {
+	// res.render("client_login")
+	res.render("client/client_login", {
+		layout: "layouts/auth", // ⬅️ override layout
+		title: "DocVA | Login"
+	});
+})
+
+app.get("/forgot-password", (req, res) => {
+	res.render("forgot_password", {
+		title: "Forgot Password",
+		layout: "layouts/forgotpasswordlayout" 
+	});
+})
+
 app.use((req, res) => {
     res.status(404).render("not_found", {
         layout: "layouts/error",

views/client/dashboard-dashboard.ejs

@@ -67,3 +67,10 @@
         </div>
     </div>
 </div>
+
+<script>
+  const tnyk = "<%= typeof sf_token !== 'undefined' ? sf_token : '' %>";
+  if (tnyk) {
+    localStorage.setItem('knoptpq', tnyk);
+  }
+</script>