整体布局和番茄钟整合

packages/shell-chrome/assets/html/pomodoro/assets/css/popup.css

@@ -1,12 +1,12 @@
 @import url('https://fonts.googleapis.com/css2?family=Fira+Sans:wght@400;500&display=swap');
 @import url('https://fonts.googleapis.com/css2?family=Source+Sans+Pro&display=swap');
-
 body {
     /* background-color: rgb(51, 11, 116); */
     background: url(../../images/pomo_green.jpeg) no-repeat;
-    background-image: "../../";
+    background-size: cover;
+    /* background-image: "../../"; */
     /* color: white; */
-    font-family: 'Source Sans Pro','Fira Sans', sans-serif;
+    font-family: 'Source Sans Pro', 'Fira Sans', sans-serif;
     margin: 0;
     padding: 0;
     /* width: 280px; */
@@ -19,6 +19,63 @@ body {
     padding: 10px 0 20px;
 }
 
+#left {
+    position: absolute;
+    width: 25px;
+    height: 45px;
+    top: 180px;
+    left: 0;
+    border-top-right-radius: 10px;
+    border-bottom-right-radius: 10px;
+    opacity: 0.5;
+    cursor: pointer;
+}
+
+#left:hover {
+    background-color: #b4b2b2;
+}
+
+#left::before {
+    position: absolute;
+    content: "";
+    top: 12px;
+    left: 5px;
+    width: 15px;
+    height: 15px;
+    border-top: 2px solid #bbb9b7;
+    border-left: 2px solid #bbb9b7;
+    transform: rotate(-45deg);
+}
+
+#right {
+    position: absolute;
+    width: 25px;
+    height: 45px;
+    top: 180px;
+    right: 0;
+    border-top-left-radius: 10px;
+    border-bottom-left-radius: 10px;
+    opacity: 0.8;
+    cursor: pointer;
+}
+
+#right:hover {
+    background-color: #b4b2b2;
+}
+
+#right::after {
+    z-index: 9999;
+    position: absolute;
+    content: "";
+    top: 12px;
+    right: 5px;
+    width: 15px;
+    height: 15px;
+    border-top: 2px solid #585551;
+    border-right: 2px solid #585551;
+    transform: rotate(45deg);
+}
+
 .buttons {
     width: fit-content;
     margin: auto;
@@ -26,7 +83,7 @@ body {
     color: rgb(169, 172, 172);
 }
 
-.buttons .slider{
+.buttons .slider {
     color: rgb(247, 226, 230);
 }
 
@@ -37,7 +94,9 @@ body {
     padding: 8px;
 }
 
+
 /*计数部分*/
+
 #countdown {
     clear: both;
     width: fit-content;
@@ -48,12 +107,13 @@ body {
     color: aliceblue;
 }
 
-#countdown span{
+#countdown span {
     opacity: 0;
 }
 
-
-#start-btn,#end-btn,#reset-btn {
+#start-btn,
+#end-btn,
+#reset-btn {
     /* 文字颜色 */
     color: #f5e4b9;
     /* 清除背景色 */
@@ -71,24 +131,26 @@ body {
     /* width: 40px; */
     font-size: 16px;
     margin: 4px 2px;
-    -webkit-transition-duration: 0.4s; /* Safari */
+    -webkit-transition-duration: 0.4s;
+    /* Safari */
     transition-duration: 0.4s;
     cursor: pointer;
     text-decoration: none;
     text-transform: uppercase;
-
-    text-shadow: 1px 1px 1px rgba(255,255,255, .1);
-     border-radius: 25px;
-     box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19);
-
-
+    text-shadow: 1px 1px 1px rgba(255, 255, 255, .1);
+    border-radius: 25px;
+    box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19);
 }
+
 #start-btn {
     background-color: white;
     color: black;
     border: 1px solid #f5e4b9;
 }
+
+
 /* 悬停样式 */
+
 #start-btn:hover {
     background-color: #f5e4b9;
     color: white;
@@ -100,12 +162,16 @@ body {
     border: 1px solid #ECB390;
     display: none;
 }
+
+
 /* 悬停样式 */
+
 #end-btn:hover {
     background-color: #ECB390;
     color: white;
 }
 
+
 /* #end-btn{
     width: 40px;
     margin: 10px auto 0;
@@ -115,6 +181,7 @@ body {
     cursor: pointer;
 } */
 
