fix lame code

Author: Lukecsharpwalker

src/app/admin/_components/add-post/add-post.component.ts

@@ -12,6 +12,7 @@ import {
 } from '@angular/core';
 import {
   FormBuilder,
+  FormControl,
   FormGroup,
   FormsModule,
   NgModel,
@@ -67,15 +68,27 @@ export class AddPostComponent implements OnInit {
   @Input() postId?: string;
   quill = viewChild.required<QuillEditorComponent>('quill');
 
-  blogForm: FormGroup<PostForm>;
-  range: Range | null = null;
-
   viewContainerRef = inject(ViewContainerRef);
   dialogService = inject(DynamicDialogService<AddImageForm>);
 
-  private fb = inject(FormBuilder);
+  blogForm: FormGroup<PostForm> = new FormGroup<PostForm>({
+    title: new FormControl('', {
+      validators: [Validators.required],
+      nonNullable: true,
+    }),
+    content: new FormControl('', {
+      validators: [Validators.required],
+      nonNullable: true,
+    }),
+    date: new FormControl<Date | null>(null),
+    description: new FormControl<string | null>(null),
+    isDraft: new FormControl(false, { nonNullable: true }),
+  });
+  range: Range | null = null;
+
   private apiService = inject(AdminApiService);
 
+<<<<<<< HEAD
   constructor() {
     this.blogForm = this.fb.group({
       title: ['', [Validators.required]],
@@ -92,17 +105,21 @@ export class AddPostComponent implements OnInit {
 =======
     });
 >>>>>>> ab739b9 (nothing special)
+=======
+  ngOnInit(): void {
+    this.loadPostIfIdExists();
+    this.initializeQuill();
+>>>>>>> cbcd61c (fix lame code)
   }
 
-  ngOnInit(): void {
+  private loadPostIfIdExists(): void {
     if (this.postId) {
       this.apiService.getPostById(this.postId).subscribe((post) => {
         if (post) {
           this.blogForm.patchValue(post);
         }
       });
     }
-    this.initializeQuill();
   }
 
   async initializeQuill() {

src/app/app.component.ts

@@ -3,12 +3,9 @@ import {
   ViewContainerRef,
   afterNextRender,
   inject,
-  OnInit,
 } from '@angular/core';
 import { RouterOutlet } from '@angular/router';
 import { CookieConsentService } from './shared/cookie-consent/cookie-consent.service';
-import { SupabaseClient } from '@supabase/supabase-js';
-import { SupabaseService } from './services/supabase.service';
 
 @Component({
   selector: 'app-root',
@@ -18,13 +15,16 @@ import { SupabaseService } from './services/supabase.service';
   styleUrl: './app.component.scss',
 })
 export class AppComponent {
-  // cookieConsentService = inject(CookieConsentService);
-  // viewContainerRef = inject(ViewContainerRef);
+  cookieConsentService = inject(CookieConsentService);
+  viewContainerRef = inject(ViewContainerRef);
 
   constructor() {
-    console.log('AppComponent');
-    // afterNextRender(() =>
-    //   this.cookieConsentService.showCookieConsent(this.viewContainerRef),
-    // );
+    this.showCookieConsent();
+  }
+
+  private showCookieConsent() {
+    afterNextRender(() =>
+      this.cookieConsentService.showCookieConsent(this.viewContainerRef),
+    );
   }
 }

src/app/reader/_components/main-page/post/add-comment/add-comment.component.ts

@@ -9,6 +9,7 @@ import {
   FormBuilder,
   Validators,
   ReactiveFormsModule,
+  FormControl,
 } from '@angular/forms';
 import { ReaderApiService } from '../../../../_services/reader-api.service';
 import { CommentsStore } from '../comments/comments.store';
@@ -25,17 +26,15 @@ import { Comment } from '../../../../../types/supabase';
 })
 export class AddCommentComponent {
   @Input() postId!: string;
-  commentForm: FormGroup;
 
-  private fb = inject(FormBuilder);
-  private apiService = inject(ReaderApiService);
-  private commentsStore = inject(CommentsStore);
+  commentForm: FormGroup = new FormGroup({
+    content: new FormControl<string>('', {
+      validators: [Validators.required],
+      nonNullable: true,
+    }),
+  });
 
-  constructor() {
-    this.commentForm = this.fb.group({
-      content: ['', [Validators.required]],
-    });
-  }
+  private commentsStore = inject(CommentsStore);
 
   onSubmit(): void {
     if (this.commentForm.valid) {

src/app/reader/_components/main-page/post/post.component.ts

@@ -35,24 +35,27 @@ export class PostComponent implements OnInit {
   postStore = inject(PostStore);
 
   post: Signal<Post | null> = this.postStore.post;
+  date: string = '';
 
   private dialogService = inject(DynamicDialogService);
   private viewContainerRef = inject(ViewContainerRef);
 
-  date: string = '';
-
   constructor() {
     this.addEventsForOpenModalWithCode();
   }
 
   ngOnInit() {
-    this.postStore.getPost(this.id());
+    this.loadPost();
   }
 
   goBack(): void {
     this.router.navigate(['/posts']);
   }
 
+  private loadPost(): void {
+    this.postStore.getPost(this.id());
+  }
+
   private showCodeModal(event: Event) {
     const preElement = event.currentTarget as HTMLElement;
     const codeElement = preElement.querySelector('code');
@@ -73,6 +76,7 @@ export class PostComponent implements OnInit {
 
   private addEventsForOpenModalWithCode() {
     afterNextRender(() => {
+      //TODO: Move to the service
       const processedNodes = new Set<Node>();
 
       const observer = new MutationObserver((mutations) => {

src/app/reader/_components/main-page/posts-list/posts-list.component.ts

@@ -45,18 +45,12 @@ export class PostsListComponent implements OnInit {
   initialScroll = 2;
 
   constructor() {
-    this.scrollProgress.set(this.initialScroll);
-    afterNextRender(() => {
-      this.scroll()?.nativeElement.addEventListener(
-        'scroll',
-        this.onScroll.bind(this),
-      );
-    });
+    this.initializeScrolling();
   }
 
-  //TODO: FIX HACK FOR PRERENDERING
   ngOnInit() {
-    setTimeout(() => {}, 0);
+    //TODO: FIX HACK FOR PRERENDERING
+    this.applyPrerenderingHack();
   }
 
   onScroll(event: Event) {
@@ -69,4 +63,18 @@ export class PostsListComponent implements OnInit {
 
     this.scrollProgress.set(scrollPercentage);
   }
+
+  private applyPrerenderingHack(): void {
+    setTimeout(() => {}, 0);
+  }
+
+  private initializeScrolling(): void {
+    this.scrollProgress.set(this.initialScroll);
+    afterNextRender(() => {
+      this.scroll()?.nativeElement.addEventListener(
+        'scroll',
+        this.onScroll.bind(this),
+      );
+    });
+  }
 }

src/app/services/supabase.service.ts

@@ -13,9 +13,9 @@ import { environment } from '../../environments/environment';
   providedIn: 'root',
 })
 export class SupabaseService {
-  private readonly supabase: SupabaseClient;
-  public session: AuthSession | null = null;
+  private supabase: SupabaseClient;
   private readonly ngZone = inject(NgZone);
+  public session: AuthSession | null = null;
 
   constructor() {
     this.supabase = this.ngZone.runOutsideAngular(() =>

src/app/shared/dynamic-dialog/dynamic-dialog.component.ts

@@ -38,9 +38,7 @@ export class DynamicDialogComponent<C = unknown> implements OnInit {
   ModalCloseStatusEnum = ModalCloseStatusEnum;
 
   ngOnInit(): void {
-    if (this.divEl() && this.component) {
-      this.componentRef = this.divEl().createComponent(this.component);
-    }
+    this.createDynamicComponent();
   }
 
   closeDialog(
@@ -57,4 +55,10 @@ export class DynamicDialogComponent<C = unknown> implements OnInit {
   onOverlayClick($event: MouseEvent) {
     console.log('Overlay clicked', $event);
   }
+
+  private createDynamicComponent(): void {
+    if (this.divEl() && this.component) {
+      this.componentRef = this.divEl().createComponent(this.component);
+    }
+  }
 }

src/app/shared/navbar/navbar.component.ts

@@ -34,12 +34,9 @@ export class NavbarComponent implements AfterViewInit {
 
   private dynamicDialogService = inject(DynamicDialogService);
   private viewContainerRef = inject(ViewContainerRef);
-  private supabaseService = inject(SupabaseService);
 
   constructor() {
-    afterNextRender(() => {
-      this.navHeight.set(this.navbar()?.nativeElement.scrollHeight ?? 0);
-    });
+    this.initializeNavHeight();
   }
 
   ngAfterViewInit() {}
@@ -66,6 +63,12 @@ export class NavbarComponent implements AfterViewInit {
     }
   }
 
+  private initializeNavHeight(): void {
+    afterNextRender(() => {
+      this.navHeight.set(this.navbar()?.nativeElement.scrollHeight ?? 0);
+    });
+  }
+
   @HostListener('window:scroll', [])
   onWindowScroll() {
     this.isScrolled = window.scrollY > 0;