🔀 Merge: 최신 main 브랜치와 병합

src/App.jsx

@@ -4,6 +4,9 @@ import { Outlet, useLocation } from 'react-router-dom';
 import Header from '@/components/Header';
 import { Background } from '@/components/Background';
 
+import { ToastContainer } from 'react-toastify';
+import 'react-toastify/dist/ReactToastify.css';
+
 const App = () => {
   const location = useLocation();
   const isListOrMyPage =
@@ -14,6 +17,14 @@ const App = () => {
     <Background>
       {isListOrMyPage && <Header />}
       <Outlet />
+      <ToastContainer
+        autoClose={1500}
+        style={{
+          margin: '50px 30px 0 0',
+          padding: '0 16px',
+        }}
+        position="top-right"
+      />
     </Background>
   );
 };

src/components/Footer/index.jsx

@@ -11,14 +11,10 @@ const Footer = () => {
       <span>
         <span>6기 2조 </span>Fandom-K
       </span>
-      <div>
-        <img
-          src={GithubLogo}
-          width={20}
-          onClick={() =>
-            window.open('https://github.com/sprint6-part2/fandom-k')
-          }
-        />
+      <div
+        onClick={() => window.open('https://github.com/sprint6-part2/fandom-k')}
+      >
+        <img src={GithubLogo} width={20} />
         <span>GitHub</span>
       </div>
     </footer>

src/main.jsx

@@ -4,22 +4,12 @@ import ReactDOM from 'react-dom/client';
 import router from './router';
 
 import { RouterProvider } from 'react-router-dom';
-import { ToastContainer } from 'react-toastify';
 
 import 'reset-css';
 import './styles/normalize.scss';
-import 'react-toastify/dist/ReactToastify.css';
 
 ReactDOM.createRoot(document.getElementById('root')).render(
   <React.StrictMode>
     <RouterProvider router={router} />
-    <ToastContainer
-      autoClose={1500}
-      style={{
-        margin: '50px 8px 0 0',
-        padding: '0 16px',
-      }}
-      position="top-right"
-    />
   </React.StrictMode>,
 );