From 2130c6bd32026a5d487fae270a41c479c63d6e13 Mon Sep 17 00:00:00 2001
From: petark7 <petarkk7@gmail.com>
Date: Sun, 1 Dec 2024 19:12:39 +0100
Subject: [PATCH] Fix conflicts while merging with staging

---
 app/signup/page.tsx                                            | 1 +
 components/module-components/blog/TagInput.tsx                 | 2 +-
 components/module-components/blog/TagList.tsx                  | 2 +-
 components/module-components/blog/TagManager.tsx               | 2 +-
 .../reusable-dropdown/ReusableDropdown.module.scss             | 2 +-
 utils/actions/session.ts                                       | 3 ++-
 utils/authOptions.ts                                           | 1 +
 7 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/app/signup/page.tsx b/app/signup/page.tsx
index 880a0440..5603808d 100644
--- a/app/signup/page.tsx
+++ b/app/signup/page.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable no-console */
 // pages/signup/index.tsx
 
 'use client';
diff --git a/components/module-components/blog/TagInput.tsx b/components/module-components/blog/TagInput.tsx
index 82a614ec..625b6ce1 100644
--- a/components/module-components/blog/TagInput.tsx
+++ b/components/module-components/blog/TagInput.tsx
@@ -9,7 +9,7 @@ import useDebounce from '../../../utils/hooks/useDebounce';
 import useAddNewTag from '../../../apis/mutations/tags/useAddNewTag';
 
 export interface TagObject {
-  id: number;
+  id: string;
   name: string;
   created_at: string;
   updated_at: string;
diff --git a/components/module-components/blog/TagList.tsx b/components/module-components/blog/TagList.tsx
index 872e758b..2aca3375 100644
--- a/components/module-components/blog/TagList.tsx
+++ b/components/module-components/blog/TagList.tsx
@@ -6,7 +6,7 @@ import styles from './TagList.module.scss';
 
 interface TagListProps {
   selectedTags: TagObject[];
-  onRemoveTag: (tagId: number) => void;
+  onRemoveTag: (tagId: string) => void;
 }
 
 const TagList = ({ selectedTags, onRemoveTag }: TagListProps) => {
diff --git a/components/module-components/blog/TagManager.tsx b/components/module-components/blog/TagManager.tsx
index 6a16eebd..84633718 100644
--- a/components/module-components/blog/TagManager.tsx
+++ b/components/module-components/blog/TagManager.tsx
@@ -9,7 +9,7 @@ interface TagManagerProps {
 }
 
 const TagManager = ({ selectedTags, onTagsChange }: TagManagerProps) => {
-  const handleRemoveTag = (tagId: number) => {
+  const handleRemoveTag = (tagId: string) => {
     onTagsChange(selectedTags.filter((tag) => tag.id !== tagId));
   };
 
diff --git a/components/reusable-components/reusable-dropdown/ReusableDropdown.module.scss b/components/reusable-components/reusable-dropdown/ReusableDropdown.module.scss
index 1e35dac1..32351de1 100644
--- a/components/reusable-components/reusable-dropdown/ReusableDropdown.module.scss
+++ b/components/reusable-components/reusable-dropdown/ReusableDropdown.module.scss
@@ -6,7 +6,7 @@
 .dropdownButton {
   height: 100%;
   display: flex;
-  justify-content: end;
+  justify-content: flex-end;
   font-size: var(--fs-button);
   font-weight: 400;
   background-color: #ffffff;
diff --git a/utils/actions/session.ts b/utils/actions/session.ts
index 581d91d6..1fd198c4 100644
--- a/utils/actions/session.ts
+++ b/utils/actions/session.ts
@@ -51,7 +51,8 @@ export async function getNewToken({
     const data: RefreshTokenResponse = await response.json();
     return data.new_token;
   } catch (error: any) {
-    // console.error({ msg: 'Error from getNewToken', error });
+    // eslint-disable-next-line no-console
+    console.error({ msg: 'Error from getNewToken', error });
     return null;
   }
 }
diff --git a/utils/authOptions.ts b/utils/authOptions.ts
index f9eed7b7..29fad4e6 100644
--- a/utils/authOptions.ts
+++ b/utils/authOptions.ts
@@ -1,3 +1,4 @@
+/* eslint-disable no-console */
 import { NextAuthOptions } from 'next-auth';
 import GithubProvider from 'next-auth/providers/github';
 import GoogleProvider from 'next-auth/providers/google';