Merge pull request #116 from MANGO-DIARY/develop

해커톤 제출 완료 (v.1.0.0)

.eslintrc.cjs

@@ -28,12 +28,29 @@ module.exports = {
   },
   plugins: ['react', 'react-refresh'],
   rules: {
+    // existing rules
+    'import/extensions': 'off',
     'react/jsx-no-target-blank': 'off',
     'react-refresh/only-export-components': ['warn', { allowConstantExport: true }],
     'react/prop-types': 'off',
     'import/no-unresolved': 'off',
     'no-alert': 'off',
     'no-console': 'off',
     'react/button-has-type': 'off',
+    'import/prefer-default-export': 'off',
+    'object-shorthand': 'off',
+    'import/no-extraneous-dependencies': 'off',
+    'react/jsx-props-no-spreading': 'off',
+    'react/react-in-jsx-scope': 'off',
+    'react/no-children-prop': 'off',
+    'jsx-a11y/anchor-is-valid': 'off',
+    'jsx-a11y/control-has-associated-label': 'off',
+    'jsx-a11y/no-static-element-interactions': 'off',
+    'jsx-a11y/click-events-have-key-events': 'off',
+    'no-unused-vars': 'off',
+    'react/jsx-filename-extension': 'off',
+    'react/self-closing-comp': 'off',
+    'consistent-return': 'off',
+    'no-param-reassign': 'off',
   },
 };

README.md

@@ -1,19 +1,27 @@
-# MANGO-DIARY-FE
+# 마음의 소리에 귀를 기울이고 싶은 당신에게, "아프지 망고"
 
-## How to Start
+![1 인트로](https://github.com/user-attachments/assets/e6b374e9-a363-4e2a-bd11-4da386a008c6)
 
-quick start with commands below🧡
+## 💻 Developers
 
-```bash
-git clone https://github.com/MANGO-DIARY/MANGO-DIARY-FE.git
-cd ./MANGO-DIARY-FE
-npm install
-npm run dev
-```
+|                                                                           FE                                                                           |                                  FE                                  |                                                FE                                                |
+| :----------------------------------------------------------------------------------------------------------------------------------------------------: | :------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------: |
+| <img style="width: 200px;" src="https://github.com/goormthon-Univ/2024_BEOTKKOTTHON_TEAM_4_FE/assets/88662427/a8b3a2b9-0761-4da8-8a79-679c12d34b67" /> | <img style="width: 200px;" src="https://github.com/haram8009.png" /> | ![image 42 (2)](https://github.com/user-attachments/assets/167a3fe4-ab64-49f5-bab2-c6f6b2dbef3f) |
+|                                                                       국민대학교                                                                       |                              국민대학교                              |                                            국민대학교                                            |
+|                                                                         김민정                                                                         |                                이하람                                |                                              박성영                                              |
+|                                                       [@minjeoong](https://github.com/minjeoong)                                                       |              [@haram8009](https://github.com/haram8009)              |                           [@Sung-young](https://github.com/Sung-young)                           |
 
-## husky
+## 📲 Tech
 
-Husky improves your commits and more 🐶 woof!
+<img src="https://img.shields.io/badge/react-61DAFB?style=for-the-badge&logo=React&logoColor=white"><img src="https://img.shields.io/badge/react query-FF4154?style=for-the-badge&logo=ReactQuery&logoColor=white"><img src="https://img.shields.io/badge/css-1572B6?style=for-the-badge&logo=css3&logoColor=white">
 
-- Pre-commit: Automatically format code with Prettier before committing
-- Pre-push: Lint your code to ensure code quality before pushing
+## 📲 기능
+
+![1 인트로](https://github.com/user-attachments/assets/e6b374e9-a363-4e2a-bd11-4da386a008c6)
+![2 문제상황](https://github.com/user-attachments/assets/ef75e78c-d5e8-49e3-8724-d13eeb1a41e8)
+![3 솔루션](https://github.com/user-attachments/assets/95c615f7-2e4d-4e8d-88e4-9463eae571d1)
+![4 기능1](https://github.com/user-attachments/assets/ad9d2a00-3cbe-4f53-8380-5f98682e427c)
+![5 기능2](https://github.com/user-attachments/assets/6d75c8c6-15e2-4e9f-9370-815f30649f7d)
+![6 기능3](https://github.com/user-attachments/assets/8d6a65c2-1cf2-42be-ba9a-094282efa762)
+![7 BM](https://github.com/user-attachments/assets/4925d6e1-9713-4334-a7c6-cfde0a640045)
+![8 마무리](https://github.com/user-attachments/assets/940a2e69-1bcc-44e7-b5f1-16e080549dac)

index.html

@@ -3,7 +3,17 @@
   <head>
     <meta charset="UTF-8" />
     <!-- <link rel="icon" type="image/svg+xml" href="/vite.svg" /> -->
+    <link rel="icon" href="/favicon.ico" />
+    <link rel="apple-touch-icon" href="/apple-touch-icon-180x180.png" sizes="180x180" />
+    <link rel="mask-icon" href="/mask-icon.svg" color="#FFFFFF" />
+
+    <link rel="preconnect" href="https://fonts.googleapis.com" />
+    <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
+    <link href="https://fonts.googleapis.com/css2?family=Jua&display=swap" rel="stylesheet" />
+
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <link rel="stylesheet" href="./src/styles/global.css" />
+    <!-- CSS 파일 추가 -->
     <title>MANGO DIARY</title>
   </head>
   <body>