Merge branch 'master' of https://git.nwhco.ir/Mesbahi-Front/Mesbahi-Admin

.env

@@ -0,0 +1,7 @@
+
+NEXT_PUBLIC_DEFAULT_LANGUAGE=en
+NEXT_PUBLIC_AVAILABLE_LANGUAGES=en
+NEXT_PUBLIC_ENABLE_MULTI_LANG=true
+NODE_ENV=production
+NEXT_PUBLIC_REST_API_ENDPOINT=https://mesbahi.nwhco.ir/api
+NEXT_PUBLIC_SITE_URL=https://mesbahi.nwhco.ir:3000

.gitignore

@@ -25,7 +25,7 @@ yarn-debug.log*
 yarn-error.log*
 
 # local env files
-.env
+# .env
 .env.local
 .env.development.local
 .env.test.local

Dockerfile

@@ -1,40 +1,48 @@
 # Base image
-FROM node:18-alpine
+FROM node:18.20.5
 
 # Set working directory
 WORKDIR /usr/src/app
 
-# Copy package.json
-COPY package.json ./
+# Copy package.json and package-lock.json (if exists)
+COPY package.json  ./
+RUN apt-get update && apt-get install -y build-essential
+RUN rm -rf .next
 
-# Install dependencies (using npm)
+# Install dependencies
 RUN npm install --legacy-peer-deps
+# RUN npm ci
 
 # Copy the rest of the application code
-
 COPY . .
-COPY .env ./
 
+# Set environment variables
 ENV NEXT_PUBLIC_DEFAULT_LANGUAGE=en
-ENV NEXT_PUBLIC_AVAILABLE_LANGUAGES=en,fr,de
+ENV NEXT_PUBLIC_AVAILABLE_LANGUAGES=en
 ENV NEXT_PUBLIC_ENABLE_MULTI_LANG=true
+ENV NODE_ENV=production
+ENV NEXT_PUBLIC_REST_API_ENDPOINT=https://mesbahi.nwhco.ir/api
+ENV NEXT_PUBLIC_SITE_URL=https://mesbahi.nwhco.ir
+ENV USE_MOCK_DATA=false
+ENV USE_MOCK_DATA=true
 
+# Verify environment variables (برای دیباگ)
+# RUN echo "NEXT_PUBLIC_DEFAULT_LANGUAGE=${NEXT_PUBLIC_DEFAULT_LANGUAGE}" && \
+    # echo "NEXT_PUBLIC_AVAILABLE_LANGUAGES=${NEXT_PUBLIC_AVAILABLE_LANGUAGES}" && \
+    # echo "NEXT_PUBLIC_ENABLE_MULTI_LANG=${NEXT_PUBLIC_ENABLE_MULTI_LANG}"
 
 # Modify tsconfig.json to ignore type errors (optional)
-RUN sed -i 's/"noEmitOnError": true/"noEmitOnError": false/' tsconfig.json && \
-    sed -i 's/"strict": true/"strict": false/' tsconfig.json && \
-    sed -i 's/"skipLibCheck": false/"skipLibCheck": true/' tsconfig.json
-
-RUN sed -i '/eslint:/a \ \ ignoreDuringBuilds: true,' next.config.js && \
-    sed -i '/typescript:/a \ \ ignoreBuildErrors: true,' next.config.js
-
-
-# Build the Next.js application
-# RUN npm run build 
+# RUN sed -i 's/"noEmitOnError": true/"noEmitOnError": false/' tsconfig.json && \
+#     sed -i 's/"strict": true/"strict": false/' tsconfig.json && \
+#     sed -i 's/"skipLibCheck": false/"skipLibCheck": true/' tsconfig.json
 
-RUN mkdir -p .next && echo "dummy-build-id" > .next/BUILD_ID
+# # Modify next.config.js to ignore linting and type errors
+# RUN sed -i '/eslint:/a \ \ ignoreDuringBuilds: true,' next.config.js && \
+#     sed -i '/typescript:/a \ \ ignoreBuildErrors: true,' next.config.js
 
 
+# Build the Next.js application with verbose logging
+RUN npm run build --verbose
 
 # Expose the port the app runs on
 EXPOSE 3000

package.json

@@ -3,9 +3,9 @@
   "version": "6.6.0",
   "private": true,
   "scripts": {
-    "dev": "next dev -p 3002",
+    "dev": "next dev -p 3000",
     "build": "next build",
-    "start": "next start -p 3002",
+    "start": "next start -p 3000",
     "lint": "next lint"
   },
   "dependencies": {

src/config/index.ts

@@ -1,4 +1,4 @@
-import invariant from 'tiny-invariant';
+const invariant = require('tiny-invariant');
 
 invariant(
   process.env.NEXT_PUBLIC_DEFAULT_LANGUAGE,
@@ -12,7 +12,7 @@ if (process.env.NEXT_PUBLIC_ENABLE_MULTI_LANG === 'true') {
   );
 }
 
-export const Config = {
+const Config = {
   broadcastDriver: process.env.NEXT_PUBLIC_API_BROADCAST_DRIVER ?? 'log',
   pusherEnable: process.env.NEXT_PUBLIC_PUSHER_ENABLED ?? 'false',
   defaultLanguage: process.env.NEXT_PUBLIC_DEFAULT_LANGUAGE ?? 'en',
@@ -21,8 +21,10 @@ export const Config = {
     : [],
   enableMultiLang: process.env.NEXT_PUBLIC_ENABLE_MULTI_LANG === 'true',
   rtlLanguages: ['ar', 'fa', 'he'],
-  getDirection: (language: string | undefined) => {
+  getDirection: (language) => {
     if (!language) return 'ltr';
     return Config.rtlLanguages.includes(language) ? 'rtl' : 'ltr';
   },
 };
+
+module.exports = { Config };