From 3cb670d1c4c6da00493a4028a3360718ba2a9e20 Mon Sep 17 00:00:00 2001
From: KANU <65529758+KANU896@users.noreply.github.com>
Date: Sat, 16 Dec 2023 13:32:36 +0900
Subject: [PATCH 1/2] =?UTF-8?q?feat:=20=EC=BD=94=EB=94=A9=EB=B0=A9=20?=
 =?UTF-8?q?=EC=83=88=EB=A1=9C=EA=B3=A0=EC=B9=A8=EC=8B=9C=20=EC=95=8C?=
 =?UTF-8?q?=EB=A6=BC=EC=B0=BD,=20=EC=BD=94=EB=94=A9=EB=B0=A9=EC=82=AC?=
 =?UTF-8?q?=EC=9D=B4=EC=A6=88=20=EC=A1=B0=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/axios-interceptor.js             |  4 +--
 src/components/code/NormalMonaco.vue | 14 ++------
 src/components/code/RankMonaco.vue   | 19 ++++-------
 src/components/profile/MyCode.vue    |  1 -
 src/views/code/Normal.vue            | 48 ++++++++++++++++++++++++----
 src/views/code/Rank.vue              | 39 +++++++++++-----------
 6 files changed, 69 insertions(+), 56 deletions(-)

diff --git a/src/axios-interceptor.js b/src/axios-interceptor.js
index e74fbf3..6068c02 100644
--- a/src/axios-interceptor.js
+++ b/src/axios-interceptor.js
@@ -9,8 +9,8 @@ var apiClient = null;
 
 apiClient.interceptors.request.use(
     function (config) {
-      config.headers["Content-Type"] = "application/json;";
-      config.headers["Content-Type"] = "multipart/form-data";
+    //   config.headers["Content-Type"] = "application/json;";
+    //   config.headers["Content-Type"] = "multipart/form-data";
       config.headers["Authorization"] = `Bearer ${sessionStorage.getItem('accessToken')}`;
       return config;
     }
diff --git a/src/components/code/NormalMonaco.vue b/src/components/code/NormalMonaco.vue
index e9217fb..9c00a12 100644
--- a/src/components/code/NormalMonaco.vue
+++ b/src/components/code/NormalMonaco.vue
@@ -14,7 +14,6 @@
   
   <script>
   import {apiClient} from '@/axios-interceptor'
-  // import axios from 'axios';
   import { defineComponent, computed, toRefs } from 'vue'
   import * as monaco from 'monaco-editor'
   
@@ -43,7 +42,6 @@
         default() {
           return {
             minimap: { enabled: false,},
-            // paste: { enabled: false, showPasteSelector: 'never'}
           }
         },
       },
@@ -65,9 +63,6 @@
           'text-align': 'left',
           'align-items': 'center',
           'margin-left': '15px',
-          // 'background-color': 'black',
-          // 'border': '3px solid var(--main5-color)',
-          // 'border-radius': '10px'
         }
       })
       return {
@@ -75,9 +70,6 @@
       }
     },
     created(){
-              // room에서 roomNo에 해당하는 quizNo 가져오기
-        // 문제내용 가져오기
-        // 테스트케이스 가져오기
         const url = `${this.backURL}/room/${this.$router.currentRoute.value.params.roomNo}`
 
         apiClient
@@ -179,14 +171,12 @@
             headers: {
              'Content-Type': 'multipart/form-data',
             },
-        }) 
+        })
         .then(response=>{
-          console.log('여기?111')
             this.output = response.data
         })
         //네트워크에 의한 요청 실패일 경우
         .catch(error=>{
-          console.log('여기?')
             console.log(error)
             alert(error.message)
         })
@@ -200,7 +190,7 @@
         const formData = new FormData();
 
         // dto 객체 생성 및 JSON 문자열로 변환 후 formData에 추가
-        const dto = { memberNo: 1, quizNo};
+        const dto = { quizNo};
         formData.append('dto', new Blob([JSON.stringify(dto)], { type: 'application/json' }), 'dto.json');
 
         // 파일 데이터 추가
diff --git a/src/components/code/RankMonaco.vue b/src/components/code/RankMonaco.vue
index 2463d79..76ec741 100644
--- a/src/components/code/RankMonaco.vue
+++ b/src/components/code/RankMonaco.vue
@@ -90,7 +90,6 @@
         default() {
           return {
             minimap: { enabled: false,},
-            // paste: { enabled: false, showPasteSelector: 'never'}
           }
         },
       },
@@ -128,10 +127,6 @@
             this.quizNo = response.data.quizNo
         })
 
