Skip to content

Commit

Permalink
[Fix]- 충돌 에러 수정
Browse files Browse the repository at this point in the history
  • Loading branch information
Chaem03 committed Nov 15, 2024
2 parents 7c733a3 + a75f21f commit c49cf46
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 7 deletions.
2 changes: 1 addition & 1 deletion index.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<html lang="ko">
<head>
<meta charset="UTF-8" />
<link rel="icon" type="image/svg+xml" href="/vite.svg" />
<link rel="icon" type="image/svg+xml" href="/images/nuguOriginal.png" />
<meta
name="viewport"
content="width=device-width, initial-scale=1, user-scalable=no"
Expand Down
Binary file added public/images/nuguOriginal.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 9 additions & 1 deletion src/apis/nuguPatch.js
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,15 @@ export const patchNuguInfo = async ({

export const getNugu = async () => {
try {
const response = await instance.get(`/user`);
const response = await instance.get(
`/user`,

{
headers: {
Authorization: `Bearer ${Cookies.get("access_token")}`,
},
}
);
return response.data;
} catch (err) {
throw err;
Expand Down
2 changes: 0 additions & 2 deletions src/components/nuguTest/styled.js
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,6 @@ export const UserRankWrapper = styled.div`
display: flex;
align-items: center;
justify-self: flex-start;
align-self: flex-start;
justify-content: center;
flex-direction: column;
gap: 3rem;
width: 100%;
Expand Down
2 changes: 1 addition & 1 deletion src/pages/login/styled.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ export const Wrapper = styled.div`
align-items: center;
gap: 4rem;
width: 100%;
height: calc(var(--vh, 1vh) * 100);
min-height: 100vh;
padding: 1rem 0;
`;

Expand Down
7 changes: 5 additions & 2 deletions src/pages/onBoarding/styled.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,10 @@ export const Wrapper = styled.div`
align-items: center;
background: linear-gradient(180deg, #d2deef 0%, #fff 100%);
width: 100%;
height: calc(var(--vh, 1vh) * 100);
min-height: 100vh;
gap: 3rem;
padding-bottom: 5rem;
padding-top: 1rem;
`;

Expand All @@ -22,11 +23,13 @@ export const LogoContainer = styled.div`
`;

export const BtnContainer = styled.div`
position: fixed;
bottom: 2rem;
display: flex;
flex-direction: column;
justify-content: center;
gap: 10px;
margin-bottom: 1rem;
#loginBtn {
color: ${({ theme }) => theme.colors.blue300};
font-family: ${({ theme }) => theme.fonts.pretendardB3};
Expand Down

0 comments on commit c49cf46

Please sign in to comment.