Compare commits
No commits in common. "main" and "blog" have entirely different histories.
4 changed files with 17 additions and 66 deletions
|
@ -48,22 +48,6 @@ const firstTen = computed<BlogCard[]>(() => {
|
||||||
return (articles.value?.slice(0, 10) ?? []).map(makeBlogCard)
|
return (articles.value?.slice(0, 10) ?? []).map(makeBlogCard)
|
||||||
})
|
})
|
||||||
|
|
||||||
const { data: externalPostsRaw } = useFetch('/api/external-posts', { method: 'POST' })
|
|
||||||
|
|
||||||
const externalPosts = computed<BlogCard[]>(() => externalPostsRaw.value?.flatMap(externalBlog => {
|
|
||||||
return externalBlog.posts.map(post => ({
|
|
||||||
title: post.title,
|
|
||||||
description: post.excerpt,
|
|
||||||
image: post.thumbnail,
|
|
||||||
date: post.date,
|
|
||||||
link: post.url,
|
|
||||||
category: 'extern',
|
|
||||||
author: externalBlog.author,
|
|
||||||
}))
|
|
||||||
}) ?? [])
|
|
||||||
|
|
||||||
const allPosts = computed<BlogCard[]>(() => [...(firstTen.value ?? []), ...(externalPosts.value ?? [])].sort((a, b) => new Date(b.date).getTime() - new Date(a.date).getTime()))
|
|
||||||
|
|
||||||
const allCategoriesAndCount = computed<Record<Category, number>>(() => {
|
const allCategoriesAndCount = computed<Record<Category, number>>(() => {
|
||||||
const categories = {} as Record<Category, number>
|
const categories = {} as Record<Category, number>
|
||||||
articles.value?.forEach(article => {
|
articles.value?.forEach(article => {
|
||||||
|
@ -72,10 +56,25 @@ const allCategoriesAndCount = computed<Record<Category, number>>(() => {
|
||||||
categories[category] = (categories[category] ?? 0) + 1
|
categories[category] = (categories[category] ?? 0) + 1
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
categories['extern'] = externalPosts.value?.length ?? 0
|
|
||||||
return categories
|
return categories
|
||||||
})
|
})
|
||||||
|
|
||||||
|
const { data: externalPostsRaw } = useFetch('/api/external-posts', { method: 'POST' })
|
||||||
|
|
||||||
|
const externalPosts = computed<BlogCard[]>(() => externalPostsRaw.value?.flatMap(externalBlog => {
|
||||||
|
return externalBlog.posts.map(post => ({
|
||||||
|
title: post.title,
|
||||||
|
description: post.excerpt,
|
||||||
|
image: post['og-image'],
|
||||||
|
date: post.date,
|
||||||
|
link: post.url,
|
||||||
|
category: 'extern',
|
||||||
|
author: externalBlog.author,
|
||||||
|
}))
|
||||||
|
}) ?? [])
|
||||||
|
|
||||||
|
const allPosts = computed<BlogCard[]>(() => [...(firstTen.value ?? []), ...(externalPosts.value ?? [])].sort((a, b) => new Date(b.date).getTime() - new Date(a.date).getTime()))
|
||||||
|
|
||||||
const makeBlogCard = (article: BlogCollectionItem): BlogCard => ({
|
const makeBlogCard = (article: BlogCollectionItem): BlogCard => ({
|
||||||
title: article.title,
|
title: article.title,
|
||||||
description: article.description,
|
description: article.description,
|
||||||
|
|
|
@ -1,47 +0,0 @@
|
||||||
version: '3'
|
|
||||||
|
|
||||||
services:
|
|
||||||
wf4:
|
|
||||||
image: oven/bun:latest
|
|
||||||
container_name: wf4
|
|
||||||
working_dir: /app
|
|
||||||
ports:
|
|
||||||
- "1337:3000"
|
|
||||||
volumes:
|
|
||||||
- wf4_data:/app
|
|
||||||
environment:
|
|
||||||
- NODE_ENV=production
|
|
||||||
command: >
|
|
||||||
sh -c "
|
|
||||||
# Install git and curl if not already installed
|
|
||||||
if ! command -v git &> /dev/null || ! command -v curl &> /dev/null; then
|
|
||||||
echo 'Installing required packages...'
|
|
||||||
apt-get update && apt-get install -y git curl
|
|
||||||
fi &&
|
|
||||||
|
|
||||||
# Clone repository if not already cloned
|
|
||||||
if [ ! -d /app/.git ]; then
|
|
||||||
echo 'Cloning repository...'
|
|
||||||
git clone https://git.webfussel.de/webfussel/wf4 /tmp/wf4 &&
|
|
||||||
cp -r /tmp/wf4/. /app/ &&
|
|
||||||
rm -rf /tmp/wf4
|
|
||||||
fi &&
|
|
||||||
|
|
||||||
# Install dependencies and start application
|
|
||||||
echo 'Installing dependencies...' &&
|
|
||||||
bun install &&
|
|
||||||
echo 'Building application...' &&
|
|
||||||
bun run build &&
|
|
||||||
echo 'Starting application...' &&
|
|
||||||
bun .output/server/index.mjs
|
|
||||||
"
|
|
||||||
restart: unless-stopped
|
|
||||||
healthcheck:
|
|
||||||
test: ["CMD", "curl", "-f", "http://localhost:1337"]
|
|
||||||
interval: 30s
|
|
||||||
timeout: 10s
|
|
||||||
retries: 3
|
|
||||||
start_period: 40s
|
|
||||||
|
|
||||||
volumes:
|
|
||||||
wf4_data:
|
|
|
@ -1 +0,0 @@
|
||||||
export default defineEventHandler((): string => 'ok' )
|
|
|
@ -3,7 +3,7 @@ export type Post = {
|
||||||
title: string
|
title: string
|
||||||
excerpt: string
|
excerpt: string
|
||||||
date: string
|
date: string
|
||||||
thumbnail: string
|
'og-image': string
|
||||||
}
|
}
|
||||||
|
|
||||||
type Author = {
|
type Author = {
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue