yjryu / KERIS star
kimgkdud898 2023-11-23
231123 김하영
@b9458615febc27755a69b8bc6e8c85bbb47dce65
0b4897c
b945861
client/resources/css/Main.css
--- client/resources/css/Main.css
+++ client/resources/css/Main.css
@@ -94,10 +94,13 @@
 
   text-align: center;
 
   z-index: 1;
 
   border-radius: 2rem;
 
-  box-shadow: 1px 1px 10px #3a3a3a;
 
+  box-shadow: 1px 1px 20px #3a3a3a;
 
+  background-color: white;
 
+}
 
+.main-popup-div .swiper-wrapper {
 
+  padding: 0 0 3rem;
 
 }
 
 .main-popup-div {
 
-  background-color: white;
 
   border-radius: 2rem;
 
 }
 
 .main-popup img {
@@ -106,10 +109,13 @@
 
   border-top-right-radius: 2rem;
 
   border-top-left-radius: 2rem;
 
 }
 
-.main-popup-div div:nth-child(2) {
 
-  text-align: right;
 
-  padding: 2rem;
 
+.main-popup-input {
 
+  padding: 0.5rem 1.7rem;
 
+  display: flex;
 
+  justify-content: space-between;
 
+  text-align: center;
 
 }
 
+
 
 .modal-news-title {
 
   font-size: 2rem;
 
   font-weight: 600;
@@ -2077,7 +2083,9 @@
 
   width: 70%;
 
   margin: 0 auto;
 
 }
 
+/* 임시 css */
 
 
+/* -------------- */
 
 .login-info > div > p {
 
   color: rgb(255, 0, 0);
 
   padding: 0 1rem;
@@ -2608,10 +2616,9 @@
 
 
 .login-checkbox-i {
 
   text-align: left;
 
-  margin: 0 auto;
 
+  /* margin: 0 auto; */
 
 }
 
-
 
-.login-checkbox-i input[type="checkbox"] {
 
+.flex .login-checkbox-i input[type="checkbox"] {
 
   text-align: left;
 
   margin: 1rem;
 
   transform: scale(1.5);
0b4897c
b945861
client/views/pages/user/login/Login.vue
--- client/views/pages/user/login/Login.vue
+++ client/views/pages/user/login/Login.vue
@@ -20,7 +20,7 @@
 
                 </div>
 
             </section>
 
 
-            <section class="login-checkbox">
 
+            <!-- <section class="login-checkbox">
 
                 <div class="login-checkbox-i">
 
                     <input type="checkbox">
 
                     <span>
@@ -35,11 +35,24 @@
 
                     <router-link :to="{ path: '/userIDsearch.page', query: { mode: 'pw' } }">
 
                         <button class="login-bu-after">비밀번호찾기</button>
 
                     </router-link>
 
-                    <router-link to="/Join.page">
 
-                        <button>회원가입</button>
 
-                    </router-link>
 
+            <router-link to="/Join.page">
 
+                <button>회원가입</button>
 
+            </router-link>
 
+        </div>
 
+        </section> -->
 
+
 
+            <div class="flex " style="margin: 1.5rem 0.5rem ;">
 
+                <div class="login-checkbox-i">
 
+                    <input type="checkbox">
 
+                    <span>
 
+                        로그인상태 유지
 
+                    </span>
 
                 </div>
 
-            </section>
 
+                <router-link to="/Join.page">
 
+                    <button style="background-color: rgba(255, 228, 196, 0);">회원가입</button>
 
+                </router-link>
 
+
 
+            </div>
 
             <section class="login-button">
 
                 <button @click="login">로그인</button>
 
             </section>
@@ -80,12 +93,12 @@
 
     },
 
     methods: {
 
         //아스크 변환
 
-        asc: function(data) {
 
+        asc: function (data) {
 
             let ascii = '';
 
-            for ( let i = 0; i < data.length; i++) {
 
+            for (let i = 0; i < data.length; i++) {
 
                 ascii += data.charCodeAt(i);
 
             }
 
-            console.log('ascii',ascii)
 
+            console.log('ascii', ascii)
 
             return ascii
 
         },
 
         //로그인
@@ -95,9 +108,9 @@
 
             let iv = this.store.state.key.iv;
 
             var salt = this.store.state.key.salt;
 
             var passPhrase = this.store.state.key.ENC_KEY;
 
-            console.log('this.asc(iv)   -   ',this.asc(iv));
 
-            console.log('this.asc(salt)   -   ',this.asc(salt)); 
-            console.log('this.asc(passPhrase)   -   ',this.asc(passPhrase));  
+            console.log('this.asc(iv)   -   ', this.asc(iv));
 
+            console.log('this.asc(salt)   -   ', this.asc(salt));
 
+            console.log('this.asc(passPhrase)   -   ', this.asc(passPhrase));
 
             var keySize = 128;
 
             var iterationCount = 1000;
 
             var key128Bits100Iterations = crypto.PBKDF2(passPhrase, crypto.enc.Hex.parse(salt), { keySize: keySize / 32, iterations: iterationCount });
0b4897c
b945861
client/views/pages/user/main/Main.vue
--- client/views/pages/user/main/Main.vue
+++ client/views/pages/user/main/Main.vue
@@ -326,16 +326,31 @@
 
 
 
 
-    <div class="main-popup" v-if="showPopup">
 
-        <div class="main-popup-div">
 
+    <!-- <div class="main-popup" v-if="showPopup">
 
+        <div>
 
 
-            <div><img src="../../../../resources/jpg/main-popup-img.jpg" alt=""></div>
 
-            <div>
 
-                <input type="checkbox" v-model="doNotShow">오늘 하루동안 열지 않기
 
+            <div class="main-popup-div">
 
+                <swiper style="margin: 2rem;" :spaceBetween="30" :centeredSlides="true" :autoplay="{
 
+                    delay: 3000,
 
+                    disableOnInteraction: false,
 
+                }" :pagination="{
 
+    clickable: true,
 
+}" :navigation="false" :modules="modules" class="mySwiper">
 
+
 
+                    <swiper-slide><img src="../../../../resources/jpg/main-popup-img.jpg" alt=""></swiper-slide>
 
+                    <swiper-slide><img src="../../../../resources/jpg/main-popup-img.jpg" alt=""></swiper-slide>
 
+                    <swiper-slide><img src="../../../../resources/jpg/main-popup-img.jpg" alt=""></swiper-slide>
 
+                    <swiper-slide><img src="../../../../resources/jpg/main-popup-img.jpg" alt=""></swiper-slide>
 
+
 
+                </swiper>
 
+            </div>
 
+            <div class="main-popup-input" :class="{ active: doNotShow }">
 
+                <p @click="closeForDay">오늘 하루동안 열지 않기</p>
 
+                <p @click="closeNow">닫기</p>
 
 
             </div>
 
         </div>
 
-    </div>
 
+    </div> -->
 
 </template>
 
 
 <script>
@@ -368,14 +383,39 @@
 
             noticeList: [],
 
             noticeListForBanner: [],
 
             swiper: null,
 
-            showPopup: true,
 
-            doNotShow: false
 
+            // showPopup: true,
 
+            // doNotShow: false,
 
+            // doNotShow: this.checkPopup()
 
         }
 
     },
 
     methods: {
 
-        openWindow() {
 
-            window.open('', '팝업창', 'width=300, height=200, left=0, top=0, toolbar=no, menubar=no, scrollbars=yes, resizable=no');
 
-        },
 
+        // closeForDay: function () {
 
+        //     this.doNotShow = true;
 
+        //     const now = new Date();
 
+        //     localStorage.setItem('popupClosed', now);
 
+        //     this.doNotShow = true;
 
+        // },
 
+        // closeNow: function () {
 
+        //     this.doNotShow = true;
 
+
 
+        // },
 
+        // checkPopup: function () {
 
+        //     const popupClosedTime = localStorage.getItem('popupClosed');
 
+        //     if (popupClosedTime) {
 
+        //         const closedTime = new Date(popupClosedTime);
 
+        //         const now = new Date();
 
+        //         const diffTime = Math.abs(now - closedTime);
 
+        //         const diffHours = Math.ceil(diffTime / (1000 * 60 * 60));
 
+        //         if (diffHours < 24) {
 
+        //             return true;
 
+        //         }
 
+        //     }
 
+        //     return false;
 
+        // },
 
+
 
+
 
+
 
+
 
         showAlert: function () {
 
             alert('페이지 준비중입니다.');
 
         },
Add a comment
List