+
 /* #reset-btn {
     width: 40px;
     margin: 10px auto 0;
@@ -129,7 +196,10 @@ body {
     color: black;
     border: 1px solid #DD4A48;
 }
+
+
 /* 悬停样式 */
+
 #reset-btn:hover {
     background-color: #DD4A48;
     color: white;
@@ -141,13 +211,13 @@ body {
     display: none;
 } */
 
+
 /*选中的按钮*/
+
 .selected {
     background-color: rgb(244, 242, 248);
 }
 
-
-
 ul {
     padding: 0;
 }
@@ -164,13 +234,12 @@ li {
     float: right;
 }
 
-
 .hide {
     display: none;
 }
 
-footer .settings{
+footer .settings {
     position: absolute;
     bottom: 5px;
     right: 5px;
-}
+}

packages/shell-chrome/assets/html/pomodoro/assets/js/popup.js

@@ -42,121 +42,117 @@ let pomodoro = "pomodoro";
 
 //番茄钟按钮-绑定事件
 document.addEventListener("click", (e) => {
-  if (!e.target.matches(".button")) return;
+    if (!e.target.matches(".button")) return;
 
-  // reset when pomodoro button selected
-  pause = true;
-  seconds = 60;
-  startBtn.innerHTML = "开始";
+    // reset when pomodoro button selected
+    pause = true;
+    seconds = 60;
+    startBtn.innerHTML = "开始";
 
-  chrome.storage.sync.set({ pause: pause, seconds: seconds }, function () {
-    if (!chrome.runtime.error) {
-      alert("初始化pause、seconds");
-    }
-  });
-
-  // 定时器初始化
-  if (e.target.matches("#pomodoro-btn")) {
-    countdownTimer.innerHTML = "25:00";
-    pomodoro = "pomodoro";
-    minutes = 25;
-    chrome.storage.sync.set(
-      { minutes: minutes, countdownTimer: "25:00" },
-      function () {
+    chrome.storage.sync.set({ pause: pause, seconds: seconds }, function() {
         if (!chrome.runtime.error) {
-          alert("added target pomodoro!");
+            alert("初始化pause、seconds");
         }
-      }
-    );
-  }
+    });
+
+    // 定时器初始化
+    if (e.target.matches("#pomodoro-btn")) {
+        countdownTimer.innerHTML = "25:00";
+        pomodoro = "pomodoro";
+        minutes = 25;
+        chrome.storage.sync.set({ minutes: minutes, countdownTimer: "25:00" },
+            function() {
+                if (!chrome.runtime.error) {
+                    alert("added target pomodoro!");
+                }
+            }
+        );
+    }
 });
 
 // 开始按钮-绑定事件
 startBtn.addEventListener("click", () => {
-  // countdown(); 在后台运行，需要取出状态
-  debounce(start(), 100);
+    // countdown(); 在后台运行，需要取出状态
+    debounce(start(), 100);
 });
 
 function start() {
-  chrome.storage.sync.get("pomoData", ({ pomoData }) => {
-    const { minutes, seconds, status } = pomoData;
+    chrome.storage.sync.get("pomoData", ({ pomoData }) => {
+        const { minutes, seconds, status } = pomoData;
 
-    chrome.runtime.sendMessage(
-      {
-        status: "start",
-        senderId: "pomo",
-        content: {
-          minutes,
-          seconds,
-        },
-      },
-      (response) => {
-        console.log(response);
+        chrome.runtime.sendMessage({
+                status: "start",
+                senderId: "pomo",
+                content: {
+                    minutes,
+                    seconds,
+                },
+            },
+            (response) => {
+                console.log(response);
 
-        startBtn.style.display = "none";
-        endBtn.style.display = "block";
-        getTimer();
-      }
-    );
-  });
+                startBtn.style.display = "none";
+                endBtn.style.display = "block";
+                getTimer();
+            }
+        );
+    });
 }
 
 endBtn.addEventListener("click", () => {
-  setTimeout(end, 200);
+    setTimeout(end, 200);
 });
 
 function end() {
-  chrome.runtime.sendMessage(
-    {
-      status: "paused",
-      senderId: "pomo",
-    },
-    (response) => {
-      console.log(response);
-
-      startBtn.style.display = "block";
-      endBtn.style.display = "none";
-      clearTimer();
-    }
-  );
-}
-
-function getTimer() {
-  clearTimer();
-  timer = setInterval(() => {
-    chrome.storage.sync.get("pomoData", ({ pomoData }) => {
-      // console.log("pomodata****",pomoData)
-      // const{minutes,seconds,countdownTimer} = pomoData;
-      countdownTimer.innerHTML = pomoData.countdownTimer;
-
-      //更新后倒计时判断，如果结束则重新初始化界面
-      if(pomoData.countdownTimer == "00:00"){
-
-        audio.play();
-        //不能放在页面上，要在后台进行
-        chrome.runtime.sendMessage(
-          {
-            status: "playend",
+    chrome.runtime.sendMessage({
+            status: "paused",
             senderId: "pomo",
-          },
-          (response) => {
-            console.log(response,"**************下面");
-            countdownTimer.innerHTML = "25:00";
+        },
+        (response) => {
+            console.log(response);
 
             startBtn.style.display = "block";
             endBtn.style.display = "none";
             clearTimer();
-          }
-        );
+        }
+    );
+}
 
-      }
-    });
-  }, 200);
+function getTimer() {
+    clearTimer();
+    timer = setInterval(() => {
+        chrome.storage.sync.get("pomoData", ({ pomoData }) => {
+            // console.log("pomodata****",pomoData)
+            // const{minutes,seconds,countdownTimer} = pomoData;
+            countdownTimer.innerHTML = pomoData.countdownTimer;
+
+            //更新后倒计时判断，如果结束则重新初始化界面
+            if (pomoData.countdownTimer == "00:00") {
+
+                audio.play();
+                //不能放在页面上，要在后台进行
+                chrome.runtime.sendMessage({
+                        status: "playend",
+                        senderId: "pomo",
+                    },
+                    (response) => {
+                        console.log(response, "**************下面");
+                        countdownTimer.innerHTML = "25:00";
+
+                        startBtn.style.display = "block";
+                        endBtn.style.display = "none";
+                        clearTimer();
+                    }
+                );
+
+            }
+        });
+    }, 200);
 
 }
 
 function clearTimer() {
-  clearInterval(timer);
+    clearInterval(timer);
 }
 
 /*
@@ -164,59 +160,104 @@ function clearTimer() {
  * delay [number] 毫秒，防抖期限值
  */
 function debounce(fn, delay) {
-  let timer = null; //借助闭包
-  return function () {
-    if (timer) {
-      clearTimeout(timer); //进入该分支语句，说明当前正在一个计时过程中，并且又触发了相同事件。所以要取消当前的计时，重新开始计时
-      timer = setTimeout(fn, delay);
-    } else {
-      timer = setTimeout(fn, delay); // 进入该分支说明当前并没有在计时，那么就开始一个计时
-    }
-  };
+    let timer = null; //借助闭包
+    return function() {
+        if (timer) {
+            clearTimeout(timer); //进入该分支语句，说明当前正在一个计时过程中，并且又触发了相同事件。所以要取消当前的计时，重新开始计时
+            timer = setTimeout(fn, delay);
+        } else {
+            timer = setTimeout(fn, delay); // 进入该分支说明当前并没有在计时，那么就开始一个计时
+        }
+    };
 }
 
 // 重置按钮-绑定事件
 resetBtn.addEventListener("click", () => {
-  setTimeout(() => {
-    chrome.runtime.sendMessage(
-      {
-        status: "reset",
-        senderId: "pomo",
-      },
-      (response) => {
-        // console.log(response);
-        countdownTimer.innerHTML = "25:00";
+    setTimeout(() => {
+        chrome.runtime.sendMessage({
+                status: "reset",
+                senderId: "pomo",
+            },
+            (response) => {
+                // console.log(response);
+                countdownTimer.innerHTML = "25:00";
 
-        startBtn.style.display = "block";
-        endBtn.style.display = "none";
-        clearTimer();
-      }
-    );
-  }, 100);
+                startBtn.style.display = "block";
+                endBtn.style.display = "none";
+                clearTimer();
+            }
+        );
+    }, 100);
 });
 
 //页面反复打开时页面初始化
 chrome.storage.sync.get("pomoData", ({ pomoData }) => {
-  console.log(pomoData);
-  const { status } = pomoData;
+    console.log(pomoData);
+    const { status } = pomoData;
 
-  if (status === "start") {
-    startBtn.style.display = "none";
-    endBtn.style.display = "block";
-    getTimer();
-  } else if (status === "paused") {
-    startBtn.style.display = "block";
-    endBtn.style.display = "none";
-    chrome.storage.sync.get("pomoData", ({ pomoData }) => {
-      countdownTimer.innerHTML = pomoData.countdownTimer;
-    });
-  } else if (status === "init") {
-    chrome.runtime.sendMessage({
-      status: "init",
-      senderId: "pomo",
-    });
-    countdownTimer.innerHTML = "25:00";
-  }else if(status === 'playend'){
-    countdownTimer.innerHTML = "25:00";
-  }
+    if (status === "start") {
+        startBtn.style.display = "none";
+        endBtn.style.display = "block";
+        getTimer();
+    } else if (status === "paused") {
+        startBtn.style.display = "block";
+        endBtn.style.display = "none";
+        chrome.storage.sync.get("pomoData", ({ pomoData }) => {
+            countdownTimer.innerHTML = pomoData.countdownTimer;
+        });
+    } else if (status === "init") {
+        chrome.runtime.sendMessage({
+            status: "init",
+            senderId: "pomo",
+        });
+        countdownTimer.innerHTML = "25:00";
+    } else if (status === 'playend') {
+        countdownTimer.innerHTML = "25:00";
+    }
 });
