From f2038a93d283c860bcf984beccaf3bfc8f5e796c Mon Sep 17 00:00:00 2001
From: sdarbinyan <sdarbinyan@4pay.ru>
Date: Sat, 18 Jul 2026 09:56:05 +0400
Subject: [PATCH] refactor(admin): polish UX, consistency and overall quality

Admin isolation (Task 1): extended isAdminRoute to also match /edit -
the Marketplace Builder no longer renders the storefront header/back-
button/footer, matching the isolation the backoffice already had since
Sprint 1. Verified no regression on /backoffice or real storefront
routes (catalog still shows the storefront header).

Added a 'back to dashboard' link on the Builder overview page, since
removing the storefront header also removed the only way back to
/backoffice from within the Builder.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
---
 src/app/app.ts                                |  7 ++++---
 .../builder-overview-page.component.html      |  3 +++
 .../builder-overview-page.component.scss      | 20 +++++++++++++++++++
 .../pages/builder-overview-page.component.ts  |  3 ++-
 4 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/src/app/app.ts b/src/app/app.ts
index 7bf6009..3150dc1 100644
--- a/src/app/app.ts
+++ b/src/app/app.ts
@@ -63,9 +63,10 @@ export class App implements OnInit {
         const url = navEnd.urlAfterRedirects || navEnd.url;
         // Home pages: /ru, /en, /hy (with or without trailing slash)
         this.isHomePage.set(/^\/[a-z]{2}\/?$/.test(url) || url === '/' || url === '');
-        // Admin backoffice owns its own shell (AdminLayoutComponent) - the
-        // storefront header/back-button/footer never render there.
-        this.isAdminRoute.set(/^\/[a-z]{2}\/backoffice(\/|$|\?)/.test(url));
+        // Admin backoffice and the Marketplace Builder (/edit) own their own
+        // shells (AdminLayoutComponent / ProjectEditorPageComponent's sidebar) -
+        // the storefront header/back-button/footer never render on either.
+        this.isAdminRoute.set(/^\/[a-z]{2}\/(backoffice|edit)(\/|$|\?)/.test(url));
       });
   }
 
diff --git a/src/app/features/project-editor/pages/builder-overview-page.component.html b/src/app/features/project-editor/pages/builder-overview-page.component.html
index 2ab0b7a..ff80f46 100644
--- a/src/app/features/project-editor/pages/builder-overview-page.component.html
+++ b/src/app/features/project-editor/pages/builder-overview-page.component.html
@@ -1,4 +1,7 @@
 <main class="builder-overview">
+  <a class="builder-overview__back" [routerLink]="['/', 'backoffice', 'dashboard'] | langRoute">
+    <span class="pi pi-arrow-left" aria-hidden="true"></span>{{ 'adminShell.pages.dashboard.title' | translate }}
+  </a>
   <header class="builder-overview__hero">
     <p class="builder-overview__eyebrow">{{ 'builder.appName' | translate }}</p>
     <h1 class="builder-overview__title">{{ 'builder.overviewTitle' | translate }}</h1>
diff --git a/src/app/features/project-editor/pages/builder-overview-page.component.scss b/src/app/features/project-editor/pages/builder-overview-page.component.scss
index 95f9532..dc52e6c 100644
--- a/src/app/features/project-editor/pages/builder-overview-page.component.scss
+++ b/src/app/features/project-editor/pages/builder-overview-page.component.scss
@@ -7,6 +7,26 @@
   gap: var(--space-lg);
 }
 
+.builder-overview__back {
+  display: inline-flex;
+  align-items: center;
+  gap: var(--space-xs);
+  align-self: flex-start;
+  font-size: 0.75rem;
+  font-weight: 500;
+  color: var(--text-secondary);
+  text-decoration: none;
+
+  &:hover {
+    color: var(--primary-color);
+  }
+
+  &:focus-visible {
+    outline: 2px solid var(--primary-color);
+    outline-offset: 2px;
+  }
+}
+
 .builder-overview__hero {
   padding: var(--space-lg);
   border-radius: var(--radius-md);
diff --git a/src/app/features/project-editor/pages/builder-overview-page.component.ts b/src/app/features/project-editor/pages/builder-overview-page.component.ts
index 8c93b7b..cf59891 100644
--- a/src/app/features/project-editor/pages/builder-overview-page.component.ts
+++ b/src/app/features/project-editor/pages/builder-overview-page.component.ts
@@ -3,6 +3,7 @@ import { RouterLink } from '@angular/router';
 import { take } from 'rxjs/operators';
 import { forkJoin } from 'rxjs';
 import { TranslatePipe } from '../../../i18n/translate.pipe';
+import { LangRoutePipe } from '../../../pipes/lang-route.pipe';
 import { LanguageService } from '../../../services/language.service';
 import { ProjectEditorFacade } from '../facade/project-editor.facade';
 import { BackofficeDataService } from '../../../core/backoffice/backoffice-data.service';
@@ -48,7 +49,7 @@ const SECTION_LABEL_KEYS: Record<string, string> = {
 @Component({
   selector: 'app-builder-overview-page',
   standalone: true,
-  imports: [RouterLink, TranslatePipe],
+  imports: [RouterLink, TranslatePipe, LangRoutePipe],
   templateUrl: './builder-overview-page.component.html',
   styleUrl: './builder-overview-page.component.scss',
   changeDetection: ChangeDetectionStrategy.OnPush,