Skip to content

Commit 8a177db

Browse files
ming0oming0o
committed
주소 수정
1 parent 1f19975 commit 8a177db

File tree

8 files changed

+51
-52
lines changed

8 files changed

+51
-52
lines changed

‎DevOps/docker-compose.yml‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ services:
66
container_name: frontend
77
expose:
88
- "80"
9-
env_file:
10-
- .env
9+
networks:
10+
- cbu-net
1111

1212
backend:
1313
build: ../backend
@@ -21,6 +21,8 @@ services:
2121
- ../DevOps/config/cbumanage.json:/backend/src/main/resources/cbumanage.json
2222
depends_on:
2323
- redis
24+
networks:
25+
- cbu-net
2426

2527
redis:
2628
image: redis:latest
@@ -44,6 +46,8 @@ services:
4446
- backend
4547
volumes:
4648
- /etc/letsencrypt:/etc/letsencrypt:ro
49+
networks:
50+
- cbu-net
4751

4852
networks:
4953
cbu-net:

‎DevOps/nginx/default.conf.template‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,11 @@ server {
1818
}
1919

2020
location / {
21-
root /usr/share/nginx/html;
22-
index index.html;
23-
try_files $uri $uri/ /index.html;
21+
proxy_pass http://frontend:80;
22+
proxy_set_header Host $host;
23+
proxy_set_header X-Real-IP $remote_addr;
24+
proxy_http_version 1.1;
25+
proxy_set_header Upgrade $http_upgrade;
26+
proxy_set_header Connection 'upgrade';
2427
}
2528
}

‎frontend/src/components/AddMail.vue‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
<v-row>
1212
<v-col cols="9" align="center">
1313
<v-text-field class="rounded-input" v-model="studentEmail" label="학교 이메일"
14-
suffix="@tukorea.ac.kr" placeholder="학교 이메일을 입력하세요." required variant="outlined" dense
15-
:error="emailError" :error-messages="emailErrorMessage" hide-details="auto">
14+
suffix="@tukorea.ac.kr" placeholder="학교 이메일을 입력하세요." required variant="outlined"
15+
dense :error="emailError" :error-messages="emailErrorMessage" hide-details="auto">
1616
</v-text-field>
1717
</v-col>
1818
<v-col cols="3" class="email-btn-col">
@@ -67,12 +67,12 @@ import { useUserStore } from '../stores/userStore';
6767
6868
const userStore = useUserStore();
6969
const router = useRouter();
70-
const SERVER_URL = import.meta.env.VITE_SERVER_URL;
70+
const SERVER_URL = import.meta.env.VITE_API_URL;
7171
7272
// 이메일 입력값 및 상태 관리
7373
const studentEmail = ref("");
7474
const verificationCode = ref("");
75-
const verificationStatus = ref<"success" | "error" | "">("");
75+
const verificationStatus = ref < "success" | "error" | "" > ("");
7676
const verificationMessage = ref("");
7777
const isJoinEnabled = ref(false); // 완료 버튼 활성화 여부
7878

‎frontend/src/components/GuidePassword.vue‎

Lines changed: 31 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,8 @@
66

77
<v-card-text>
88
<v-form>
9-
<v-text-field
10-
label="새 비밀번호"
11-
v-model="newPassword"
12-
:type="showPassword ? 'text' : 'password'"
13-
placeholder="새 비밀번호 입력"
14-
variant="outlined" dense class="password-input">
9+
<v-text-field label="새 비밀번호" v-model="newPassword" :type="showPassword ? 'text' : 'password'"
10+
placeholder="새 비밀번호 입력" variant="outlined" dense class="password-input">
1511
<template v-slot:append-inner>
1612
<v-icon @click="showPassword = !showPassword" class="password-toggle-icon">
1713
{{ showPassword ? 'mdi-eye-off' : 'mdi-eye' }}
@@ -20,12 +16,9 @@
2016
</v-text-field>
2117
<small class="password-hint">🔹 8자 이상, 영어+숫자+특수문자 중 2개 이상 포함</small>
2218

23-
<v-text-field
24-
label="새 비밀번호 확인"
25-
v-model="confirmPassword"
26-
:type="showConfirmPassword ? 'text' : 'password'"
27-
placeholder="새 비밀번호 확인"
28-
variant="outlined" dense class="password-input">
19+
<v-text-field label="새 비밀번호 확인" v-model="confirmPassword"
20+
:type="showConfirmPassword ? 'text' : 'password'" placeholder="새 비밀번호 확인" variant="outlined"
21+
dense class="password-input">
2922
<template v-slot:append-inner>
3023
<v-icon @click="showConfirmPassword = !showConfirmPassword" class="password-toggle-icon">
3124
{{ showConfirmPassword ? 'mdi-eye-off' : 'mdi-eye' }}
@@ -36,8 +29,8 @@
3629
</v-card-text>
3730

