Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

article-nav #125

Merged
merged 8 commits into from
Jan 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
78 changes: 78 additions & 0 deletions cigaradvisor/blocks/article-navigation/article-navigation.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
.article-navigation.block {
display: flex;
flex-wrap: wrap;
margin: 30px auto 0;
justify-content: space-between;
max-width: 1080px;
align-items: stretch;
}

.article-navigation.block>div {
padding: 10px;
width: 100%;
}

.article-navigation.block a {
background-color: var(--transparent-tan);
padding: 20px 40px;
border: 1px solid var(--tan);
display: block;
width: 100%;
height: 100%;
}

.article-navigation.block h3 {
margin: 18px 0;
line-height: 35px;
font-size: var(--body-font-size-l);
font-weight: var(--font-weight-bold);
font-family: montserrat, sans-serif;
}

.article-navigation.block span {
line-height: 35px;
font-size: var(--body-font-size-l);
font-weight: var(--font-weight-bold);
font-family: montserrat, sans-serif;
display: inline-block;
color: var(--tan);
}

.article-navigation.block .previous-article-nav a {
text-align: center;
}

.article-navigation.block .next-article-nav a {
text-align: center;
}

.article-navigation.block .previous-article-nav h3::before {
content: '';
font-family: var(--ff-fontawesome);
margin-right: 10px;
font-size: var(--body-font-size-s);
;
}

.article-navigation.block .next-article-nav h3::after {
content: '';
font-family: var(--ff-fontawesome);
margin-left: 10px;
font-size: var(--body-font-size-s);
}


@media screen and (min-width: 600px) {
.article-navigation.block>div {
width: 50%;
padding: 10px 10px 10px 0;
}

.article-navigation.block .previous-article-nav a {
text-align: left;
}

.article-navigation.block .next-article-nav a {
text-align: right;
}
}
32 changes: 32 additions & 0 deletions cigaradvisor/blocks/article-navigation/article-navigation.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
import { loadPosts } from '../../scripts/scripts.js';

export default async function decorate(block) {
const allArticles = await loadPosts();
let previousArticle;
let nextArticle;
const currentArticle = window.location.href;
allArticles.forEach((article, index) => {
if (currentArticle.indexOf(article.path) > -1) {
previousArticle = allArticles[index + 1];
nextArticle = allArticles[index - 1];
}
});
const previousArticleNav = document.createElement('div');
previousArticleNav.classList.add('previous-article-nav');
const nextArticleNav = document.createElement('div');
nextArticleNav.classList.add('next-article-nav');

if (previousArticle) {
previousArticleNav.innerHTML = `<a href="${previousArticle.path}" rel="prev">
<h3>Previous Post</h3>
<span>${previousArticle.heading}</span></a>`;
}
if (nextArticle) {
nextArticleNav.innerHTML = `<a href="${nextArticle.path}" rel="next">
<h3>Next Post</h3>
<span>${nextArticle.heading}</span></a>`;
}

block.replaceChildren(previousArticleNav);
block.append(nextArticleNav);
}
1 change: 1 addition & 0 deletions cigaradvisor/blocks/author-teaser/author-teaser.css
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@
}

.author-teaser.block .author-details ul {
list-style-type: none;
display: flex;
margin: 10px 30px;

Expand Down
1 change: 1 addition & 0 deletions cigaradvisor/blocks/author-teaser/author-teaser.js
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ export default async function decorate(block) {
const link = block.querySelector('a');
const path = link ? link.getAttribute('href') : block.textContent.trim();
const author = await fetchAuthorInfo(path);
block.innerHTML = '';
if (author) {
buildAuthorTeaser(block, author);
}
Expand Down
13 changes: 7 additions & 6 deletions cigaradvisor/scripts/scripts.js
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ export function getRelativePath(path) {
}

let articleIndexData;
async function loadPosts() {
export async function loadPosts() {
if (!articleIndexData) {
const resp = await fetch(ARTICLE_INDEX_PATH);
let jsonData = '';
Expand All @@ -201,6 +201,7 @@ async function loadPosts() {
}
articleIndexData = jsonData.data;
}
return articleIndexData;
}

/**
Expand All @@ -212,8 +213,8 @@ async function loadPosts() {
export async function fetchPostsInfo(filterValue, filterParam = 'path') {
let filter = filterValue;
filter = getRelativePath(filterValue);
await loadPosts();
return articleIndexData.filter((obj) => obj[filterParam] === filter);
const articles = await loadPosts();
return articles.filter((obj) => obj[filterParam] === filter);
}

/**
Expand All @@ -222,9 +223,9 @@ export async function fetchPostsInfo(filterValue, filterParam = 'path') {
* @return {Promise<void>}
*/
export async function getPostByIdx(idx) {
await loadPosts();
if (articleIndexData.length >= idx) {
return articleIndexData[idx - 1];
const articles = await loadPosts();
if (articles.length >= idx) {
return articles[idx - 1];
}
return undefined;
}
Expand Down
1 change: 1 addition & 0 deletions cigaradvisor/styles/styles.css
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
--clr-dark-gray: #141414;
--clr-white: #fff;
--tan: #8e7b5c;
--transparent-tan: #8E7B5C33;
--subdued-gold: #b19b5e;
--silver: #ccc;
--very-light-grey: #ddd;
Expand Down