diff --git a/backend/prisma/seed-products.ts b/backend/prisma/seed-products.ts index 1def8610..260f7876 100644 --- a/backend/prisma/seed-products.ts +++ b/backend/prisma/seed-products.ts @@ -55,7 +55,7 @@ async function main() { console.log('Seeding products from seed-products-data.json...'); // 2. Read JSON data - const dataPath = path.join(__dirname, 'seed-products-data.json'); + const dataPath = path.join(process.cwd() + "/prisma", 'seed-products-data.json'); if (!fs.existsSync(dataPath)) { console.error('seed-products-data.json not found at', dataPath); process.exit(1); diff --git a/backend/prisma/seed.ts b/backend/prisma/seed.ts index f914609b..15a7ebad 100644 --- a/backend/prisma/seed.ts +++ b/backend/prisma/seed.ts @@ -165,7 +165,7 @@ async function main() { // 2. Seed Scientific Terms console.log('Seeding Scientific Terms...'); - const termsFilePath = path.join(__dirname, '..', '..', 'frontend', 'application', 'lib', 'data', 'scientificTerms.ts'); + const termsFilePath = path.join(process.cwd() + "/prisma", '..', '..', 'frontend', 'application', 'lib', 'data', 'scientificTerms.ts'); if (fs.existsSync(termsFilePath)) { const termsContent = fs.readFileSync(termsFilePath, 'utf-8'); const termsJsCode = ts.transpile(termsContent, { diff --git a/frontend/admin-panel/src/components/ui/MediaSelector.tsx b/frontend/admin-panel/src/components/ui/MediaSelector.tsx index a443bf97..1ce1829a 100644 --- a/frontend/admin-panel/src/components/ui/MediaSelector.tsx +++ b/frontend/admin-panel/src/components/ui/MediaSelector.tsx @@ -186,7 +186,7 @@ export default function MediaSelector({ isOpen, onClose, onSelect, multiple = fa ) : (
{mediaList.map((media) => { - const imgUrl = media.url.startsWith('http') ? media.url : `http://localhost:4001${media.url}`; + const imgUrl = media.url.startsWith('http') ? media.url : `https://apicanina.parsaaghayi.ir${media.url}`; const isSelected = selectedUrl && imgUrl === selectedUrl; return (
{blog.imageUrl ? ( - blog + blog ) : (
@@ -222,7 +222,7 @@ export default function Blogs() {
{formData.imageUrl ? ( - preview + preview ) : (
diff --git a/frontend/admin-panel/src/pages/Categories.tsx b/frontend/admin-panel/src/pages/Categories.tsx index da9d1f6c..ff91b292 100644 --- a/frontend/admin-panel/src/pages/Categories.tsx +++ b/frontend/admin-panel/src/pages/Categories.tsx @@ -158,7 +158,7 @@ export default function Categories() { {cat.imageUrl ? ( - {cat.name} + {cat.name} ) : (
@@ -240,7 +240,7 @@ export default function Categories() {
{formData.imageUrl ? ( - preview + preview ) : (
diff --git a/frontend/admin-panel/src/pages/Media.tsx b/frontend/admin-panel/src/pages/Media.tsx index fba1c375..298455b2 100644 --- a/frontend/admin-panel/src/pages/Media.tsx +++ b/frontend/admin-panel/src/pages/Media.tsx @@ -102,7 +102,7 @@ export default function MediaManager() { }; const handleCopyUrl = async (media: Media) => { - const fullUrl = media.url.startsWith('http') ? media.url : `http://localhost:4001${media.url}`; + const fullUrl = media.url.startsWith('http') ? media.url : `https://apicanina.parsaaghayi.ir${media.url}`; try { await navigator.clipboard.writeText(fullUrl); setCopiedId(media.id); @@ -202,7 +202,7 @@ export default function MediaManager() { ) : (
{filtered.map(media => { - const imgUrl = media.url.startsWith('http') ? media.url : `http://localhost:4001${media.url}`; + const imgUrl = media.url.startsWith('http') ? media.url : `https://apicanina.parsaaghayi.ir${media.url}`; return (
{pet.imageUrl ? ( - {pet.name} + {pet.name} ) : (
diff --git a/frontend/admin-panel/src/pages/Products.tsx b/frontend/admin-panel/src/pages/Products.tsx index 4122a921..04069bd3 100644 --- a/frontend/admin-panel/src/pages/Products.tsx +++ b/frontend/admin-panel/src/pages/Products.tsx @@ -214,7 +214,7 @@ export default function Products() { {product.imageUrl ? ( - {product.name} + {product.name} ) : (
@@ -385,7 +385,7 @@ export default function Products() { {formData.imageUrl ? (
- product + product
@@ -435,7 +435,7 @@ export default function Products() { isOpen={isMediaSelectorOpen} onClose={() => setIsMediaSelectorOpen(false)} onSelect={(url) => setFormData({...formData, imageUrl: url})} - selectedUrl={formData.imageUrl.startsWith('http') ? formData.imageUrl : formData.imageUrl ? `http://localhost:4001${formData.imageUrl}` : undefined} + selectedUrl={formData.imageUrl.startsWith('http') ? formData.imageUrl : formData.imageUrl ? `https://apicanina.parsaaghayi.ir${formData.imageUrl}` : undefined} />
); diff --git a/frontend/admin-panel/src/services/api.ts b/frontend/admin-panel/src/services/api.ts index b6af10a4..8ea1445e 100644 --- a/frontend/admin-panel/src/services/api.ts +++ b/frontend/admin-panel/src/services/api.ts @@ -1,7 +1,7 @@ import axios from 'axios'; const api = axios.create({ - baseURL: 'http://localhost:4001/api', // Backend NestJS API URL + baseURL: 'https://apicanina.parsaaghayi.ir/api', // Backend NestJS API URL headers: { 'Content-Type': 'application/json', }, diff --git a/nginx.conf b/nginx.conf index a327a1c0..23040145 100644 --- a/nginx.conf +++ b/nginx.conf @@ -1,17 +1,15 @@ server { - listen 8080 default_server; - server_name _; - root /app; - index index.html; + listen 8080; + server_name canina.parsaaghayi.ir; # Security Headers server_tokens off; - add_header X-Frame-ों "SAMEORIGIN" always; + add_header X-Frame-Options "SAMEORIGIN" always; add_header X-XSS-Protection "1; mode=block" always; add_header X-Content-Type-Options "nosniff" always; add_header Referrer-Policy "no-referrer-when-downgrade" always; - add_header Content-Security-Policy "default-src 'self' http: https: data: blob: 'unsafe-inline' 'unsafe-eval' https://images.unsplash.com https://canina.de;" always; + # Main Application (Next.js) location / { proxy_pass http://localhost:3000; proxy_http_version 1.1; @@ -20,11 +18,22 @@ server { proxy_set_header Host $host; proxy_cache_bypass $http_upgrade; } + + # Backend API + location /api { + proxy_pass http://backend_prod:3000; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection 'upgrade'; + proxy_set_header Host $host; + proxy_cache_bypass $http_upgrade; + } } server { listen 8080; server_name admincanina.parsaaghayi.ir; + root /app/admin_static; index index.html; @@ -34,14 +43,15 @@ server { add_header X-XSS-Protection "1; mode=block" always; add_header X-Content-Type-Options "nosniff" always; add_header Referrer-Policy "no-referrer-when-downgrade" always; - add_header Content-Security-Policy "default-src 'self' http: https: data: blob: 'unsafe-inline' 'unsafe-eval' https://images.unsplash.com https://canina.de;" always; + # SPA routing for Admin Panel location / { try_files $uri $uri/ /index.html; } + # Backend API for Admin location /api { - proxy_pass http://backend:3000; + proxy_pass http://backend_prod:3000; proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection 'upgrade';