From 538d013c8fb80d7c5f09bf6243ecb2e40159cbdf Mon Sep 17 00:00:00 2001 From: Fabian Thielen Date: Fri, 5 Jan 2018 03:49:44 +0100 Subject: [PATCH] Cleanup, JS-Fixes --- .travis.yml | 7 ++--- assets/pre/jquery.js | 5 ---- assets/pre/style.sass | 51 ------------------------------------- gulpfile.js | 49 ----------------------------------- index.html | 59 ------------------------------------------- index.js | 10 +++++--- package.json | 11 ++------ 7 files changed, 11 insertions(+), 181 deletions(-) delete mode 100644 assets/pre/jquery.js delete mode 100644 assets/pre/style.sass delete mode 100644 gulpfile.js delete mode 100644 index.html diff --git a/.travis.yml b/.travis.yml index 4c43d9e..0c5485f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,17 +18,14 @@ cache: install: - npm i script: -- gulp - npm run dist -before_deploy: -- git tag "$(date +'%Y%m%d%H%M%S')-$(git log --format=%h -1)" deploy: provider: releases api_key: secure: EGFC8COoSPPWWX4PLoACvbplCqK08Ihx/soTQlawrsbScZroFIDdh0imo7oZ10xfGRbaPT8EACkujf0XdIBKjsWGHT8ssKooPlZyUFq/XgZ8iZUmFqq8rapacYkA49CSq8ir8KKYtWFZ7ORgNPgmibo5fvz6SR8uHbHj7mdq3VmpvCuOxGbfaJZTm7qcDZcgNTM0JfRs8fkkfYCDG6jGB694RGVquHVRtpFGXGVGnwNkpx5buqbis8GmjK24gU/6M6h96Ps3inI/qqW6nIEUSkwxvNBhFKfHE9GVUEL+kplELqyVO6FZ+3NpR8ONghhfRxSQV+YFDNA0WhKvsxIuNY9NlM8FjQ5MyIh1jT2E194D3CuzQTAKMDyn27S4IxXT/ETMQ9391j86aYt96qvvGgxFezVzv6xIalBQAWy4KY+0O89GAPmX7IMdVPBjtIvmtzIkqwRNVp4soGzOYhmYCMzinuSji6Qn6SoY8LLmFBvYxv0V35mq+aar0mxoUne8VpeTGSHdGidonhfNTn8uaMCrg02/4nm5MvEkmT9s/SylE4X4WFge9BHSBB1JdiRtmASbA5oDk3gVv84xrMVwD+A59rFLrKA6laRNC4GzMzgBFO7LhpUk29LPP1SnWQYoIYqfBH9zIFrtH/fUyRudhfDx3PPOxnNUAwjRFVbEfeY= file: - - dist/meistertask-electron-1.0.2-x86_64.AppImage - - dist/meistertask-electron_1.0.2_amd64.deb + - dist/meistertask-electron-1.0.3-x86_64.AppImage + - dist/meistertask-electron_1.0.3_amd64.deb skip_cleanup: true on: repo: ClocxHD/MeisterTask-Electron diff --git a/assets/pre/jquery.js b/assets/pre/jquery.js deleted file mode 100644 index 6fb3511..0000000 --- a/assets/pre/jquery.js +++ /dev/null @@ -1,5 +0,0 @@ -window.onload = function () { - var script = document.createElement("script"); - script.src = "https://code.jquery.com/jquery-2.1.4.min.js"; - document.body.appendChild(script); -}; \ No newline at end of file diff --git a/assets/pre/style.sass b/assets/pre/style.sass deleted file mode 100644 index 000e00d..0000000 --- a/assets/pre/style.sass +++ /dev/null @@ -1,51 +0,0 @@ -html, body - width: 100% - height: 100% - padding: 0 - margin: 0 - -#webviewlul - position: absolute - top: 0 - left: 0 - width: 100% - height: 90% - display: inline-flex - -#title-bar - -webkit-app-region: drag - height: 24px - background-color: #2f343f - padding: 0 - margin: 0 - .title-bar-logo - position: fixed - width: 20px - height: 20px - left: 3px - top: 1.5px - #title - position: fixed - top: 3px - left: 26px - color: #efefef - font-family: "Ubuntu", sans-serif - #title-bar-btns - -webkit-app-region: no-drag - position: fixed - top: 3px - right: 6px - #min-btn, #max-btn - margin-right: 3px - #min-btn - color: #ffbe2f - &:hover - color: lighten(#ffbe2f, 10%) - #max-btn - color: #28ca40 - &:hover - color: lighten(#28ca40, 10%) - #close-btn - color: #ff6058 - &:hover - color: lighten(#ff6058, 10%) \ No newline at end of file diff --git a/gulpfile.js b/gulpfile.js deleted file mode 100644 index 1c9c404..0000000 --- a/gulpfile.js +++ /dev/null @@ -1,49 +0,0 @@ -'use strict'; - -const gulp = require('gulp'); -const sass = require('gulp-sass'); -const uglify = require('gulp-uglify'); -const pump = require('pump'); -const rename = require('gulp-rename'); -const cleanCSS = require('gulp-clean-css'); -const concat = require('gulp-concat'); - -const paths = { - styles: { - src: 'assets/pre/*.sass', - dest: 'assets/post/' - }, - scripts: { - src: 'assets/pre/*.js', - dest: 'assets/post/' - } -}; - -function styles(cb) { - pump([ - gulp.src(paths.styles.src), - sass(), - cleanCSS(), - rename({ - basename: 'style', - suffix: '.min' - }), - gulp.dest(paths.styles.dest) - ], - cb - ); -} - -function scripts(cb) { - pump([ - gulp.src(paths.scripts.src), - uglify(), - concat('main.min.js'), - gulp.dest(paths.scripts.dest) - ], - cb - ); -} - -const build = gulp.series(styles, scripts); -gulp.task('default', build); \ No newline at end of file diff --git a/index.html b/index.html deleted file mode 100644 index 31f349b..0000000 --- a/index.html +++ /dev/null @@ -1,59 +0,0 @@ - - - - MeisterTask - - - - - -
- -
meistertask
-
- - - -
-
- - - - \ No newline at end of file diff --git a/index.js b/index.js index 1aa07f1..cfa8ae5 100644 --- a/index.js +++ b/index.js @@ -13,12 +13,16 @@ app.on('ready', function () { width: 1920, height: 1080, resizable: true, - frame: false, show: false, - icon: path.join(__dirname, 'assets/icons/icon.png') + icon: path.join(__dirname, 'assets/icons/icon.png'), + webPreferences: { + nodeIntegration: false + } }); - mainWindow.loadURL('file://' + __dirname + '/index.html'); + mainWindow.setMenu(null); + + mainWindow.loadURL('https://www.meistertask.com/app/dashboard'); mainWindow.on('ready-to-show', () => { mainWindow.show(); }); diff --git a/package.json b/package.json index ca59650..44844ee 100644 --- a/package.json +++ b/package.json @@ -5,20 +5,13 @@ "name": "Fabian Thielen", "email": "electron@fabian-thielen.io" }, - "version": "1.0.2", + "version": "1.0.3", "description": "Unofficial Electron Wrapper for MeisterTask", "main": "index.js", "dependencies": {}, "devDependencies": { "electron": "^1.7.10", - "electron-builder": "^19.52.1", - "gulp": "github:gulpjs/gulp#4.0", - "gulp-clean-css": "^3.9.2", - "gulp-concat": "^2.6.1", - "gulp-rename": "^1.2.2", - "gulp-sass": "^3.1.0", - "gulp-uglify": "^3.0.0", - "pump": "^2.0.0" + "electron-builder": "^19.52.1" }, "scripts": { "postinstall": "install-app-deps",