love you corban

thegazelle-ad · Sep 22, 2024 · 967af3a · 967af3a
1 parent 436346f
commit 967af3a
Show file tree

Hide file tree

Showing 3 changed files with 2,132 additions and 647 deletions.
diff --git a/app/archives/page.tsx b/app/archives/page.tsx
@@ -3,6 +3,7 @@ export const runtime = 'nodejs';
 export const preferredRegion = 'fra1';
 export const dynamic = 'error';
 
+import Image from "next/image";
 import Link from "next/link";
 import { format, parse } from "date-fns";
 import { Metadata } from "next";
@@ -15,6 +16,7 @@ import {
   DATABASE_DATE_FORMAT,
   ARTICLE_DATE_FORMAT,
   DEFAULT_ISSUE_DATE,
+  ARTICLE_DEFAULT_IMAGE,
 } from '../../env';
 
 export const metadata: Metadata = {
@@ -30,6 +32,16 @@ const IssueCard = ({ issue }: { issue: IssueArchive }) => {
   return (
     <div className="flex flex-col justify-center w-[300px] m-4 text-center group hover:text-sky-600">
       <Link href={`/issue/${issue.issueNumber}`}>
+        <Image
+          priority={true}
+          src={issue.imageUrl || ARTICLE_DEFAULT_IMAGE}
+          // fill
+          width={300}
+          height={300}
+          alt={issue.imageUrl}
+          className="aspect-[16/9] object-cover"
+          sizes="(max-width: 768px) 100vw, (max-width: 1200px) 50vw, 33vw"
+        />
         <h1 className="font-normal text-2xl mt-1">
           {issue.issueName}
         </h1>
@@ -46,6 +58,7 @@ const IssueCard = ({ issue }: { issue: IssueArchive }) => {
 
 export default async function Page() {    
   const issues = await getIssueArchive();
+
 
   return (
     <div className="flex flex-col items-center justify-center">

diff --git a/db/queries/issues.ts b/db/queries/issues.ts
@@ -3,22 +3,26 @@ import {
     Issues,
     Categories,
     IssuesCategoriesOrder,
+    IssuesArticlesOrder,
     wrapCache,
+    Articles,
 } from '../common';
 
-import { eq, isNotNull, desc } from 'drizzle-orm/expressions';
+import { eq, isNotNull, and, desc } from 'drizzle-orm/expressions';
 
 type Issue = {
     id: number;
     issueNumber: number;
     issueName: string;
     publishedAt: string | null;
+    imageUrl: string;
 }
 
 export type IssueArchive = {
     issueNumber: number;
     issueName: string;
     publishedAt: string | null; 
+    imageUrl: string;
 }
 // NOTE - Caching is per request
 export const getLatestPublishedIssue = wrapCache(async () => {
@@ -89,9 +93,17 @@ export const getIssueArchive = wrapCache(async () => {
         issueNumber: Issues.issueNumber,
         issueName: Issues.name,
         publishedAt: Issues.published_at,
+        imageUrl: Articles.imageUrl
     })
         .from(Issues)
-        .where(isNotNull(Issues.published_at))
+        .innerJoin(IssuesArticlesOrder, eq(IssuesArticlesOrder.issueId, Issues.id) )
+        .innerJoin(Articles, eq(Articles.id, IssuesArticlesOrder.articleId))
+        .where(
+            and(
+                eq(IssuesArticlesOrder.type, 1),
+                isNotNull(Issues.published_at)
+            )
+        )
         .orderBy(desc(Issues.id));
 
     return issues;