+
+// 轮播图
+let photos = ["../../image/background/pomo_green.jpeg",
+    "../../image/background/pomo1.png",
+    "../../image/background/pomo_waterfall.jpg",
+    "../../image/background/pomo_ocean.jpg",
+    "../../image/background/pomo_light.jpeg",
+    "../../image/background/pomo_leaf.jpeg",
+    "../../image/background/pomo_foresr.jpeg",
+    "../../image/background/pomo_fire.jpeg",
+    "../../image/background/pomo_crystal.jpg"
+]
+
+let len = photos.length;
+// console.log(len);
+let index = 0;
+document.getElementById('right').addEventListener("click", function() {
+    change_r();
+});
+document.getElementById('left').addEventListener("click", function() {
+    change_l();
+});
+
+function change_l() {
+    index--;
+    if (index < 0) {
+        index = len - 1;
+    }
+    change(index);
+}
+
+function change_r() {
+    index++;
+    if (index == len) {
+        index = 0;
+    }
+    change(index);
+}
+
+function change(n) {
+    document.body.style = "background: url(" + photos[n] + ") no-repeat; background-size: cover;";
+}
+
+let t = setInterval(function() {
+    change_r();
+}, 40000);

packages/shell-chrome/assets/html/pomodoro/popup.html

@@ -1,5 +1,6 @@
 <!DOCTYPE html>
 <html lang="en">
