untoc-camp · yujin5047 · May 22, 2024 · Jun 2, 2024 · Jun 2, 2024 · Jun 27, 2024
diff --git a/.DS_Store b/.DS_Store
diff --git a/README.md b/README.md
@@ -60,46 +60,3 @@
     </td>
   </tr>
 </table>
-
-### 디렉토리 구조
-
-```plaintext
-comboong-note/
-├── README.md
-├── assets
-│   ├── fonts
-│   │   └── SCDream4.otf
-│   ├── img
-│   │   ├── drop_down.png
-│   │   ├── iconImg-128.png
-│   │   ├── iconImg-16.png
-│   │   ├── iconImg-32.png
-│   │   ├── iconImg-48.png
-│   │   └── iconImg.png
-│   ├── modal
-│   │   ├── modal.html
-│   │   └── modal.js
-│   └── popup
-│       ├── popup.css
-│       ├── popup.html
-│       └── popup.js
-├── manifest.json
-├── package-lock.json
-├── package.json
-├── scripts
-│   ├── crawling.js
-│   ├── notification.js
-│   ├── preprocess.js
-│   ├── setting.js
-│   └── storage.js
-└── service-worker.js
-```
-
-
-### 기술 스택
-
-<p>
-  <img src="https://img.shields.io/badge/HTML5-E34F26?style=for-the-badge&logo=html5&logoColor=white">
-  <img src="https://img.shields.io/badge/CSS3-1572B6?style=for-the-badge&logo=css3&logoColor=white">
-  <img src="https://img.shields.io/badge/JavaScript-F7DF1E?style=for-the-badge&logo=javascript&logoColor=black">
-</p>
diff --git a/assets/.DS_Store b/assets/.DS_Store
diff --git a/assets/img/.DS_Store b/assets/img/.DS_Store
diff --git a/assets/img/Initial_settings_img.png b/assets/img/Initial_settings_img.png
diff --git a/assets/img/bell_img.png b/assets/img/bell_img.png
diff --git a/assets/img/iconImg-1.png b/assets/img/iconImg-1.png
diff --git a/assets/img/iconImg-128.png b/assets/img/iconImg-128.png
diff --git a/assets/img/iconImg-16.png b/assets/img/iconImg-16.png
diff --git a/assets/img/iconImg-32.png b/assets/img/iconImg-32.png
diff --git a/assets/img/iconImg-48.png b/assets/img/iconImg-48.png
diff --git a/assets/img/refresh.png b/assets/img/refresh.png
diff --git a/assets/img/setting_img.png b/assets/img/setting_img.png
diff --git a/assets/img/warning_img.png b/assets/img/warning_img.png
diff --git a/assets/modal/modal.css b/assets/modal/modal.css
@@ -0,0 +1,106 @@
+@font-face {
+    font-family: 'SCDream';
+    font-weight: 400;
+    src: url('/assets/fonts/SCDream4.otf');
+  }
+html::-webkit-scrollbar{
+    display: none;
+}
+body {
+    font-family: SCDream;
+    width: 500px;
+    height: 440px;
+    background-color: white;
+    margin: 0;
+}
+.Comboongtext {
+    text-align: middle;
+    vertical-align: top;
+    padding: 10px 0 0 0px;
+    margin: 0;
+    display: flex;
+    align-items: center;
+}
+.iconcomboong {
+    width: 57px;
+    height: 60px;
+    display: flex;
+    padding: 0 40px;
+}
+.commentbox {
+    padding: 0;
+    height: 230px;
+    background-color: #F5F5F5;
+    flex-direction: column;
+    justify-content: space-around;
+    box-shadow: 0px 4px 3px 0 rgb(153, 151, 151);
+}
+.comment1, .comment2, .comment3{
+    display: flex;
+    align-items: center;
+    flex: 10em;
+    flex: 30%;
+    padding-top: 20px;
+}
+.li-img{
+    width: 40px;
+    padding: 8px 15px 0px 15px;
+}
+.li-comment{
+    list-style-type: none;
+    white-space: nowrap;
+    flex: 10em;
+    flex: 30%;
+}
+ul{
+    display: grid;
+    padding-left: 0;
+}
+#extra{
+    float: right;
+    background-color: #edf6ff;
+    border-radius: 30px 30px 30px 0;
+    width: 230px;
+    height: 100px;
+    padding: 0px 0px 15px 0px;
+    white-space: pre;
+    margin: 15px;
+    display: none;
+    position: absolute;
+    top: 20px;
+    left: 230px;
+    z-index: 1000;
+    box-shadow: 0px 4px 3px 0 rgb(153, 151, 151);
+}
+.extra_default{
+    color: black;
+    font-weight: bold;
+}
+.extra_settings{
+    color: grey;
+    font-weight: bold;
+}
+#settingset{
+    width: 22px;
+    height: 20px;
+}
+
+.error-imform{
+display: flex;
+justify-content: center;
+}
+.error-text {
+    width: 385px;
+    height: 40px;
+    background-color: #105395;
+    vertical-align: middle;
+    text-align: center;
+    display: inline-block;
+    margin-top: 20px;
+    margin-left: auto;
+    margin-right: auto;
+    padding-top: 20px;
+    color: white;
+    border-radius: 0px 30px;
+}
+
diff --git a/assets/modal/modal.html b/assets/modal/modal.html
@@ -4,9 +4,31 @@
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>Comboong Note</title>
+    <link rel="stylesheet" href="modal.css" />
   </head>
   <body>
