Skip to content

Commit 171bd87

Browse files
봄봄
authored andcommitted
fix: 충돌 에러 해결
2 parents 52ef4cb + 8abf051 commit 171bd87

File tree

2 files changed

+42
-17
lines changed

2 files changed

+42
-17
lines changed

README.md

Lines changed: 41 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,45 @@
1-
![image](https://github.com/user-attachments/assets/23f8c862-ffe7-4b7a-8f42-962cc218f2a5)
21

3-
# NiNE Dot˙
2+
<img width="1920" height="1080" alt="60" src="https://github.com/user-attachments/assets/536931a0-e061-4ddc-841b-81769219a65d" />
3+
<img width="1920" height="1080" alt="67" src="https://github.com/user-attachments/assets/be2f7541-c9a1-4c74-ae74-0989d59750af" />
4+
<img width="1920" height="1080" alt="65" src="https://github.com/user-attachments/assets/f3783ab0-b23a-479f-81dd-777bfda7bec1" />
5+
<img width="1920" height="1080" alt="68" src="https://github.com/user-attachments/assets/394a39cd-2a76-48c9-9fbd-7543577f65ab" />
6+
<img width="1920" height="1080" alt="74" src="https://github.com/user-attachments/assets/3602e313-fe47-4fb7-b24a-5dba7ab21ebc" />
7+
<img width="1920" height="1080" alt="218" src="https://github.com/user-attachments/assets/6c210613-496e-4b72-8a0e-f1d1d841d9f0" />
8+
<img width="1920" height="1080" alt="76" src="https://github.com/user-attachments/assets/f7055f22-3bf0-4c23-be30-10ad275c4775" />
9+
<img width="1920" height="1080" alt="62" src="https://github.com/user-attachments/assets/4d2d2e64-a728-4599-9d0b-66fdaaa7d722" />
10+
11+
12+
<h2>⚒️ FE Developer</h2>
13+
14+
<table>
15+
<tr>
16+
<td align="center">
17+
<img width="640" height="1066" alt="image 3" src="https://github.com/user-attachments/assets/716b2c08-c65e-42b8-87d1-b9db0f22f914" />
18+
<br/>
19+
<b>임지수</b><br/>
20+
<a href="https://github.com/jisooooooooooo">@jisooooooooooo</a>
21+
</td>
22+
<td align="center">
23+
<img width="640" height="1066" alt="image 1" src="https://github.com/user-attachments/assets/2679a003-8106-44a5-9309-dbc5da40023a" />
24+
<br/>
25+
<b>권새봄</b><br/>
26+
<a href="https://github.com/kwonsaebom">@kwonsaebom</a>
27+
</td>
28+
<td align="center">
29+
<img width="640" height="1066" alt="image 2" src="https://github.com/user-attachments/assets/c33a5bbc-26a4-4855-a46d-b82e51875ff9" />
30+
<br/>
31+
<b>신지수</b><br/>
32+
<a href="https://github.com/shinjigu">@shinjigu</a>
33+
</td>
34+
<td align="center">
35+
<img width="640" height="1066" alt="image 4" src="https://github.com/user-attachments/assets/587b2637-9350-46b3-845f-3aa44b567909" />
36+
<br/>
37+
<b>이윤지</b><br/>
38+
<a href="https://github.com/Leeyoonji23">@Leeyoonji23</a>
39+
</td>
40+
</tr>
41+
</table>
442

5-
**목표 관리를 시스템화하세요. 생각은 우리가 도와드릴게요.**
6-
7-
- 만다르트 작성
8-
- AI 할 일 추천
9-
- 진척도 및 주간 회고
10-
11-
## ⚒️ FE Developer
12-
13-
| 임지수</br>[@jisooooooooooo](https://github.com/jisooooooooooo) | 권새봄</br>[@kwonsaebom](https://github.com/kwonsaebom) | 신지수</br>[@shinjigu](https://github.com/shinjigu) | 이윤지</br>[@Leeyoonji23](https://github.com/Leeyoonji23) |
14-
| :--------------------------------------------------------------------------------------------------------: | :-----------------------------------------------------------------------------: | :------------------------------------------------------------------------------: | :-----------------------------------------------------------------------------: |
15-
| <img src = "https://github.com/user-attachments/assets/99ee54a2-eae0-4ccd-94a3-419d6266000c" width ="250"> | <img src = "https://avatars.githubusercontent.com/u/94830364?v=4" width ="250"> | <img src = "https://avatars.githubusercontent.com/u/130023628?v=4" width ="250"> | <img src = "https://avatars.githubusercontent.com/u/90778858?v=4" width ="250"> |
16-
| `전체 목표 작성`</br>`만다르트 상위 목표 작성` | `로그인`</br>`나의 히스토리` | `만다르트 하위 목표 작성`</br>`나의 할 일` | `나의 만다르트`</br>`나의 만다르트 수정` |
1743

1844
## 📘 Tech Stack
1945

@@ -126,5 +152,5 @@
126152
```
127153

128154
## ⚪️ 나인도트 웨비들의 자세한 컨벤션은?
155+
[<img width="1920" height="1080" alt="Web팀 단체사진" src="https://github.com/user-attachments/assets/4374de39-aab5-40ca-a12e-5335b5bd91d3" />](https://www.notion.so/216f2c0149da81aa86ebf5a8c6ceb628)
129156

130-
[![KakaoTalk_Photo_2025-07-03-15-15-32](https://github.com/user-attachments/assets/55c401f9-22cc-4f3c-a32a-32c57d192d16)](https://fantastic-kumquat-2d3.notion.site/216f2c0149da81aa86ebf5a8c6ceb628)

src/api/auth/googleLogin/util/getAccessToken.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
import axiosInstance from '@/api/axiosInstance';
22

33
const getAccessToken = async (code: string) => {
4-
const redirectUri = import.meta.env.VITE_GOOGLE_REDIRECT_URI_LOCAL;
4+
const redirectUri = import.meta.env.VITE_GOOGLE_REDIRECT_URI;
55

66
const response = await axiosInstance.post(
77
`/auth/oauth2/google/callback?redirect_uri=${redirectUri}`,
88
{ code },
99
);
10-
1110
return response.data.data;
1211
};
1312

0 commit comments

Comments
 (0)