Merge branch 'kub-stage' into production

Co-authored-by: Cursor <cursoragent@cursor.com>

.gitea/workflows/fo-stage.yml

@@ -1,46 +0,0 @@
-
-name: Push nuget and docker image Actions Workflow
-
-on:
-  push:
-    branches:        
-      - stage-new
-jobs:
-  Deploy:
-    runs-on: windows
-    steps:
-      - name: Checkout
-        uses: https://git.afrino.co/actions/checkout@v3
-      - name: Setup dotnet
-        uses: https://git.afrino.co/actions/setup-dotnet@v3
-        with:
-          dotnet-version: 7.0.x
-      
-      - name: Remove Package Source
-        run: dotnet nuget remove source FourSat
-        continue-on-error: true
-      - name: Add Package Source
-        run: dotnet nuget add source --name FourSat --username systemuser --password sZSA7PTiv3pUSQZ https://git.afrino.co/api/packages/FourSat/nuget/index.json --store-password-in-clear-text
-
-      - name: Install dependencies
-        run: dotnet restore ".\src\FrontOffice.Main\FrontOffice.Main.csproj"
-      - name: Build
-        run: dotnet build ".\src\FrontOffice.Main\FrontOffice.Main.csproj" --configuration Release --no-restore
-      - name: Test
-        run: dotnet test ".\src\FrontOffice.Main\FrontOffice.Main.csproj" --no-restore --verbosity normal
-      - name: Recycle Apppool
-        run: |
-          & "C:\Windows\System32\inetsrv\appcmd.exe" recycle apppool /apppool.name:kbs1.ir
-        shell: powershell
-      - name: Stop Website
-        run: |
-          & "C:\Windows\System32\inetsrv\appcmd.exe" stop site /site.name:kbs1.ir
-        shell: powershell
-      - name: Publish
-        run: dotnet publish ".\src\FrontOffice.Main\FrontOffice.Main.csproj" -c Release -o publish
-      - name: Copy Publish To IIS Directory
-        run: Get-ChildItem -Path "publish\*" | Copy-Item -Destination "E:\kbs1.ir\kbs1.ir\" -Recurse -Force
-      - name: Start Website
-        run: |
-          & "C:\Windows\System32\inetsrv\appcmd.exe" start site /site.name:kbs1.ir
-        shell: powershell

.gitea/workflows/kub-deploy.yml

@@ -74,11 +74,7 @@ jobs:
           # Apply manifests and restart
           sshpass -e ssh -o StrictHostKeyChecking=no root@${{ env.K8S_SERVER }} "
             kubectl apply -n kbs-stage -f /tmp/frontoffice-deployment.yaml &&
-            # Drop cached :latest so IfNotPresent/Always both pick the new digest
-            # (crictl is broken on this host — use containerd ctr)
-            ctr -n k8s.io images ls -q | grep -E 'frontoffice(:latest|@)' | while read -r ref; do
-              ctr -n k8s.io images rm \"\$ref\" 2>/dev/null || true
-            done
+            crictl rmi ${REGISTRY}/${IMAGE_NAME}:latest 2>/dev/null || true &&
             kubectl -n kbs-stage rollout restart deployment/frontoffice &&
             kubectl -n kbs-stage rollout status deployment/frontoffice --timeout=180s &&
             rm -f /tmp/frontoffice-deployment.yaml

.gitea/workflows/prod-deploy.yml

@@ -40,7 +40,7 @@ jobs:
           done
           
           if ! docker info >/dev/null 2>&1; then
-            echo "❌ Docker daemon failed to start after 3 minutes"
+            echo "❌ Docker daemon failed to start"
             exit 1
           fi
 
@@ -56,9 +56,10 @@ jobs:
       - name: Build Docker Image
         run: |
           cd src
-          DOCKER_BUILDKIT=0 docker build --network host -t ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ github.sha }} \
+          DOCKER_BUILDKIT=0 docker build --network host -f FrontOffice.Main/Dockerfile \
+                       -t ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ github.sha }} \
                        -t ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:prod \
-                       -f FrontOffice.Main/Dockerfile .
+                       .
 
       - name: Push to Registry
         run: |

k8s/staging/frontoffice-deployment.yaml

@@ -21,8 +21,7 @@ spec:
       containers:
         - name: frontoffice
           image: 185.252.31.44:30080/admin/frontoffice:latest
-          # Staging uses :latest — Always avoids stale node cache after registry retag
-          imagePullPolicy: Always
+          imagePullPolicy: IfNotPresent
           ports:
             - containerPort: 80
               name: http

src/FrontOffice.Main/Pages/Index.razor

@@ -93,48 +93,9 @@
     </section>
 }
 