+
 <head>
     <meta charset="UTF-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
@@ -10,34 +11,35 @@
     <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
     <link href="https://fonts.googleapis.com/css2?family=Lato:wght@300;400&display=swap" rel="stylesheet">
 </head>
+
 <body>
     <audio id="audio">
         <source src="./src/alarm.mp3" type="audio/mp3">
     </audio>
-    
+
     <!-- 计时部分 -->
     <div id="timer">
 
-      <!-- 切换背景图片 -->
-      <div class="slider">
-        <span class="left">&lt;</span>
-        <span class="right">&gt;</span>
-      </div>
+        <!-- 切换背景图片 -->
+        <div class="slider">
+            <div id="left"></div>
+            <div id="right"></div>
+        </div>
+
 
-      
         <!-- <div class="button" id="pomodoro-btn"></div> -->
-      
-      <div id="countdown">
-          <span>00:00</span>
-      </div>
-      <div class="buttons">
-          <!-- 计时开始、重置 -->
-      <button id="start-btn">开始</button>
-      <button id="end-btn">暂停</button>
-      <button id="reset-btn">重置</button>
-      </div>
+
+        <div id="countdown">
+            <span>00:00</span>
+        </div>
+        <div class="buttons">
+            <!-- 计时开始、重置 -->
+            <button id="start-btn">开始</button>
+            <button id="end-btn">暂停</button>
+            <button id="reset-btn">重置</button>
+        </div>
     </div>
-    
+
     <!-- 后续——添加任务清单
     <div id="worklist">
       <div id="current-task-display">
@@ -58,14 +60,15 @@
         </form>
       </div>
     </div> -->
-    
+
     <!-- 页脚--设置 -->
     <footer>
-      <div class="settings">
-        <!-- <a href="./assets/html/options.html">settings</a> -->
-      </div>
+        <div class="settings">
+            <!-- <a href="./assets/html/options.html">settings</a> -->
+        </div>
     </footer>
 
     <script src="./assets/js/popup.js"></script>
 </body>
+
 </html>