06 Deployment

.github/workflows/backend.yml

@@ -2,7 +2,7 @@ name: backend
 
 on:
   push:
-    branches: [ main ]
+    branches: [ "06-Deployment" ]
 
 permissions:
   packages: write
@@ -63,5 +63,5 @@ jobs:
           context: ./backend
           push: true
           tags: |
-            ghcr.io/${{ vars.DOCKER_TAG }}
-            ${{ vars.DOCKER_TAG }}
+            ${{ vars.DOCKERHUB_USERNAME }}/${{ vars.IMAGE_NAME }}:latest
+            ghcr.io/flyingpointer2/${{ vars.IMAGE_NAME }}:latest

.github/workflows/frontend.yml

@@ -4,7 +4,7 @@ name: frontend
 on:
   # Runs on pushes targeting the default branch
   push:
-    branches: ["main"]
+    branches: ["06-Deployment"]
 
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
@@ -36,7 +36,7 @@ jobs:
       - name: Set up Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: 20
+          node-version: 22
           cache: yarn
           cache-dependency-path: ./frontend/yarn.lock
 

.gitignore

@@ -7,3 +7,7 @@ build
 electron
 
 .local.env
+
+# new
+.DS_Store
+.env

backend/src/email.ts

@@ -3,7 +3,8 @@ import nodemailer from "nodemailer";
 
 const router = express.Router();
 
-const sendEmail = async (to: string, subject: string, text: string) => {
+// 增加 export 使得 sendEmail 函数可以被其他脚本调用
+export const sendEmail = async (to: string, subject: string, text: string) => {
   const transporter = nodemailer.createTransport({
     host: process.env.EMAIL_HOST!,
     port: Number(process.env.EMAIL_PORT!),
@@ -29,7 +30,7 @@ router.post("/contact-us", async (req, res) => {
   }
   try {
     const result = await sendEmail(
-      process.env.EMAIL_ADDRESS!,
+      `${email}`,
       "Web Workshop Contact Us Form",
       `Message from ${name} <${email}>:\n\n${message}`,
     );