About page

ivan770 · Jun 3, 2018 · 2e342a1 · 2e342a1
1 parent d57c762
commit 2e342a1
Show file tree

Hide file tree

Showing 4 changed files with 53 additions and 8 deletions.
diff --git a/about.html b/about.html
@@ -0,0 +1,24 @@
+<!DOCTYPE html>
+  <html>
+    <head>
+      <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
+      <link type="text/css" rel="stylesheet" href="css/materialize.min.css"  media="screen,projection"/>
+      <link type="text/css" rel="stylesheet" href="css/about.css"/>
+      <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
+    </head>
+    <body>
+      <div class="center">
+        <img src="img/icon.png" height="128" width="128"/>
+    <h3>PineSQL</h3>
+    <h5>Created by ivan770</h5>
+    <h6 id="version">Version: 1.5.1</h6>
+</div>
+      <script>
+      const pjson = require("./package.json")
+      const version = document.getElementById("version")
+
+      version.innerText = `Version: ${pjson.version}`
+      </script>
+      <script type="text/javascript" src="js/materialize.min.js"></script>
+    </body>
+</html>
diff --git a/css/about.css b/css/about.css
@@ -0,0 +1,6 @@
+.center {
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    transform: translateX(-50%) translateY(-50%);
+}
diff --git a/js/base.js b/js/base.js
@@ -15,6 +15,8 @@ function updateCheck(){
           if (compareVersions(`${pjson.version}`, `${JSON.parse(body).tag_name}`) == -1){
             appendLog(`New version available: ${JSON.parse(body).tag_name}`, "UPDATE")
           }
+        } else {
+          appendLog("Connection error", "UPDATE")
         }
       });
 }
diff --git a/main.js b/main.js
@@ -40,15 +40,24 @@ app.on('ready', () => {
       icon: path.join(__dirname, 'img/icon.png')
     })
 
+    aboutWin = new BrowserWindow({
+      width: 800,
+      height: 600,
+      show: false,
+      icon: path.join(__dirname, 'img/icon.png')
+    })
+
     assistantWin.loadURL(`file://${__dirname}/construct.html`)
     splash.loadURL(`file://${__dirname}/splash.html`)
     mainWindow.loadURL(`file://${__dirname}/index.html`)
     settingsWin.loadURL(`file://${__dirname}/settings.html`)
+    aboutWin.loadURL(`file://${__dirname}/about.html`)
 
     mainWindow.on('closed', function() {
         mainWindow = null
         assistantWin.destroy()
         settingsWin.destroy()
+        aboutWin.destroy()
     })
 
     assistantWin.on('close', function(event) {
@@ -61,6 +70,11 @@ app.on('ready', () => {
         event.preventDefault()
     })
 
+    aboutWin.on('close', function(event) {
+        aboutWin.hide()
+        event.preventDefault()
+    })
+
     mainWindow.once('ready-to-show', () => {
         splash.destroy()
         mainWindow.show()
@@ -82,7 +96,13 @@ app.on('ready', () => {
                   click() {
                     settingsWin.show()
                   }
-                }
+                },
+                {
+                    label: 'About',
+                      click() {
+                        aboutWin.show()
+                      }
+                    }
             ]
         },
         {
@@ -98,13 +118,6 @@ app.on('ready', () => {
                     click() {
                         require('electron').shell.openExternal('https://raw.githubusercontent.com/ivan770/pinesql/master/LICENSE')
                     }
-                },
-                {
-                    type: 'separator'
-                },
-                {
-                    label: 'Created by ivan770',
-                    enabled: false
                 }
             ]
         }