diff --git a/views/auth/login.ejs b/views/auth/login.ejs
index bc14e19..97a442d 100644
--- a/views/auth/login.ejs
+++ b/views/auth/login.ejs
@@ -1,9 +1,12 @@
+
- <% if(typeof success_msg !== 'undefined' || typeof error_msg !== 'undefined' || typeof error !== 'undefined') { %>
-
<%- JSON.stringify({
- success_msg: typeof success_msg !== 'undefined' && success_msg ? success_msg : null,
- error_msg: typeof error_msg !== 'undefined' && error_msg ? error_msg : null,
- error: typeof error !== 'undefined' && error ? error : null
- }) %>
- <% } %>
-
-
-
-

-
+ <% if(typeof success_msg !=='undefined' || typeof error_msg !=='undefined' || typeof error !=='undefined' ) { %>
+
<%- JSON.stringify({ success_msg: typeof success_msg
+ !=='undefined' && success_msg ? success_msg : null, error_msg: typeof error_msg !=='undefined' && error_msg ?
+ error_msg : null, error: typeof error !=='undefined' && error ? error : null }) %>
+ <% } %>
-
-
CMS Management System
-
Welcome to Content Management System
-
+
+
+

+
-
-
+
-
+
+
\ No newline at end of file
diff --git a/views/layouts/main.ejs b/views/layouts/main.ejs
index 315cda5..a2d7cd0 100644
--- a/views/layouts/main.ejs
+++ b/views/layouts/main.ejs
@@ -2,7 +2,7 @@
-
+
@@ -701,7 +701,7 @@
|
-
@@ -710,18 +710,6 @@
Homepage
-
- FAQ
-
-
- Testimonials
-
-
- Video Gallery
-
@@ -732,49 +720,13 @@
-
-
- About
-
-
+
+ About
-
-
- Services
-
-
+
+ Services
Blog
@@ -1006,7 +958,7 @@
if (!response.ok) {
throw new Error('Failed to load footer data');
}
-
+
const footerData = await response.json();
renderFooter(footerData);
} catch (error) {
@@ -1019,7 +971,7 @@
function renderFooter(data) {
const footerContent = document.getElementById('footerContent');
const footerCopyright = document.getElementById('footerCopyright');
-
+
if (!footerContent || !footerCopyright) return;
let footerHTML = '';
@@ -1030,8 +982,8 @@
@@ -1042,7 +994,7 @@
if (data.columns && Array.isArray(data.columns)) {
// Sort columns by order if available, otherwise maintain array order
const sortedColumns = data.columns.sort((a, b) => (a.order || 0) - (b.order || 0));
-
+
sortedColumns.forEach(column => {
if (column.title || (column.links && column.links.length > 0)) {
footerHTML += `
@@ -1050,13 +1002,13 @@
${column.title ? `${escapeHtml(column.title)}
` : ''}
${column.links && column.links.length > 0 ? `
` : ''}
@@ -1094,12 +1046,12 @@
${data.address && data.address.text ? `
- ${data.address.mapUrl ?
- `
+ ${data.address.mapUrl ?
+ `
${escapeHtml(data.address.text)}
- ` :
- escapeHtml(data.address.text)
- }
+ ` :
+ escapeHtml(data.address.text)
+ }
` : ''}
@@ -1110,19 +1062,19 @@
if (data.social && data.social.links && Array.isArray(data.social.links) && data.social.links.length > 0) {
// Sort social links by order if available
const sortedSocials = data.social.links.sort((a, b) => (a.order || 0) - (b.order || 0));
-
+
footerHTML += `
@@ -1134,10 +1086,10 @@
// Update copyright
const currentYear = new Date().getFullYear();
- const copyrightText = data.copyright && data.copyright.text ?
- data.copyright.text :
+ const copyrightText = data.copyright && data.copyright.text ?
+ data.copyright.text :
`© ${currentYear} Website. All rights reserved.`;
-
+
footerCopyright.innerHTML = copyrightText;
}
@@ -1145,7 +1097,7 @@
function renderFallbackFooter() {
const footerContent = document.getElementById('footerContent');
const footerCopyright = document.getElementById('footerCopyright');
-
+
if (footerContent) {
footerContent.innerHTML = `
`;
}
-
+
if (footerCopyright) {
footerCopyright.innerHTML = `© ${new Date().getFullYear()} CMS-GGCamp. All rights reserved.`;
}