More work on share dynamics

Author: akariv

projects/budgetkey/src/app/app-routing.module.ts

@@ -8,7 +8,7 @@ const routes: Routes = [
   { path: 'i', loadChildren: () => import('./item/item.module').then(m => m.ItemModule) },
   { path: 'about', loadChildren: () => import('./about/about.module').then(m => m.AboutModule) },
   { path: 'p', loadChildren: () => import('./profile/profile.module').then(m => m.ProfileModule) },
-  { path: 'l', loadChildren: () => import('./list-components/list-components.module').then(m => m.ListComponentsModule) },
+  { path: 'l', loadChildren: () => import('./list-page/list-page.module').then(m => m.ListPageModule) },
   { path: 'not-found', component: PageNotFoundComponent },
   { path: '**', pathMatch: 'full', component: PageNotFoundComponent },
 ];
@@ -17,6 +17,7 @@ const routes: Routes = [
   imports: [RouterModule.forRoot(routes, {
     initialNavigation: 'enabledBlocking',
     anchorScrolling: 'enabled',
+    // enableTracing: true,
 })],
   exports: [RouterModule]
 })

projects/budgetkey/src/app/app.module.ts

@@ -8,6 +8,8 @@ import { NGX_SEO_CONFIG_TOKEN, NgxSeoModule } from '@avivharuzi/ngx-seo';
 import { PageNotFoundComponent } from './page-not-found/page-not-found.component';
 import { AppErrorHandler } from './app-error-handler';
 import { ListComponentsModule } from './list-components/list-components.module';
+import { provideRouter, withDebugTracing } from '@angular/router';
+import { ListPageModule } from './list-page/list-page.module';
 
 @NgModule({
   declarations: [
@@ -20,6 +22,7 @@ import { ListComponentsModule } from './list-components/list-components.module';
     CommonComponentsModule,
     ListComponentsModule,
     NgxSeoModule.forRoot(),
+    ListPageModule,
   ],
   providers: [
     provideClientHydration(),

projects/budgetkey/src/app/common-components/auth/auth.component.html

@@ -16,8 +16,9 @@
             </svg>
         </div>
         <div *ngIf="user && user.authenticated" class='menu'>
-            <a class='menu-line' (activated)="profile()" clickOnReturn>התראות שמורות</a>
-            <a class='menu-line' (activated)="profile()" clickOnReturn>פרופיל אישי</a>
+            <a class='menu-line' (activated)="profile()" *ngIf='hasProfile' clickOnReturn>התראות שמורות</a>
+            <a class='menu-line' (activated)="myLists()" clickOnReturn *ngIf='lists.hasCuratedLists()'>הרשימות שלי</a>
+            <!-- <a class='menu-line' (activated)="profile()" clickOnReturn>פרופיל אישי</a> -->
             <a class='menu-line' (activated)="logout()" clickOnReturn>התנתקות</a>
         </div>
 </div>

projects/budgetkey/src/app/common-components/auth/auth.component.ts

@@ -6,6 +6,8 @@ import { AuthService } from './auth.service';
 import { Observable } from 'rxjs';
 import { PlatformService } from '../platform.service';
 import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy';
+import { Router } from '@angular/router';
+import { ListsService } from '../services/lists.service';
 
 @UntilDestroy()
 @Component({
@@ -18,7 +20,7 @@ export class AuthComponent implements AfterViewInit {
 
     @Input() theme: any;
 
-    constructor(private auth: AuthService, private ps: PlatformService) {
+    constructor(private auth: AuthService, private ps: PlatformService, private router: Router, public lists: ListsService) {
         this.auth.getUser().pipe(
             untilDestroyed(this)
         ).subscribe((user) => {
@@ -55,13 +57,17 @@ export class AuthComponent implements AfterViewInit {
         });
     }
 
+    get hasProfile() {
+        return this.auth?.authConfig?.profilePagePath || null;
+    }
+    
     profile() {
         if (this.auth.authConfig.profilePagePath) {
-            let params = '';
-            if (this.theme && this.theme.themeId) {
-                params = '?theme=' + this.theme.themeId;
-            }
-            window.location.href = this.auth.authConfig.profilePagePath + params;
+            this.router.navigate(this.auth.authConfig.profilePagePath, { queryParamsHandling: 'preserve' });
         }
     }
+
+    myLists() {
+        this.router.navigate(['/l/my'], { queryParamsHandling: 'preserve' });
+    }
 }

projects/budgetkey/src/app/common-components/auth/auth.service.ts

@@ -18,7 +18,7 @@ export class AuthService {
         authServerUrl: 'https://next.obudget.org',
         jwtLocalStorageKey: 'jwt',
         jwtQueryParam: 'jwt',
-        profilePagePath: '/p/'
+        profilePagePath: ['/p']
     };    
 
     constructor(private http: HttpClient, private platform: PlatformService) {
@@ -104,9 +104,7 @@ export class AuthService {
     }
 
     logout(): Observable<any> {
-        console.log('LOGOUT');
         this.deleteToken();
-        console.log('token delted');
         return this.check();
     }
 

projects/budgetkey/src/app/common-components/common.less

@@ -1,4 +1,4 @@
-@import '../../common.less';
+@import '../../../../common.less';
 
 header {
   height: @headerHeight;

projects/budgetkey/src/app/common-components/components/header/bk-header.component.less

@@ -1,6 +1,8 @@
 import {Component, Inject, Input} from '@angular/core';
 import { GlobalSettingsService } from '../../global-settings.service';
 import { Router } from '@angular/router';
+import { platform } from 'os';
+import { PlatformService } from '../../platform.service';
 
 @Component({
     selector: 'app-bk-header',
@@ -13,8 +15,8 @@ export class BkHeaderComponent {
     @Input() showLanguages = false;
     public showAuth = false;
 
-    constructor (public globalSettings: GlobalSettingsService, private router: Router) {
-      this.showAuth = !globalSettings.theme.disableAuth;
+    constructor (public globalSettings: GlobalSettingsService, private router: Router, private platform: PlatformService) {
+      this.showAuth = !globalSettings.theme.disableAuth && this.platform.browser();
     }
 
     doSearch(href?: string) {

projects/budgetkey/src/app/common-components/components/header/bk-header.component.ts

@@ -1,13 +1,16 @@
 <div class="bkmodal-bg">
-    <div class="bkmodal-dialog">
-      <div class="bkmodal-content">
-          <button type="button" class="close" (click)="_close()">&times;</button>
-          <div class="bkmodal-header" *ngIf='title'>
-            <h4 class="modal-title">{{title}}</h4>
-          </div>
-          <div class="bkmodal-body">
-            <ng-content></ng-content>
-          </div>
-        </div>
+  <div class="bkmodal-dialog">
+    <div class="bkmodal-content" *ngIf='standardLayout'>
+      <button type="button" class="close" (click)="_close()">&times;</button>
+      <div class="bkmodal-header" *ngIf='title'>
+        <h4 class="modal-title">{{title}}</h4>
+      </div>
+      <div class="bkmodal-body">
+        <ng-content></ng-content>
+      </div>
     </div>
-  </div>
+    <div *ngIf='!standardLayout'>
+      <ng-content></ng-content>
+    </div>
+  </div>
+</div>

projects/budgetkey/src/app/common-components/components/modal/modal.component.html

@@ -1,4 +1,6 @@
 :host {
+  position: relative;
+  
   .bkmodal-bg {
     position: fixed;
     z-index: 10000;
@@ -14,7 +16,6 @@
   }
 
   .bkmodal-dialog {
-
     width: 60%;
     max-width: 600px;
     background: white;