Merge pull request #23 from pooulad/dockerize

Dockerize

Author: pooulad

.dockerignore

@@ -0,0 +1,3 @@
+./frontend/node_modules
+./frontend/.next
+node_modules 

.env

@@ -1,7 +1,15 @@
-DB_HOST=localhost
+DB_HOST=postgres
 DB_PORT=5432
 DB_PASS=postgres
 DB_USER=postgres
 DB_SSLMODE=disable
 DB_NAME=GoNextJsCrud
-SECRET_JWT=iuehieuher7v347834geuygwyu32gf783gfuwegysduycgwgf783tf3gf
+SECRET_JWT=iuehieuher7v347834geuygwyu32gf783gfuwegysduycgwgf783tf3gf
+NEXTAUTH_URL=http://localhost:3000
+
+# api app configuration
+API_PORT=8000
+API_HOST=0.0.0.0
+
+# client PORT
+APP_PORT=3000

Dockerfile

@@ -0,0 +1,14 @@
+FROM focker.ir/golang:1.22
+
+WORKDIR /app
+
+COPY go.mod go.sum ./
+COPY .env ./
+RUN go mod download && go mod verify
+
+COPY . .
+RUN go build -v -o main .
+
+EXPOSE 8000
+
+CMD ["/app/main"]

README.md

@@ -27,14 +27,34 @@ in front-end:
 
 ## How to run
 
-In root of source you should run your go project
+🚦I included the .env file intentionally in the project so that you can see how the services work and with what settings. Otherwise, it should not be displayed in the project.
+
+With Docker🐳:
+
+1-Run DB and API service
+```bash
+  docker composer up -d
+```
+2- Run nextjs
+```bash
+  cd ./frontend
+  yarn install
+  yarn run dev
+```
+
+Manaul✌️:
+
+1-Create DB based on .env file(you can change it in .env file)
+
+2-In root of source you should run your go project
 ```bash
+  go mod tidy
   go run main.go
 ```
-In root frontend directory you should run your next project
+3-In root frontend directory you should run your next project
 ```bash
-  npm install
-  npm run dev
+  yarn install
+  yarn run dev
 ```
 
 ## API Reference
@@ -60,7 +80,8 @@ This section tracks the progress of implemented features in project.
 
 - [x] Add swagger to project.
 - [x] Add Next-auth to project -> frontend directory.
-- [ ] Add all api response states(success,failure).
+- [x] Add all api response states(success,failure).
+- [x] Dockerize project.
 
 ## Screenshots
 

docker-compose.yml

@@ -0,0 +1,40 @@
+services:
+  # ⚠️Next auth error in login api handler. so i decided to comment it for now
+  # client:
+  #   container_name: ngca_client
+  #   build:
+  #     context: ./frontend/
+  #     dockerfile: Dockerfile
+  #   image: ngca_client
+  #   ports:
+  #     - "${APP_PORT}:3000"
+  #   environment:
+  #     NEXTAUTH_URL: http://localhost:3000
+  #     AUTH_URL: http://localhost:3000
+  api:
+    container_name: ngca_server
+    build:
+      context: .
+      dockerfile: Dockerfile
+    ports:
+      - ${API_PORT}:8000
+    env_file: ".env"
+    depends_on:
+      postgres:
+        condition: service_healthy
+        restart: true
+  postgres:
+    container_name: ngca_db
+    ports:
+      - ${DB_PORT}:5432
+    image: postgres:latest
+    healthcheck:
+      test: [ "CMD-SHELL", "pg_isready -U ${DB_USER} -d ${DB_NAME}" ]
+      interval: 10s
+      retries: 5
+      start_period: 30s
+      timeout: 10s
+    environment:
+      - POSTGRES_USER=${DB_USER}
+      - POSTGRES_PASSWORD=${DB_PASS}
+      - POSTGRES_DB=${DB_NAME}

frontend/.env

@@ -1 +1,16 @@
-NEXTAUTH_SECRET=iuehieuher7v347834geuygwyu32gf783gfuwegysduycgwgf783tf3gf
+NEXTAUTH_SECRET=iuehieuher7v347834geuygwyu32gf783gfuwegysduycgwgf783tf3gfX
+NEXTAUTH_URL=http://localhost:3000
+DB_HOST=postgres
+DB_PORT=5432
+DB_PASS=postgres
+DB_USER=postgres
+DB_SSLMODE=disable
+DB_NAME=GoNextJsCrud
+SECRET_JWT=iuehieuher7v347834geuygwyu32gf783gfuwegysduycgwgf783tf3gf
+
+# api app configuration
+API_PORT=8000
+API_HOST=localhost
+
+# client PORT
+APP_PORT=3000

frontend/Dockerfile

