Merge pull request #113 from bsospace/develop

Develop

Author: boytur

Jenkinsfile

@@ -31,7 +31,7 @@ pipeline {
                         default:
                             env.ENVIRONMENT = 'other'
                             env.DOCKER_COMPOSE_FILE = ''
-                            echo "Branch ${branchName} is not supported. Skipping deployment."
+                            env.ENV_FILE_CREDENTIAL = 'blog-dev-env-file'
                     }
 
                     echo "Environment: ${env.ENVIRONMENT}"
@@ -41,9 +41,6 @@ pipeline {
         }
 
         stage('Setup .env') {
-            when {
-                expression { env.ENVIRONMENT != 'other' }
-            }
             steps {
                 script {
                     withCredentials([file(credentialsId: env.ENV_FILE_CREDENTIAL, variable: 'SECRET_ENV_FILE')]) {
@@ -75,6 +72,14 @@ pipeline {
             }
         }
 
+        stage('Maual Build') {
+            steps {
+                script {
+                    sh 'npm run build'
+                }
+            }
+        }
+
         stage('Run Tests') {
             steps {
                 script {

app/api/posts/edit/[id]/route.ts

@@ -3,20 +3,17 @@ import prisma from "@/prisma/client";
 import { slugify } from "@/app/utils/slugify";
 import { v4 as uuidv4 } from "uuid";
 import { S3Client, PutObjectCommand } from "@aws-sdk/client-s3";
+import envConfig from "@/app/configs/envConfig";
 
-// Cloudflare R2 settings
-const R2_BUCKET_NAME = process.env.R2_BUCKET_NAME;
-const R2_ACCESS_KEY = process.env.R2_ACCESS_KEY;
-const R2_SECRET_KEY = process.env.R2_SECRET_KEY;
-const R2_ACCOUNT_ID = process.env.R2_ACCOUNT_ID;
-const R2_ENDPOINT = `https://${R2_ACCOUNT_ID}.r2.cloudflarestorage.com`;
+
+const R2_ENDPOINT = `https://${envConfig.cloudflareR2AccessId}.r2.cloudflarestorage.com`;
 
 const s3Client = new S3Client({
   region: "auto",
   endpoint: R2_ENDPOINT,
   credentials: {
-    accessKeyId: R2_ACCESS_KEY!,
-    secretAccessKey: R2_SECRET_KEY!,
+    accessKeyId: envConfig.cloudflareR2AccessKey,
+    secretAccessKey: envConfig.cloudflareR2SecretKey,
   },
 });
 
@@ -32,16 +29,6 @@ async function uploadImagesFromContent(content: string): Promise<string> {
 
     // If it's not an external URL (e.g., https://), consider it a blob
     const isExternalUrl = imgSrc.startsWith("https://");
-    const oldBucketUrl = imgSrc.startsWith("https://bso-image.posyayee.shop/");
-
-    if (oldBucketUrl) {
-      const newImageUrl = imgSrc.replace(
-        "https://bso-image.posyayee.shop/",
-        `https://assets.bsospace.com/`
-      );
-
-      content = content.replace(imgSrc, newImageUrl);
-    }
 
     if (!isExternalUrl) {
       // Separate the image type and base64 data
@@ -59,15 +46,15 @@ async function uploadImagesFromContent(content: string): Promise<string> {
       // Upload image to Cloudflare R2
       const uploadPromise = s3Client.send(
         new PutObjectCommand({
-          Bucket: R2_BUCKET_NAME,
+          Bucket: envConfig.cloudflareR2BucketName,
           Key: newFileName,
           Body: imageBuffer,
           ContentType: contentType,
         })
       );
 
       // Create new URL from Cloudflare R2
-      const newImageUrl = `https://bso-image.posyayee.shop/${newFileName}`;
+      const newImageUrl = `${envConfig.cloudflareR2Domain}/${newFileName}`;
       content = content.replace(imgSrc, newImageUrl);
 
       uploads.push(uploadPromise);

app/components/Layout.tsx

@@ -1,19 +1,45 @@
 "use client";
-import { ReactNode } from "react";
+import { ReactNode, useEffect, useState } from "react";
 import ThemeSwitcher from "./ThemeSwitcher";
 import Image from "next/image";
 import logo from "../../public/BSO LOGO.svg";
 import Link from "next/link";
+import axios from "axios";
+import Script from "next/script";
 
-interface LayoutProps {
-  children: ReactNode;
-}
+export default function Layout({ children }: { children: ReactNode }) {
+  const [version, setVersion] = useState<string>("unknown");
+
+  useEffect(() => {
+    const fetchLatestVersion = async () => {
+      try {
+        const response = await axios.get(
+          "https://api.github.com/repos/bsospace/BSOSpace-Blog-Frontend/releases/latest"
+        );
+        setVersion(response.data.tag_name || "unknown");
+      } catch (error) {
+        console.error("Error fetching latest version from GitHub:", error);
+        setVersion("unknown");
+      }
+    };
+
+    fetchLatestVersion();
+  }, []);
 
-export default function Layout({ children }: LayoutProps) {
   return (
     <div className="flex flex-col min-h-screen dark:bg-space-dark bg-space-light">
-        {/* eslint-disable-next-line @next/next/no-sync-scripts */}
-        <script data-name="BMC-Widget" data-cfasync="false" src="https://cdnjs.buymeacoffee.com/1.0.0/widget.prod.min.js" data-id="bsospace" data-description="Support me on Buy me a coffee!" data-message="" data-color="#FF813F" data-position="Right" data-x_margin="18" data-y_margin="18"></script>
+      <Script
+        data-name="BMC-Widget"
+        data-cfasync="false"
+        src="https://cdnjs.buymeacoffee.com/1.0.0/widget.prod.min.js"
+        data-id="bsospace"
+        data-description="Support me on Buy me a coffee!"
+        data-message=""
+        data-color="#FF813F"
+        data-position="Right"
+        data-x_margin="18"
+        data-y_margin="18"
+      ></Script>
       {/* Header */}
       <header className="sticky top-0 p-2 z-50 bg-white dark:bg-[#1F1F1F] shadow-md">
         <div className="container mx-auto px-4 flex justify-between items-center">
@@ -55,8 +81,8 @@ export default function Layout({ children }: LayoutProps) {
       {/* Footer */}
       <footer className="bg-white dark:bg-[#1F1F1F] py-4">
         <div className="container mx-auto text-center md:text-body-15pt-medium text-[10px]">
-          Be Simple but Outstanding | &copy; 2025 BSO Space Blog. All rights
-          reserved.
+          Be Simple but Outstanding | Version: {version} | &copy; 2025 BSO Space
+          Blog. All rights reserved.
         </div>
       </footer>
     </div>