Merge pull request #73 from dnd-side-project/develop

✨ Update v1.0.2
dnd-side-project · Jun 11, 2024 · a40c7dd · a40c7dd
2 parents a7672f7 + d4272c1
commit a40c7dd
Show file tree

Hide file tree

Showing 28 changed files with 76 additions and 11,010 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -1 +1,2 @@
-* @seondal
+@seondal
+
diff --git a/.github/ISSUE_TEMPLATE/trouble-shooting.md b/.github/ISSUE_TEMPLATE/trouble-shooting.md
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
diff --git a/.github/auto_assign.yml b/.github/auto_assign.yml
diff --git a/.github/labeler.yml b/.github/labeler.yml
diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml
diff --git a/.github/workflows/auto-label.yml b/.github/workflows/auto-label.yml
diff --git a/.github/workflows/cd-develop-branch.yml b/.github/workflows/cd-develop-branch.yml
diff --git a/.github/workflows/cd-feature-branch.yml b/.github/workflows/cd-feature-branch.yml
diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml
diff --git a/.gitignore b/.gitignore
@@ -9,3 +9,6 @@
 # Next-PWA
 public/*.js
 public/*.js.map
+
+package-lock.json
+yarn.lock
diff --git a/.husky/commit-msg b/.husky/commit-msg
diff --git a/.husky/pre-commit b/.husky/pre-commit
diff --git a/public/images/app_icon.png b/public/images/app_icon.png
diff --git a/public/meta/og_detail.png b/public/meta/og_detail.png
diff --git a/public/meta/og_kakao.png b/public/meta/og_kakao.png
diff --git a/public/meta/og_main.png b/public/meta/og_main.png
diff --git a/src/apis/config/privateApi.ts b/src/apis/config/privateApi.ts
@@ -18,7 +18,7 @@ const privateApi: CustomInstance = axios.create({
 privateApi.interceptors.response.use(
   (response) => response.data,
   (error) => {
-    if (error.response.status === 415) {
+    if (error.response.status === 401) {
       alert('세션이 만료되었어요. 다시 로그인이 필요해요!');
     } else {
       alert('오류가 발생했어요. 다시 시도해주세요');

diff --git a/src/app/auth/page.tsx b/src/app/auth/page.tsx
@@ -17,7 +17,7 @@ export default function Page() {
         setUser(response);
         localStorage.setItem('accesstoken', response.token.accessToken);
         alert(`로그인에 성공했어요!`);
-        router.replace('/menu');
+        router.back();
       });
     }
   });

diff --git a/src/app/globals.css b/src/app/globals.css
@@ -14,12 +14,25 @@
 body {
   min-height: 100vh;
 }
+#ios-banner {
+  display: none;
+}
 
+/*iOS Browser*/
 @supports (-webkit-touch-callout: none) {
   body {
-    /* for ios safari 15, safe-area-inset-bottom is 0, so a special fix apply here */
     min-height: -webkit-fill-available;
   }
+  #ios-banner {
+    display: block;
+  }
+}
+
+/*PWA*/
+@media all and (display-mode: standalone) {
+  #ios-banner {
+    display: none;
+  }
 }
 
 @media (min-width: 440px) {

diff --git a/src/components/Button/BottomFixedDiv.tsx b/src/components/Button/BottomFixedDiv.tsx
@@ -1,3 +1,4 @@
+import Banner from '../Header/Banner';
 import { StrictPropsWithChildren } from '@/types';
 
 export function ButtonList({ children }: StrictPropsWithChildren) {
@@ -6,7 +7,7 @@ export function ButtonList({ children }: StrictPropsWithChildren) {
 
 export function BottomDiv({ children }: StrictPropsWithChildren) {
   return (
-    <div className={`mx-auto max-w-440 bg-white px-20 pb-30 pt-10`}>
+    <div className={`mx-auto max-w-440 bg-white px-20 pb-24 pt-10`}>
       <ButtonList>{children}</ButtonList>
     </div>
   );
@@ -17,8 +18,12 @@ export function BottomFixedDiv({ children }: StrictPropsWithChildren) {
     <>
       <div className={`fixed inset-x-0 bottom-0 z-30`}>
         <BottomDiv>{children}</BottomDiv>
+        <div id="ios-banner">
+          <Banner />
+        </div>
       </div>
-      <div className="h-100" />
+      <div className="h-88" />
+      <div id="ios-banner" className="h-62" />
     </>
   );
 }