iamcoolvivek007/freightdesk
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[OWL] Fix EJS include paths + layouts/main.ejs syntax
Some checks failed
FreightDesk CI/CD / Lint & Test (push) Has been cancelled
Details
FreightDesk CI/CD / Build Docker Image (push) Has been cancelled
Details
FreightDesk CI/CD / Deploy to Coolify (push) Has been cancelled
Details

Browse source 
- Fixed 30 EJS views: changed ../partials/ to ../../partials/ for views in subdirectories
  (pages/loads/, pages/shippers/, pages/portal/, pages/marketplace/, pages/payments/, etc.)
- Fixed layouts/main.ejs: corrected malformed EJS tags on lines 11 and 66
  (<% ... { <% → <% ... { %>)
This commit is contained in:
FreightDesk 2026-06-08 04:30:59 +00:00
parent ec6ec234ac
commit 4a06fe370f
30 changed files with 60 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
webapp/src/views/layouts/main.ejs
View file

@ -8,7 +8,7 @@
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin> <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
<link href="https://fonts.googleapis.com/css2?family=Noto+Sans+Devanagari:wght@400;600;700&family=Inter:wght@300;400;500;600;700&display=swap" rel="stylesheet"> <link href="https://fonts.googleapis.com/css2?family=Noto+Sans+Devanagari:wght@400;600;700&family=Inter:wght@300;400;500;600;700&display=swap" rel="stylesheet">
<link rel="stylesheet" href="/css/style.css"> <link rel="stylesheet" href="/css/style.css">
<% if (typeof extraCss !== 'undefined') { <% for (const css of extraCss) { %> <link rel="stylesheet" href="<%= css %>"> <% } %> <% } %> <% if (typeof extraCss !== 'undefined') { %> <% for (const css of extraCss) { %> <link rel="stylesheet" href="<%= css %>"> <% } %> <% } %>
</head> </head>
<body> <body>
<% if (typeof user !== 'undefined' && user) { %> <% if (typeof user !== 'undefined' && user) { %>
@ -63,6 +63,6 @@
<% } %> <% } %>
<script src="/js/app.js"></script> <script src="/js/app.js"></script>
<% if (typeof extraJs !== 'undefined') { <% for (const js of extraJs) { %><script src="<%= js %>"></script><% } %> <% } %> <% if (typeof extraJs !== 'undefined') { %> <% for (const js of extraJs) { %><script src="<%= js %>"></script><% } %> <% } %>
</body> </body>
</html> </html>

4
webapp/src/views/pages/admin/moderation.ejs
View file

@ -1,4 +1,4 @@
<%- include('../partials/header', { activeMenu: 'moderation' }) %> <%- include('../../partials/header', { activeMenu: 'moderation' }) %>
<div class="page-header"> <div class="page-header">
<div> <div>
@ -197,4 +197,4 @@ async function resolveDispute(id) {
} }
</script> </script>
<%- include('../partials/footer') %> <%- include('../../partials/footer') %>

4
webapp/src/views/pages/audit/detail.ejs
View file

@ -1,4 +1,4 @@
<%- include('../partials/header', { activeMenu: 'audit' }) %> <%- include('../../partials/header', { activeMenu: 'audit' }) %>
<div class="page-header"> <div class="page-header">
<div> <div>
@ -65,4 +65,4 @@
</div> </div>
<% } %> <% } %>
<%- include('../partials/footer') %> <%- include('../../partials/footer') %>

4
webapp/src/views/pages/audit/list.ejs
View file

@ -1,4 +1,4 @@
<%- include('../partials/header', { activeMenu: 'audit' }) %> <%- include('../../partials/header', { activeMenu: 'audit' }) %>
<div class="page-header"> <div class="page-header">
<div> <div>
@ -90,4 +90,4 @@
</div> </div>
</div> </div>
<%- include('../partials/footer') %> <%- include('../../partials/footer') %>

4
webapp/src/views/pages/invoices/list.ejs
View file

@ -1,4 +1,4 @@
<%- include('../partials/header', { activeMenu: 'invoices' }) %> <%- include('../../partials/header', { activeMenu: 'invoices' }) %>
<div class="page-header"> <div class="page-header">
<div> <div>
@ -88,4 +88,4 @@
</div> </div>
</div> </div>
<%- include('../partials/footer') %> <%- include('../../partials/footer') %>

