add link to blog and update CI

VovaStelmashchuk · VovaStelmashchuk · commit 56a06a2c4f7d · 2026-02-08T14:50:06.000+02:00
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -6,24 +6,44 @@ on:
             - "main"
 
 env:
+    ENV_KEYS: >-
+        MONGO_URI
+        DISCORD_CLIENT_ID
+        DISCORD_CLIENT_SECRET
+        DISCORD_BOT_TOKEN
+        DISCORD_GUILD_MEMBER_ROLE_ID
+        DISCORD_GUILD_ID
+        JWT_SECRET
+        SPACE_ELECTRICITY_TRACKER_SLUG
+
+    # Application environment variables
+    GIT_COMMIT_SHA: ${{ github.sha }}
+    MONGO_URI: ${{ secrets.MONGO_URI }}
+    DISCORD_CLIENT_ID: ${{ vars.DISCORD_CLIENT_ID }}
+    DISCORD_CLIENT_SECRET: ${{ secrets.DISCORD_CLIENT_SECRET }}
+    DISCORD_BOT_TOKEN: ${{ secrets.DISCORD_BOT_TOKEN }}
+    DISCORD_GUILD_MEMBER_ROLE_ID: ${{ vars.DISCORD_GUILD_MEMBER_ROLE_ID }}
+    DISCORD_GUILD_ID: ${{ vars.DISCORD_GUILD_ID }}
+    JWT_SECRET: ${{ secrets.JWT_SECRET }}
+    SPACE_ELECTRICITY_TRACKER_SLUG: ${{ vars.SPACE_ELECTRICITY_TRACKER_SLUG }}
+    
+    # Docker image configuration
+    IMAGE_NAME: nu31hackerspace/space
+    DOCKER_STACK_NAME: nu31space
     REGISTRY: ghcr.io
-    DOCKER_STACKE_NAME: nu31space
+    
+    # Deployment configuration
     DEPLOY_USER: deploy
-    HOST: 167.235.52.168
+    HOST: ${{ vars.HOST }}
+    DEPLOY_SSH_PRIVATE_KEY: ${{ secrets.DEPLOY_SSH_PRIVATE_KEY }}
 
 jobs:
     build-and-push-image:
-        strategy:
-            matrix:
-                include:
-                    - name: space
-                      context: .
-                      image: space
-
         runs-on: ubuntu-latest
         permissions:
             contents: read
             packages: write
+            attestations: write
             id-token: write
 
         steps:
@@ -39,16 +59,16 @@ jobs:
                   username: ${{ github.actor }}
                   password: ${{ secrets.GITHUB_TOKEN }}
 
-            - name: Build and push main app image
+            - name: Build and push Docker image
               uses: docker/build-push-action@v6
               with:
-                  context: ${{ matrix.context }}
+                  context: .
                   push: true
                   tags: |
-                      ${{ env.REGISTRY }}/nu31hackerspace/${{ matrix.image }}:latest
-                      ${{ env.REGISTRY }}/nu31hackerspace/${{ matrix.image }}:${{ github.sha }}
+                      ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest
+                      ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ github.sha }}
                   build-args: |
-                      GIT_COMMIT_SHA=${{ github.sha }}
+                      GIT_COMMIT_SHA=${{ env.GIT_COMMIT_SHA }}
 
     deploy:
         runs-on: ubuntu-latest
@@ -58,24 +78,25 @@ jobs:
             - name: Checkout repository
               uses: actions/checkout@v4
 
-            - name: Create env file
+            - name: Create .env file for Docker Stack
               run: |
-                  echo "GIT_COMMIT_HASH='${{ github.sha }}'" >> ./envfile
-                  echo "MONGO_URI='${{ secrets.MONGO_URI }}'" >> ./envfile
-                  echo "DISCORD_CLIENT_ID='${{ vars.DISCORD_CLIENT_ID }}'" >> ./envfile
-                  echo "DISCORD_CLIENT_SECRET='${{ secrets.DISCORD_CLIENT_SECRET }}'" >> ./envfile
-                  echo "DISCORD_BOT_TOKEN='${{ secrets.DISCORD_BOT_TOKEN }}'" >> ./envfile
-                  echo "DISCORD_GUILD_MEMBER_ROLE_ID='${{ vars.DISCORD_GUILD_MEMBER_ROLE_ID }}'" >> ./envfile
-                  echo "DISCORD_GUILD_ID='${{ vars.DISCORD_GUILD_ID }}'" >> ./envfile
-                  echo "JWT_SECRET='${{ secrets.JWT_SECRET }}'" >> ./envfile
-                  echo "SPACE_ELECTRICITY_TRACKER_SLUG='${{ vars.SPACE_ELECTRICITY_TRACKER_SLUG }}'" >> ./envfile
+                  echo "IMAGE_NAME='$IMAGE_NAME'" >> .env
+                  echo "GIT_COMMIT_SHA='$GIT_COMMIT_SHA'" >> .env
+                  for key in $ENV_KEYS; do
+                      echo "$key='${!key}'" >> .env
+                  done
 
             - name: Docker Stack Deploy
               uses: cssnr/stack-deploy-action@v1
               with:
