From 60939f14ea7893f3ffbd1da814c21c304c6753ac Mon Sep 17 00:00:00 2001 From: parsa aghaei Date: Sun, 12 Jul 2026 13:24:33 +0330 Subject: [PATCH] chore: remove committed build artifacts (node_modules, dist, .next) - Remove node_modules, dist, .next from git tracking - Add .next and *.tsbuildinfo to .gitignore - Remove Iranian mirrors from Dockerfiles (arvancloud.ir) - Add npm ci step for dependency installation - Ready for VPN-based internet access workflow --- .gitignore | 3 ++ Dockerfile | 21 +++++----- backend/Dockerfile | 39 ++++++++----------- .../admin-panel/src/components/Sidebar.tsx | 2 +- .../src/components/ui/ConfirmModal.tsx | 1 - .../src/components/ui/MediaSelector.tsx | 2 +- .../src/components/ui/Skeleton.tsx | 1 - .../admin-panel/src/components/ui/Spinner.tsx | 1 - frontend/admin-panel/src/pages/Media.tsx | 2 +- frontend/admin-panel/src/pages/Orders.tsx | 2 +- frontend/admin-panel/src/pages/Reports.tsx | 2 +- frontend/admin-panel/src/pages/UITexts.tsx | 2 +- frontend/admin-panel/src/pages/Users.tsx | 2 +- 13 files changed, 36 insertions(+), 44 deletions(-) diff --git a/.gitignore b/.gitignore index 3fbaa04f..85bdf6d0 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,6 @@ coverage/ !.env.example /fonts/ /backend/uploads/ +node_modules +.next +*.tsbuildinfo diff --git a/Dockerfile b/Dockerfile index 76ac1291..40e8aa3a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,23 +1,20 @@ -# Build stage for Frontend Application -FROM docker.arvancloud.ir/library/node:22-alpine AS app-builder -RUN sed -i 's/dl-cdn.alpinelinux.org/mirror.arvancloud.ir/g' /etc/apk/repositories && \ - apk add --no-cache openssl +FROM node:22-alpine AS app-builder +RUN apk add --no-cache openssl WORKDIR /app -# Copy everything including node_modules +COPY frontend/application/package*.json ./ +RUN npm ci COPY frontend/application ./ RUN npm run build -# Build stage for Admin Panel -FROM docker.arvancloud.ir/library/node:22-alpine AS admin-builder -RUN sed -i 's/dl-cdn.alpinelinux.org/mirror.arvancloud.ir/g' /etc/apk/repositories && \ - apk add --no-cache openssl +FROM node:22-alpine AS admin-builder +RUN apk add --no-cache openssl WORKDIR /app -# Copy everything including node_modules +COPY frontend/admin-panel/package*.json ./ +RUN npm ci COPY frontend/admin-panel ./ RUN npm run build -# Production stage -FROM docker.arvancloud.ir/nginxinc/nginx-unprivileged:alpine +FROM nginxinc/nginx-unprivileged:alpine WORKDIR /usr/share/nginx/html COPY --from=app-builder /app/.next ./.next COPY --from=app-builder /app/public ./public diff --git a/backend/Dockerfile b/backend/Dockerfile index ff0057d6..b9e7aff0 100644 --- a/backend/Dockerfile +++ b/backend/Dockerfile @@ -1,33 +1,28 @@ -FROM docker.arvancloud.ir/library/node:22-alpine AS builder +FROM node:22-alpine AS builder -RUN sed -i 's/dl-cdn.alpinelinux.org/mirror.arvancloud.ir/g' /etc/apk/repositories && \ - apk add --no-cache openssl +RUN apk add --no-cache openssl WORKDIR /app -# Copy all files including node_modules -COPY . . - -# Generate prisma client using the existing node_modules -RUN npx prisma generate -RUN npm run build - -# Production image -FROM docker.arvancloud.ir/library/node:22-alpine - -RUN sed -i 's/dl-cdn.alpinelinux.org/mirror.arvancloud.ir/g' /etc/apk/repositories && \ - apk add --no-cache openssl - -WORKDIR /app - -# Copy everything needed for production COPY package*.json ./ -COPY node_modules ./node_modules -COPY dist ./dist +RUN npm ci + +COPY . . +RUN npx prisma generate && npm run build + +FROM node:22-alpine + +RUN apk add --no-cache openssl + +WORKDIR /app + +COPY package*.json ./ +RUN npm ci --omit=dev + +COPY --from=builder /app/dist ./dist EXPOSE 3000 USER node -# Start the application CMD ["node", "dist/main"] diff --git a/frontend/admin-panel/src/components/Sidebar.tsx b/frontend/admin-panel/src/components/Sidebar.tsx index 97bce72a..d03e26b2 100644 --- a/frontend/admin-panel/src/components/Sidebar.tsx +++ b/frontend/admin-panel/src/components/Sidebar.tsx @@ -1,5 +1,5 @@ import { Link, useLocation, useNavigate } from 'react-router-dom'; -import { Home, Users, ShoppingBag, ShoppingCart, Tag, Settings, LogOut, TrendingUp, FolderTree, FileText, BookOpen, Heart, Package, LayoutDashboard, Languages, Image } from 'lucide-react'; +import { Users, ShoppingCart, Tag, Settings, LogOut, TrendingUp, FolderTree, FileText, BookOpen, Heart, Package, LayoutDashboard, Languages, Image } from 'lucide-react'; const menuGroups = [ { diff --git a/frontend/admin-panel/src/components/ui/ConfirmModal.tsx b/frontend/admin-panel/src/components/ui/ConfirmModal.tsx index 0238b0a0..31dece4a 100644 --- a/frontend/admin-panel/src/components/ui/ConfirmModal.tsx +++ b/frontend/admin-panel/src/components/ui/ConfirmModal.tsx @@ -1,4 +1,3 @@ -import React from 'react'; import { X, AlertTriangle } from 'lucide-react'; interface ConfirmModalProps { diff --git a/frontend/admin-panel/src/components/ui/MediaSelector.tsx b/frontend/admin-panel/src/components/ui/MediaSelector.tsx index 11f29ea5..a443bf97 100644 --- a/frontend/admin-panel/src/components/ui/MediaSelector.tsx +++ b/frontend/admin-panel/src/components/ui/MediaSelector.tsx @@ -24,7 +24,7 @@ export default function MediaSelector({ isOpen, onClose, onSelect, multiple = fa const [isUploading, setIsUploading] = useState(false); const [pasteStatus, setPasteStatus] = useState(null); const fileInputRef = useRef(null); - const pasteTimerRef = useRef>(); + const pasteTimerRef = useRef>(null); useEffect(() => { if (isOpen) { diff --git a/frontend/admin-panel/src/components/ui/Skeleton.tsx b/frontend/admin-panel/src/components/ui/Skeleton.tsx index 3170f43a..11296c4a 100644 --- a/frontend/admin-panel/src/components/ui/Skeleton.tsx +++ b/frontend/admin-panel/src/components/ui/Skeleton.tsx @@ -1,4 +1,3 @@ -import React from 'react'; export default function Skeleton({ className = '' }: { className?: string }) { return ( diff --git a/frontend/admin-panel/src/components/ui/Spinner.tsx b/frontend/admin-panel/src/components/ui/Spinner.tsx index 109c8702..6b348f48 100644 --- a/frontend/admin-panel/src/components/ui/Spinner.tsx +++ b/frontend/admin-panel/src/components/ui/Spinner.tsx @@ -1,4 +1,3 @@ -import React from 'react'; export default function Spinner({ size = 'md', className = '' }: { size?: 'sm' | 'md' | 'lg', className?: string }) { const sizeClasses = { diff --git a/frontend/admin-panel/src/pages/Media.tsx b/frontend/admin-panel/src/pages/Media.tsx index 9099ae10..fba1c375 100644 --- a/frontend/admin-panel/src/pages/Media.tsx +++ b/frontend/admin-panel/src/pages/Media.tsx @@ -21,7 +21,7 @@ export default function MediaManager() { const [isDragOver, setIsDragOver] = useState(false); const [previewUrl, setPreviewUrl] = useState(null); const fileInputRef = useRef(null); - const pasteTimerRef = useRef>(); + const pasteTimerRef = useRef>(null); useEffect(() => { fetchMedia(); diff --git a/frontend/admin-panel/src/pages/Orders.tsx b/frontend/admin-panel/src/pages/Orders.tsx index 98c0f9c9..cbf9aa1a 100644 --- a/frontend/admin-panel/src/pages/Orders.tsx +++ b/frontend/admin-panel/src/pages/Orders.tsx @@ -1,5 +1,5 @@ import { useState, useEffect } from 'react'; -import { ShoppingCart, Eye, Truck, Check, X, Search, Filter } from 'lucide-react'; +import { ShoppingCart, Eye, Truck, Check, X, Search } from 'lucide-react'; import api from '../services/api'; import Skeleton from '../components/ui/Skeleton'; import Spinner from '../components/ui/Spinner'; diff --git a/frontend/admin-panel/src/pages/Reports.tsx b/frontend/admin-panel/src/pages/Reports.tsx index c355b146..eefce35f 100644 --- a/frontend/admin-panel/src/pages/Reports.tsx +++ b/frontend/admin-panel/src/pages/Reports.tsx @@ -137,7 +137,7 @@ export default function Reports() { - {categoryDistribution.map((entry: any, index: number) => ( + {categoryDistribution.map((_: any, index: number) => ( ))} diff --git a/frontend/admin-panel/src/pages/UITexts.tsx b/frontend/admin-panel/src/pages/UITexts.tsx index 38a706a9..4bbae743 100644 --- a/frontend/admin-panel/src/pages/UITexts.tsx +++ b/frontend/admin-panel/src/pages/UITexts.tsx @@ -1,5 +1,5 @@ import { useState, useEffect } from 'react'; -import { Languages, Save, Search, CheckCircle, Loader2 } from 'lucide-react'; +import { Languages, Save, Search, Loader2 } from 'lucide-react'; import api from '../services/api'; import Spinner from '../components/ui/Spinner'; diff --git a/frontend/admin-panel/src/pages/Users.tsx b/frontend/admin-panel/src/pages/Users.tsx index 36d06a98..b9ebcb5d 100644 --- a/frontend/admin-panel/src/pages/Users.tsx +++ b/frontend/admin-panel/src/pages/Users.tsx @@ -1,5 +1,5 @@ import { useState, useEffect } from 'react'; -import { Users as UsersIcon, CheckCircle, XCircle, Search, Filter, Edit3, Check, X } from 'lucide-react'; +import { Users as UsersIcon, CheckCircle, Search, Edit3, Check, X } from 'lucide-react'; import api from '../services/api'; import Skeleton from '../components/ui/Skeleton'; import Spinner from '../components/ui/Spinner';