4
webapp/src/views/pages/invoices/preview.ejs
View file

@ -1,4 +1,4 @@
<%- include('../partials/header', { activeMenu: 'invoices' }) %> <%- include('../../partials/header', { activeMenu: 'invoices' }) %>
<div class="page-header"> <div class="page-header">
<div> <div>
@ -72,4 +72,4 @@
<button onclick="window.print()" class="btn btn-outline">&#128424; Print Invoice</button> <button onclick="window.print()" class="btn btn-outline">&#128424; Print Invoice</button>
</div> </div>
<%- include('../partials/footer') %> <%- include('../../partials/footer') %>

4
webapp/src/views/pages/loads/detail.ejs
View file

@ -1,4 +1,4 @@
<%- include('../partials/header', { activeMenu: 'loads' }) %> <%- include('../../partials/header', { activeMenu: 'loads' }) %>
<div class="page-header"> <div class="page-header">
<div> <div>
@ -108,4 +108,4 @@
</div> </div>
</div> </div>
<%- include('../partials/footer') %> <%- include('../../partials/footer') %>

4
webapp/src/views/pages/loads/form.ejs
View file

@ -1,4 +1,4 @@
<%- include('../partials/header', { activeMenu: 'loads' }) %> <%- include('../../partials/header', { activeMenu: 'loads' }) %>
<div class="page-header"> <div class="page-header">
<div> <div>
@ -231,4 +231,4 @@ function applyParsed() {
} }
</script> </script>
<%- include('../partials/footer', { extraJs: [] }) %> <%- include('../../partials/footer', { extraJs: [] }) %>

4
webapp/src/views/pages/loads/list.ejs
View file

@ -1,4 +1,4 @@
<%- include('../partials/header', { activeMenu: 'loads' }) %> <%- include('../../partials/header', { activeMenu: 'loads' }) %>
<div class="page-header"> <div class="page-header">
<div> <div>
@ -98,4 +98,4 @@
})(); })();
</script> </script>
<%- include('../partials/footer') %> <%- include('../../partials/footer') %>

4
webapp/src/views/pages/marketplace/bulk-parser.ejs
View file

@ -1,4 +1,4 @@
<%- include('../partials/portal-header', { activeMenu: 'parser' }) %> <%- include('../../partials/portal-header', { activeMenu: 'parser' }) %>
<div class="page-header"> <div class="page-header">
<div> <div>
@ -202,4 +202,4 @@ function clearAll() {
} }
</script> </script>
<%- include('../partials/portal-footer') %> <%- include('../../partials/portal-footer') %>

4
webapp/src/views/pages/marketplace/index.ejs
View file

@ -1,4 +1,4 @@
<%- include('../partials/portal-header', { activeMenu: 'marketplace' }) %> <%- include('../../partials/portal-header', { activeMenu: 'marketplace' }) %>
<div class="page-header"> <div class="page-header">
<div> <div>
@ -115,4 +115,4 @@
</div> </div>
<% } %> <% } %>
<%- include('../partials/portal-footer') %> <%- include('../../partials/portal-footer') %>

4
webapp/src/views/pages/marketplace/load-detail.ejs
View file

@ -1,4 +1,4 @@
<%- include('../partials/portal-header', { activeMenu: 'marketplace' }) %> <%- include('../../partials/portal-header', { activeMenu: 'marketplace' }) %>
<div style="max-width:800px;margin:0 auto;"> <div style="max-width:800px;margin:0 auto;">
<a href="/marketplace" class="btn btn-sm btn-outline mb-3">&larr; Back to Marketplace</a> <a href="/marketplace" class="btn btn-sm btn-outline mb-3">&larr; Back to Marketplace</a>
@ -271,4 +271,4 @@ async function raiseDispute() {
} }
</script> </script>
<%- include('../partials/portal-footer') %> <%- include('../../partials/portal-footer') %>

4
webapp/src/views/pages/marketplace/notifications.ejs
View file

