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.

Sign up for GitHub

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

fix(articles): broken main image #22

Merged
merged 3 commits into from
Oct 7, 2024
Merged

fix(articles): broken main image #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0f06004
fix(articles): broken main image
pr0xity Oct 7, 2024
3801476
fix(article): removed unused import
pr0xity Oct 7, 2024
306b037
update image size
pr0xity Oct 7, 2024
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
7 changes: 3 additions & 4 deletions src/components/NewsComp.astro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,21 +29,20 @@ const articles = await fetchArticles({
<h3 class="text-xl text-white font-bold mt-2">{article.title}</h3>
<time
datetime={article.meta.first_published_at}
class="text-sm text-gray-500"
>
class="text-sm text-gray-500">
{new Date(article.meta.first_published_at).toLocaleDateString(
"en-US",
{
year: "numeric",
month: "long",
day: "numeric",
},
}
)}
</time>
</div>
{article.main_image && (
<img
src={article.main_image.full_url}
src={article.main_image.sizes.thumbnail.url}
alt={article.main_image.alt}
class="w-24 h-24 object-cover ml-2 rounded-lg"
/>
Expand Down
7 changes: 3 additions & 4 deletions src/components/sections/NewsComp.astro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,9 @@ const articles = await fetchArticles({
</h3>
<time
datetime={article.meta.first_published_at}
class="text-sm text-gray-500"
>
class="text-sm text-gray-500">
{new Date(
article.meta.first_published_at,
article.meta.first_published_at
).toLocaleDateString("en-US", {
year: "numeric",
month: "long",
Expand All @@ -61,7 +60,7 @@ const articles = await fetchArticles({
</div>
{article.main_image && (
<img
src={article.main_image.full_url}
src={article.main_image.sizes.thumbnail.url}
alt={article.main_image.alt}
class="w-24 h-24 object-cover ml-2 rounded-lg"
/>
Expand Down
10 changes: 4 additions & 6 deletions src/pages/news/[slug].astro
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
---
import type { Article } from "../../utils";

import H1 from "../../components/H1.astro";
import Main from "../../components/Main.astro";
import Layout from "../../layouts/Layout.astro";
Expand Down Expand Up @@ -33,7 +31,7 @@ const processEmbedTags = (html: string) => {
/<embed[^>]+embedtype="image"[^>]+id="(\d+)"[^>]+alt="([^"]+)"[^>]*>/g,
(match, id, alt) => {
return `<img src="${imageBaseUrl}${id}" alt="${alt}"/>`;
},
}
);
};

Expand Down Expand Up @@ -62,8 +60,7 @@ const finishedHtml = processEmbedTags(article.body);
<!-- Publish Date -->
<time
datetime={article.meta.first_published_at}
class="text-sm text-gray-500 mb-2 block"
>
class="text-sm text-gray-500 mb-2 block">
{new Date(article.meta.first_published_at).toLocaleDateString()}
</time>
<!-- Author -->
Expand All @@ -83,7 +80,8 @@ const finishedHtml = processEmbedTags(article.body);
{
article.main_image && (
<img
src={article.main_image.full_url}
src={article.main_image.sizes.large.url}
srcset={`${article.main_image.sizes.large.url} 500w, ${article.main_image.sizes.extra_large.url} 1000w`}
alt={article.main_image.alt}
class="w-auto h-auto mb-4"
/>
Expand Down
147 changes: 86 additions & 61 deletions src/utils/articles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,88 +1,113 @@
export interface Article {
id: number;
meta: {
type: string;
detail_url: string;
html_url: string;
slug: string;
first_published_at: string;
};
title: string;
intro: string;
body: string;
contributors: Array<{
id: number;
meta: {
type: string;
detail_url: string;
html_url: string;
slug: string;
first_published_at: string;
};
name: string;
contribution_type: string;
image?: string;
}>;
tags: Array<{
id: number;
name: string;
slug: string;
}>;
main_image?: {
title: string;
intro: string;
body: string;
contributors: Array<{
id: number;
name: string;
contribution_type: string;
image?: string;
}>;
tags: Array<{
id: number;
name: string;
slug: string;
}>;
main_image?: {
alt: string;
url: string;
sizes: {
thumbnail: {
url: string;
width: number;
height: number;
};
small: {
url: string;
width: number;
height: number;
};
medium: {
url: string;
full_url: string;
width: number;
height: number;
alt: string;
};
large: {
url: string;
width: number;
height: number;
};
extra_large: {
url: string;
width: number;
height: number;
};
};
};
}

export interface FetchArticlesProps {
api_url: string;
limit?: number;
offset?: number;
tags?: string[];
api_url: string;
limit?: number;
offset?: number;
tags?: string[];
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could very well be on my side, but let's double check if prettier is being used (in theory we should see no diffs like this between prs from different contributors)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We might need set some more config in the projects prettier file 😅

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like it might be on my end in this case, if forcing prettier to run it seems to output this format. But that it doesn't trigger automatically does seem to indicate we might need more/better config 😄

}

export const fetchArticles = async ({
api_url,
tags = [],
limit = 6,
offset = 0,
api_url,
tags = [],
limit = 6,
offset = 0,
}: FetchArticlesProps): Promise<Article[]> => {
const url = new URL(`${api_url}api/v2/news/`);
url.searchParams.set("fields", "title,tags,first_published_at,main_image");
url.searchParams.set("limit", limit.toString(10));
url.searchParams.set("offset", offset.toString(10));
const url = new URL(`${api_url}api/v2/news/`);
url.searchParams.set("fields", "title,tags,first_published_at,main_image");
url.searchParams.set("limit", limit.toString(10));
url.searchParams.set("offset", offset.toString(10));

if (tags?.length) {
url.searchParams.set("tags", tags.join(","));
}
if (tags?.length) {
url.searchParams.set("tags", tags.join(","));
}

const response = await fetch(url.toString());
const data = await response.json();
const articles: Article[] = data.items;
return articles;
const response = await fetch(url.toString());
const data = await response.json();
const articles: Article[] = data.items;
return articles;
};

export const fetchArticleIdBySlug = async ({
slug,
api_url,
slug,
api_url,
}: {
slug: string;
api_url: string;
slug: string;
api_url: string;
}): Promise<number | null> => {
const response = await fetch(`${api_url}api/v2/news/?&slug=${slug}`);
const data = await response.json();
const articles: Article[] = data.items;
if (articles.length > 0) {
return articles[0].id;
} else {
return null;
}
const response = await fetch(`${api_url}api/v2/news/?&slug=${slug}`);
const data = await response.json();
const articles: Article[] = data.items;
if (articles.length > 0) {
return articles[0].id;
} else {
return null;
}
};

export const fetchArticleById = async ({
id,
api_url,
id,
api_url,
}: {
id: number;
api_url: string;
id: number;
api_url: string;
}): Promise<Article> => {
const response = await fetch(`${api_url}api/v2/news/${id}/`);
const data = await response.json();
return data;
const response = await fetch(`${api_url}api/v2/news/${id}/`);
const data = await response.json();
return data;
};