Merge pull request #7 from Yentis/release/1.1.0

Release/1.1.0

package.json

@@ -1,6 +1,6 @@
 {
   "name": "quasar-manga-reader",
-  "version": "1.0.1",
+  "version": "1.1.0",
   "description": "Manga reader that scrapes manga sites for updates",
   "productName": "Manga Reader",
   "author": "Yentis#5218",
@@ -23,7 +23,7 @@
     "core-js": "^3.6.5",
     "mocha": "^8.1.1",
     "quasar": "^1.0.0",
-    "vue-lazyload": "^1.3.3"
+    "relevancy": "^0.2.0"
   },
   "devDependencies": {
     "@quasar/app": "^2.0.0",

quasar.conf.js

@@ -25,15 +25,11 @@ module.exports = configure(function (ctx) {
     // --> boot files are part of "main.js"
     // https://quasar.dev/quasar-cli/boot-files
     boot: [
-      'composition-api',
-      'lazyload'
+      'composition-api'
     ],
 
     // https://quasar.dev/quasar-cli/quasar-conf-js#Property%3A-css
-    css: [
-      'app.css',
-      'bulma.min.css'
-    ],
+    css: [],
 
     // https://github.com/quasarframework/quasar/tree/dev/extras
     extras: [
@@ -111,7 +107,9 @@ module.exports = configure(function (ctx) {
       // Quasar plugins
       plugins: [
         'LocalStorage',
-        'Cookies'
+        'Cookies',
+        'Notify',
+        'Loading'
       ]
     },
 

src-cordova/config.xml

@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<widget id="org.cordova.manga.reader" version="1.0.1" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget id="org.cordova.manga.reader" version="1.1.0" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
     <name>Manga Reader</name>
     <description>Manga reader that scrapes manga sites for updates</description>
     <author email="[email protected]" href="http://cordova.io">

src-cordova/package.json

@@ -14,14 +14,16 @@
   "license": "Apache-2.0",
   "devDependencies": {
     "cordova-android": "^9.0.0",
+    "cordova-plugin-cookiemaster": "^1.0.5",
+    "cordova-plugin-inappbrowser": "^4.0.0",
     "cordova-plugin-whitelist": "^1.3.4"
   },
   "cordova": {
     "plugins": {
-      "cordova-plugin-whitelist": {}
+      "cordova-plugin-whitelist": {},
+      "cordova-plugin-inappbrowser": {},
+      "com.cordova.plugins.cookiemaster": {}
     },
-    "platforms": [
-      "android"
-    ]
+    "platforms": []
   }
-}
+}

src-electron/main-process/electron-main.js

@@ -1,4 +1,4 @@
-import { app, BrowserWindow, nativeTheme, session } from 'electron'
+import { app, BrowserWindow, nativeTheme, session, Menu } from 'electron'
 
 try {
   if (process.platform === 'win32' && nativeTheme.shouldUseDarkColors === true) {
@@ -17,6 +17,27 @@ if (process.env.PROD) {
 let mainWindow
 
 function createWindow () {
+  const menu = Menu.buildFromTemplate([{
+    label: '<',
+    click: (_item, window) => {
+      window.webContents.goBack()
+    }
+  }, {
+    label: '>',
+    click: (_item, window) => {
+      window.webContents.goForward()
+    }
+  }, {
+    label: 'Manga list',
+    click: (_item, window) => {
+      window.webContents.goToIndex(0)
+    }
+  }, {
+    label: '',
+    role: "toggleDevTools",
+    visible: false
+  }])
+
   /**
    * Initial window options
    */
@@ -25,7 +46,6 @@ function createWindow () {
     height: 800,
     minWidth: 900,
     title: 'Manga Reader',
-    autoHideMenuBar: true,
     useContentSize: true,
     webPreferences: {
       // Change from /quasar.conf.js > electron > nodeIntegration;
@@ -38,6 +58,7 @@ function createWindow () {
     }
   })
 
+  mainWindow.setMenu(menu)
   session.defaultSession.cookies.set({
     url: 'https://www.webtoons.com/',
     name: 'ageGatePass',

src/classes/manga.ts

@@ -1,4 +1,4 @@
-import { SiteType } from './siteType'
+import { SiteType } from '../enums/siteEnum'
 
 export class Manga {
     url: string;

src/classes/notifyOptions.ts

@@ -0,0 +1,23 @@
+export class NotifyOptions {
+    message: Error | string
+    type = 'negative'
+    timeout: number | undefined = undefined
+    position: 'bottom' | 'top' | 'top-left' | 'top-right' | 'bottom-left' | 'bottom-right' | 'left' | 'right' | 'center' | undefined = undefined
+    closeBtn: boolean | string = false
+    actions: Array<{ label: string, handler?: () => void, color?: string }> | undefined
+
+    constructor (message: Error | string) {
+      this.message = message
+    }
+
+    getOptions () {
+      return {
+        type: this.type,
+        message: this.message instanceof Error ? this.message.message : this.message,
+        timeout: this.timeout,
+        position: this.position,
+        closeBtn: this.closeBtn,
+        actions: this.actions
+      }
+    }
+}