optimized

RoderickQiu · Feb 3, 2019 · c5439f8 · c5439f8
1 parent 6cf4502
commit c5439f8
Show file tree

Hide file tree

Showing 14 changed files with 59 additions and 27 deletions.
diff --git a/about.html b/about.html
@@ -34,11 +34,12 @@
                         class="fa fa-exclamation-circle" title="Issues"></i></a>
             </p>
             <hr />
-            <p class="small">
-                <i class="fa fa-copyright" aria-hidden="true"></i> 2019
-                <a href="javascript:require('electron').shell.openExternal('https://roderickqiu.scris.top/')" class="rest">Roderick
-                    Qiu</a>.
-            </p>
+            <span class="small text-muted">
+                &copy; 2019<a href="javascript:require('electron').shell.openExternal('https://roderickqiu.scris.top/')"
+                    class="rest">&nbsp;Roderick Qiu</a>.
+            </span><br />
+            <p class="extreme-small">If you have problems or you want to</p>
+            <p class="extreme-small"> some suggestion, just tell me!</p>
         </div>
     </div>
 </body>

diff --git a/docs/favicon.ico b/docs/favicon.ico
diff --git a/docs/help.html b/docs/help.html
@@ -32,6 +32,7 @@ <h2 class="h4">1. How to use it</h2>
                 When the time ends, a warning is given. <br />
                 <img src="https://raw.githubusercontent.com/RoderickQiu/wnr/master/res/preview/preview-4.png" class="img-fluid" /><br />
                 And another period of time starts. <br />
+                (You can have a rest time with wnr <b>full-screen</b> to prevent you from using you computer, too.) <br />
                 <img src="https://raw.githubusercontent.com/RoderickQiu/wnr/master/res/preview/preview-5.png" class="img-fluid" /><br />
                 Now, you've learnt to use wnr! Congratulations! <br /><br />
                 <h2 class="h4">2. Other things</h2>

diff --git a/index.html b/index.html
@@ -42,7 +42,8 @@
         <div id="controller">
             <a href="javascript:settings()" class="small rest"><i class="fa fa-cog fa-fw" title="Settings"></i></a>&nbsp;
             <a href="javascript:about()" class="small rest"><i class="fa fa-info fa-fw" title="About wnr"></i></a>&nbsp;
-            <a href="javascript:winhider()" class="small rest" id="win-hider"><i class="fa fa-sort-desc fa-fw" title="Hide the window to system tray"></i></a><span id="no-use-space">&nbsp;</span>
+            <a href="javascript:winhider()" class="small rest" id="win-hider"><i class="fa fa-sort-desc fa-fw" title="Hide the window to system tray"></i></a><span
+                id="no-use-space">&nbsp;</span>
             <a href="javascript:minimizer()" class="small rest"><i class="fa fa-minus fa-fw" title="Minimize to taskbar"></i></a>&nbsp;
             <a href="javascript:window.close()" class="small rest"><i class="fa fa-times fa-fw" title="Exit"></i></a>
         </div>
@@ -53,7 +54,7 @@
                     style="ime-mode:Disabled" class="work lead" autofocus required /><br /><br />
                 <input name="rest-time" id="rest-time" placeholder="then rest for (minutes)" type="number" onkeypress="return (/[0-9]/.test(String.fromCharCode(event.keyCode)))"
                     style="ime-mode:Disabled" class="rest lead" required /><br /><br />
-                <input name="loop" id="loop" placeholder="loop for how many times" type="number" onkeypress="return (/[0-9]/.test(String.fromCharCode(event.keyCode)))"
+                <input name="loop" id="loop" placeholder="loop for (times)" type="number" onkeypress="return (/[0-9]/.test(String.fromCharCode(event.keyCode)))"
                     style="ime-mode:Disabled" class="small" required /><br /><!-- control that only numbers are OK -->
             </form>
         </div>
@@ -63,9 +64,9 @@
         $("#work-time").val(store.get("worktime"));
         $("#rest-time").val(store.get("resttime"));
         $("#loop").val(store.get("looptime"));