-
-        //********************memberNo 얻어오기****************************
-
-
     },
     mounted() {
       this.initMonaco()
@@ -240,7 +235,6 @@
         
         const quizNo = this.quizNo  // 퀴즈번호
         const rankNo = this.rankNo  // 랭크번호
-        const memberNo = this.memberNo
         const fileContent = this._getValue();
 
         // FormData 객체 생성
@@ -277,19 +271,18 @@
                 'Content-Type': 'application/json'
               }
             })
-            .then(response => {
-              console.log(response.data)
-              console.log(response.data.msg)
-            })
+            .catch(error => {
+              console.log('Server Error:', error);
+                alert('서버 에러 발생. 자세한 내용은 콘솔을 확인하세요.');
+            });
         })
         //네트워크에 의한 요청 실패일 경우
         .catch(error=>{
             console.log(error)
             alert(error.message)
         })
-
-
-      }
+      },
+      
     },
     watch: {  
       options: {
diff --git a/src/components/profile/MyCode.vue b/src/components/profile/MyCode.vue
index 6033057..6e1f2de 100644
--- a/src/components/profile/MyCode.vue
+++ b/src/components/profile/MyCode.vue
@@ -93,7 +93,6 @@ export default {
         })
         .catch((error) => {
             console.log(error);
-            // alert(error.message)
         });
     }
     
diff --git a/src/views/code/Normal.vue b/src/views/code/Normal.vue
index 8579f94..e1f020f 100644
--- a/src/views/code/Normal.vue
+++ b/src/views/code/Normal.vue
@@ -7,7 +7,10 @@
             <div id="problem-des-title" class="title">문제설명</div>
             <div id="problem-des-container">
                 <div id="problem-des-content">
-                    <span v-html="replaceNewlines(this.quizContent)"></span>
+                    <textarea
+                        class="readonlyTextarea"
+                        :value="this.quizContent"
+                        readonly></textarea>
                 </div>
             </div>
 
@@ -64,6 +67,7 @@ export default {
             testcaseNo: '',
             testcaseList: [],
             quizContent: '',
+            quizTitle: '',
             timerRunning: true,
             minutes: 60,
             seconds: 0,
@@ -111,10 +115,23 @@ export default {
         replaceNewlines(text) {
             return text.replace(/\n/g, '<br>');
         },
+        // beforeunload 이벤트 핸들러
+        beforeUnloadHandler(event) {
+            // 여기에 알림창을 띄우는 로직 추가
+            const confirmationMessage = '변경사항이 저장되지 않을 수 있습니다. 정말로 나가시겠습니까?';
+            event.returnValue = confirmationMessage; // Standard for most browsers
+            // 알림창에서 확인 버튼을 눌렀을 때 홈으로 이동
+            const shouldNavigateHome = window.confirm(confirmationMessage);
+            if (shouldNavigateHome) {
+                this.$router.push({ path: `/` });
+            }
+            return confirmationMessage; // For some older browsers
+        },
 
         
     },
     created(){
+        window.addEventListener('beforeunload', this.beforeUnloadHandler);
         //타이머 시작
         this.updateTimer();
 
@@ -125,6 +142,7 @@ export default {
         .then((response) => {
             this.quizNo = response.data.quizNo
             this.quizContent = response.data.quizContent
+            this.quizTitle = response.data.quizTitle
 
             const url2 = `${this.backURL}/submit/${this.quizNo}`
 
@@ -142,6 +160,10 @@ export default {
         })
 
     },
+    beforeDestroy() {
+        // 컴포넌트가 파괴되기 전에 이벤트 리스너를 제거하는 것이 좋습니다.
+        window.removeEventListener('beforeunload', this.beforeUnloadHandler);
+    },
 }
 
 </script>
@@ -153,6 +175,7 @@ export default {
 
 #code-layout {
   min-width: 1280px;
+  width: 100vh;
   height: max-content;
 
   display: flex;
@@ -165,7 +188,7 @@ export default {
 body.flex-container{
     display: inline-flex;
     justify-content: center; 
-    height: 792px;
+    height: 100vh;
     padding-bottom: 10px;
 }
 
@@ -187,7 +210,7 @@ body.flex-container{
 
 #problem-des-container{
     box-sizing: border-box;
-    height: 250px;
+    height: 300px;
     margin-bottom: 10px;
     background-color: var(--white-color);
     border: 3px solid var(--main5-color);
@@ -196,19 +219,17 @@ body.flex-container{
     display: flex;
     flex-direction: column;
     overflow-y: auto;
-    word-wrap: break-word; /* 단어 단위로 자동 줄 바꿈  */
 }
 
 #problem-des-content{
     box-sizing: border-box;
     font-size: 0.8rem;
     padding: 8px;
-    overflow-wrap: break-word; /* 단어 단위로 자동 줄 바꿈  */
 }
 
 
 #testcase-des-container{
-    height: 250px;
+    height: 300px;
     margin-bottom: 10px;
     background-color: var(--white-color);
     border: 3px solid var(--main5-color);
@@ -287,7 +308,7 @@ body.flex-container{
 }
 #relative-code-content{
     width: 200px;
-    height: 22vh;
+    height: 26vh;
     margin-bottom: 16px;
     border: 3px solid var(--main5-color);
     border-radius: 10px;
@@ -312,4 +333,17 @@ body.flex-container{
     margin:16px 0px 0px
 }
 
+.readonlyTextarea {
+  width: 98%;
+  height: 250px;
+  overflow: auto;
+  cursor: default;
+  outline: none;
+  border: none;
+  resize: none;
+}
+::-webkit-scrollbar {
+  width: 0;
+}
+
 </style>
\ No newline at end of file
diff --git a/src/views/code/Rank.vue b/src/views/code/Rank.vue
index 406e79f..7f2912f 100644
--- a/src/views/code/Rank.vue
+++ b/src/views/code/Rank.vue
@@ -9,7 +9,6 @@
                     <div id="problem-des-content">
                         <textarea
                         class="readonlyTextarea"
-                        id="quiz-input"
                         :value="this.quizContent"
                         readonly></textarea>
                     </div>
@@ -179,6 +178,7 @@
     
     #code-layout {
       min-width: 1280px;
+      width: 100vh;
       height: max-content;
     
       display: flex;
@@ -191,7 +191,7 @@
     body.flex-container{
         display: inline-flex;
         justify-content: center; 
-        height: 792px;
+        height: 100vh;
         padding-bottom: 10px;
     }
     
@@ -213,7 +213,7 @@
     
     #problem-des-container{
         box-sizing: border-box;
-        height: 250px;
+        height: 300px;
         margin-bottom: 10px;
         background-color: var(--white-color);
         border: 3px solid var(--main5-color);
@@ -222,19 +222,17 @@
         display: flex;
         flex-direction: column;
         overflow-y: auto;
-        word-wrap: break-word; /* 단어 단위로 자동 줄 바꿈  */
     }
     
     #problem-des-content{
         box-sizing: border-box;
         font-size: 0.8rem;
         padding: 8px;
-        overflow-wrap: break-word; /* 단어 단위로 자동 줄 바꿈  */
     }
     
     
     #testcase-des-container{
-        height: 250px;
+        height: 300px;
         margin-bottom: 10px;
         background-color: var(--white-color);
         border: 3px solid var(--main5-color);
@@ -287,6 +285,7 @@
     #relative-code-layout{
         width: 260px;
         padding: 10px;
+        
         margin-top: 90px;
         margin-right: 10px;
     
@@ -297,8 +296,9 @@
         border: 3px solid var(--main5-color);
         border-radius: 10px;
     }
-    
-    
+    #timer-title{
+        margin-top: 55px;
+    }
     .title{
         padding-left: 10px;
     }
