optimized + celebrate for 2020

RoderickQiu · RoderickQiu · commit 412f0e4c987d · 2019-12-29T11:52:17.000+08:00
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -20,6 +20,12 @@
             "type": "shell",
             "command": "yarn",
             "group": "none"
+        },
+        {
+            "label": "autoclean",
+            "type": "shell",
+            "command": "yarn autoclean --force",
+            "group": "none"
         }
     ]
 }
diff --git a/.yarnclean b/.yarnclean
@@ -0,0 +1,45 @@
+# test directories
+__tests__
+test
+tests
+powered-test
+
+# asset directories
+docs
+doc
+website
+images
+assets
+
+# examples
+example
+examples
+
+# code coverage directories
+coverage
+.nyc_output
+
+# build scripts
+Makefile
+Gulpfile.js
+Gruntfile.js
+
+# configs
+appveyor.yml
+circle.yml
+codeship-services.yml
+codeship-steps.yml
+wercker.yml
+.tern-project
+.gitattributes
+.editorconfig
+.*ignore
+.eslintrc
+.jshintrc
+.flowconfig
+.documentup.json
+.yarn-metadata.json
+.travis.yml
+
+# misc
+*.md
diff --git a/about.html b/about.html
@@ -51,6 +51,10 @@
                     $('#issues').attr('title', i18n.__('issues'));
                 </script>
             </p>
+            <p class="extreme-small text-muted">
+                &copy; 2019-2020 <a href="https://r-q.name/">Roderick Qiu.</a>
+            </p>
+            <p class="extreme-small">&nbsp;</p>
             <p class="extreme-small">
                 <a class="rest"
                     href="javascript:require('electron').shell.openExternal('https://wnr.scris.top/acknoledgements.html')">Acknoledgements</a>
diff --git a/docs/bangzhu.html b/docs/bangzhu.html
@@ -83,7 +83,7 @@ <h2 class="h4">2、其他</h2>
     <footer class="footer mx-auto py-4 text-center m">
         <div class="container">
             <span class="text-muted">
-                &copy; 2019 <a href="https://roderickqiu.scris.top/">Roderick Qiu.</a>
+                &copy; 2019-2020 <a href="https://r-q.name/">Roderick Qiu.</a>
             </span>
         </div>
     </footer>
diff --git a/docs/help.html b/docs/help.html
@@ -84,7 +84,7 @@ <h2 class="h4">2. Other things</h2>
         <div class="container">
             <span class="small text-muted">The name is a abbr of <i>"Work & Rest"</i>.</span><br />
             <span class="text-muted">
-                &copy; 2019 <a href="https://roderickqiu.scris.top/">Roderick Qiu.</a>
+                &copy; 2019-2020 <a href="https://r-q.name/">Roderick Qiu.</a>
             </span>
         </div>
     </footer>
diff --git a/docs/index.html b/docs/index.html
@@ -41,7 +41,7 @@ <h1 class="display-4"><span class="work">w</span><span class="text-black-50">n</
         <div class="container">
             <span class="small text-muted">The name is an abbr of <i>"Work & Rest"</i>.</span><br />
             <span class="text-muted">
-                &copy; 2019 <a href="https://roderickqiu.scris.top/">Roderick Qiu.</a>
+                &copy; 2019-2020 <a href="https://r-q.name/">Roderick Qiu.</a>
             </span>
         </div>
     </footer>
diff --git a/docs/zh.html b/docs/zh.html
@@ -41,7 +41,7 @@ <h1 class="display-4"><span class="work">w</span><span class="text-black-50">n</
     <footer class="footer mx-auto py-4" id="footer">
         <div class="container">
             <span class="text-muted">
-                &copy; 2019 <a href="https://roderickqiu.scris.top/">Roderick Qiu.</a>
+                &copy; 2019-2020 <a href="https://r-q.name/">Roderick Qiu.</a>
             </span>
         </div>
     </footer>
diff --git a/main.js b/main.js
@@ -24,11 +24,12 @@ function createWindow() {
         width: 364,
         height: 360,
         frame: false,
+        backgroundColor: "#FEFEFE",
         resizable: false,
         maximizable: false,
         show: false,
         hasShadow: true,
-        webPreferences: { nodeIntegration: true },
+        webPreferences: { nodeIntegration: true, webgl: false },
         titleBarStyle: "hiddenInset",
         title: "wnr",
         icon: "./res/icons/wnrIcon.png"
@@ -69,9 +70,11 @@ function alarmSet() {
                         wait: true // Wait with callback, until user action is taken against notification
                     }
                 );
-                if (win != null) if (!win.isVisible()) win.show();
+                notifier.on('click', function (notifierObject, options, event) {
+                    if (win != null) if (!win.isVisible()) win.show();
+                });
             }
-        }, 1200000)//不断提示使用wnr
+        }, 600000)//不断提示使用wnr
     }
 }
 
