🔀 Merge pull request #9 from HiBixby/develop

🔖 v0.1.2
HiBixby · Feb 3, 2023 · ccaf86c · ccaf86c
2 parents d85a50c + af0b95f
commit ccaf86c
Show file tree

Hide file tree

Showing 21 changed files with 267 additions and 123 deletions.
diff --git a/README.md b/README.md
@@ -4,7 +4,12 @@
 
 🚧 WIP 🚧
 
-[DEMO](https://hibixby.github.io/WhaleHae/)
+## How to use
+1. [웨일 스토어에서 설치하기 (v0.1.1)](https://store.whale.naver.com/detail/gmpkjmenbbmjcmcjpclkedbfbhmogbhp)
+
+2. [개발 버전 체험 (v0.1.2-alpha)](https://hibixby.github.io/WhaleHae/)
+
+     - 개발 버전은 체험은 Github pages를 사용하므로 Chrome.api를 사용할 수 없어서 일부 기능이 작동하지 않습니다.
 
 ## What I used
 

diff --git a/docs/assets/index-1fc6866e.js b/docs/assets/index-1fc6866e.js
diff --git a/docs/assets/index-4cb2d004.css b/docs/assets/index-4cb2d004.css
diff --git a/docs/assets/index-8e967823.css b/docs/assets/index-8e967823.css
diff --git a/docs/assets/index-c0adee32.js b/docs/assets/index-c0adee32.js
diff --git a/docs/background.js b/docs/background.js
@@ -1,25 +1,68 @@
 console.log("background.js loaded!");
 
-chrome.alarms.onAlarm.addListener((alarm) => {
-  console.log("Alarm!!!");
+let passedAlarmCnt = 0;
+const CreateTab = (link) => {
+  //링크가 null이 아니라면 탭 열기
+  if (link !== null) {
+    chrome.tabs.create({
+      url: link,
+    });
+  }
+};
+const CreateNotificationOptions = (message) => {
+  let notificationOptions = {
+    type: "basic",
+    iconUrl: "logo.png",
+    title: "웨, 일해",
+    message: "🐳제목없음🐳",
+    priority: 2,
+  };
+  if (message !== null) {
+    notificationOptions.message = message;
+  }
+  return notificationOptions;
+};
+const CreateNotification = (NOTIFICATION_ID, message) => {
+  chrome.notifications.create(
+    NOTIFICATION_ID,
+    CreateNotificationOptions(message)
+  );
+};
+const UpdateNotification = (NOTIFICATION_ID, message) => {
+  chrome.notifications.update(
+    NOTIFICATION_ID,
+    CreateNotificationOptions(message),
+    (wasUpdated) => {
+      console.log("wasUpdated:", wasUpdated);
+    }
+  );
+};
+const FindIndexOfTodo = (id, result) => {
+  for (index in result.todos) {
+    if (id === result.todos[index].id.toString()) return index;
+  }
+};
+
+chrome.alarms.onAlarm.addListener(async (alarm) => {
+  console.log("Alarm executed!", alarm);
   const id = alarm.name;
-  chrome.storage.local.get(["todos"]).then((result) => {
-    for (index in result.todos) {
-      if (id === result.todos[index].id.toString()) {
-        const message = result.todos[index].title;
-        chrome.notifications.create(id.toString(), {
-          type: "basic",
-          iconUrl: "logo.png",
-          title: "웨, 일해",
-          message: message ? message : "🐳제목 없음🐳",
-          priority: 2,
-        });
-        if (result.todos[index].link !== null) {
-          chrome.tabs.create({
-            url: result.todos[index].link,
-          });
-        }
-      }
+  const result = await chrome.storage.local.get(["todos"]);
+  console.log("result is...", result);
+  const index = FindIndexOfTodo(id, result);
+  //시간이 지난 알람일 때
+  if (Date.now() > result.todos[index].date + 60000) {
+    passedAlarmCnt++;
+    const NOTIFICATION_ID = "hasPassedAlarms";
+    const message = `자리를 비운 동안 ${passedAlarmCnt}개의 알림이 실행되지 않았습니다.`;
+    if (passedAlarmCnt === 1) {
+      CreateNotification(NOTIFICATION_ID, message);
+    } else {
+      UpdateNotification(NOTIFICATION_ID, message);
     }
-  });
+    //정상 알람일 때
+  } else {
+    const message = result.todos[index].title;
+    CreateNotification(id, message);
+    CreateTab(result.todos[index].link);
+  }
 });
diff --git a/docs/index.html b/docs/index.html
@@ -12,8 +12,8 @@
     <link rel="stylesheet" href="./main.css" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>웨, 일해</title>
-    <script type="module" crossorigin src="./assets/index-c0adee32.js"></script>
-    <link rel="stylesheet" href="./assets/index-8e967823.css">
+    <script type="module" crossorigin src="./assets/index-1fc6866e.js"></script>
+    <link rel="stylesheet" href="./assets/index-4cb2d004.css">
   </head>
   <body>
     <div id="app">

diff --git a/docs/main.css b/docs/main.css
@@ -1,3 +1,12 @@
+html,
+body {
+    height: 100%;
+}
+
+body {
+    margin: 0;
+}
+
 .logo-container {
     height: 100vh;
     width: 100vw;

diff --git a/docs/manifest.json b/docs/manifest.json
@@ -2,7 +2,7 @@
   "manifest_version": 3,
   "name": "웨,일해(Whale Hae)",
   "description": "웨일대학 1팀 - 일정 관리 및 링크 자동 실행",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "sidebar_action": {
     "default_page": "index.html",
     "default_icon": {

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "whale-hae",
-  "version": "0.1.0",
+  "version": "0.1.2",
   "private": true,
   "scripts": {
     "dev": "vite",