@@ -314,7 +314,7 @@
     
     #relative-code-content{
         width: 200px;
-        height: 22vh;
+        height: 26vh;
         margin-bottom: 16px;
         border: 3px solid var(--main5-color);
         border-radius: 10px;
@@ -340,21 +340,18 @@
     }
     
 
-    #quiz-input,
-#quiz-output {
+
+.readonlyTextarea {
   width: 98%;
-  height: 100%;
-  line-height: 30px;
-  /* overflow: auto; */
+  height: 250px;
+  overflow: auto;
   cursor: default;
+  outline: none;
   border: none;
+  resize: none;
+}
+::-webkit-scrollbar {
+  width: 0;
 }
-/* 
-.readonlyTextarea {
-  background-color: var(--main1-color);
-  color: var(--main5-color);
-  
-  cursor: default;
-} */
 
     </style>
\ No newline at end of file

From 75919d7ebd3d56098e3f7c813117308a8b51bf8f Mon Sep 17 00:00:00 2001
From: KANU <65529758+KANU896@users.noreply.github.com>
Date: Sat, 16 Dec 2023 14:00:35 +0900
Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=EB=85=B8=EB=A7=90=EB=AA=A8=EB=93=9C?=
 =?UTF-8?q?=20=EB=AA=A8=EB=82=98=EC=BD=94=20=EC=8B=A4=ED=96=89=EC=AA=BD=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/code/NormalMonaco.vue | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/components/code/NormalMonaco.vue b/src/components/code/NormalMonaco.vue
index 68744bb..9444052 100644
--- a/src/components/code/NormalMonaco.vue
+++ b/src/components/code/NormalMonaco.vue
@@ -186,8 +186,7 @@ export default defineComponent({
           },
         })
         .then(response => {
-          this.output = response.data.result
-          this.gameResult = response.data.gameResult
+          this.output = response.data
         })
         //네트워크에 의한 요청 실패일 경우
         .catch(error => {