-                  name: ${{ env.DOCKER_STACKE_NAME }}
+                  name: ${{ env.DOCKER_STACK_NAME }}
                   file: docker-stack.yml
                   host: ${{ env.HOST }}
+                  port: 22
                   user: ${{ env.DEPLOY_USER }}
-                  ssh_key: ${{ secrets.DEPLOY_SSH_PRIVATE_KEY }}
-                  env_file: ./envfile
+                  ssh_key: ${{ env.DEPLOY_SSH_PRIVATE_KEY }}
+                  env_file: .env
+                  detach: false
+                  prune: true
+                  resolve_image: 'always'
+                  summary: true
diff --git a/app/components/Header.vue b/app/components/Header.vue
@@ -7,6 +7,11 @@
                 </NuxtLink>
                 <MainBadge v-if="!isLoading && status" :variant="badgeVariant" :label="badgeLabel" />
             </div>
+            <nav class="flex items-center space-x-6">
+                <NuxtLink to="/blog" class="text-label-primary hover:text-accent-primary transition-colors font-medium">
+                    Блог
+                </NuxtLink>
+            </nav>
             <div class="flex items-center space-x-4">
                 <NuxtLink v-if="isLoggedIn && avatarUrl" to="/profile"
                     class="flex items-center space-x-3 hover:opacity-80 transition-opacity">
diff --git a/app/pages/blog/index.vue b/app/pages/blog/index.vue
@@ -0,0 +1,64 @@
+<template>
+    <div class="min-h-screen bg-background-primary">
+        <div class="container mx-auto px-4 py-8 max-w-5xl">
+            <h1 class="text-3xl font-bold text-accent-primary mb-8">Блог</h1>
+
+            <div v-if="pending" class="text-center py-12">
+                <p class="text-label-secondary">Завантаження статей...</p>
+            </div>
+
+            <div v-else-if="error" class="text-center py-12">
+                <p class="text-red-500">Помилка завантаження: {{ error.message }}</p>
+            </div>
+
+            <div v-else-if="articles && articles.items.length > 0"
+                class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-6">
+                <NuxtLink v-for="article in articles.items" :key="article.slug" :to="`/blog/${article.slug}`"
+                    class="group bg-fill-secondary border border-separator-primary rounded-xl p-6 hover:border-accent-primary transition-colors">
+                    <h2 class="text-xl font-semibold text-accent-primary group-hover:underline mb-3">
+                        {{ article.title }}
+                    </h2>
+                    <p class="text-sm text-label-tertiary">
+                        {{ formatDate(article.createdAt) }}
+                    </p>
+                </NuxtLink>
+            </div>
+
+            <div v-else class="text-center py-12">
+                <p class="text-label-secondary">Статей поки немає</p>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script setup lang="ts">
+import { definePageMeta, useFetch } from '#imports'
+
+definePageMeta({
+    layout: 'default',
+})
+
+interface ArticleListItem {
+    slug: string
+    title: string
+    createdAt: string
+    updatedAt: string
+}
+
+interface ArticlesResponse {
+    items: ArticleListItem[]
+    page: number
+    pageSize: number
+    total: number
+}
+
+const { data: articles, pending, error } = await useFetch<ArticlesResponse>('/api/content')
+
+function formatDate(dateString: string): string {
+    return new Date(dateString).toLocaleDateString('uk-UA', {
+        year: 'numeric',
+        month: 'long',
+        day: 'numeric',
+    })
+}
+</script>
diff --git a/app/pages/index.vue b/app/pages/index.vue
@@ -5,6 +5,9 @@
                 <MainBadge v-if="!electricityLoading && electricityStatus" :variant="electricityBadgeVariant"
                     :label="electricityBadgeLabel" class="w-full sm:w-auto mb-4 sm:mb-0" />
             </div>
+            <NuxtLink to="/blog" class="text-label-primary hover:text-accent-primary transition-colors font-medium">
+                Блог
+            </NuxtLink>
             <div class="flex w-full sm:w-auto items-center justify-end gap-4 flex-row">
                 <MainButton buttonStyle="primary" size="M" icon="ic:baseline-discord" label="Вхід для резедентів"
                     :link="data?.redirectUri" class="w-full sm:w-auto" />
diff --git a/server/api/content/index.get.ts b/server/api/content/index.get.ts
@@ -0,0 +1,25 @@
+import { defineEventHandler, getQuery, useNitroApp } from '#imports'
+
+export default defineEventHandler(async (event) => {
+    const { page = '1', pageSize = '20' } = getQuery(event) as Record<string, string>
+    const p = Math.max(parseInt(page, 10) || 1, 1)
+    const ps = Math.min(Math.max(parseInt(pageSize, 10) || 20, 1), 100)
+
+    const db = useNitroApp().db
+    const cursor = db
+        .collection('blogPosts')
+        .find(
+            { status: 'published' },
+            { projection: { _id: 0, slug: 1, title: 1, createdAt: 1, updatedAt: 1 } }
+        )
+        .sort({ createdAt: -1 })
+        .skip((p - 1) * ps)
+        .limit(ps)
+
+    const [items, total] = await Promise.all([
+        cursor.toArray(),
+        db.collection('blogPosts').countDocuments({ status: 'published' }),
+    ])
+
+    return { items, page: p, pageSize: ps, total }
+})