-        if(process.platform == "darwin") {
-            $("#win-hider").css("display","none");
-            $("#no-use-space").css("display","none");
+        if (process.platform == "darwin") {
+            $("#win-hider").css("display", "none");
+            $("#no-use-space").css("display", "none");
         }
     </script>
 </body>

diff --git a/main.js b/main.js
@@ -66,18 +66,40 @@ app.on('ready', () => {
     })
 
     if (process.platform == "win32") tray = new Tray(path.join(__dirname, '\\res\\icons\\iconWin.ico'));
-    else if(process.platform != "darwin") tray = new Tray(path.join(__dirname, '\\res\\icons\\wnrIcon.png'));
+    else if (process.platform != "darwin") tray = new Tray(path.join(__dirname, '\\res\\icons\\wnrIcon.png'));
     const contextMenu = Menu.buildFromTemplate([
         {
-            label: 'Show/Hide', click: () => {
+            label: 'wnr v' + require("./package.json").version
+        }, {
+            type: 'separator'
+        }, {
+            label: 'Website',
+            click: function () {
+                shell.openExternal('https://wnr.scris.top/');
+            }
+        }, {
+            label: 'Help Page',
+            click: function () {
+                shell.openExternal('https://wnr.scris.top/help.html');
+            }
+        }, {
+            label: 'Github',
+            click: function () {
+                shell.openExternal('https://github.com/RoderickQiu/wnr/');
+            }
+        }, {
+            type: 'separator'
+        }, {
+            label: 'Show / Hide', click: () => {
                 win.isVisible() ? win.hide() : win.show();
                 if (settingsWin != null) settingsWin.isVisible() ? settingsWin.hide() : settingsWin.show();
                 if (aboutWin != null) aboutWin.isVisible() ? aboutWin.hide() : aboutWin.show();
             }
-        },
-        { label: 'Exit', click: () => { app.quit() } }
+        }, {
+            label: 'Exit', click: () => { app.quit() }
+        }
     ]);
-    if(tray != null) {
+    if (tray != null) {
         tray.setToolTip('wnr');
         tray.setContextMenu(contextMenu);
         tray.on('click', () => {
@@ -218,7 +240,7 @@ ipcMain.on('minimizer', function () {
 })
 
 ipcMain.on('about', function () {
-    aboutWin = new BrowserWindow({ parent: win, modal: true, width: 233, height: 216, resizable: false, frame: false, show: false, center: true, webPreferences: { nodeIntegration: true } });
+    aboutWin = new BrowserWindow({ parent: win, modal: true, width: 256, height: 233, resizable: false, frame: false, show: false, center: true, webPreferences: { nodeIntegration: true } });
     aboutWin.loadFile("about.html");
     if (store.get("top") == true || store.get("top") == undefined) aboutWin.setAlwaysOnTop(true);
     aboutWin.once('ready-to-show', () => {

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -27,7 +27,7 @@
     "request": "^2.88.0"
   },
   "devDependencies": {
-    "electron": "^4.0.2",
+    "electron": "^4.0.4",
     "electron-builder": "^20.38.5"
   },
   "build": {

diff --git a/res/icons/iconMac.psd b/res/icons/iconMac.psd
diff --git a/res/icons/iconWin.ico b/res/icons/iconWin.ico
diff --git a/res/icons/wnrIcon.png b/res/icons/wnrIcon.png
diff --git a/res/icons/wnrIcon.psd b/res/icons/wnrIcon.psd
diff --git a/settings.html b/settings.html
@@ -89,7 +89,7 @@
                 <li>
                     <a href="javascript:updatechecker(2)" class="rest"><span id="manually">Manually check for update</span></a>&nbsp;<b>(Now
                         <script>document.write("v" + require("./package.json").version)</script>)</b>
-                </li> 
+                </li>
                 <li id="hotkey-tip">
                     Open/Hide hotkey:
                     <b>
@@ -103,7 +103,7 @@
     </div>
     <script>
         if (process.platform == 'darwin') {
-            $("#hotkey-tip").css("display","none");
+            $("#hotkey-tip").css("display", "none");
         }
     </script>
     <script src="updater.js"></script>

diff --git a/style.css b/style.css
@@ -76,6 +76,12 @@ input:focus::-webkit-input-placeholder, input:hover::-webkit-input-placeholder {
 .rest:focus::-webkit-input-placeholder, .rest:hover::-webkit-input-placeholder{
     color: #5490eac2;
 }
+.extreme-small{
+    font-size: xx-small;
+    line-break: loose;
+    line-height: 100%;
+    margin: 5px;
+}
 
 #main{
     -webkit-app-region: no-drag;/* let it clickable */

diff --git a/timer.html b/timer.html
@@ -19,7 +19,8 @@
     <div class="d-flex mx-auto justify-content-center align-items-center text-dark" id="main">
         <div id="controller">
             <a href="index.html" class="small work"><i class="fa fa-chevron-left fa-fw" title="Give up the timer & Back"></i></a>&nbsp;
-            <a href="javascript:winhider()" class="small work" id="win-hider"><i class="fa fa-sort-desc fa-fw" title="Hide the window to system tray"></i></a><span id="no-use-space">&nbsp;</span>
+            <a href="javascript:winhider()" class="small work" id="win-hider"><i class="fa fa-sort-desc fa-fw" title="Hide the window to system tray"></i></a><span
+                id="no-use-space">&nbsp;</span>
             <a href="javascript:minimizer()" class="small work"><i class="fa fa-minus fa-fw" title="Minimize to taskbar"></i></a>&nbsp;
             <a href="javascript:window.close()" class="small work"><i class="fa fa-times fa-fw" title="Exit"></i></a>
         </div>
@@ -31,9 +32,9 @@
         </div>
     </div><!-- for things with 'work' mark, when it's resting, the color should be changed -->
     <script>
-        if(process.platform == "darwin") {
-            $("#win-hider").css("display","none");
-            $("#no-use-space").css("display","none");
+        if (process.platform == "darwin") {
+            $("#win-hider").css("display", "none");
+            $("#no-use-space").css("display", "none");
         }
         var ipc = require('electron').ipcRenderer;
         const Store = require('electron-store');