@ -1,4 +1,4 @@
<%- include('../partials/portal-header', { activeMenu: 'notifications' }) %> <%- include('../../partials/portal-header', { activeMenu: 'notifications' }) %>
<div class="page-header"> <div class="page-header">
<div> <div>
@ -55,4 +55,4 @@ async function markAllRead() {
} }
</script> </script>
<%- include('../partials/portal-footer') %> <%- include('../../partials/portal-footer') %>

4
webapp/src/views/pages/marketplace/post.ejs
View file

@ -1,4 +1,4 @@
<%- include('../partials/portal-header', { activeMenu: 'marketplace' }) %> <%- include('../../partials/portal-header', { activeMenu: 'marketplace' }) %>
<div class="page-header"> <div class="page-header">
<div> <div>
@ -118,4 +118,4 @@
</div> </div>
</div> </div>
<%- include('../partials/portal-footer') %> <%- include('../../partials/portal-footer') %>

4
webapp/src/views/pages/payments/deposit.ejs
View file

@ -1,4 +1,4 @@
<%- include('../partials/portal-header', { activeMenu: 'payments' }) %> <%- include('../../partials/portal-header', { activeMenu: 'payments' }) %>
<div class="page-header"> <div class="page-header">
<div> <div>
@ -75,4 +75,4 @@ function setAmount(amt) {
} }
</script> </script>
<%- include('../partials/portal-footer') %> <%- include('../../partials/portal-footer') %>

4
webapp/src/views/pages/payments/index.ejs
View file

@ -1,4 +1,4 @@
<%- include('../partials/portal-header', { activeMenu: 'payments' }) %> <%- include('../../partials/portal-header', { activeMenu: 'payments' }) %>
<div class="page-header"> <div class="page-header">
<div> <div>
@ -98,4 +98,4 @@
</div> </div>
</div> </div>
<%- include('../partials/portal-footer') %> <%- include('../../partials/portal-footer') %>

4
webapp/src/views/pages/payments/list.ejs
View file

@ -1,4 +1,4 @@
<%- include('../partials/header', { activeMenu: 'payments' }) %> <%- include('../../partials/header', { activeMenu: 'payments' }) %>
<div class="page-header"> <div class="page-header">
<div> <div>
@ -30,4 +30,4 @@
</div> </div>
</div> </div>
<%- include('../partials/footer') %> <%- include('../../partials/footer') %>

4
webapp/src/views/pages/payments/payout.ejs
View file

@ -1,4 +1,4 @@
<%- include('../partials/portal-header', { activeMenu: 'payments' }) %> <%- include('../../partials/portal-header', { activeMenu: 'payments' }) %>
<div class="page-header"> <div class="page-header">
<div> <div>
@ -109,4 +109,4 @@
</div> </div>
</div> </div>
<%- include('../partials/portal-footer') %> <%- include('../../partials/portal-footer') %>

4
webapp/src/views/pages/portal-users/list.ejs
View file

@ -1,4 +1,4 @@
<%- include('../partials/header', { activeMenu: 'portal-users' }) %> <%- include('../../partials/header', { activeMenu: 'portal-users' }) %>
<div class="page-header"> <div class="page-header">
<div> <div>
@ -140,4 +140,4 @@ async function resetPassword(id) {
} }
</script> </script>
<%- include('../partials/footer') %> <%- include('../../partials/footer') %>

4
webapp/src/views/pages/portal/driver-dashboard.ejs
View file

@ -1,4 +1,4 @@
<%- include('../partials/header', { activeMenu: 'portal' }) %> <%- include('../../partials/header', { activeMenu: 'portal' }) %>
<div class="page-header"> <div class="page-header">
<div> <div>
@ -78,4 +78,4 @@
</div> </div>
</div> </div>
<%- include('../partials/footer') %> <%- include('../../partials/footer') %>

4
webapp/src/views/pages/portal/driver-load-detail.ejs
View file

@ -1,4 +1,4 @@
<%- include('../partials/header', { activeMenu: 'portal' }) %> <%- include('../../partials/header', { activeMenu: 'portal' }) %>
<div class="page-header"> <div class="page-header">
<div> <div>
@ -45,4 +45,4 @@
</div> </div>
</div> </div>
<%- include('../partials/footer') %> <%- include('../../partials/footer') %>