-    모달
-    <script src="./modal.js"></script>
+    <h1 class="Comboongtext"><img  src="../img/iconImg-1.png"class="iconcomboong"/> Comboong Note</h1>
+    <div class="commentbox">
+      <ul>
+        <div class="comment1"><img src="../img/setting_img.png" class="li-img"/><li class="li-comment"><b>초기 설정값</b>을 확인해 주세요<img src="../img/Initial_settings_img.png" id="settingset"/></li></div>
+        <div id="extra">
+          <span class="extra_default">default setting</span>
+          <span class="extra_settings">  Alarm : ON
+            Crawling : 3시간
+            Notification : 1일
+            Major : 정보컴퓨터공학부
+          </span>
+        </div>
+        <div class="comment2"><img src="../img/bell_img.png" class="li-img"/><li class="li-comment"> 처음 설치 시 <b>알람</b>이 뜰 수 있음을 <b>유의해 주세요</b></li></div>
+        <div class="comment3"><img src="../img/warning_img.png" class="li-img"/><li class="li-comment"> 본 프로그램으로 생기는 <b>불이익</b>은 <b>책임지기 힘듭니다</b></li></div>
+      </ul>
+    </div>
+    <div class="error-imform">
+      <div class="error-text">
+        오류 제보: [email protected]
+      </div>
+    </div>
+
+    <script type="module" src="./modal.js"></script>
   </body>
 </html>
diff --git a/assets/modal/modal.js b/assets/modal/modal.js
@@ -3,3 +3,15 @@
 //   console.log(modalDisplayData);
 //   console.log(modalDisplayData.content, modalDisplayData.remainingDays);
 // })();
+document.addEventListener('DOMContentLoaded', function () {
+    const settingsImg = document.getElementById('settingset');
+    const extraDiv = document.getElementById('extra');
+
+    settingsImg.addEventListener('mouseenter', function () {
+        extraDiv.style.display = 'block';
+    });
+
+    settingsImg.addEventListener('mouseleave', function () {
+        extraDiv.style.display = 'none';
+    });
+  });
diff --git a/manifest.json b/manifest.json
@@ -7,15 +7,9 @@
     "service_worker": "service-worker.js",
     "type": "module"
   },
-  "permissions": ["scripting", "storage", "alarms", "notifications"],
+  "permissions": ["tabs", "scripting", "storage", "alarms", "notifications"],
   "host_permissions": ["https://onestop.pusan.ac.kr/", "https://cse.pusan.ac.kr/cse/14651/subview.do"],
   "action": {
     "default_popup": "/assets/popup/popup.html"
-  },
-  "icons": {
-    "16": "assets/img/iconImg-16.png",
-    "32": "assets/img/iconImg-32.png",
-    "48": "assets/img/iconImg-48.png",
-    "128": "assets/img/iconImg-128.png"
   }
 }
diff --git a/scripts/crawling.js b/scripts/crawling.js
@@ -1,16 +1,9 @@
-import { localStorageSet, localStorageGet } from './storage.js';
-
 async function getSchedules() {
   const { tabs } = await chrome.windows.create({
     url: 'https://onestop.pusan.ac.kr',
     state: 'minimized',
   });
 
-  setTimeout(function () {
-    chrome.windows.remove(tabs[0].windowId);
-    return null;
-  }, 15000);
-
   const result = await chrome.scripting.executeScript({
     target: { tabId: tabs[0].id },
     func: () => {
@@ -34,11 +27,6 @@ async function getMajorNotices() {
     state: 'minimized',
   });
 
-  setTimeout(function () {
-    chrome.windows.remove(tabs[0].windowId);
-    return null;
-  }, 15000);
-
   const result = await chrome.scripting.executeScript({
     target: { tabId: tabs[0].id },
     func: () => {