merge: resolve merge conflicts in ArchivePage.tsx and graphify-out from develop

This commit is contained in:
parsa aghaei committed 2026-08-26 10:17:09 +03:30
commit 753b3dd7ec
48 files changed
+240706 -94210

No files matched your search

+82 -8
View File
@@ -3,24 +3,36 @@
"1": "app.module.ts",
"2": "SmsService",
"3": "ProductService",
"4": "SafeImage.tsx",
"4": "utils.ts",
"5": "CmsController",
"6": "tickets.controller.ts",
"7": "pets/pets.controller.ts",
"8": "admin.module.ts",
"7": "Button.tsx",
"8": "ReportsController",
"9": "devDependencies",
<<<<<<< HEAD
"10": "ReviewsController",
"11": "MediaSelector.tsx",
"12": "index.ts",
"13": "app-audit-verification.e2e-spec.js",
"14": "useSettingsStore",
=======
"10": "ReviewsService",
"11": "MediaSelector.tsx",
"12": "PetProfile.tsx",
"13": "app-audit-verification.e2e-spec.js",
"14": "UserDashboard.tsx",
>>>>>>> cf9ae234b9938be85c833ab98741a4590f9cfe13
"15": "src/services/api.ts",
"16": "DoctorQueryDto",
"17": "UserDashboard.tsx",
"18": "JwtAuthGuard",
"19": "ProductsService",
"20": "CreateVideoDto",
<<<<<<< HEAD
"21": "Button.tsx",
=======
"21": "ProductPage.tsx",
>>>>>>> cf9ae234b9938be85c833ab98741a4590f9cfe13
"22": "lib/services/api.ts",
"23": "MenuService",
"24": "BE-001",
@@ -32,7 +44,7 @@
"30": "DEVOPS-001",
"31": "DOC-001",
"32": "adminRoutes.tsx",
"33": "WholesaleApplyDto",
"33": "WholesaleService",
"34": "B2BService",
"35": "PetProfile.tsx",
"36": "FaqService",
@@ -47,18 +59,27 @@
"45": "What You Must Do When Invoked",
"46": "HomeController",
"47": "IngredientsService",
<<<<<<< HEAD
"48": "useCartStore",
=======
"48": "auth.module.ts",
>>>>>>> cf9ae234b9938be85c833ab98741a4590f9cfe13
"49": "devDependencies",
"50": "devDependencies",
"51": "BlogsController",
"52": "PrescriptionsService",
"53": "SmartAdvisorService",
<<<<<<< HEAD
"54": "UsersService",
=======
"54": "UsersController",
>>>>>>> cf9ae234b9938be85c833ab98741a4590f9cfe13
"55": "UITexts.tsx",
"56": "Orders.tsx",
"57": "Role & Core Objective",
"58": "ContactService",
"59": "compilerOptions",
<<<<<<< HEAD
"60": "PaymentService",
"61": "AdminTransactionFilterDto",
"62": "CreateReviewDto",
@@ -68,6 +89,17 @@
"66": "WikiController",
"67": "PetsController",
"68": "20260526145407_init/migration.sql",
=======
"60": "users.controller.ts",
"61": "payment.service.ts",
"62": "ProductDto",
"63": "dependencies",
"64": "compilerOptions",
"65": "app.e2e-spec.js",
"66": "ApiOperation",
"67": "admin.module.ts",
"68": "PaymentService",
>>>>>>> cf9ae234b9938be85c833ab98741a4590f9cfe13
"69": "Required Review Group Closures",
"70": "compilerOptions",
"71": "getPageMetadata",
@@ -75,7 +107,11 @@
"73": "Operational Rules & Boundaries",
"74": "WikiController",
"75": "PetsController",
<<<<<<< HEAD
"76": "CreateEBankCheckoutDto",
=======
"76": "AdminService",
>>>>>>> cf9ae234b9938be85c833ab98741a4590f9cfe13
"77": "seo.module.ts",
"78": "route.ts",
"79": "🏢 AI Software Agency — Master Orchestration Protocol v3",
@@ -87,9 +123,13 @@
"85": "eslint-config-prettier",
"86": "zibal.service.ts",
"87": "dependencies",
<<<<<<< HEAD
"88": "ProductPage.tsx",
=======
"88": "toPersian",
>>>>>>> cf9ae234b9938be85c833ab98741a4590f9cfe13
"89": "seed-products.ts",
"90": "HomeClient.tsx",
"90": "useSettingsStore",
"91": "Reconciled Audit Roles & Assignments",
"92": "OrdersService",
"93": "@nestjs/schematics",
@@ -105,30 +145,45 @@
"103": "Comprehensive Change Log",
"104": "Coupons.tsx",
"105": "Operational Rules & Boundaries",
<<<<<<< HEAD
"106": "blog/page.tsx",
"107": "layout.tsx",
=======
"106": "Media.tsx",
"107": "@types/supertest",
>>>>>>> cf9ae234b9938be85c833ab98741a4590f9cfe13
"108": "PrismaService",
"109": "1. Summary of Integrity Repairs Performed",
"110": "Operational Rules & Boundaries",
"111": "Operational Rules & Boundaries",
"112": "Operational Rules & Boundaries",
"113": "reviews.controller.ts",
"113": "CreateReviewDto",
"114": "AppService",
"115": "@types/react-dom",
"115": "UsersService",
"116": "Vazirmatn Changelog",
"117": "Vazirmatn Font فونت وزیرمتن",
"118": "Operational Rules & Boundaries",
"119": "compilerOptions",
"120": "compilerOptions",
"121": "backend/README.md",
<<<<<<< HEAD
"122": "videos/page.tsx",
"123": "BlogsService",
=======
"122": "Param",
"123": "CreateEBankCheckoutDto",
>>>>>>> cf9ae234b9938be85c833ab98741a4590f9cfe13
"124": "Repository Map",
"125": "validate_integrity.js",
"126": "admin-panel/package.json",
"127": "Sahel-Font",
<<<<<<< HEAD
"128": "AdminService",
"129": "نقشه جامع پوشش تست‌های سرتاسری (E2E Test Coverage Map) — پروژه Canina",
=======
"128": "AdminController",
"129": "InitiatePaymentDto",
>>>>>>> cf9ae234b9938be85c833ab98741a4590f9cfe13
"130": "Sahel-Font",
"131": "Role & Core Objective",
"132": "orchestrate.py",
@@ -150,8 +205,13 @@
"148": "typescript",
"149": "SmsSettingsPage.tsx",
"150": "Product Requirement Document (PRD)",
<<<<<<< HEAD
"151": "admin.service.ts",
"152": "InitiatePaymentDto",
=======
"151": "auth.service.ts",
"152": ".createCoupon",
>>>>>>> cf9ae234b9938be85c833ab98741a4590f9cfe13
"153": "exclude",
"154": "Baseline Command Plan & Reconciled Command History",
"155": "seo-backfill.ts",
@@ -222,7 +282,15 @@
"229": ".agents/workflows/graphify.md",
"230": "instructions.md",
"232": "@eslint/js",
<<<<<<< HEAD
"234": "20260526160916_add_ui_texts_and_scientific_terms/migration.sql",
=======
"233": "eslint-plugin-prettier",
"234": "WholesaleApplyDto",
"235": "@nestjs/cli",
"236": "@nestjs/testing",
"237": "app/page.tsx",
>>>>>>> cf9ae234b9938be85c833ab98741a4590f9cfe13
"238": "prisma",
"239": "source-map-support",
"240": "supertest",
@@ -297,7 +365,13 @@
"311": "@types/multer",
"312": "@types/passport-jwt",
"313": "Modal.tsx",
<<<<<<< HEAD
=======
"314": "typescript-eslint",
>>>>>>> cf9ae234b9938be85c833ab98741a4590f9cfe13
"315": "typescript",
"316": "ts-jest",
"317": "revalidate/route.ts",
"318": "MaskableField.tsx"
"318": "MaskableField.tsx",
"319": "eslint-config-next"
}