4
webapp/src/views/pages/portal/driver-loads.ejs
View file

@ -1,4 +1,4 @@
<%- include('../partials/header', { activeMenu: 'portal' }) %> <%- include('../../partials/header', { activeMenu: 'portal' }) %>
<div class="page-header"> <div class="page-header">
<div> <div>
@ -73,4 +73,4 @@
</div> </div>
</div> </div>
<%- include('../partials/footer') %> <%- include('../../partials/footer') %>

4
webapp/src/views/pages/portal/shipper-dashboard.ejs
View file

@ -1,4 +1,4 @@
<%- include('../partials/header', { activeMenu: 'portal' }) %> <%- include('../../partials/header', { activeMenu: 'portal' }) %>
<div class="page-header"> <div class="page-header">
<div> <div>
@ -70,4 +70,4 @@
</div> </div>
</div> </div>
<%- include('../partials/footer') %> <%- include('../../partials/footer') %>

4
webapp/src/views/pages/portal/shipper-load-detail.ejs
View file

@ -1,4 +1,4 @@
<%- include('../partials/header', { activeMenu: 'portal' }) %> <%- include('../../partials/header', { activeMenu: 'portal' }) %>
<div class="page-header"> <div class="page-header">
<div> <div>
@ -72,4 +72,4 @@
</div> </div>
</div> </div>
<%- include('../partials/footer') %> <%- include('../../partials/footer') %>

4
webapp/src/views/pages/portal/shipper-loads.ejs
View file

@ -1,4 +1,4 @@
<%- include('../partials/header', { activeMenu: 'portal' }) %> <%- include('../../partials/header', { activeMenu: 'portal' }) %>
<div class="page-header"> <div class="page-header">
<div> <div>
@ -72,4 +72,4 @@
</div> </div>
</div> </div>
<%- include('../partials/footer') %> <%- include('../../partials/footer') %>

4
webapp/src/views/pages/reports/index.ejs
View file

@ -1,4 +1,4 @@
<%- include('../partials/header', { activeMenu: 'reports' }) %> <%- include('../../partials/header', { activeMenu: 'reports' }) %>
<div class="page-header"> <div class="page-header">
<div> <div>
@ -72,4 +72,4 @@
</div> </div>
</div> </div>
<%- include('../partials/footer') %> <%- include('../../partials/footer') %>

4
webapp/src/views/pages/shippers/detail.ejs
View file

@ -1,4 +1,4 @@
<%- include('../partials/header', { activeMenu: 'shippers' }) %> <%- include('../../partials/header', { activeMenu: 'shippers' }) %>
<div class="page-header"> <div class="page-header">
<div> <div>
@ -46,4 +46,4 @@
</div> </div>
</div> </div>
<%- include('../partials/footer') %> <%- include('../../partials/footer') %>

4
webapp/src/views/pages/shippers/list.ejs
View file

@ -1,4 +1,4 @@
<%- include('../partials/header', { activeMenu: 'shippers' }) %> <%- include('../../partials/header', { activeMenu: 'shippers' }) %>
<div class="page-header"> <div class="page-header">
<div> <div>
@ -62,4 +62,4 @@
</div> </div>
</div> </div>
<%- include('../partials/footer') %> <%- include('../../partials/footer') %>

4
webapp/src/views/pages/vehicles/detail.ejs
View file

@ -1,4 +1,4 @@
<%- include('../partials/header', { activeMenu: 'vehicles' }) %> <%- include('../../partials/header', { activeMenu: 'vehicles' }) %>
<div class="page-header"> <div class="page-header">
<div> <div>
@ -30,4 +30,4 @@
</div> </div>
</div> </div>
<%- include('../partials/footer') %> <%- include('../../partials/footer') %>

4
webapp/src/views/pages/vehicles/list.ejs
View file

@ -1,4 +1,4 @@
<%- include('../partials/header', { activeMenu: 'vehicles' }) %> <%- include('../../partials/header', { activeMenu: 'vehicles' }) %>
<div class="page-header"> <div class="page-header">
<div> <div>
@ -53,4 +53,4 @@
</div> </div>
</div> </div>
<%- include('../partials/footer') %> <%- include('../../partials/footer') %>