chore: resolve merge conflicts

src/app/app.config.ts

@@ -1,13 +1,13 @@
 import { provideHttpClient } from '@angular/common/http';
-import { provideRouter, withComponentInputBinding } from '@angular/router';
+import { provideRouter } from '@angular/router';
 import { provideMarkdown } from 'ngx-markdown';
 import { routes } from './app.routes';
 import { provideGeminiApi } from './gemini/gemini.provider';
 
 export const appConfig = {
     providers: [
       provideHttpClient(),
-      provideRouter(routes, withComponentInputBinding()),
+      provideRouter(routes),
       provideGeminiApi(),
       provideMarkdown()
     ]

src/app/gemini/chat-history/chat-history.component.ts

@@ -1,4 +1,4 @@
-import { ChangeDetectionStrategy, Component, EventEmitter, Output, input } from '@angular/core';
+import { ChangeDetectionStrategy, Component, input } from '@angular/core';
 import { MarkdownComponent } from 'ngx-markdown';
 import { HistoryItem } from '../interfaces/history-item.interface';
 import { LineBreakPipe } from '../pipes/line-break.pipe';

src/app/gemini/custom-operators/generate-text.operator.ts

@@ -0,0 +1,15 @@
+import { Observable, catchError, map, of, retry, tap } from 'rxjs';
+
+export function generateText(numRetries: number) {
+    return function(source: Observable<any>) {
+      return source.pipe(
+          retry(numRetries),
+          tap((response) => console.log(response)),
+          map((response) => response.candidates?.[0].content?.parts?.[0].text || 'No response' ),
+          catchError((err) => {
+            console.error(err);
+            return of('Error occurs');
+          })
+        );
+      }
+  }

src/app/gemini/services/gemini.service.ts

@@ -1,6 +1,7 @@
 import { HttpClient } from '@angular/common/http';
 import { Injectable, inject } from '@angular/core';
-import { Observable, catchError, map, of, retry, tap } from 'rxjs';
+import { Observable } from 'rxjs';
+import { generateText } from '../custom-operators/generate-text.operator';
 import { GEMINI_GENERATION_CONFIG, GEMINI_PRO_URL, GEMINI_PRO_VISION_URL, GEMINI_SAFETY_SETTINGS } from '../gemini.constant';
 import { GeminiResponse } from '../interfaces/generate-response.interface';
 import { MultimodalInquiry } from '../interfaces/genmini.interface';
@@ -34,15 +35,7 @@ export class GeminiService {
         "Content-Type": "application/json"
       }
     })
-    .pipe(
-      retry(3),
-      tap((response) => console.log(response)),
-      map((response) => response.candidates?.[0].content?.parts?.[0].text || 'No response' ),
-      catchError((err) => {
-        console.error(err);
-        return of('Error occurs');
-      })
-    );
+    .pipe(generateText(3));
   }
 
   generateTextFromMultimodal({ prompt, mimeType, base64Data }: MultimodalInquiry): Observable<string> {
@@ -70,14 +63,6 @@ export class GeminiService {
         "Content-Type": "application/json"
       }
     })
-    .pipe(
-      retry(3),
-      tap((response) => console.log(response)),
-      map((response) => response.candidates?.[0].content?.parts?.[0].text || 'No response' ),
-      catchError((err) => {
-        console.error(err);
-        return of('Error occurs');
-      })
-    );
+    .pipe(generateText(3));
   }
 }