@@ -488,7 +491,18 @@ ipcMain.on('minimizer', function () {
 function about() {
     if (app.isReady()) {
         if (win != null) {
-            aboutWin = new BrowserWindow({ parent: win, width: 256, height: 233, resizable: false, frame: false, show: false, center: true, titleBarStyle: "hidden", webPreferences: { nodeIntegration: true } });
+            aboutWin = new BrowserWindow({
+                parent: win,
+                width: 279,
+                height: 256,
+                backgroundColor: "#FEFEFE",
+                resizable: false,
+                frame: false,
+                show: false,
+                center: true,
+                titleBarStyle: "hidden",
+                webPreferences: { nodeIntegration: true }
+            });
             aboutWin.loadFile("about.html");
             if (store.get("top") == true) aboutWin.setAlwaysOnTop(true);
             aboutWin.once('ready-to-show', () => {
@@ -505,7 +519,18 @@ ipcMain.on('about', about);
 function settings() {
     if (app.isReady()) {
         if (win != null) {
-            settingsWin = new BrowserWindow({ parent: win, width: 729, height: 486, resizable: false, frame: false, show: false, center: true, webPreferences: { nodeIntegration: true }, titleBarStyle: "hidden" });
+            settingsWin = new BrowserWindow({
+                parent: win,
+                width: 729,
+                height: 486,
+                backgroundColor: "#FEFEFE",
+                resizable: false,
+                frame: false,
+                show: false,
+                center: true,
+                webPreferences: { nodeIntegration: true },
+                titleBarStyle: "hidden"
+            });
             settingsWin.loadFile("settings.html");
             if (store.get("top") == true) settingsWin.setAlwaysOnTop(true);
             settingsWin.once('ready-to-show', () => {
@@ -535,7 +560,18 @@ ipcMain.on('settings', settings);
 function tourguide() {
     if (app.isReady()) {
         if (win != null) {
-            tourWin = new BrowserWindow({ parent: win, width: 729, height: 600, resizable: false, frame: false, show: false, center: true, titleBarStyle: "hidden", webPreferences: { nodeIntegration: true } });
+            tourWin = new BrowserWindow({
+                parent: win,
+                width: 729,
+                height: 600,
+                backgroundColor: "#FEFEFE",
+                resizable: false,
+                frame: false,
+                show: false,
+                center: true,
+                titleBarStyle: "hidden",
+                webPreferences: { nodeIntegration: true }
+            });
             tourWin.loadFile("tourguide.html");
             if (store.get("top") == true) tourWin.setAlwaysOnTop(true);
             tourWin.once('ready-to-show', () => {
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "wnr",
-  "version": "1.6.1",
+  "version": "1.6.2",
   "description": "It's a timer app with strong expansibility for computers. The name is an abbr of \"Work and Rest\".",
   "main": "main.js",
   "scripts": {
@@ -30,7 +30,7 @@
     "winreg": "1.2.4"
   },
   "devDependencies": {
-    "electron": "6.1.4",
+    "electron": "7.1.7",
     "electron-builder": "22.1.0"
   }
 }
diff --git a/res/builder/linux.js b/res/builder/linux.js
@@ -9,7 +9,16 @@ const config = {
         "target": [
             "dir"
         ],
-        "icon": "res/icons/wnrIcon.png"
+        "icon": "res/icons/wnrIcon.png",
+        "files": [
+            "**/*",
+            //! to exclude
+            "!res/preview/",
+            "!res/icons/*Mac*",
+            "!res/icons/*Win*",
+            "!res/icons/*.psd",
+            "!node_modules/node-notifier/vendor/snoreToast/*"
+        ]
     }
 }
 
diff --git a/res/builder/mac.js b/res/builder/mac.js
@@ -10,7 +10,15 @@ const config = {
             "dir"
         ],
         "icon": "res/icons/iconMac.icns",
-        "darkModeSupport": true
+        "darkModeSupport": true,
+        "files": [
+            "**/*",
+            //! to exclude
+            "!res/preview/",
+            "!res/icons/*Win*",
+            "!res/icons/*.psd",
+            "!node_modules/node-notifier/vendor/snoreToast/*"
+        ]
     }
 }
 
diff --git a/res/builder/win.js b/res/builder/win.js
@@ -9,7 +9,14 @@ const config = {
         "target": [
             "dir"
         ],
-        "icon": "res/icons/iconWin.ico"
+        "icon": "res/icons/iconWin.ico",
+        "files": [
+            "**/*",
+            //! to exclude
+            "!res/preview/",
+            "!res/icons/*Mac*",
+            "!res/icons/*.psd"
+        ]
     }
 }
 
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,12 @@`
`20`	`20`	`"type": "shell",`
`21`	`21`	`"command": "yarn",`
`22`	`22`	`"group": "none"`
	`23`	`+ },`
	`24`	`+ {`
	`25`	`+ "label": "autoclean",`
	`26`	`+ "type": "shell",`
	`27`	`+ "command": "yarn autoclean --force",`
	`28`	`+ "group": "none"`
`23`	`29`	`}`
`24`	`30`	`]`
`25`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "wnr",`
`3`		`- "version": "1.6.1",`
	`3`	`+ "version": "1.6.2",`
`4`	`4`	`"description": "It's a timer app with strong expansibility for computers. The name is an abbr of \"Work and Rest\".",`
`5`	`5`	`"main": "main.js",`
`6`	`6`	`"scripts": {`
`@@ -30,7 +30,7 @@`
`30`	`30`	`"winreg": "1.2.4"`
`31`	`31`	`},`
`32`	`32`	`"devDependencies": {`
`33`		`- "electron": "6.1.4",`
	`33`	`+ "electron": "7.1.7",`
`34`	`34`	`"electron-builder": "22.1.0"`
`35`	`35`	`}`
`36`	`36`	`}`