🩹 fix : merge conflicts

frontend/src/components/atoms/Button/index.tsx

@@ -1,7 +1,7 @@
-import { Button, ButtonProps } from "@mui/material";
+import { Button } from "@mui/material";
+import { ButtonPropsInterface } from "../../../utils/interfaces";
 
-interface ButtonPropsInterface extends ButtonProps {}
-
-const MuiButton = ({ ...buttonProps }: ButtonPropsInterface) => <Button {...buttonProps} disableElevation disableRipple />;
+const MuiButton = ({ ...buttonProps }: ButtonPropsInterface) =>
+    <Button {...buttonProps} disableElevation disableRipple />;
 
 export default MuiButton;

frontend/src/components/atoms/icon/index.tsx → frontend/src/components/atoms/Icon/index.tsx

@@ -1,12 +1,4 @@
-import React from "react";
-
-interface IconComponentProps {
-  width?: string;
-  height?: string;
-  padding?: string;
-  src: string;
-  sx?:React.CSSProperties,
-}
+import { IconComponentProps } from "../../../utils/interfaces";
 
 const IconComponent = (props: IconComponentProps) => {
     const { src, width, height, padding } = props;

frontend/src/components/atoms/image/index.tsx → frontend/src/components/atoms/Image/index.tsx

@@ -1,10 +1,6 @@
 import { IMAGE_DATATESTID } from "../../../utils/constants";
+import { ImageComponentProps } from "../../../utils/interfaces";
 
-interface ImageComponentProps {
-  src: string;
-  height?: string;
-  width?: string;
-}
 
 const ImageComponent = ({ src, height, width }: ImageComponentProps) => {
   return (

frontend/src/components/atoms/textfield/index.tsx → frontend/src/components/atoms/Textfield/index.tsx

@@ -2,18 +2,8 @@ import React, { useState } from 'react';
 import { TextField, IconButton, InputAdornment } from '@mui/material';
 import EyeOn from "../../../../public/assets/images/eye.svg";
 import EyeOff from "../../../../public/assets/images/Vector.svg";
-import IconComponent from '../icon';
-
-export interface TextFieldProps {
-  placeholder?: string;
-  value: string;
-  onChange: (value: string) => void;
-  isPassword: boolean;
-  width?: string;
-  height?: string | number;
-  size?: "small" | "medium";
-  borderRadius?: string | number;
-}
+import IconComponent from '../Icon';
+import { TextFieldProps } from '../../../utils/interfaces';
 
 const CustomTextField: React.FC<TextFieldProps> = ({
   placeholder,

frontend/src/components/atoms/typography/index.tsx → frontend/src/components/atoms/Typography/index.tsx

@@ -1,11 +1,7 @@
-import  { ReactNode } from "react";
-import { Typography, TypographyProps } from "@mui/material";
+import { Typography } from "@mui/material";
 import { TYPOGRAPHY_DATATESTID } from "../../../utils/constants";
+import { CustomTypographyProps } from "../../../utils/interfaces";
 
-interface CustomTypographyProps extends TypographyProps {
-  text: ReactNode;
-
-}
 const MuiTypography = ({ variant, sx, text, ...rest }: CustomTypographyProps) => (
   <Typography data-testid={TYPOGRAPHY_DATATESTID} variant={variant} sx={sx} {...rest}>
     {text}

frontend/src/components/molecules/socialLogin/index.tsx → frontend/src/components/molecules/SocialLogin/index.tsx

@@ -1,5 +1,5 @@
-import MuiTypography from "../../atoms/typography";
-import IconComponent from "../../atoms/icon";
+import MuiTypography from "../../atoms/Typography";
+import IconComponent from "../../atoms/Icon";
 import { SocialLoginProps } from "../../../utils/interfaces";
 import { StylesBox } from "./styles";
 

frontend/src/utils/interfaces.ts

@@ -1,3 +1,6 @@
+import { ButtonProps, TypographyProps } from "@mui/material";
+import { ReactNode } from "react";
+
 export interface SocialLoginProps {
     text: string;
     src: string;
@@ -7,6 +10,27 @@ export interface TypographyWithTextFieldProps {
   label: string;
   color: string;
   placeholder: string;
+  text: string;
+  src: string;
+}
+export interface ButtonPropsInterface extends ButtonProps { }
+
+export interface IconComponentProps {
+  width?: string;
+  height?: string;
+  padding?: string;
+  src: string;
+  sx?:React.CSSProperties,
+}
+
+export interface ImageComponentProps {
+  src: string;
+  height?: string;
+  width?: string;
+}
+
+export interface TextFieldProps {
+  placeholder?: string;
   value: string;
   onChange: (value: string) => void;
   isPassword: boolean;
@@ -15,4 +39,8 @@ export interface TypographyWithTextFieldProps {
   size?: "small" | "medium";
   borderRadius?: string | number;
   variant:any
+}
+
+export interface CustomTypographyProps extends TypographyProps {
+  text: ReactNode;
 }