fix for build

Author: Lukecsharpwalker

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

@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 import {
   ChangeDetectionStrategy,
   Component,
@@ -11,7 +10,6 @@ import {
   ViewContainerRef,
 } from '@angular/core';
 import {
-  FormBuilder,
   FormControl,
   FormGroup,
   FormsModule,
@@ -30,23 +28,11 @@ import { DynamicDialogService } from '../../../shared/dynamic-dialog/dynamic-dia
 import { ModalConfig } from '../../../shared/_models/modal-config.intreface';
 import { AddImageComponent } from './add-image/add-image.component';
 import { AddImageForm } from './add-image/add-image-controls.interface';
-<<<<<<< HEAD
-=======
-import { ChangeDetectionStrategy, Component, inject } from '@angular/core';
-import { FormBuilder, FormGroup, ReactiveFormsModule, Validators } from '@angular/forms';
-import { ApiService } from '../../_services/api.service';
-import { Firestore, FirestoreModule} from '@angular/fire/firestore';
-import { HttpClient } from '@angular/common/http';
-import { AsyncPipe } from '@angular/common';
->>>>>>> ab739b9 (nothing special)
-=======
 import { Post } from '../../../types/supabase';
->>>>>>> fca8c97 (ngrx signal store fixes)
 
 @Component({
   selector: 'blog-add-post',
   standalone: true,
-<<<<<<< HEAD
   imports: [
     ReactiveFormsModule,
     FormsModule,
@@ -55,12 +41,8 @@ import { Post } from '../../../types/supabase';
     RouterModule,
   ],
   providers: [AdminApiService, NgModel],
-=======
-  imports: [ReactiveFormsModule, FirestoreModule, AsyncPipe],
-  providers: [ApiService, HttpClient],
->>>>>>> ab739b9 (nothing special)
   templateUrl: './add-post.component.html',
-  styleUrl: './add-post.component.scss',
+  styleUrls: ['./add-post.component.scss'],
   schemas: [CUSTOM_ELEMENTS_SCHEMA],
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
@@ -88,28 +70,9 @@ export class AddPostComponent implements OnInit {
 
   private apiService = inject(AdminApiService);
 
-<<<<<<< HEAD
-  constructor() {
-    this.blogForm = this.fb.group({
-      title: ['', [Validators.required]],
-      content: ['', [Validators.required]],
-<<<<<<< HEAD
-<<<<<<< HEAD
-      date: new Timestamp(0, 0),
-=======
-      date: null,
->>>>>>> 34e7e50 (supabase added, firebase removed)
-      description: [null],
-      isDraft: [false],
-    }) as FormGroup<PostForm>;
-=======
-    });
->>>>>>> ab739b9 (nothing special)
-=======
   ngOnInit(): void {
     this.loadPostIfIdExists();
     this.initializeQuill();
->>>>>>> cbcd61c (fix lame code)
   }
 
   private loadPostIfIdExists(): void {
@@ -231,12 +194,11 @@ export class AddPostComponent implements OnInit {
     index: number,
     stringToInsert: string,
   ): string {
-    const result = [
+    return [
       ...originalString.slice(0, index),
       ...stringToInsert,
       ...originalString.slice(index),
     ].join('');
-    return result;
   }
 
   @HostListener('window:beforeunload', ['$event'])

src/app/auth/_guards/authAdminGuard.ts

@@ -1,63 +1,16 @@
 import { inject } from '@angular/core';
 import { CanMatchFn, Router } from '@angular/router';
-<<<<<<< HEAD
-<<<<<<< HEAD
-import { AuthService } from '../auth.service';
-=======
->>>>>>> 34e7e50 (supabase added, firebase removed)
-import { Roles } from '../../shared/_enums/roles';
-<<<<<<< HEAD
-=======
-import { Observable } from 'rxjs';
-import { map, take } from 'rxjs/operators';
-import { AuthService } from '../auth.service';
->>>>>>> 2ca65a2 (auth guard moved to auth folder)
-=======
 import { SupabaseService } from '../../services/supabase.service';
->>>>>>> 793fe4a (login fixed)
+import { Roles } from '../../shared/_enums/roles';
 
 export const authAdminGuard: CanMatchFn = (): boolean => {
   const supabaseService = inject(SupabaseService);
   const router = inject(Router);
-<<<<<<< HEAD
-
-<<<<<<< HEAD
-<<<<<<< HEAD
-  if (authService.user$()?.roles?.includes(Roles.ADMIN)) {
-=======
-  console.log('GUARD', authService.isAdmin$());
-  if (authService.isAdmin$()) {
->>>>>>> 2ca65a2 (auth guard moved to auth folder)
-=======
   const session = supabaseService.getSession();
-
-<<<<<<< HEAD:src/app/auth/_guards/auth.guard.ts
-  // For now, just check if the user is authenticated
-  // In a real application, you would check for specific roles in the user's metadata
-  if (session) {
->>>>>>> 793fe4a (login fixed)
-=======
   if (session?.user?.app_metadata?.['role'] === Roles.ADMIN) {
->>>>>>> bc9c691 (wip):src/app/auth/_guards/authAdminGuard.ts
     return true;
   } else {
     router.navigate(['/posts']);
     return false;
   }
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-
->>>>>>> 2ca65a2 (auth guard moved to auth folder)
-=======
-  // if (authService.user$()?.roles?.includes(Roles.ADMIN)) {
-  //   return true;
-  // } else {
-  //   router.navigate(['/posts']);
-  //   return false;
-  // }
-  return true;
->>>>>>> 34e7e50 (supabase added, firebase removed)
-=======
->>>>>>> 793fe4a (login fixed)
 };

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

@@ -4,7 +4,6 @@ import {
   Input,
   inject,
   input,
-  InputSignal,
 } from '@angular/core';
 import { ReaderApiService } from '../../../../_services/reader-api.service';
 import { Comment } from '../../../../../types/supabase';
@@ -24,7 +23,6 @@ export class CommentsComponent {
   @Input() postId!: string;
   comments = input<Comment[]>();
 
-  private apiService = inject(ReaderApiService);
   private commentsStore = inject(CommentsStore);
 
   deleteComment(commentId: string): void {