@@ -0,0 +1,25 @@
+FROM focker.ir/node:lts-alpine
+
+# تنظیم دایرکتوری کاری
+WORKDIR /app
+
+# کپی فایل‌های پکیج قبل از بقیه فایل‌ها برای بهینه‌سازی کش
+COPY package.json yarn.lock ./
+
+# نصب وابستگی‌ها
+RUN yarn install
+
+# کپی فایل env
+COPY .env .env
+
+# کپی باقی فایل‌ها
+COPY . .
+
+# ساخت پروژه
+RUN yarn build
+
+# تنظیم پورت
+EXPOSE 3000
+
+# اجرای پروژه
+CMD ["yarn", "start"]

frontend/config/site.ts

@@ -1,5 +1,5 @@
 import { SiteConfig } from "../types/index";
 
 export const siteConfig: SiteConfig = {
-  localApi: "http://127.0.0.1:8080/api",
+  localApi: "http://127.0.0.1:8000/api",
 };

frontend/lib/auth.ts

@@ -1,71 +1,76 @@
-import { getServerSession, NextAuthOptions } from "next-auth"
+import { getServerSession, NextAuthOptions } from "next-auth";
 import CredentialsProvider from "next-auth/providers/credentials";
 
 const authOptions: NextAuthOptions = {
-    session: {
-      strategy: "jwt",
-    },
-    providers: [
-      // EmailProvider
-      // CustomProvider
-      CredentialsProvider({
-        name: "Credentials",
-  
-        credentials: {
-          username: { label: "Username", type: "text", placeholder: "jsmith" },
-          password: { label: "Password", type: "password" },
-        },
-        async authorize(credentials, req) {
-          // Add logic here to look up the user from the credentials supplied
-  
-          const res = await fetch("http://localhost:8080/api/login", {
+  session: {
+    strategy: "jwt",
+  },
+  providers: [
+    CredentialsProvider({
+      name: "Credentials",
+      credentials: {
+        username: { label: "Username", type: "text", placeholder: "jsmith" },
+        password: { label: "Password", type: "password" },
+      },
+      async authorize(credentials) {
+        if (!credentials?.username || !credentials?.password) {
+          // اگر ورودی خالی است خطا می‌دهیم
+          throw new Error("Username and password are required");
+        }
+
+        try {
+          const res = await fetch("http://localhost:8000/api/login", {
             method: "POST",
             headers: {
               "Content-Type": "application/json",
             },
             body: JSON.stringify({
-              username: credentials?.username,
-              password: credentials?.password,
+              username: credentials.username,
+              password: credentials.password,
             }),
           });
+
+          // اگر درخواست ناموفق بود، خطا می‌دهیم
+          if (!res.ok) {
+            const errorData = await res.json();
+            throw new Error(errorData?.message || "Invalid credentials");
+          }
+
           const user = await res.json();
-          console.log("this is user",user);
-          console.log("this is req",req);
-          
-  
-          if (user) {
-            return user;
-          } else {
-            return null;
+          if (user && user.token) {
+            return user; // برگشت دادن یوزر به NextAuth
           }
-        },
-      }),
-    ],
-    callbacks: {
-      async jwt({ token, user }) {
-        return { ...token, ...user };
-      },
-      async session({ session, token, user }) {
-        console.log("sd",user);
-        
-        session.user = token as any;
-        return session;
+
+          // در صورتی که توکن نداشته باشد، null برمی‌گرداند
+          return null;
+        } catch (error) {
+          console.error("Authorization error:", error);
+          // در صورتی که خطا داشتیم، null برگشت داده می‌شود که باعث جلوگیری از هدایت به صفحه خطا می‌شود
+          return null;
+        }
       },
+    }),
+  ],
+  callbacks: {
+    async jwt({ token, user }) {
+      if (user) {
+        token = { ...token, ...user }; // اطلاعات کاربر به توکن اضافه می‌شود
+      }
+      return token;
     },
-    pages: {
-      signIn: "/auth/signin",
-      // signOut: "/auth/signout",
-      // error: "/auth/error",
-      // verifyRequest: "/auth/verify-request",
-      // newUser: "/auth/new-user",
+    async session({ session, token }) {
+      session.user = token as any; // اطلاعات توکن به سشن اضافه می‌شود
+      return session;
     },
-    debug: true,
-  };
+  },
+  pages: {
+    signIn: "/auth/signin", // صفحه لاگین به صورت اختصاصی
+    // این بخش را برای جلوگیری از هدایت به صفحه خطا خالی نگه داریم
+    error: "/auth/signin",  // به این صورت، در صورت خطا به صفحه لاگین هدایت می‌شود
+  },
+  debug: true,
+};
 
-/**
- * Helper function to get the session on the server without having to import the authOptions object every single time
- * @returns The session object or null
- */
-const getSession = () => getServerSession(authOptions)
+const getSession = () => getServerSession(authOptions);
 
-export { authOptions, getSession }
+export { authOptions, getSession };