From d513ea381eb1305a476a201a6f2dce2b2452a7ce Mon Sep 17 00:00:00 2001
From: ahasani194 <ahasani194@gmail.com>
Date: Mon, 11 May 2026 20:26:02 +0330
Subject: [PATCH] feat: update PWA installation logic, enhance app versioning,
 and streamline environment configurations

---
 ngsw-config.json                                     | 6 +++---
 src/app/core/services/pwa-install.service.ts         | 7 +------
 src/app/domains/pos/components/splash.component.html | 1 +
 src/app/domains/pos/components/splash.component.ts   | 2 +-
 src/app/domains/pos/layouts/layout.component.html    | 4 +---
 src/app/layout/default/app.layout.component.ts       | 2 --
 src/environments/environment.prod.ts                 | 2 +-
 src/environments/environment.tis.ts                  | 2 +-
 8 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/ngsw-config.json b/ngsw-config.json
index 171d048..efd9e8b 100644
--- a/ngsw-config.json
+++ b/ngsw-config.json
@@ -1,9 +1,9 @@
 {
   "$schema": "./node_modules/@angular/service-worker/config/schema.json",
   "appData": {
-    "appVersion": "0.0.3",
-    "buildDate": "2026-05-11T13:52:49.314Z",
-    "buildNumber": 3
+    "appVersion": "0.0.4",
+    "buildDate": "2026-05-11T16:11:59.783Z",
+    "buildNumber": 4
   },
   "assetGroups": [
     {
diff --git a/src/app/core/services/pwa-install.service.ts b/src/app/core/services/pwa-install.service.ts
index fa233b6..01fabb9 100644
--- a/src/app/core/services/pwa-install.service.ts
+++ b/src/app/core/services/pwa-install.service.ts
@@ -20,9 +20,6 @@ export class PwaInstallService {
       window.matchMedia('(display-mode: standalone)').matches ||
       (window.navigator as any).standalone === true;
 
-    console.log(window.matchMedia('(display-mode: standalone)').matches);
-    console.log(window.navigator);
-
     this.isInstalled.set(standalone);
 
     window.addEventListener('beforeinstallprompt', (event: any) => {
@@ -30,7 +27,6 @@ export class PwaInstallService {
 
       this.deferredInstallPrompt = event;
       this.canInstall.set(true);
-      console.log(this.deferredInstallPrompt);
     });
 
     window.addEventListener('appinstalled', () => {
@@ -45,8 +41,6 @@ export class PwaInstallService {
       return;
     }
 
-    console.log('openInstallConfirm');
-
     this.confirmationService.confirm({
       header: 'نصب اپلیکیشن',
       message: 'برای ادامه می‌بایست نیازمندی‌های نرم‌افزار را نصب کنید',
@@ -59,6 +53,7 @@ export class PwaInstallService {
         this.deferredInstallPrompt.userChoice.finally(() => {
           this.deferredInstallPrompt = null;
           this.canInstall.set(false);
+          window.location.reload();
         });
       },
     });
diff --git a/src/app/domains/pos/components/splash.component.html b/src/app/domains/pos/components/splash.component.html
index 8ef4a55..0dc2714 100644
--- a/src/app/domains/pos/components/splash.component.html
+++ b/src/app/domains/pos/components/splash.component.html
@@ -1,6 +1,7 @@
 <div class="h-svh w-svw flex flex-col items-center justify-center">
   {{ requireInstall }}
   {{ pwaInstalled() }}
+  {{ canInstall() }}
   <img [src]="logo" class="w-32 animate-pulse" />
   @if (requireInstall && !pwaInstalled()) {
     <div class="mt-6 flex flex-col items-center gap-3">
diff --git a/src/app/domains/pos/components/splash.component.ts b/src/app/domains/pos/components/splash.component.ts
index 4b6ee31..6151c4e 100644
--- a/src/app/domains/pos/components/splash.component.ts
+++ b/src/app/domains/pos/components/splash.component.ts
@@ -30,7 +30,7 @@ export class PosSplashComponent {
   constructor() {
     effect(() => {
       if (!this.requireInstall || this.pwaInstalled() || this.installPromptShown) {
-        this.getData();
+        // this.getData();
         return;
       }
 
diff --git a/src/app/domains/pos/layouts/layout.component.html b/src/app/domains/pos/layouts/layout.component.html
index 3589fd2..15e8236 100644
--- a/src/app/domains/pos/layouts/layout.component.html
+++ b/src/app/domains/pos/layouts/layout.component.html
@@ -30,9 +30,7 @@
           <router-outlet></router-outlet>
         }
       } @else {
-        @defer (when !isAuth()) {
-          <pos-pages-layout />
-        }
+        <pos-pages-layout />
       }
     </div>
   }
diff --git a/src/app/layout/default/app.layout.component.ts b/src/app/layout/default/app.layout.component.ts
index 28d4967..6500b20 100644
--- a/src/app/layout/default/app.layout.component.ts
+++ b/src/app/layout/default/app.layout.component.ts
@@ -138,8 +138,6 @@ export class AppLayout {
     this.layoutService.topbarCenterSlot$.subscribe((tpl) => (this.topBarCenterAction = tpl));
     this.layoutService.topbarEndSlot$.subscribe((tpl) => (this.topBarEndAction = tpl));
 
-    console.log(this.authService.currentAccount());
-
     if (window.location.pathname === '/') {
       if (!this.authService.currentAccount()) {
         this.router.navigateByUrl('auth');
diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts
index f08ed25..084e4d6 100644
--- a/src/environments/environment.prod.ts
+++ b/src/environments/environment.prod.ts
@@ -1,7 +1,7 @@
 // Development environment configuration
 export const environment = {
   production: false,
-  apiBaseUrl: 'https://psp-api.shift-am.ir:5002',
+  apiBaseUrl: 'https://psp-api.shift-am.ir',
   // apiBaseUrl: 'http://192.168.128.73:5002',
   host: 'localhost',
   port: 5001,
diff --git a/src/environments/environment.tis.ts b/src/environments/environment.tis.ts
index 3bae07f..0ac90f5 100644
--- a/src/environments/environment.tis.ts
+++ b/src/environments/environment.tis.ts
@@ -1,7 +1,7 @@
 // TIS tenant environment configuration
 export const environment = {
   production: true,
-  apiBaseUrl: 'https://psp-api.shift-am.ir:5002',
+  apiBaseUrl: 'https://psp-api.shift-am.ir',
   // apiBaseUrl: 'http://192.168.128.73:5002',
   host: 'localhost',
   port: 5000,