fix: front end

Giggle-projects · Aug 16, 2023 · 1fc0e61 · 1fc0e61
1 parent f68e351
commit 1fc0e61
Show file tree

Hide file tree

Showing 6 changed files with 49 additions and 11 deletions.
diff --git a/redis/data/dump.rdb b/redis/data/dump.rdb
diff --git a/src/main/resources/static/css/personal-information.css b/src/main/resources/static/css/personal-information.css
@@ -22,10 +22,17 @@
   flex-direction: column;
   align-items: center;
 }
-.frame-icon58 {
+.frame-icon58{
+    position: relative;
+    width: 24px;
+    height: 24px;
+    overflow: hidden;
+    flex-shrink: 0;
+}
+.frame-icon59{
   position: relative;
-  width: 24px;
-  height: 24px;
+  width: 48;
+  height: 48px;
   overflow: hidden;
   flex-shrink: 0;
 }

diff --git a/src/main/resources/static/html/personal-information.html b/src/main/resources/static/html/personal-information.html
@@ -66,7 +66,7 @@
               <div class="frame1241">
                 <div class="frame1242">
                   <img
-                    class="frame-icon58"
+                    class="frame-icon59"
                     alt=""
                     src="../files/586-frame.svg"
                   />

diff --git a/src/main/resources/static/js/personal-information.js b/src/main/resources/static/js/personal-information.js
@@ -1,4 +1,5 @@
 const currentDomain = "http://localhost:8080"
+var imgElement = document.querySelector('.frame-icon59');
 
 async function fetchMyInfo() {
     const responseMemberInfo = await fetch(currentDomain + "/api/member/me");
@@ -23,6 +24,17 @@ async function fetchMyInfo() {
 
     name.innerText = responseMemberInfoValue.name
     applicationType.innerText = responseMemberInfoValue.applicationTypeName
+
+
+    // 아이콘 추가하기 코드
+    console.log(responseMemberInfoValue.applicationTypeName)
+    if (responseMemberInfoValue.applicationTypeName === "경찰직공무원(남)" || responseMemberInfoValue.applicationTypeName === "경찰직공무원(여)") {
+        imgElement.src = "../files/type_icon4.png"; // 경찰직 이미지 경로로 변경
+    } else if (responseMemberInfoValue.applicationTypeName === "소방직공무원(남)" || responseMemberInfoValue.applicationTypeName === "소방직공무원(여)") {
+        imgElement.src = "../files/type_icon2.jpeg"; // 소방직 이미지 경로로 변경
+    } else if (responseMemberInfoValue.applicationTypeName === "교정직공무원(남)" || responseMemberInfoValue.applicationTypeName === "교정직공무원(여)") {
+        imgElement.src = "../files/type_icon3.png";// 교정직 이미지 경로로 변경
+    }
     currentScore.innerText = "현재 점수 : " + responseScoreInfoValue.score + "점"
     maxScore.innerText = "최고 점수 : " + responseScoreInfoValue.maxScore + "점"
 }
@@ -122,14 +134,14 @@ async function showBarChart() {
             datasets: [{
                 label: '나',
                 data: myScore,
-                backgroundColor: 'rgba(0, 0, 0, 0.2)',
-                borderColor: 'rgba(0, 0, 0, 1)',
+                backgroundColor: "rgba(66, 135, 245, 0.5)",
+                borderColor: "rgba(66, 135, 245, 1)",
                 borderWidth: 1
             },{
                 label: '상위 30%',
                 data: top30Score,
-                backgroundColor: 'rgba(192, 192, 192, 0.2)',
-                borderColor: 'rgba(192, 192, 192, 1)',
+                backgroundColor: "rgba(66, 135, 245, 0.2)",
+                borderColor: "rgba(66, 135, 245, 1)",
                 borderWidth: 1
             }]
         },

diff --git a/src/main/resources/static/js/record.js b/src/main/resources/static/js/record.js
@@ -99,10 +99,11 @@ function saveData() {
         .then(response => response.json())
         .then(result => {
             if (result.prediction === 1) {
-                sAlert("데이터가 저장되었습니다.\n결과: 합격");
-                reload()
+                noError_sAlert("데이터가 저장되었습니다.\n결과: 합격");
+                location.reload();
             } else {
-                sAlert("데이터가 저장되었습니다.\n결과: 불합격");
+                noError_sAlert("데이터가 저장되었습니다.\n결과: 불합격");
+                location.reload();
             }
         })
         .catch(error => {
@@ -298,3 +299,11 @@ function sAlert(txt, title = 'ERROR',) {
         confirmButtonText: '닫기'
     });
 }
+// sAlert('custom alert example!');
+function noError_sAlert(txt, title = 'Success',) {
+    Swal.fire({
+        title: title,
+        text: txt,
+        confirmButtonText: '닫기'
+    });
+}
diff --git a/src/main/resources/static/js/setting-account.js b/src/main/resources/static/js/setting-account.js
@@ -75,6 +75,7 @@ document.addEventListener("DOMContentLoaded", function () {
         if (passwordMachResult) {
             if (!(passwordInput.value === passwordInput2.value)) {
                 passwordResult2.textContent = "비밀번호가 일치하지 않습니다.";
+                passwordResult2.style.color="red";
                 passwordMachResult = 0;
             }
         }
@@ -105,6 +106,13 @@ document.addEventListener("DOMContentLoaded", function () {
         // 재설정 로직
 
         passwordResult.textContent = errorMessage || "비밀번호가 유효합니다.";
+
+        if (passwordResult.textContent ==="비밀번호가 유효합니다."){
+            passwordResult.style.color='black';
+        }
+        else{
+            passwordResult.style.color='red';
+        }
     }
 
     function checkPasswordMatch() {
@@ -113,10 +121,12 @@ document.addEventListener("DOMContentLoaded", function () {
 
         if (password1 === password2) {
             passwordResult2.textContent = "비밀번호가 일치합니다.";
+            passwordResult2.style.color='black';
             passwordMachResult = 1
         } else {
             passwordResult2.textContent = "비밀번호가 일치하지 않습니다.";
             passwordMachResult = 0
+            passwordResult2.style.color='red';
         }
     }