3831
<v-card-actions>
39-
<v-btn block :disabled="!isPasswordValid || newPassword !== confirmPassword"
40-
@click="changePassword" class="custom-btn">
32+
<v-btn block :disabled="!isPasswordValid || newPassword !== confirmPassword" @click="changePassword"
33+
class="custom-btn">
4134
비밀번호 변경
4235
</v-btn>
4336
</v-card-actions>
@@ -50,7 +43,7 @@ import { ref, computed } from 'vue';
5043
import { useUserStore } from '../stores/userStore';
5144
import { useRoute } from 'vue-router';
5245
53-
const SERVER_URL = import.meta.env.VITE_SERVER_URL;
46+
const SERVER_URL = import.meta.env.VITE_API_URL;
5447
const route = useRoute();
5548
const userStore = useUserStore();
5649
@@ -72,36 +65,35 @@ const changePassword = async () => {
7265
if (isPasswordValid.value && newPassword.value === confirmPassword.value) {
7366
7467
try {
75-
const requestData = {
76-
studentNumber: studentNumber.value,
77-
password: newPassword.value
78-
};
79-
80-
const response = await fetch(`${SERVER_URL}/login/password`, {
81-
method: "PATCH",
82-
headers: {
83-
"Content-Type": "application/json",
84-
"Accept": "application/json"
85-
},
86-
body: JSON.stringify(requestData)
87-
});
88-
89-
// ✅ 서버 응답이 200이면 성공 처리
90-
if (response.ok) {
91-
alert("비밀번호 변경 완료!");
92-
} else {
93-
alert(`오류 발생: 비밀번호 변경 실패 (Status: ${response.status})`);
94-
}
95-
} catch (error) {
96-
alert("네트워크 오류가 발생했습니다. 다시 시도해주세요.");
97-
}
68+
const requestData = {
69+
studentNumber: studentNumber.value,
70+
password: newPassword.value
71+
};
72+
73+
const response = await fetch(`${SERVER_URL}/login/password`, {
74+
method: "PATCH",
75+
headers: {
76+
"Content-Type": "application/json",
77+
"Accept": "application/json"
78+
},
79+
body: JSON.stringify(requestData)
80+
});
81+
82+
// ✅ 서버 응답이 200이면 성공 처리
83+
if (response.ok) {
84+
alert("비밀번호 변경 완료!");
85+
} else {
86+
alert(`오류 발생: 비밀번호 변경 실패 (Status: ${response.status})`);
87+
}
88+
} catch (error) {
89+
alert("네트워크 오류가 발생했습니다. 다시 시도해주세요.");
90+
}
9891
9992
}
10093
};
10194
</script>
10295

10396
<style scoped>
104-
10597
.change-password-page {
10698
display: flex;
10799
flex-direction: column;

‎frontend/src/hooks/useLogin.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ export function useLogin() {
1414
const router = useRouter();
1515

1616
const handleLogin = async ({ studentId = "", password = "" }: LoginParams): Promise<void> => {
17-
const SERVER_URL = import.meta.env.VITE_SERVER_URL;
17+
const SERVER_URL = import.meta.env.VITE_API_URL;
1818

1919
if (!studentId || !password) {
2020
errorMessage.value = "아이디와 비밀번호를 입력하세요.";

‎frontend/src/hooks/useSignUp.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ export default function useSignUp() {
44
const signUpError = ref(false);
55
const signUpErrorMessage = ref("");
66
const isSignUpSuccessful = ref(false);
7-
const SERVER_URL = import.meta.env.VITE_SERVER_URL;
7+
const SERVER_URL = import.meta.env.VITE_API_URL;
88

99
const registerUser = async (
1010
email: string,

‎frontend/src/hooks/useVerifyEmail.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ export default function useVerifyEmail() {
1212
return email.includes("@") ? email : `${email}@tukorea.ac.kr`;
1313
};
1414

15-
const SERVER_URL = import.meta.env.VITE_SERVER_URL;
15+
const SERVER_URL = import.meta.env.VITE_API_URL;
1616

1717
// 인증번호 전송
1818
const sendEmailToServer = async (mail: string): Promise<boolean> => {

‎frontend/src/hooks/useVerifyUser.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ export default function useVerifyUser() {
1414
const verificationError = ref(false); // 에러 상태
1515
const verificationErrorMessage = ref(""); // 에러 메시지
1616

17-
const SERVER_URL = import.meta.env.VITE_SERVER_URL;
17+
const SERVER_URL = import.meta.env.VITE_API_URL;
1818

1919
const verifyUser = async (
2020
studentNumber: string,

0 commit comments

Comments
 (0)