- - + + {formattedDate} @@ -40,7 +40,7 @@ export default function PostCard({ post, featured = false }: PostCardProps) { + } font-logo text-carbon-950 dark:text-carbon-100 group-hover:text-carbon-700 dark:group-hover:text-mulberry-200 transition-colors mb-chorus-lg`}> {post.title} diff --git a/dev-start.sh b/dev-start.sh index 0175e7e..22b04b8 100755 --- a/dev-start.sh +++ b/dev-start.sh @@ -20,8 +20,8 @@ if [ ! -d "node_modules" ]; then fi # Start the development server -echo "🚀 Starting Next.js development server on port 3002..." -echo "📝 Blog will be available at: http://localhost:3002" +echo "🚀 Starting Next.js development server on port 3025..." +echo "📝 Blog will be available at: http://localhost:3025" echo "🌍 Production URL will be: https://blog.chorus.services" echo "" echo "Press Ctrl+C to stop the server" diff --git a/docker-compose.yml b/docker-compose.yml index 246bbe3..8c728a4 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,33 +2,38 @@ version: '3.8' services: chorus-blog: - build: - context: . - dockerfile: Dockerfile + image: registry.home.deepblack.cloud/tony/chorus-blog:latest ports: - - "3002:3000" + - "3025:3025" environment: - NODE_ENV=production - NEXT_TELEMETRY_DISABLED=1 volumes: - - ./posts:/app/posts:ro - - ./scheduled:/app/scheduled:ro + - /rust/containers/PING/content/posts:/app/content/posts:ro + - /rust/containers/PING/content/scheduled:/app/content/scheduled:ro - blog_logs:/app/.next/cache - labels: - - "traefik.enable=true" - - "traefik.docker.network=tengig" - - "traefik.http.routers.chorus-blog.rule=Host(`blog.chorus.services`)" - - "traefik.http.routers.chorus-blog.entrypoints=web-secured" - - "traefik.http.routers.chorus-blog.tls.certresolver=letsencryptresolver" - - "traefik.http.services.chorus-blog.loadbalancer.server.port=3000" - - "traefik.http.services.chorus-blog.loadbalancer.passhostheader=true" + deploy: + labels: + - "traefik.enable=true" + - "traefik.docker.network=tengig" + - "traefik.http.routers.chorus-blog.rule=Host(`blog.chorus.services`)" + - "traefik.http.routers.chorus-blog.entrypoints=web-secured" + - "traefik.http.routers.chorus-blog.tls.certresolver=letsencryptresolver" + - "traefik.http.services.chorus-blog.loadbalancer.server.port=3025" + - "traefik.http.services.chorus-blog.loadbalancer.passhostheader=true" + placement: + constraints: + - node.hostname == walnut + networks: - tengig - restart: unless-stopped + - blog volumes: blog_logs: networks: tengig: - external: true \ No newline at end of file + external: true + blog: + driver: overlay diff --git a/lib/blog.ts b/lib/blog.ts index 9125f4b..57d8d33 100644 --- a/lib/blog.ts +++ b/lib/blog.ts @@ -4,82 +4,116 @@ import matter from 'gray-matter' import { BlogPost, BlogMeta } from '@/types/blog' const postsDirectory = path.join(process.cwd(), 'content/posts') +const scheduledDirectory = path.join(process.cwd(), 'content/scheduled') + +// Helper function to check if a post should be published +function shouldPublishPost(post: BlogMeta): boolean { + // If no publishDate is set, use the date field + const publishDate = post.publishDate || post.date + if (!publishDate) return true + + // Don't publish draft posts + if (post.draft === true) return false + + // Check if publish date has passed + const publishDateTime = new Date(publishDate) + const now = new Date() + + return publishDateTime <= now +} + +// Helper function to recursively read markdown files from a directory +function readMarkdownFiles(directory: string, basePath: string = ''): BlogPost[] { + if (!fs.existsSync(directory)) { + return [] + } + + const items = fs.readdirSync(directory) + const posts: BlogPost[] = [] + + items.forEach((item) => { + const fullPath = path.join(directory, item) + const stat = fs.statSync(fullPath) + + if (stat.isDirectory()) { + // Recursively read subdirectories + const subPosts = readMarkdownFiles(fullPath, path.join(basePath, item)) + posts.push(...subPosts) + } else if (item.endsWith('.md')) { + try { + // Read markdown file as string + const fileContents = fs.readFileSync(fullPath, 'utf8') + + // Use gray-matter to parse the post metadata section + const matterResult = matter(fileContents) + const meta = matterResult.data as BlogMeta + + // Create slug from filename (remove .md extension) + const slug = item.replace(/\.md$/, '') + + // Calculate reading time (average 200 words per minute) + const wordCount = matterResult.content.split(/\s+/).length + const readingTime = Math.ceil(wordCount / 200) + + const post: BlogPost = { + slug, + content: matterResult.content, + readingTime, + ...meta, + } + + posts.push(post) + } catch (error) { + console.error(`Error reading markdown file ${fullPath}:`, error) + } + } + }) + + return posts +} export function getSortedPostsData(): BlogPost[] { - // Get file names under /content/posts - const fileNames = fs.readdirSync(postsDirectory) - const allPostsData = fileNames - .filter((fileName) => fileName.endsWith('.md')) - .map((fileName) => { - // Remove ".md" from file name to get id - const slug = fileName.replace(/\.md$/, '') - - // Read markdown file as string - const fullPath = path.join(postsDirectory, fileName) - const fileContents = fs.readFileSync(fullPath, 'utf8') - - // Use gray-matter to parse the post metadata section - const matterResult = matter(fileContents) - const meta = matterResult.data as BlogMeta - - // Calculate reading time (average 200 words per minute) - const wordCount = matterResult.content.split(/\s+/).length - const readingTime = Math.ceil(wordCount / 200) - - return { - slug, - content: matterResult.content, - readingTime, - ...meta, - } as BlogPost - }) - - // Sort posts by date - return allPostsData.sort((a, b) => { - if (a.date < b.date) { - return 1 - } else { - return -1 - } + // Read posts from both published and scheduled directories + const publishedPosts = readMarkdownFiles(postsDirectory) + const scheduledPosts = readMarkdownFiles(scheduledDirectory) + + // Combine all posts + const allPosts = [...publishedPosts, ...scheduledPosts] + + // Filter posts that should be published + const publishablePosts = allPosts.filter(post => shouldPublishPost(post)) + + // Sort posts by date (newest first) + return publishablePosts.sort((a, b) => { + const dateA = new Date(a.date) + const dateB = new Date(b.date) + return dateB.getTime() - dateA.getTime() }) } export function getAllPostSlugs() { - const fileNames = fs.readdirSync(postsDirectory) - return fileNames - .filter((fileName) => fileName.endsWith('.md')) - .map((fileName) => { - return { - params: { - slug: fileName.replace(/\.md$/, ''), - }, - } - }) + // Get all publishable posts and extract their slugs + const posts = getSortedPostsData() + return posts.map((post) => { + return { + params: { + slug: post.slug, + }, + } + }) } export function getPostData(slug: string): BlogPost | null { - try { - const fullPath = path.join(postsDirectory, `${slug}.md`) - const fileContents = fs.readFileSync(fullPath, 'utf8') - - // Use gray-matter to parse the post metadata section - const matterResult = matter(fileContents) - const meta = matterResult.data as BlogMeta - - // Calculate reading time (average 200 words per minute) - const wordCount = matterResult.content.split(/\s+/).length - const readingTime = Math.ceil(wordCount / 200) - - return { - slug, - content: matterResult.content, - readingTime, - ...meta, - } as BlogPost - } catch (error) { - console.error(`Error reading post ${slug}:`, error) + // Find the post in our sorted posts data + const posts = getSortedPostsData() + const post = posts.find(p => p.slug === slug) + + if (!post) { + console.error(`Post with slug '${slug}' not found or not yet publishable`) return null } + + return post } export function getFeaturedPosts(): BlogPost[] { diff --git a/package.json b/package.json index 0be3a56..fc325de 100644 --- a/package.json +++ b/package.json @@ -1,16 +1,16 @@ { "name": "chorus-ping", - "version": "1.0.0", + "version": "1.0.1", "description": "CHORUS PING! - Static blog posts using Next.js", "private": true, "scripts": { - "dev": "next dev -p 3002", + "dev": "next dev -p 3024", "build": "next build", - "start": "next start -p 3002", + "start": "next start -p 3025", "lint": "next lint", "type-check": "tsc --noEmit", "docker:build": "docker build -t chorus-blog .", - "docker:run": "docker run -p 3002:3000 chorus-blog", + "docker:run": "docker run -p 3025:3025 chorus-blog", "docker:compose": "docker-compose up -d" }, "dependencies": { diff --git a/types/blog.ts b/types/blog.ts index c7b48c6..3962cca 100644 --- a/types/blog.ts +++ b/types/blog.ts @@ -4,6 +4,8 @@ export interface BlogPost { description: string content: string date: string + publishDate?: string + draft?: boolean author: { name: string avatar?: string @@ -19,6 +21,8 @@ export interface BlogMeta { title: string description: string date: string + publishDate?: string + draft?: boolean author: { name: string avatar?: string