From 91ec27de1df14d03b6c42010cb9e26a303438a7e Mon Sep 17 00:00:00 2001 From: Cursor Agent Date: Mon, 16 Nov 2026 07:04:44 +0000 Subject: [PATCH 1/8] feat(config): add Steward feedback URL and key configuration with defaults --- .env.example | 6 +++++- docs/environment.md | 2 ++ tools/set-env.js | 5 +++++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.env.example b/.env.example index 82efc07b..097c511a 100644 --- a/.env.example +++ b/.env.example @@ -15,4 +15,8 @@ AUTH_API_IV_KEY = 'AUTH_API_IV_KEY' # VIASOCKET INTERFACE INTERFACE_SCRIPT_URL = 'INTERFACE_SCRIPT_URL' #CLIENT -CLIENT_BASE_URL = 'CLIENT_BASE_URL' \ No newline at end of file +CLIENT_BASE_URL = 'CLIENT_BASE_URL' + +# STEWARD FEEDBACK +STEWARD_FEEDBACK_URL = 'https://steward.embarko.app/api/v1/feedback' +STEWARD_FEEDBACK_KEY = 'pk_7109b673ade5f6aefc2eb0a1dfbcee1c4a2e' \ No newline at end of file diff --git a/docs/environment.md b/docs/environment.md index 9d61131f..73e28a5f 100644 --- a/docs/environment.md +++ b/docs/environment.md @@ -61,6 +61,8 @@ No key has a fallback (`get(key)` is called without a default), so every key is |---|---|---|---|---| | `FIREBASE_CONFIG_API_KEY`, `FIREBASE_CONFIG_AUTH_DOMAIN`, `FIREBASE_CONFIG_PROJECT_ID`, `FIREBASE_CONFIG_STORAGE_BUCKET`, `FIREBASE_CONFIG_MESSAGING_SENDER_ID`, `FIREBASE_CONFIG_APP_ID` | dashboard (`--proxy`) → `apps/36-blocks/src/environments/env-variables.ts` | `environment.firebaseConfig.*` | `apps/36-blocks/src/app/app.config.ts` (`AngularFireModule.initializeApp`) | Google sign-in and `AuthService.getToken` fail. | | `INTERFACE_SCRIPT_URL` | dashboard | `environment.interfaceScriptUrl` | `apps/36-blocks/src/app/panel/layout/layout.component.ts:LayoutComponent` | viaSocket chatbot script gets `src="undefined"`. | +| `STEWARD_FEEDBACK_URL` | dashboard | `environment.stewardFeedbackUrl` | `FeedbackService` | defaults to `https://steward.embarko.app/api/v1/feedback`. | +| `STEWARD_FEEDBACK_KEY` | dashboard | `environment.stewardFeedbackKey` | `FeedbackService` | defaults to public key `pk_7109b673ade5f6aefc2eb0a1dfbcee1c4a2e`. | | `AUTH_UI_ENCODE_KEY`, `AUTH_UI_IV_KEY` | widget (`--auth`) → `apps/36-blocks-widget/src/environments/env-variables.ts` | `environment.uiEncodeKey`, `environment.uiIvKey` | widget login/register password and `proxy_state` encryption ([widget-auth](./modules/widget-auth.md)) | Backend cannot decrypt passwords → login/register fail. | | `AUTH_API_ENCODE_KEY`, `AUTH_API_IV_KEY` | widget | `environment.apiEncodeKey`, `environment.apiIvKey` | `OtpEffects.getWidgetData$` (decrypts `data.ciphered`) | Widget config cannot be decrypted → no login buttons. | | `HCAPTCHA_SITE_KEY` | widget | `environment.hCaptchaSiteKey` | `apps/36-blocks-widget/src/main.ts` (`NgHcaptchaModule.forRoot`), widget login form | hCaptcha fails to load → password login blocked. **Not in `.env.example`.** Local `environment.ts` overrides it with hCaptcha's public test key. | diff --git a/tools/set-env.js b/tools/set-env.js index 622416ec..fd0773bc 100644 --- a/tools/set-env.js +++ b/tools/set-env.js @@ -83,6 +83,11 @@ function writeProxyEnv() { // VIASOCKET INTERFACE interfaceScriptUrl: ${JSON.stringify(get('INTERFACE_SCRIPT_URL'))}, + + // STEWARD FEEDBACK + stewardFeedbackUrl: ${JSON.stringify(get('STEWARD_FEEDBACK_URL', 'https://steward.embarko.app/api/v1/feedback'))}, + stewardFeedbackKey: ${JSON.stringify(get('STEWARD_FEEDBACK_KEY', 'pk_7109b673ade5f6aefc2eb0a1dfbcee1c4a2e'))}, + appVersion: ${JSON.stringify(get('APP_VERSION', require('../package.json').version))}, }; `; const outPath = path.join(root, 'apps/36-blocks/src/environments/env-variables.ts'); From ccc728392e3424adaeda5448f1ef27101795198e Mon Sep 17 00:00:00 2001 From: Cursor Agent Date: Mon, 16 Nov 2026 07:04:52 +0000 Subject: [PATCH 2/8] feat(feedback): implement native feedback dialog and submission service --- .../panel/feedback/feedback-api.service.ts | 193 ++++++++++++++++++ .../feedback-dialog.component.html | 74 +++++++ .../feedback-dialog.component.scss | 100 +++++++++ .../feedback-dialog.component.ts | 66 ++++++ .../feedback-floating-button.component.html | 13 ++ .../feedback-floating-button.component.scss | 25 +++ .../feedback-floating-button.component.ts | 25 +++ .../app/panel/feedback/feedback.service.ts | 33 +++ apps/36-blocks/src/styles.scss | 5 + 9 files changed, 534 insertions(+) create mode 100644 apps/36-blocks/src/app/panel/feedback/feedback-api.service.ts create mode 100644 apps/36-blocks/src/app/panel/feedback/feedback-dialog/feedback-dialog.component.html create mode 100644 apps/36-blocks/src/app/panel/feedback/feedback-dialog/feedback-dialog.component.scss create mode 100644 apps/36-blocks/src/app/panel/feedback/feedback-dialog/feedback-dialog.component.ts create mode 100644 apps/36-blocks/src/app/panel/feedback/feedback-floating-button/feedback-floating-button.component.html create mode 100644 apps/36-blocks/src/app/panel/feedback/feedback-floating-button/feedback-floating-button.component.scss create mode 100644 apps/36-blocks/src/app/panel/feedback/feedback-floating-button/feedback-floating-button.component.ts create mode 100644 apps/36-blocks/src/app/panel/feedback/feedback.service.ts diff --git a/apps/36-blocks/src/app/panel/feedback/feedback-api.service.ts b/apps/36-blocks/src/app/panel/feedback/feedback-api.service.ts new file mode 100644 index 00000000..31cc764c --- /dev/null +++ b/apps/36-blocks/src/app/panel/feedback/feedback-api.service.ts @@ -0,0 +1,193 @@ +import { Injectable, inject } from '@angular/core'; +import { AuthService } from '@proxy/services/proxy/auth'; +import { CookieService } from 'ngx-cookie-service'; +import { Store, select } from '@ngrx/store'; +import { selectClientSettings } from '../../core/ngrx'; +import { selectLogInData } from '../../website/home/ngrx/selector/login.selector'; +import { ILogInFeatureStateWithRootState } from '../../website/home/ngrx/store/login.state'; +import { IClientSettings, IFirebaseUserModel } from '@proxy/models/root-models'; +import { BillingService } from '../billing/billing.service'; +import { environment } from '../../../environments/environment'; +import { take } from 'rxjs/operators'; + +export interface IFeedbackUser { + id: string | number | null; + email: string | null; + name: string | null; + company: string | null; + plan: string | null; +} + +export interface IFeedbackSendResult { + success: boolean; + status: number; + error?: string; +} + +@Injectable({ + providedIn: 'root', +}) +export class FeedbackApiService { + private readonly authService = inject(AuthService); + private readonly cookieService = inject(CookieService); + private readonly store = inject>(Store); + private readonly billingService = inject(BillingService); + + private currentLoginData: IFirebaseUserModel | null = null; + private currentClientSettings: IClientSettings | null = null; + private cachedPlan: string | null = null; + + constructor() { + this.store.pipe(select(selectLogInData)).subscribe((loginData) => { + this.currentLoginData = loginData ?? null; + }); + + this.store.pipe(select(selectClientSettings)).subscribe((settings) => { + this.currentClientSettings = settings ?? null; + }); + } + + public refreshPlan(): void { + const rawToken = this.authService.getTokenSync() || this.cookieService.get('authToken'); + if (!rawToken) return; + + this.billingService + .getSubscriptionStatus() + .pipe(take(1)) + .subscribe({ + next: (res) => { + if (res?.data?.active_plan_code) { + this.cachedPlan = res.data.active_plan_code; + } else if (res?.data && !res.data.has_subscription) { + this.cachedPlan = 'free'; + } + }, + error: () => { + // Ignore errors when refreshing plan in background + }, + }); + } + + private parseJwt(token: string | null | undefined): Record | null { + if (!token || typeof token !== 'string') return null; + try { + const parts = token.split('.'); + if (parts.length < 2) return null; + const base64Url = parts[1]; + const base64 = base64Url.replace(/-/g, '+').replace(/_/g, '/'); + const jsonPayload = decodeURIComponent( + atob(base64) + .split('') + .map((c) => '%' + ('00' + c.charCodeAt(0).toString(16)).slice(-2)) + .join('') + ); + return JSON.parse(jsonPayload); + } catch { + return null; + } + } + + public getSessionUser(): IFeedbackUser { + const rawToken = this.authService.getTokenSync() || this.cookieService.get('authToken'); + const jwt = this.parseJwt(rawToken); + + const id = + this.currentLoginData?.uid ?? + jwt?.['id'] ?? + jwt?.['user_id'] ?? + jwt?.['sub'] ?? + (this.currentClientSettings?.client?.id != null ? String(this.currentClientSettings.client.id) : null); + + const email = + this.currentLoginData?.email ?? jwt?.['email'] ?? this.currentClientSettings?.client?.email ?? null; + + const name = + this.currentLoginData?.displayName ?? jwt?.['name'] ?? this.currentClientSettings?.client?.name ?? null; + + const company = this.currentClientSettings?.client?.name ?? jwt?.['company_name'] ?? jwt?.['company'] ?? null; + + const plan = + this.cachedPlan ?? + jwt?.['plan'] ?? + jwt?.['plan_code'] ?? + this.currentClientSettings?.client?.settings?.['plan'] ?? + null; + + return { + id, + email, + name, + company, + plan, + }; + } + + public async sendFeedback(text: string): Promise { + const url = (environment as any).stewardFeedbackUrl || 'https://steward.embarko.app/api/v1/feedback'; + const key = (environment as any).stewardFeedbackKey || 'pk_7109b673ade5f6aefc2eb0a1dfbcee1c4a2e'; + const appVersion = (environment as any).appVersion || '0.0.3'; + + const user = this.getSessionUser(); + const payload = { + text, + user, + page: { + url: typeof window !== 'undefined' ? window.location.href : '', + title: typeof document !== 'undefined' ? document.title : '', + }, + meta: { + app_version: appVersion, + }, + }; + + try { + const response = await fetch(url, { + method: 'POST', + headers: { + 'Content-Type': 'application/json', + 'X-Steward-Key': key, + }, + body: JSON.stringify(payload), + }); + + if (response.status === 202 || (response.status >= 200 && response.status < 300)) { + return { success: true, status: response.status }; + } + + if (response.status === 429) { + return { + success: false, + status: 429, + error: 'Too many at once. Please try again shortly.', + }; + } + + let errorMessage = `Request failed (${response.status})`; + try { + const data = await response.json(); + if (data?.message) { + errorMessage = data.message; + } else if (data?.error) { + errorMessage = typeof data.error === 'string' ? data.error : JSON.stringify(data.error); + } + } catch { + const textOutput = await response.text().catch(() => ''); + if (textOutput) { + errorMessage = textOutput; + } + } + + return { + success: false, + status: response.status, + error: errorMessage, + }; + } catch (err: any) { + return { + success: false, + status: 0, + error: err?.message || 'Network error. Please check your connection and try again.', + }; + } + } +} diff --git a/apps/36-blocks/src/app/panel/feedback/feedback-dialog/feedback-dialog.component.html b/apps/36-blocks/src/app/panel/feedback/feedback-dialog/feedback-dialog.component.html new file mode 100644 index 00000000..f4179af9 --- /dev/null +++ b/apps/36-blocks/src/app/panel/feedback/feedback-dialog/feedback-dialog.component.html @@ -0,0 +1,74 @@ + diff --git a/apps/36-blocks/src/app/panel/feedback/feedback-dialog/feedback-dialog.component.scss b/apps/36-blocks/src/app/panel/feedback/feedback-dialog/feedback-dialog.component.scss new file mode 100644 index 00000000..06e66719 --- /dev/null +++ b/apps/36-blocks/src/app/panel/feedback/feedback-dialog/feedback-dialog.component.scss @@ -0,0 +1,100 @@ +.feedback-dialog-shell { + display: flex; + flex-direction: column; + min-width: 440px; + max-width: 520px; + width: 100%; + + @media (max-width: 600px) { + min-width: 0; + } +} + +.feedback-dialog-header { + display: flex; + align-items: center; + justify-content: space-between; + padding: 16px 20px 12px; + border-bottom: 1px solid var(--color-common-border); + + h2 { + margin: 0 !important; + font-size: 16px !important; + font-weight: 600 !important; + color: var(--mat-sys-on-surface, var(--color-common-text)) !important; + } +} + +.feedback-dialog-close { + width: 32px !important; + height: 32px !important; + color: var(--color-common-secondary-text) !important; +} + +.feedback-dialog-content { + padding: 16px 20px !important; + + textarea { + resize: vertical; + min-height: 110px; + } +} + +.feedback-error-banner { + display: flex; + gap: 8px; + padding: 10px 12px; + border-radius: 6px; + background: rgba(220, 38, 38, 0.08); + border: 1px solid rgba(220, 38, 38, 0.25); + margin-top: 10px; + font-size: 13px; +} + +.feedback-success-view { + display: flex; + flex-direction: column; + align-items: center; + padding: 28px 20px !important; + text-align: center; + + .success-icon-wrap { + display: inline-flex; + align-items: center; + justify-content: center; + width: 48px; + height: 48px; + border-radius: 50%; + background: rgba(16, 185, 129, 0.12); + color: var(--color-common-green, #10b981); + margin-bottom: 12px; + + .success-icon { + font-size: 32px; + width: 32px; + height: 32px; + } + } + + h3 { + margin: 0 0 4px; + font-size: 16px; + font-weight: 600; + color: var(--mat-sys-on-surface, var(--color-common-text)); + } + + p { + margin: 0; + font-size: 13px; + color: var(--color-common-secondary-text); + } +} + +.feedback-dialog-actions { + display: flex; + justify-content: flex-end; + gap: 8px; + padding: 12px 20px 16px !important; + border-top: 1px solid var(--color-common-border); + margin: 0 !important; +} diff --git a/apps/36-blocks/src/app/panel/feedback/feedback-dialog/feedback-dialog.component.ts b/apps/36-blocks/src/app/panel/feedback/feedback-dialog/feedback-dialog.component.ts new file mode 100644 index 00000000..a34f4a2d --- /dev/null +++ b/apps/36-blocks/src/app/panel/feedback/feedback-dialog/feedback-dialog.component.ts @@ -0,0 +1,66 @@ +import { ChangeDetectionStrategy, Component, inject, signal } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { FormsModule } from '@angular/forms'; +import { MatDialogModule, MatDialogRef } from '@angular/material/dialog'; +import { MatButtonModule } from '@angular/material/button'; +import { MatFormFieldModule } from '@angular/material/form-field'; +import { MatInputModule } from '@angular/material/input'; +import { MatIconModule } from '@angular/material/icon'; +import { MatProgressSpinnerModule } from '@angular/material/progress-spinner'; +import { FeedbackApiService } from '../feedback-api.service'; + +@Component({ + selector: 'proxy-feedback-dialog', + templateUrl: './feedback-dialog.component.html', + styleUrls: ['./feedback-dialog.component.scss'], + changeDetection: ChangeDetectionStrategy.OnPush, + imports: [ + CommonModule, + FormsModule, + MatDialogModule, + MatButtonModule, + MatFormFieldModule, + MatInputModule, + MatIconModule, + MatProgressSpinnerModule, + ], +}) +export class FeedbackDialogComponent { + private readonly dialogRef = inject>(MatDialogRef); + private readonly apiService = inject(FeedbackApiService); + + public readonly state = signal<'idle' | 'loading' | 'success' | 'error'>('idle'); + public readonly errorMessage = signal(null); + public feedbackText = ''; + + public canSend(): boolean { + return Boolean(this.feedbackText && this.feedbackText.trim().length > 0); + } + + public async send(): Promise { + if (!this.canSend() || this.state() === 'loading') { + return; + } + + this.state.set('loading'); + this.errorMessage.set(null); + this.dialogRef.disableClose = true; + + const result = await this.apiService.sendFeedback(this.feedbackText.trim()); + + if (result.success) { + this.state.set('success'); + this.dialogRef.disableClose = false; + } else { + this.state.set('error'); + this.dialogRef.disableClose = false; + this.errorMessage.set(result.error || 'Failed to send feedback. Please try again.'); + } + } + + public close(): void { + if (this.state() !== 'loading') { + this.dialogRef.close(); + } + } +} diff --git a/apps/36-blocks/src/app/panel/feedback/feedback-floating-button/feedback-floating-button.component.html b/apps/36-blocks/src/app/panel/feedback/feedback-floating-button/feedback-floating-button.component.html new file mode 100644 index 00000000..92167300 --- /dev/null +++ b/apps/36-blocks/src/app/panel/feedback/feedback-floating-button/feedback-floating-button.component.html @@ -0,0 +1,13 @@ +@if (shouldShow()) { + +} diff --git a/apps/36-blocks/src/app/panel/feedback/feedback-floating-button/feedback-floating-button.component.scss b/apps/36-blocks/src/app/panel/feedback/feedback-floating-button/feedback-floating-button.component.scss new file mode 100644 index 00000000..497fbea6 --- /dev/null +++ b/apps/36-blocks/src/app/panel/feedback/feedback-floating-button/feedback-floating-button.component.scss @@ -0,0 +1,25 @@ +.feedback-floating-btn { + position: fixed; + bottom: 24px; + right: 24px; + z-index: 999; + background-color: var(--mat-sys-primary, #0f766e) !important; + color: var(--mat-sys-on-primary, #ffffff) !important; + box-shadow: + 0 4px 14px rgba(0, 0, 0, 0.2), + 0 2px 6px rgba(0, 0, 0, 0.12); + transition: + transform 0.2s cubic-bezier(0.4, 0, 0.2, 1), + box-shadow 0.2s cubic-bezier(0.4, 0, 0.2, 1); + + &:hover { + transform: translateY(-2px) scale(1.05); + box-shadow: + 0 6px 20px rgba(0, 0, 0, 0.25), + 0 3px 8px rgba(0, 0, 0, 0.15); + } + + &:active { + transform: translateY(0) scale(1); + } +} diff --git a/apps/36-blocks/src/app/panel/feedback/feedback-floating-button/feedback-floating-button.component.ts b/apps/36-blocks/src/app/panel/feedback/feedback-floating-button/feedback-floating-button.component.ts new file mode 100644 index 00000000..3af63d66 --- /dev/null +++ b/apps/36-blocks/src/app/panel/feedback/feedback-floating-button/feedback-floating-button.component.ts @@ -0,0 +1,25 @@ +import { ChangeDetectionStrategy, Component, computed, inject } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { MatButtonModule } from '@angular/material/button'; +import { MatIconModule } from '@angular/material/icon'; +import { MatTooltipModule } from '@angular/material/tooltip'; +import { FeedbackService } from '../feedback.service'; + +@Component({ + selector: 'proxy-feedback-floating-button', + templateUrl: './feedback-floating-button.component.html', + styleUrls: ['./feedback-floating-button.component.scss'], + changeDetection: ChangeDetectionStrategy.OnPush, + imports: [CommonModule, MatButtonModule, MatIconModule, MatTooltipModule], +}) +export class FeedbackFloatingButtonComponent { + public readonly feedbackService = inject(FeedbackService); + + public readonly shouldShow = computed(() => { + return this.feedbackService.isLoggedIn() && !this.feedbackService.isSidebarPresent(); + }); + + public openFeedback(): void { + this.feedbackService.openFeedback(); + } +} diff --git a/apps/36-blocks/src/app/panel/feedback/feedback.service.ts b/apps/36-blocks/src/app/panel/feedback/feedback.service.ts new file mode 100644 index 00000000..92e52cba --- /dev/null +++ b/apps/36-blocks/src/app/panel/feedback/feedback.service.ts @@ -0,0 +1,33 @@ +import { Injectable, inject, signal } from '@angular/core'; +import { MatDialog } from '@angular/material/dialog'; +import { CookieService } from 'ngx-cookie-service'; +import { AuthService } from '@proxy/services/proxy/auth'; +import { FeedbackApiService } from './feedback-api.service'; +import { FeedbackDialogComponent } from './feedback-dialog/feedback-dialog.component'; + +@Injectable({ + providedIn: 'root', +}) +export class FeedbackService { + private readonly dialog = inject(MatDialog); + private readonly apiService = inject(FeedbackApiService); + private readonly cookieService = inject(CookieService); + private readonly authService = inject(AuthService); + + public readonly isSidebarPresent = signal(false); + + public isLoggedIn(): boolean { + const cookie = this.cookieService.get('authToken'); + const mem = this.authService.getTokenSync(); + return Boolean((cookie && cookie.trim().length > 0) || (mem && mem.trim().length > 0)); + } + + public openFeedback(): void { + this.apiService.refreshPlan(); + this.dialog.open(FeedbackDialogComponent, { + panelClass: ['mat-dialog', 'feedback-dialog'], + autoFocus: 'first-tabbable', + restoreFocus: true, + }); + } +} diff --git a/apps/36-blocks/src/styles.scss b/apps/36-blocks/src/styles.scss index 02e7e9a5..58e83247 100644 --- a/apps/36-blocks/src/styles.scss +++ b/apps/36-blocks/src/styles.scss @@ -167,6 +167,11 @@ button { min-width: auto !important; width: auto !important; } + + &.feedback-dialog { + min-width: min(480px, 92vw) !important; + max-width: 92vw !important; + } } .preview-fullscreen-dialog { From 64290f9115364dd5f8cab3023bae0a6c28f4c932 Mon Sep 17 00:00:00 2001 From: Cursor Agent Date: Mon, 16 Nov 2026 07:04:57 +0000 Subject: [PATCH 3/8] feat(feedback): integrate sidebar and floating entry points for signed-in users --- apps/36-blocks/src/app/app.component.html | 1 + apps/36-blocks/src/app/app.component.ts | 3 +- .../app/panel/layout/layout.component.html | 22 ++++++++++ .../app/panel/layout/layout.component.scss | 44 +++++++++++++++++++ .../src/app/panel/layout/layout.component.ts | 14 ++++++ 5 files changed, 83 insertions(+), 1 deletion(-) diff --git a/apps/36-blocks/src/app/app.component.html b/apps/36-blocks/src/app/app.component.html index aa58719b..e19618f4 100644 --- a/apps/36-blocks/src/app/app.component.html +++ b/apps/36-blocks/src/app/app.component.html @@ -1,4 +1,5 @@ + diff --git a/apps/36-blocks/src/app/app.component.ts b/apps/36-blocks/src/app/app.component.ts index fa6aecc7..d79e7a76 100644 --- a/apps/36-blocks/src/app/app.component.ts +++ b/apps/36-blocks/src/app/app.component.ts @@ -19,11 +19,12 @@ import { IAppState, selectClientSettings } from './core/ngrx'; import { rootActions } from './core/ngrx/actions'; import { IClientSettings, IFirebaseUserModel } from '@proxy/models/root-models'; import { readReturnUrlFromUrl, resolvePostLoginTarget } from '@proxy/utils/return-url'; +import { FeedbackFloatingButtonComponent } from './panel/feedback/feedback-floating-button/feedback-floating-button.component'; @Component({ changeDetection: ChangeDetectionStrategy.OnPush, selector: 'proxy-root', - imports: [RouterModule, PrimeNgToastComponent], + imports: [RouterModule, PrimeNgToastComponent, FeedbackFloatingButtonComponent], templateUrl: './app.component.html', }) export class AppComponent extends BaseComponent implements OnInit, OnDestroy { diff --git a/apps/36-blocks/src/app/panel/layout/layout.component.html b/apps/36-blocks/src/app/panel/layout/layout.component.html index aa50295a..06f2f0aa 100644 --- a/apps/36-blocks/src/app/panel/layout/layout.component.html +++ b/apps/36-blocks/src/app/panel/layout/layout.component.html @@ -132,6 +132,28 @@ } + @if (sideNavService.isSideNavOpen()) { diff --git a/apps/36-blocks/src/app/panel/layout/layout.component.scss b/apps/36-blocks/src/app/panel/layout/layout.component.scss index bea79622..08675173 100644 --- a/apps/36-blocks/src/app/panel/layout/layout.component.scss +++ b/apps/36-blocks/src/app/panel/layout/layout.component.scss @@ -71,6 +71,50 @@ .sidebar-billing-link__arrow { margin-left: auto; } +.sidebar-feedback-link { + padding: 6px; + margin-top: 2px; +} +.sidebar-feedback-link--collapsed { + padding: 6px 0; + display: flex; + justify-content: center; +} +.sidebar-feedback-link__btn { + display: flex; + align-items: center; + gap: 10px; + padding: 8px 10px; + width: 100%; + color: var(--experience-ink); + border: none; + background: transparent; + border-radius: 6px; + font-size: 12px; + cursor: pointer; + font-family: inherit; + text-align: left; + transition: + background 0.15s ease, + color 0.15s ease; +} +.sidebar-feedback-link__btn:hover { + background: var(--experience-soft); + color: var(--experience-accent); +} +.sidebar-feedback-link__icon-wrap { + display: inline-flex; + align-items: center; + justify-content: center; +} +.sidebar-feedback-link__text { + display: flex; + align-items: center; +} +.sidebar-feedback-link__label { + font-weight: 550; + font-size: 12px; +} .collapsed-sidebar .workspace-brand { padding: 5px 0 20px; justify-content: center; diff --git a/apps/36-blocks/src/app/panel/layout/layout.component.ts b/apps/36-blocks/src/app/panel/layout/layout.component.ts index 7de5651e..d7bb05cf 100644 --- a/apps/36-blocks/src/app/panel/layout/layout.component.ts +++ b/apps/36-blocks/src/app/panel/layout/layout.component.ts @@ -44,6 +44,7 @@ import { SideNavService } from './side-nav.service'; import { shouldCollapseSidebarForEmptyWorkspace } from './sidebar-default'; import { UiSettingsService } from './ui-settings.service'; import { FeaturesService } from '@proxy/services/proxy/features'; +import { FeedbackService } from '../feedback/feedback.service'; import { take } from 'rxjs/operators'; import { AiSetupService } from '../../ai-setup/ai-setup.service'; @Component({ @@ -119,11 +120,13 @@ export class LayoutComponent extends BaseComponent implements OnInit, OnDestroy private featuresService = inject(FeaturesService); private dialog = inject(MatDialog); private aiSetup = inject(AiSetupService); + public feedbackService = inject(FeedbackService); /** The workspace the "empty workspace starts collapsed" rule was already applied to. */ private collapsedForWorkspace: number | null = null; constructor() { super(); + this.feedbackService.isSidebarPresent.set(!this.sideNavService.hideSidebar()); // A workspace without blocks (first sign-in, sign-up, or after switching) starts with the sidebar collapsed. effect(() => { const workspace = this.aiSetup.workspace(); @@ -176,10 +179,12 @@ export class LayoutComponent extends BaseComponent implements OnInit, OnDestroy .subscribe((res) => { const hasFeatures = (res?.data?.totalEntityCount ?? 0) > 0; this.sideNavService.hideSidebar.set(!hasFeatures); + this.feedbackService.isSidebarPresent.set(hasFeatures); this.cdr.markForCheck(); }); } else { this.sideNavService.hideSidebar.set(false); + this.feedbackService.isSidebarPresent.set(true); } this.cdr.markForCheck(); }); @@ -331,4 +336,13 @@ export class LayoutComponent extends BaseComponent implements OnInit, OnDestroy public toggleSideBarEvent(): void { this.sideNavService.toggle(); } + + public openFeedback(): void { + this.feedbackService.openFeedback(); + } + + override ngOnDestroy(): void { + this.feedbackService.isSidebarPresent.set(false); + super.ngOnDestroy(); + } } From 3d37a822bb90d9baf8df4d0287e5b84c35780859 Mon Sep 17 00:00:00 2001 From: Cursor Agent Date: Mon, 16 Nov 2026 07:05:01 +0000 Subject: [PATCH 4/8] test(feedback): add tests for feedback widget and environment configuration --- tools/tests/feedback.test.cjs | 68 +++++++++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+) create mode 100644 tools/tests/feedback.test.cjs diff --git a/tools/tests/feedback.test.cjs b/tools/tests/feedback.test.cjs new file mode 100644 index 00000000..f9bfd7e3 --- /dev/null +++ b/tools/tests/feedback.test.cjs @@ -0,0 +1,68 @@ +const assert = require('node:assert/strict'); +const { readFileSync } = require('node:fs'); +const { test } = require('node:test'); + +test('tools/set-env.js includes default Steward feedback URL, key, and app version', () => { + const setEnvSource = readFileSync('tools/set-env.js', 'utf8'); + assert.match(setEnvSource, /STEWARD_FEEDBACK_URL/); + assert.match(setEnvSource, /STEWARD_FEEDBACK_KEY/); + assert.match(setEnvSource, /https:\/\/steward\.embarko\.app\/api\/v1\/feedback/); + assert.match(setEnvSource, /pk_7109b673ade5f6aefc2eb0a1dfbcee1c4a2e/); + assert.match(setEnvSource, /appVersion/); +}); + +test('.env.example includes Steward feedback environment variables', () => { + const envExample = readFileSync('.env.example', 'utf8'); + assert.match(envExample, /STEWARD_FEEDBACK_URL\s*=\s*'https:\/\/steward\.embarko\.app\/api\/v1\/feedback'/); + assert.match(envExample, /STEWARD_FEEDBACK_KEY\s*=\s*'pk_7109b673ade5f6aefc2eb0a1dfbcee1c4a2e'/); +}); + +test('docs/environment.md documents STEWARD_FEEDBACK_URL and STEWARD_FEEDBACK_KEY', () => { + const envDocs = readFileSync('docs/environment.md', 'utf8'); + assert.match(envDocs, /STEWARD_FEEDBACK_URL/); + assert.match(envDocs, /STEWARD_FEEDBACK_KEY/); +}); + +test('sidebar in layout.component.html has Feedback item with correct styling and tooltip', () => { + const html = readFileSync('apps/36-blocks/src/app/panel/layout/layout.component.html', 'utf8'); + assert.match(html, /sidebar-feedback-link/); + assert.match(html, /openFeedback\(\)/); + assert.match(html, /!sideNavService\.isSideNavOpen\(\)\s*\?\s*'Feedback'\s*:\s*''/); + assert.match(html, />feedback<\/mat-icon>/); + + const scss = readFileSync('apps/36-blocks/src/app/panel/layout/layout.component.scss', 'utf8'); + assert.match(scss, /\.sidebar-feedback-link/); + assert.match(scss, /\.sidebar-feedback-link__btn/); +}); + +test('app.component.html hosts proxy-feedback-floating-button', () => { + const html = readFileSync('apps/36-blocks/src/app/app.component.html', 'utf8'); + assert.match(html, /<\/proxy-feedback-floating-button>/); +}); + +test('feedback dialog template satisfies acceptance criteria', () => { + const html = readFileSync( + 'apps/36-blocks/src/app/panel/feedback/feedback-dialog/feedback-dialog.component.html', + 'utf8' + ); + // Must have ONE textarea + const textareaMatches = html.match(/