robo8x [chore] 12/31/2018, 5:46:52 PM

Author: p3x-robot

README.md

@@ -9,7 +9,7 @@
 
 
 
-# 📚 P3X Onenote Linux v2018.12.31-0  
+# 📚 P3X Onenote Linux v2018.12.31-2  
 
 
 This is an open-source project. Star this repository, if you like it, or even donate! Thank you so much! :)
@@ -161,7 +161,7 @@ Since Electron v3 the try click is executing the right click, for some reason.
 
 ---
 
-[**P3X-ONENOTE**](https://pages.corifeus.com/onenote) Build v2018.12.31-0 
+[**P3X-ONENOTE**](https://pages.corifeus.com/onenote) Build v2018.12.31-2 
 
 [![Like Corifeus @ Facebook](https://img.shields.io/badge/LIKE-Corifeus-3b5998.svg)](https://www.facebook.com/corifeus.software) [![Donate for Corifeus / P3X](https://img.shields.io/badge/Donate-Corifeus-003087.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=QZVM4V6HVZJW6)  [![Contact Corifeus / P3X](https://img.shields.io/badge/Contact-P3X-ff9900.svg)](https://www.patrikx3.com/en/front/contact) 
 

artifacts/npm.md

@@ -27,7 +27,7 @@ Though, I am using it, but some distros are different and I only use Linux Mint
 
 ---
 
-[**P3X-ONENOTE**](https://pages.corifeus.com/onenote) Build v2018.12.31-0 
+[**P3X-ONENOTE**](https://pages.corifeus.com/onenote) Build v2018.12.31-2 
 
 [![Like Corifeus @ Facebook](https://img.shields.io/badge/LIKE-Corifeus-3b5998.svg)](https://www.facebook.com/corifeus.software) [![Donate for Corifeus / P3X](https://img.shields.io/badge/Donate-Corifeus-003087.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=QZVM4V6HVZJW6)  [![Contact Corifeus / P3X](https://img.shields.io/badge/Contact-P3X-ff9900.svg)](https://www.patrikx3.com/en/front/contact) 
 

package.json

@@ -1,6 +1,6 @@
 {
     "name": "p3x-onenote",
-    "version": "2018.12.31-0",
+    "version": "2018.12.31-2",
     "description": "📚 P3X Onenote Linux",
     "main": "src/electron/app.js",
     "corifeus": {
@@ -38,15 +38,17 @@
     },
     "homepage": "https://pages.corifeus.com/onenote",
     "dependencies": {
-        "electron": "^4.0.0",
+        "@fortawesome/fontawesome-free": "^5.6.3",
         "angular": "^1.7.5",
         "angular-animate": "^1.7.5",
         "angular-aria": "^1.7.5",
         "angular-material": "^1.1.11",
         "angular-messages": "^1.7.5",
         "configstore": "^4.0.0",
         "corifeus-utils": "^2018.12.30-2",
+        "electron": "^4.0.0",
         "electron-updater": "^4.0.6",
+        "jquery": "^3.3.1",
         "opencollective": "^1.0.3",
         "semver": "^5.6.0",
         "typeface-roboto": "0.0.54"
@@ -83,4 +85,4 @@
         "type": "opencollective",
         "url": "https://opencollective.com/p3x-onenote"
     }
-}
+}

src/electron/window/onenote/core/overlay.css

@@ -0,0 +1,24 @@
+
+#p3xr-overlay {
+  z-index: 999999;
+  font-size: 125%;
+  position: fixed;
+  left: 0;
+  top: 0;
+  width: 100vw;
+  height: 100vh;
+  text-align:center;
+  /*Flexbox*/
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  align-content: center;
+  justify-content: center;
+  background-color: rgba(0, 0, 0, 0.9);
+  z-index: 99999;
+  color: rgba(128, 128, 128, 0.5);
+}
+
+#p3xr-overlay  i {
+  font-size: 400% !important;
+}

src/electron/window/onenote/core/overlay.js

@@ -0,0 +1,56 @@
+let shown = false
+let hideTimeout
+const ipc = require('electron').ipcRenderer;
+let showCount = 0
+
+p3x.onenote.ui.overlay = new function() {
+    const template = (options = {}) => {
+
+        return `
+<div id="p3xr-overlay">
+    <div id="p3xr-overlay-info">
+        <i class="fas fa-cog fa-spin fa-4x"></i>
+        ${options.hasOwnProperty('message') ? "<br/><br/>" : ''}
+        ${options.hasOwnProperty('message') ? options.message : ''}
+    </div>
+</div>
+        
+        `
+    }
+
+    this.show = (options = {}) => {
+        /*
+        ipc.send('p3x-debug', {
+            'overlay show': shown,
+        })
+        */
+        showCount++
+
+        if (showCount > 5) {
+            require('../action/multi-actions')({
+                action: 'home'
+            })
+            this.hide()
+        }
+
+        if (shown) {
+            return
+        }
+        shown = true
+        ///this.hide()
+        //console.warn('p3xr.ui.overlay show')
+        $body.append(template(options))
+    }
+
+    this.hide = () => {
+
+        /*
+        ipc.send('p3x-debug', {
+            'overlay hide': 'done',
+        })
+        */
+        //console.warn('p3xr.ui.overlay hide')
+        $body.find('#p3xr-overlay').remove()
+        shown = false
+    }
+}

src/electron/window/onenote/event/handler.js

@@ -10,9 +10,22 @@ const handler = (options) => {
  //		webview.insertCSS(window.cssData);
      });
      */
+    const allowedUrlRegex = /^((https?:\/\/((onedrive\.live\.com\/((redir\?resid\=)|((redir|edit).aspx\?)))|((www\.)?onenote\.com))|(about\:blank)))/i
+    const disalledUrl = /^((https?:\/\/))/i
+
 
     setInterval(() => {
         //console.log(webview.src, global.p3x.onenote.root.p3x.onenote.location)
+
+        if (!allowedUrlRegex.test(webview.src) && (webview.src.startsWith('https://onedrive.live.com') || webview.src.startsWith('http://onedrive.live.com'))) {
+            p3x.onenote.ui.overlay.show({
+                message: p3x.onenote.lang.label.disallowedContent
+            })
+        } else {
+            p3x.onenote.ui.overlay.hide()
+        }
+
+
         if (global.p3x.onenote.root.p3x.onenote.location !== webview.src) {
             global.p3x.onenote.root.p3x.onenote.location = webview.src
             global.p3x.onenote.data.url = webview.src
@@ -23,7 +36,7 @@ const handler = (options) => {
 
     /*
     webview.addEventListener('did-stop-loading', function(event) {
-        webview.insertCSS(p3x.onenote.hackCss);
+       // webview.insertCSS(p3x.onenote.hackCss);
     });
 
     webview.addEventListener('will-navigate', function(event, url) {
@@ -42,10 +55,12 @@ const handler = (options) => {
     */
 
     webview.addEventListener('did-navigate', function(event, url) {
+        /*
         ipc.send('p3x-debug', {
             'did-navigate': event,
             url: url,
         });
+        */
 
         global.p3x.onenote.data.url = webview.src;
         ipc.send('p3x-onenote-save', global.p3x.onenote.data);
@@ -54,12 +69,13 @@ const handler = (options) => {
         global.p3x.onenote.root.$digest()
     });
 
-    const allowedUrlRegex = /^((https?:\/\/((onedrive\.live\.com\/redir\?resid\=)|((www\.)?onenote\.com))|(about\:blank)))/
     webview.addEventListener('new-window', function(event) {
+        /*
         ipc.send('p3x-debug', {
             'new-window': event,
             allowed: allowedUrlRegex.test(event.url)
         })
+        */
         event.preventDefault()
         //console.log(event.url)
         if (allowedUrlRegex.test(event.url) ) {

src/electron/window/onenote/index.html

@@ -10,6 +10,7 @@
     <link rel="stylesheet" href="../../../../node_modules/angular/angular-csp.css">
     <link rel="stylesheet" href="../../../../node_modules/angular-material/angular-material.css">
     <link rel="stylesheet" href="./style.css">
+    <link rel="stylesheet" href="./core/overlay.css ">
 
     <!-- must be last -->
 	<link rel="icon" type="image/png" href="../../images/256x256.png" />

src/electron/window/onenote/load.js

@@ -1,5 +1,12 @@
 const { ipcRenderer } = require('electron');
 
+// fontawesome
+require('@fortawesome/fontawesome-free/js/all')
+
+// jquery
+global.$ = require('jquery/dist/jquery.slim')
+global.jQuery = global.$
+
 /*
 const fs = require('fs')
 
@@ -16,6 +23,9 @@ fs.readFile(__dirname + '/hack.css', 'utf-8', function(err, data) {
 
 global.p3x = {
     onenote: {
+        ui: {
+
+        },
         hackCss: undefined,
         ng:undefined,
         webview: undefined,
@@ -31,11 +41,21 @@ global.p3x = {
     }
 }
 
+
 document.title = `${global.p3x.onenote.lang.title} v${global.p3x.onenote.pkg.version}`;
 
+
+require('./core/overlay')
 require('./angular')
 
 window.p3xOneNoteOnLoad = function() {
+
+
+    $(() => {
+        global.$body = $('body');
+    })
+
+
     const webview = document.getElementById("p3x-onenote-webview");
     global.p3x.onenote.webview = webview;
     webview.focus()

src/translation/english/index.js

@@ -25,6 +25,7 @@ const translation = {
         hide: 'Hide',
         copyLocation: 'Copy this location to the clipboard',
         copyLocationCopied: 'The location is copied to the clipboard.',
+        disallowedContent: 'Disallowed content, soon redirecting to home ...'
     },
     dialog: {
         minimizationBehavior: {