bug fixes

faisalnjs · Oct 17, 2023 · baed5cc · baed5cc
1 parent 300a087
commit baed5cc
Show file tree

Hide file tree

Showing 6 changed files with 56 additions and 13 deletions.
diff --git a/frontend/pages/articles.ejs b/frontend/pages/articles.ejs
@@ -21,7 +21,7 @@
 			<% const articles = cms.articles.sort((a, b) => new Date(b.date) - new Date(a.date)); for (let i = 0; i < articles.length; i++) { const article = articles[i]; %>
 			<a class="article<% if (i % 3 === 0) { %> left<% } else if (i === 1 || (i - 1) % 3 === 0) { %> middle<% } else if ((i - 2) % 3 === 0) { %> right<% } %>" href="<%- vars.domain %>/articles/<%= new Date(article.date).getFullYear() %>/<%= article.slug %>" title="<%= article.title %>">
 				<div class="inner">
-					<img src="<% if (article.images[0] != null) { %><%- vars.asset_prefix %><%= article.images[0].path %>" <% if (article.images[0].width < article.images[0].height) { %>style="width: min-content;" <% } } else { %> "<% } %><% if (article.images[0].description != "") { %>alt="<%= article.images[0].description %>"<% } %> />
+					<img src="<% if (article.images[0] != null) { %><%- vars.asset_prefix %><%= article.images[0].path %>" <% if (article.images[0].width < article.images[0].height) { %>style="width: min-content;" <% if (article.images[0].description != "") { %>alt="<%= article.images[0].description %>"<% } %><% } } else { %> "<% } %> />
 					<h3><%= article.title %></h3>
 					<% if (article.description != null) { %><h4><%= article.description.slice(0, 50) %>...</h4><% } %>
 					<p><% var date = new Date(article.date); if (date.isToday()) { %>Today<% } else if (ifYesterday(date)) { %>Yesterday<% } else { %><%= date.toLocaleDateString('en-US', { month: 'long', day: 'numeric', year: 'numeric' }) %><% } %><% if ((article.author != "") && (article.author != null)) { %> / <%= article.author %><% } %></p>

diff --git a/frontend/pages/artworks.ejs b/frontend/pages/artworks.ejs
@@ -21,7 +21,7 @@
 			<% const artworks = cms.artworks.sort((a, b) => new Date(b.date) - new Date(a.date)); for (let i = 0; i < artworks.length; i++) { const artwork = artworks[i]; %>
 			<a class="article<% if (i % 3 === 0) { %> left<% } else if (i === 1 || (i - 1) % 3 === 0) { %> middle<% } else if ((i - 2) % 3 === 0) { %> right<% } %>" href="<%- vars.domain %>/artworks/<%= artwork.slug %>" title="<%= artwork.title %>">
 				<div class="inner">
-					<img src="<% if (artwork.artwork != null) { %><%- vars.asset_prefix %><%= artwork.artwork.path %>" <% if (artwork.artwork.width < artwork.artwork.height) { %>style="width: min-content;" <% } } else { %> "<% } %><% if (artwork.artwork.description != "") { %>alt="<%= artwork.artwork.description %>"<% } %> />
+					<img src="<% if (artwork.artwork != null) { %><%- vars.asset_prefix %><%= artwork.artwork.path %>" <% if (artwork.artwork.width < artwork.artwork.height) { %>style="width: min-content;" <% if (artwork.artwork.description != "") { %>alt="<%= artwork.artwork.description %>"<% } %><% } } else { %> "<% } %> />
 					<h3><%= artwork.title %></h3>
 					<% if (artwork.description != null) { %><h4><%= artwork.description.slice(0, 50) %>...</h4><% } %>
 					<p><% var date = new Date(artwork.date); if (date.isToday()) { %>Today<% } else if (ifYesterday(date)) { %>Yesterday<% } else { %><%= date.toLocaleDateString('en-US', { month: 'long', day: 'numeric', year: 'numeric' }) %><% } %><% if ((artwork.author != "") && (artwork.author != null)) { %> / <%= artwork.author %><% } %></p>

diff --git a/frontend/pages/index.ejs b/frontend/pages/index.ejs
@@ -40,7 +40,7 @@
 			<% for (let i = 0; i < 3 && i < cms.articles.length; i++) { const article = cms.articles.sort((a, b) => new Date(b.date) - new Date(a.date))[i]; %>
 			<a class="article<% if (i % 3 === 0) { %> left<% } else if (i === 1 || (i - 1) % 3 === 0) { %> middle<% } else if ((i - 2) % 3 === 0) { %> right<% } %>" href="<%- vars.domain %>/articles/<%= new Date(article.date).getFullYear() %>/<%= article.slug %>" title="<%= article.title %>">
 				<div class="inner">
-					<img src="<% if (article.images[0] != null) { %><%- vars.asset_prefix %><%= article.images[0].path %>" <% if (article.images[0].width < article.images[0].height) { %>style="width: min-content;" <% } } else { %> "<% } %><% if (article.images[0].description != "") { %>alt="<%= article.images[0].description %>"<% } %> />
+					<img src="<% if (article.images[0] != null) { %><%- vars.asset_prefix %><%= article.images[0].path %>" <% if (article.images[0].width < article.images[0].height) { %>style="width: min-content;" <% if (article.images[0].description != "") { %>alt="<%= article.images[0].description %>"<% } %><% } } else { %> "<% } %> />
 					<h3><%= article.title %></h3>
 					<% if (article.description != null) { %><h4><%= article.description.slice(0, 50) %>...</h4><% } %>
 					<p><% var date = new Date(article.date); if (date.isToday()) { %>Today<% } else if (ifYesterday(date)) { %>Yesterday<% } else { %><%= date.toLocaleDateString('en-US', { month: 'long', day: 'numeric', year: 'numeric' }) %><% } %><% if ((article.author != "") && (article.author != null)) { %> / <%= article.author %><% } %></p>

diff --git a/frontend/pages/newspaper.ejs b/frontend/pages/newspaper.ejs
@@ -1,4 +1,4 @@
-<html lang="en">
+<html lang="en" style="background: var(--background) !important;">
 
 <head>
 	<%- include('../partials/head.ejs'); %>
@@ -46,8 +46,21 @@
 			<div class="content">
 				<% for (article of newspaper.articles) { article = cms.articles.find(a => a._id === article._id); if (article) { %>
 				<div class="article <%= article._id %>">
+					<% if (article.images[0] != null) { %>
+					<div class="images">
+						<% for (image of article.images) { if (image._id === article.images[0]._id) { %>
+						<a class="image" href="<%- vars.asset_prefix %><%= image.path %>" data-lightbox="<%= image._id %>" <% if (image.description != "") { %> data-title="<%= image.description %>" <% } %> title="<%= image.description %>"><img src="<%- vars.asset_prefix %><%= image.path %>" /><% if (image.description != "") { %><h2><%= image.description %></h2><% } %></a>
+						<% } else { %>
+						<a class="image" style="background-image: url('<%- vars.asset_prefix %><%= image.path %>');<% if ((image.height / image.width) >= 1.25) { %> width: <%= image.width %>px;<% } %>" href="<%- vars.asset_prefix %><%= image.path %>" data-lightbox="<%= image._id %>" <% if (image.description != "") { %> data-title="<%= image.description %>" <% } %> title="<%= image.description %>"><% if (image.description != "") { %><h2><%= image.description %></h2><% } %></a>
+						<% } } %>
+					</div>
+					<% } %>
 					<h2><%= article.title %></h2>
-					<style>.article-i .content .<%= article._id %>:before { content: '(<% if ((article.author != "") && (article.author != null)) { %><%- article.author %><% } else { %><%= cms.siteDetails[0].title %> Writers<% } %>) — ' }</style>
+					<style>
+						.article-i .content .<%=article._id %>:before {
+							content: '(<% if ((article.author != "") && (article.author != null)) { %><%- article.author %><% } else { %><%= cms.siteDetails[0].title %> Writers<% } %>) — '
+						}
+					</style>
 					<%- article.content.replaceAll('/.spaces/', vars.asset_url) %>
 				</div>
 				<br />
@@ -59,19 +72,49 @@
 		<% if (newspaper.articles.length != 0) { %>
 		<div class="content mobileOnly">
 			<% for (article of newspaper.articles) { article = cms.articles.find(a => a._id === article._id); if (article) { %>
-			<h2><%= article.title %></h2>
-			<style>.article-i .content:before { content: '(<% if ((article.author != "") && (article.author != null)) { %><%- article.author %><% } else { %><%= cms.siteDetails[0].title %> Writers<% } %>) — ' }</style>
-			<%- article.content.replaceAll('/.spaces/', vars.asset_url) %>
+			<div class="article <%= article._id %>">
+				<% if (article.images[0] != null) { %>
+				<div class="images">
+					<% for (image of article.images) { if (image._id === article.images[0]._id) { %>
+					<a class="image" href="<%- vars.asset_prefix %><%= image.path %>" data-lightbox="<%= image._id %>" <% if (image.description != "") { %> data-title="<%= image.description %>" <% } %> title="<%= image.description %>"><img src="<%- vars.asset_prefix %><%= image.path %>" /><% if (image.description != "") { %><h2><%= image.description %></h2><% } %></a>
+					<% } else { %>
+					<a class="image" style="background-image: url('<%- vars.asset_prefix %><%= image.path %>');<% if ((image.height / image.width) >= 1.25) { %> width: <%= image.width %>px;<% } %>" href="<%- vars.asset_prefix %><%= image.path %>" data-lightbox="<%= image._id %>" <% if (image.description != "") { %> data-title="<%= image.description %>" <% } %> title="<%= image.description %>"><% if (image.description != "") { %><h2><%= image.description %></h2><% } %></a>
+					<% } } %>
+				</div>
+				<% } %>
+				<h2><%= article.title %></h2>
+				<style>
+					.article-i .content .<%=article._id %>:before {
+						content: '(<% if ((article.author != "") && (article.author != null)) { %><%- article.author %><% } else { %><%= cms.siteDetails[0].title %> Writers<% } %>) — '
+					}
+				</style>
+				<%- article.content.replaceAll('/.spaces/', vars.asset_url) %>
+			</div>
 			<br />
 			<% } } %>
 		</div>
 		<% } %>
 		<% } else if (newspaper.articles.length != 0) { %>
 		<div class="content">
 			<% for (article of newspaper.articles) { article = cms.articles.find(a => a._id === article._id); if (article) { %>
-			<h2><%= article.title %></h2>
-			<style>.article-i .content:before { content: '(<% if ((article.author != "") && (article.author != null)) { %><%- article.author %><% } else { %><%= cms.siteDetails[0].title %> Writers<% } %>) — ' }</style>
-			<%- article.content.replaceAll('/.spaces/', vars.asset_url) %>
+			<div class="article <%= article._id %>">
+				<% if (article.images[0] != null) { %>
+				<div class="images">
+					<% for (image of article.images) { if (image._id === article.images[0]._id) { %>
+					<a class="image" href="<%- vars.asset_prefix %><%= image.path %>" data-lightbox="<%= image._id %>" <% if (image.description != "") { %> data-title="<%= image.description %>" <% } %> title="<%= image.description %>"><img src="<%- vars.asset_prefix %><%= image.path %>" /><% if (image.description != "") { %><h2><%= image.description %></h2><% } %></a>
+					<% } else { %>
+					<a class="image" style="background-image: url('<%- vars.asset_prefix %><%= image.path %>');<% if ((image.height / image.width) >= 1.25) { %> width: <%= image.width %>px;<% } %>" href="<%- vars.asset_prefix %><%= image.path %>" data-lightbox="<%= image._id %>" <% if (image.description != "") { %> data-title="<%= image.description %>" <% } %> title="<%= image.description %>"><% if (image.description != "") { %><h2><%= image.description %></h2><% } %></a>
+					<% } } %>
+				</div>
+				<% } %>
+				<h2><%= article.title %></h2>
+				<style>
+					.article-i .content .<%=article._id %>:before {
+						content: '(<% if ((article.author != "") && (article.author != null)) { %><%- article.author %><% } else { %><%= cms.siteDetails[0].title %> Writers<% } %>) — '
+					}
+				</style>
+				<%- article.content.replaceAll('/.spaces/', vars.asset_url) %>
+			</div>
 			<br />
 			<% } } %>
 		</div>

diff --git a/frontend/pages/search.ejs b/frontend/pages/search.ejs
@@ -62,7 +62,7 @@
 			<% }); %>
 			<% filteredArticles.sort((a, b) => new Date(b.date) - new Date(a.date)).forEach(article => { %>
 			<a class="article" href="<%- vars.domain %>/articles/<%= new Date(article.date).getFullYear() %>/<%= article.slug %>" title="Article: <%= article.title %>">
-				<img src="<% if (article.images[0] != null) { %><%- vars.asset_prefix %><%= article.images[0].path %><% } else { %> <% } %>"<% if (article.images[0].description != "") { %>alt="<%= article.images[0].description %>"<% } %> />
+				<img src="<% if (article.images[0] != null) { %><%- vars.asset_prefix %><%= article.images[0].path %>" <% if (article.images[0].description != "") { %>alt="<%= article.images[0].description %>"<% } %><% } else { %> "<% } %> />
 				<div class="inner">
 					<h3>Article: <%= article.title %></h3>
 					<% if (article.description != null) { %><h4><%= article.description.slice(0, 50) %>...</h4><% } %>

diff --git a/frontend/pages/tag.ejs b/frontend/pages/tag.ejs
@@ -28,7 +28,7 @@
 			<% if (filteredArticles.length != 0) { const articles = filteredArticles.sort((a, b) => b._created - a._created); for (let i = 0; i < articles.length; i++) { const article = articles[i]; %>
 			<a class="article<% if (i % 3 === 0) { %> left<% } else if (i === 1 || (i - 1) % 3 === 0) { %> middle<% } else if ((i - 2) % 3 === 0) { %> right<% } %>" href="<%- vars.domain %>/articles/<%= new Date(article.date).getFullYear() %>/<%= article.slug %>" title="<%= article.title %>">
 				<div class="inner">
-					<img src="<% if (article.images[0] != null) { %><%- vars.asset_prefix %><%= article.images[0].path %>" <% if (article.images[0].width < article.images[0].height) { %>style="width: min-content;" <% } } else { %> "<% } %><% if (article.images[0].description != "") { %>alt="<%= article.images[0].description %>"<% } %> />
+					<img src="<% if (article.images[0] != null) { %><%- vars.asset_prefix %><%= article.images[0].path %>" <% if (article.images[0].width < article.images[0].height) { %>style="width: min-content;" <% if (article.images[0].description != "") { %>alt="<%= article.images[0].description %>"<% } %><% } } else { %> "<% } %> />
 					<h3><%= article.title %></h3>
 					<% if (article.description != null) { %><h4><%= article.description.slice(0, 50) %>...</h4><% } %>
 					<p><% var date = new Date(article.date); if (date.isToday()) { %>Today<% } else if (ifYesterday(date)) { %>Yesterday<% } else { %><%= date.toLocaleDateString('en-US', { month: 'long', day: 'numeric', year: 'numeric' }) %><% } %><% if ((article.author != "") && (article.author != null)) { %> / <%= article.author %><% } %></p>