Skip to content

Commit 855d4f0

Browse files
committed
Merge branch 'release' of https://github.com/TaskFlow-CLAP/TaskFlow-FE into CLAP-353
2 parents 1a27ad3 + b64f830 commit 855d4f0

File tree

4 files changed

+12
-8
lines changed

4 files changed

+12
-8
lines changed

.github/workflows/CD.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,10 @@ jobs:
2929
- name: Build with npm
3030
run: npm run build-only
3131

32+
- name: Create nginxfile.conf
33+
run: touch ./nginxfile.conf
34+
- run: echo "${{ secrets.NGINX_FILE_CONF }}" > ./nginxfile.conf
35+
3236
- name: Create nginx.conf
3337
run: touch ./nginx.conf
3438
- run: echo "${{ secrets.NGINX_CONF }}" > ./nginx.conf

Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
FROM nginx
2+
COPY nginxfile.conf /etc/nginx/nginx.conf
23
COPY nginx.conf /etc/nginx/conf.d/default.conf
34
COPY dist/. /usr/share/nginx/html/
45
CMD ["nginx", "-g", "daemon off;"]

src/api/auth.ts

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { axiosInstance } from '@/utils/axios'
22
import Cookies from 'js-cookie'
3-
import type { loginDataTypes } from '@/types/auth'
3+
44
import { useMemberStore } from '@/stores/member'
55

66
export const postPasswordEmailSend = async (name: string, email: string) => {
@@ -17,8 +17,10 @@ export const postPasswordCheck = async (password: string) => {
1717
return response.data
1818
}
1919

20-
export const postLogin = async (loginData: loginDataTypes) => {
21-
const response = await axiosInstance.post('/api/auths/login', loginData)
20+
export const postLogin = async (nickName: string, password: string) => {
21+
const response = await axiosInstance.post(`/api/auths/login?nickname=${nickName}`, {
22+
password: password
23+
})
2224
Cookies.set('accessToken', response.data.accessToken, {
2325
path: '/',
2426
sameSite: 'strict'

src/views/LoginView.vue

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -76,11 +76,8 @@ const closeModal = () => {
7676
7777
const handleLogin = async () => {
7878
try {
79-
const loginData = {
80-
nickname: nickname.value,
81-
password: password.value
82-
}
83-
const res = await postLogin(loginData)
79+
const name = nickname.value.toString()
80+
const res = await postLogin(name, password.value)
8481
const role = await memberStore.updateMemberInfoWithToken()
8582
8683
if (!Cookies.get('refreshToken')) {

0 commit comments

Comments
 (0)