Merge branch 'dev' into Feat/#24

KDT-hahahoho · Oct 21, 2024 · 5f70ff0 · 5f70ff0
2 parents 70c24d5 + 17ba945
commit 5f70ff0
Show file tree

Hide file tree

Showing 54 changed files with 7,747 additions and 1,974 deletions.
diff --git a/index.html b/index.html
@@ -2,9 +2,19 @@
 <html lang="en">
   <head>
     <meta charset="UTF-8" />
-    <link rel="icon" type="image/svg+xml" href="/vite.svg" />
+    <link rel="icon" type="image/svg+xml" href="icons/favicon.icon" />
+
+    <!--  -->
+    <link rel="apple-touch-icon" href="public/icons/apple-touch-icon-180x180.png" sizes="180x180" />
+    <link
+      rel="mask-icon"
+      href="public/icons/maskable-icon-512x512.png
+    "
+      color="#FFFFFF"
+    />
+    <meta name="theme-color" content="#ffffff" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Vite + React + TS</title>
+    <title>Wish</title>
   </head>
   <body>
     <div id="root"></div>

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -7,7 +7,8 @@
     "dev": "vite",
     "build": "tsc -b && vite build",
     "lint": "eslint .",
-    "preview": "vite preview"
+    "preview": "vite preview",
+    "gen-pwa": "pwa-assets-generator --preset minimal public/icons/logo.svg"
   },
   "dependencies": {
     "@emotion/react": "^11.13.3",
@@ -25,6 +26,7 @@
     "@eslint/js": "^9.11.1",
     "@types/react": "^18.3.10",
     "@types/react-dom": "^18.3.0",
+    "@vite-pwa/assets-generator": "^0.2.6",
     "@vitejs/plugin-react": "^4.3.2",
     "eslint": "^9.11.1",
     "eslint-plugin-react-hooks": "^5.1.0-rc.0",
@@ -33,6 +35,7 @@
     "prettier": "^3.3.3",
     "typescript": "^5.5.3",
     "typescript-eslint": "^8.7.0",
-    "vite": "^5.4.8"
+    "vite": "^5.4.8",
+    "vite-plugin-pwa": "^0.20.5"
   }
 }
diff --git a/public/icons/apple-touch-icon-180x180.png b/public/icons/apple-touch-icon-180x180.png
diff --git a/public/icons/favicon.ico b/public/icons/favicon.ico
diff --git a/public/icons/logo-512x512.png b/public/icons/logo-512x512.png
diff --git a/public/icons/logo.svg b/public/icons/logo.svg
diff --git a/public/icons/maskable-icon-512x512.png b/public/icons/maskable-icon-512x512.png
diff --git a/public/icons/pwa-192x192.png b/public/icons/pwa-192x192.png
diff --git a/public/icons/pwa-512x512.png b/public/icons/pwa-512x512.png
diff --git a/public/icons/pwa-64x64.png b/public/icons/pwa-64x64.png
diff --git a/src/assets/Images/checkArrow.svg b/src/assets/Images/checkArrow.svg
diff --git a/src/assets/Images/checkedArrow.svg b/src/assets/Images/checkedArrow.svg
diff --git a/src/assets/Images/icon-send.svg b/src/assets/Images/icon-send.svg
diff --git a/src/assets/Images/img-speech-bubble.svg b/src/assets/Images/img-speech-bubble.svg
diff --git a/src/assets/Images/img-wish-emotion.svg b/src/assets/Images/img-wish-emotion.svg
diff --git a/src/assets/Images/logo.svg b/src/assets/Images/logo.svg
diff --git a/src/assets/Images/subfertility.svg b/src/assets/Images/subfertility.svg
diff --git a/src/assets/Images/welcome.svg b/src/assets/Images/welcome.svg
diff --git a/src/components/Auth/AuthError.tsx b/src/components/Auth/AuthError.tsx
@@ -2,8 +2,11 @@
 import styled from '@emotion/styled';
 import variables from '@styles/Variables';
 
+// 디폴트 형식과 툴팁형식을 제공함
+
 interface AuthErrorProps {
   message: string;
+  type?: 'default' | 'tooltip';
 }
 
 const AuthErrorContainer = styled.div`
@@ -13,7 +16,26 @@ const AuthErrorContainer = styled.div`
   padding-top: 1.2rem;
 `;
 
-const AuthError = ({ message }: AuthErrorProps) => {
+const AuthErrorTypeToolTip = styled.div`
+  color: #ffa997;
+  padding: 0.6rem;
+  background-color: #ffefeb;
+  font-size: ${variables.size.medium};
+  padding-left: 1.2rem;
+  padding-top: 1.2rem;
+  position: absolute;
+  z-index: 1000;
+  width: 36.8rem;
+  bottom: 20rem;
+  box-sizing: border-box;
+  border-radius: ${variables.borderRadius};
+`;
+
+const AuthError = ({ message, type = 'default' }: AuthErrorProps) => {
+  if (type === 'tooltip') {
+    return <AuthErrorTypeToolTip>X {message}</AuthErrorTypeToolTip>;
+  }
+
   return <AuthErrorContainer>{message}</AuthErrorContainer>;
 };