-@* ═══════════════════════════════════════════════
-   1c. TWENTYCARD CREDIT — promo box
-   ═══════════════════════════════════════════════ *@
-<section class="py-4" style="background:var(--mud-palette-surface);">
-    <MudContainer MaxWidth="MaxWidth.Medium">
-        <MudPaper Elevation="0" Class="landing-twentycard-box rounded-xl pa-4 pa-md-5">
-            <MudStack Row="true" Spacing="3" AlignItems="AlignItems.Start" Class="flex-wrap">
-                <MudAvatar Color="Color.Info" Variant="Variant.Filled" Size="Size.Large" Class="rounded-lg" Style="min-width:56px;">
-                    <MudIcon Icon="@Icons.Material.Filled.AccountBalance" />
-                </MudAvatar>
-                <MudStack Spacing="2" Style="flex:1; min-width:220px;">
-                    <MudText Typo="Typo.h6">تأمین اعتبار ۲۰کارت</MudText>
-                    <MudText Typo="Typo.body2" Class="mud-text-secondary">
-                        با تأمین اعتبار از طریق ۲۰کارت می‌توانید بدون پرداخت نقدی کامل، هزینه خرید پکیج و محصولات در کارا بازار را پوشش دهید.
-                        فرایند درخواست و تأیید اعتبار در پنل ۲۰کارت انجام می‌شود و پس از آن پرداخت از همان مسیر در دسترس است.
-                        این روش برای کسانی مناسب است که می‌خواهند سریع‌تر وارد مسیر عضویت و خرید شوند.
-                    </MudText>
-                    <MudText Typo="Typo.body2">
-                        بعد از دریافت وام، می‌توانید در کارا بازار از باشگاه مشتریان استفاده کنید و با فروش و دعوت، توسعه سرمایه داشته باشید.
-                    </MudText>
-                    <div class="mt-1">
-                        <MudButton Variant="Variant.Filled"
-                                   Color="Color.Info"
-                                   Class="rounded-pill"
-                                   StartIcon="@Icons.Material.Filled.OpenInNew"
-                                   Disabled="@string.IsNullOrWhiteSpace(_twentyCardPortalUrl)"
-                                   OnClick="OpenTwentyCardPortal">
-                            ورود به سایت ۲۰کارت
-                        </MudButton>
-                    </div>
-                </MudStack>
-            </MudStack>
-        </MudPaper>
-    </MudContainer>
-</section>
-
 @* ═══════════════════════════════════════════════
    2. HOW IT WORKS — 3 numbered steps
-   (appsettings Landing:ShowStepsSection; default false)
    ═══════════════════════════════════════════════ *@
-@if (_showStepsSection)
-{
 <section class="section-landing">
     <MudContainer MaxWidth="MaxWidth.Large">
         <div class="text-center mb-8 fade-in-up">
@@ -160,14 +121,10 @@
         </MudGrid>
     </MudContainer>
 </section>
-}
 
 @* ═══════════════════════════════════════════════
    3. FEATURES — 6 cards with icons
-   (appsettings Landing:ShowFeaturesSection; default false)
    ═══════════════════════════════════════════════ *@
-@if (_showFeaturesSection)
-{
 <section class="section-landing" style="background:var(--mud-palette-background-gray);">
     <MudContainer MaxWidth="MaxWidth.Large">
         <div class="text-center mb-8 fade-in-up">
@@ -195,7 +152,6 @@
         </MudGrid>
     </MudContainer>
 </section>
-}
 
 @* ═══════════════════════════════════════════════
    4. STATS — Counter cards

src/FrontOffice.Main/Pages/Index.razor.cs

@@ -1,6 +1,5 @@
 using FrontOffice.Main.Utilities;
 using Microsoft.AspNetCore.Components;
-using Microsoft.Extensions.Configuration;
 using Microsoft.JSInterop;
 using MudBlazor;
 
@@ -17,12 +16,8 @@ public partial class Index : IDisposable
     [Inject] private DiscountCartService DiscountCart { get; set; } = default!;
     [Inject] private GuestActionGate GuestGate { get; set; } = default!;
     [Inject] private VATService VAT { get; set; } = default!;
-    [Inject] private IConfiguration Configuration { get; set; } = default!;
 
     private bool _isAuthenticated;
-    private string _twentyCardPortalUrl = string.Empty;
-    private bool _showStepsSection;
-    private bool _showFeaturesSection;
 
     // ── CMS page data ──
     private PageSettingsDto? _pageData;
@@ -54,10 +49,6 @@ public partial class Index : IDisposable
     {
         MainService.OnChangeHandler += OnStateChanged;
         _isAuthenticated = await AuthService.IsAuthenticatedAsync();
-        _twentyCardPortalUrl = Configuration["TwentyCard:CreditPortalUrl"] ?? string.Empty;
-        // appsettings Landing:* — default false (hidden). Set true to restore sections.
-        _showStepsSection = Configuration.GetValue("Landing:ShowStepsSection", false);
-        _showFeaturesSection = Configuration.GetValue("Landing:ShowFeaturesSection", false);
 
         // Load landing page settings from CMS
         try
@@ -307,12 +298,6 @@ public partial class Index : IDisposable
         Navigation.NavigateTo(RouteConstants.Registration.Wizard);
     }
 
