From d983a6869f0d5d11cd8a5b34e7e94b291a7aa29f Mon Sep 17 00:00:00 2001
From: amirrezaghabeli <a.ghabeli@ravanertebat.com>
Date: Mon, 18 Aug 2025 08:28:41 +0330
Subject: [PATCH] added tenders list

---
 lib/views/home/tenders_list_item.dart | 64 ---------------------------
 1 file changed, 64 deletions(-)

diff --git a/lib/views/home/tenders_list_item.dart b/lib/views/home/tenders_list_item.dart
index c67ab39..18c49ec 100644
--- a/lib/views/home/tenders_list_item.dart
+++ b/lib/views/home/tenders_list_item.dart
@@ -27,7 +27,6 @@ class TendersListItem extends StatelessWidget {
         child: Column(
           crossAxisAlignment: CrossAxisAlignment.start,
           children: [
-<<<<<<< HEAD
             SizedBox(
               width: double.infinity,
               child: Text(
@@ -54,30 +53,6 @@ class TendersListItem extends StatelessWidget {
                 children: [
                   Text(
                     '${AppStrings.tenderDeadline} :',
-=======
-            Row(
-              mainAxisAlignment: MainAxisAlignment.spaceBetween,
-              children: [
-                Text(
-                  // tender.createdTime ?? '',
-                  '',
-                  style: TextStyle(
-                    fontSize: 12.0.sp(),
-                    fontWeight: FontWeight.w400,
-                    color: AppColors.grey60,
-                  ),
-                ),
-                Container(
-                  width: 91.0.w(),
-                  height: 24.0.h(),
-                  decoration: BoxDecoration(
-                    color: AppColors.green20,
-                    borderRadius: BorderRadius.circular(8),
-                  ),
-                  alignment: Alignment.center,
-                  child: Text(
-                    '',
->>>>>>> tender_tender_detail
                     style: TextStyle(
                       fontSize: 15.0.sp(),
                       fontWeight: FontWeight.w500,
@@ -97,11 +72,7 @@ class TendersListItem extends StatelessWidget {
             ),
             SizedBox(height: 12.0.h()),
             Text(
-<<<<<<< HEAD
               tender.title!,
-=======
-              '',
->>>>>>> tender_tender_detail
               style: TextStyle(
                 overflow: TextOverflow.ellipsis,
                 fontSize: 16.0.sp(),
@@ -110,7 +81,6 @@ class TendersListItem extends StatelessWidget {
               ),
             ),
             SizedBox(height: 8.0.h()),
-<<<<<<< HEAD
             SizedBox(
               width: double.infinity,
               child: Text(
@@ -123,16 +93,6 @@ class TendersListItem extends StatelessWidget {
                   fontWeight: FontWeight.w400,
                   color: AppColors.grey70,
                 ),
-=======
-            Text(
-              '',
-              maxLines: 3,
-              overflow: TextOverflow.ellipsis,
-              style: TextStyle(
-                fontSize: 14.0.sp(),
-                fontWeight: FontWeight.w400,
-                color: AppColors.grey70,
->>>>>>> tender_tender_detail
               ),
             ),
             SizedBox(height: 18.0.h()),
@@ -144,11 +104,7 @@ class TendersListItem extends StatelessWidget {
                 SvgPicture.asset(AssetsManager.location),
                 SizedBox(width: 1.0.w()),
                 Text(
-<<<<<<< HEAD
                   tender.countryCode!,
-=======
-                  '',
->>>>>>> tender_tender_detail
                   style: TextStyle(
                     fontSize: 12.0.sp(),
                     fontWeight: FontWeight.w400,
@@ -162,7 +118,6 @@ class TendersListItem extends StatelessWidget {
                   child: Image.asset(AssetsManager.seFlag, fit: BoxFit.cover),
                 ),
                 Spacer(),
-<<<<<<< HEAD
                 // Container(
                 //   width: 96.0.w(),
                 //   height: 24.0.h(),
@@ -180,25 +135,6 @@ class TendersListItem extends StatelessWidget {
                 //     ),
                 //   ),
                 // ),
-=======
-                Container(
-                  width: 96.0.w(),
-                  height: 24.0.h(),
-                  decoration: BoxDecoration(
-                    color: AppColors.grey30,
-                    borderRadius: BorderRadius.circular(88),
-                  ),
-                  alignment: Alignment.center,
-                  child: Text(
-                    '',
-                    style: TextStyle(
-                      fontSize: 12.0.sp(),
-                      fontWeight: FontWeight.w500,
-                      color: AppColors.grey60,
-                    ),
-                  ),
-                ),
->>>>>>> tender_tender_detail
               ],
             ),
           ],