Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

✨ Update v1.0.2 #73

Merged
merged 12 commits into from
Jun 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .github/CODEOWNERS
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
* @seondal
@seondal

28 changes: 0 additions & 28 deletions .github/ISSUE_TEMPLATE/trouble-shooting.md

This file was deleted.

24 changes: 0 additions & 24 deletions .github/PULL_REQUEST_TEMPLATE.md

This file was deleted.

2 changes: 0 additions & 2 deletions .github/auto_assign.yml

This file was deleted.

41 changes: 0 additions & 41 deletions .github/labeler.yml

This file was deleted.

40 changes: 0 additions & 40 deletions .github/release-drafter.yml

This file was deleted.

19 changes: 0 additions & 19 deletions .github/workflows/auto-label.yml

This file was deleted.

27 changes: 0 additions & 27 deletions .github/workflows/cd-develop-branch.yml

This file was deleted.

27 changes: 0 additions & 27 deletions .github/workflows/cd-feature-branch.yml

This file was deleted.

20 changes: 0 additions & 20 deletions .github/workflows/release-drafter.yml

This file was deleted.

3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,6 @@
# Next-PWA
public/*.js
public/*.js.map

package-lock.json
yarn.lock
5 changes: 0 additions & 5 deletions .husky/commit-msg

This file was deleted.

20 changes: 0 additions & 20 deletions .husky/pre-commit

This file was deleted.

Binary file added public/images/app_icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/meta/og_detail.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/meta/og_kakao.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/meta/og_main.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/apis/config/privateApi.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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('오류가 발생했어요. 다시 시도해주세요');
Expand Down
2 changes: 1 addition & 1 deletion src/app/auth/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ export default function Page() {
setUser(response);
localStorage.setItem('accesstoken', response.token.accessToken);
alert(`로그인에 성공했어요!`);
router.replace('/menu');
router.back();
});
}
});
Expand Down
15 changes: 14 additions & 1 deletion src/app/globals.css
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
9 changes: 7 additions & 2 deletions src/components/Button/BottomFixedDiv.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import Banner from '../Header/Banner';
import { StrictPropsWithChildren } from '@/types';

export function ButtonList({ children }: StrictPropsWithChildren) {
Expand All @@ -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>
);
Expand All @@ -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" />
</>
);
}
Loading