-    private async Task OpenTwentyCardPortal()
-    {
-        if (string.IsNullOrWhiteSpace(_twentyCardPortalUrl)) return;
-        await JS.InvokeVoidAsync("open", _twentyCardPortalUrl, "_blank");
-    }
-
     private void NavigateToPost(string slug)
     {
         Navigation.NavigateTo($"/blog/{slug}");
@@ -349,10 +334,8 @@ public partial class Index : IDisposable
         public string? HeroButtonPrimaryText { get; set; }
         public string? HeroButtonSecondaryText { get; set; }
         public List<TrustBadgeItem>? TrustBadges { get; set; }
-        public bool? StepsEnabled { get; set; }
         public string? StepsTitle { get; set; }
         public List<StepItem>? Steps { get; set; }
-        public bool? FeaturesEnabled { get; set; }
         public string? FeaturesTitle { get; set; }
         public List<FeatureItem>? Features { get; set; }
         public string? StatsTitle { get; set; }

src/FrontOffice.Main/Pages/Profile/PaymentCallback.razor

@@ -31,7 +31,7 @@
             <MudDivider Class="my-4" />
             
             <MudText Typo="Typo.body2" Color="Color.Secondary">
-                موجودی کیف پول: @FormatPrice(_walletBalance)
+                موجودی کیف پول اصلی: @FormatPrice(_walletBalance)
             </MudText>
             
             <MudButton Color="Color.Primary" Variant="Variant.Filled" Class="mt-6"

src/FrontOffice.Main/Shared/Footer.razor

@@ -45,6 +45,9 @@
                                        Href="https://wa.me/989123456789" 
                                        Target="_blank" />
                     </MudStack>
+                     <MudStack Row="true" Spacing="2" Class="enamad">
+                     <a referrerpolicy='origin' target='_blank' href='https://trustseal.enamad.ir/?id=688255&Code=uoMRGkyUYHAtMxkpBLB0KyPL5Ac66ACX'><img referrerpolicy='origin' src='https://trustseal.enamad.ir/logo.aspx?id=688255&Code=uoMRGkyUYHAtMxkpBLB0KyPL5Ac66ACX' alt='' style='cursor:pointer' code='uoMRGkyUYHAtMxkpBLB0KyPL5Ac66ACX'></a>
+                     </MudStack>
                 </MudStack>
             </MudItem>
 

src/FrontOffice.Main/appsettings.Production.json

@@ -1,13 +1,6 @@
 {
-  "GwUrl": "https://cms.kbs1.ir",
+  "GwUrl": "https://cms.kbs2.ir",
   "DownloadUrl": "",
-  "TwentyCard": {
-    "CreditPortalUrl": "https://userpanel.20card.ir/"
-  },
-  "Landing": {
-    "ShowStepsSection": false,
-    "ShowFeaturesSection": false
-  },
   "EncryptionSettings": {
     "Key": "kmcQ3XTmH4mrdh8VHziuscyf8LLYjG//Kyni81nH/0E=",
     "IV": "1wyF3Tt142MOkCpIyCxh/g=="
@@ -21,5 +14,10 @@
       "Microsoft.AspNetCore": "Warning"
     }
   },
+  "Seo": {
+    "SiteUrl": "https://kbs2.ir",
+    "SiteName": "کارابازار سلامت",
+    "DefaultDescription": "باشگاه مشتریان کارابازار سلامت (KBS) — فروشگاه محصولات سلامت، پاداش شفاف، کیف پول و شبکه فروش."
+  },
   "AllowedHosts": "*"
 }

src/FrontOffice.Main/appsettings.Staging.json

@@ -9,10 +9,6 @@
   "TwentyCard": {
     "CreditPortalUrl": "https://userpanel.20card.ir/"
   },
-  "Landing": {
-    "ShowStepsSection": false,
-    "ShowFeaturesSection": false
-  },
   "EncryptionSettings": {
     "Key": "kmcQ3XTmH4mrdh8VHziuscyf8LLYjG//Kyni81nH/0E=",
     "IV": "1wyF3Tt142MOkCpIyCxh/g=="

src/FrontOffice.Main/appsettings.json

@@ -9,10 +9,6 @@
   "TwentyCard": {
     "CreditPortalUrl": "https://userpanel.20card.ir/"
   },
-  "Landing": {
-    "ShowStepsSection": false,
-    "ShowFeaturesSection": false
-  },
   "EncryptionSettings": {
     "Key": "kmcQ3XTmH4mrdh8VHziuscyf8LLYjG//Kyni81nH/0E=",
     "IV": "1wyF3Tt142MOkCpIyCxh/g=="

src/FrontOffice.Main/wwwroot/css/site.css

@@ -1617,12 +1617,6 @@ html, body {
     overflow: hidden;
 }
 
-/* ── Landing TwentyCard credit promo ── */
-.landing-twentycard-box {
-    background: var(--ds-info-soft);
-    border: 1px solid rgba(59, 130, 246, 0.22);
-}
-
 /* ── Register Wizard Unified ── */
 .wizard-section {
     min-height: 80vh;