From a7fad2cd9259bbfb10f9b5f0e029644db9dc177f Mon Sep 17 00:00:00 2001
From: angrykoala
Date: Sun, 8 Dec 2019 21:23:04 +0100
Subject: [PATCH 01/19] minor change in dist build
---
package.json | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/package.json b/package.json
index 5fb58edd..e1cafc51 100644
--- a/package.json
+++ b/package.json
@@ -51,7 +51,8 @@
"target": [
"deb",
"AppImage",
- "snap"
+ "snap",
+ "zip"
],
"category": "Utility"
},
From fcdd73e5bfeb6173823e69553cb42f8d9dcb525b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9s?=
Date: Tue, 17 Dec 2019 18:59:20 +0100
Subject: [PATCH 02/19] quit option on context menu
---
CHANGELOG.md | 5 +++++
package-lock.json | 32 ++++++++++++++++----------------
package.json | 12 ++++++------
src/app/api/context_menu.js | 8 +++++++-
4 files changed, 34 insertions(+), 23 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0b0b7133..8704424d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,8 @@
+1.0.0 / ####-##-##
+==================
+
+* Quit option in context menu
+
0.7.0 / 2019-08-12
==================
diff --git a/package-lock.json b/package-lock.json
index f7b62ef3..42640cc6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
{
"name": "gaucho",
- "version": "0.7.0",
+ "version": "1.0.0",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
@@ -917,9 +917,9 @@
}
},
"@fortawesome/fontawesome-free": {
- "version": "5.11.2",
- "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-5.11.2.tgz",
- "integrity": "sha512-XiUPoS79r1G7PcpnNtq85TJ7inJWe0v+b5oZJZKb0pGHNIV6+UiNeQWiFGmuQ0aj7GEhnD/v9iqxIsjuRKtEnQ=="
+ "version": "5.12.0",
+ "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-5.12.0.tgz",
+ "integrity": "sha512-vKDJUuE2GAdBERaQWmmtsciAMzjwNrROXA5KTGSZvayAsmuTGjam5z6QNqNPCwDfVljLWuov1nEC3mEQf/n6fQ=="
},
"@iarna/toml": {
"version": "2.2.3",
@@ -1068,9 +1068,9 @@
"dev": true
},
"@types/node": {
- "version": "10.17.6",
- "resolved": "https://registry.npmjs.org/@types/node/-/node-10.17.6.tgz",
- "integrity": "sha512-0a2X6cgN3RdPBL2MIlR6Lt0KlM7fOFsutuXcdglcOq6WvLnYXgPQSh0Mx6tO1KCAE8MxbHSOSTWDoUxRq+l3DA==",
+ "version": "10.17.10",
+ "resolved": "https://registry.npmjs.org/@types/node/-/node-10.17.10.tgz",
+ "integrity": "sha512-K9E84otvA2HQBTp0TWPwWf/986N6v0v7ers6q7wL48w5SXKzYjqlYkaxHYMwWRzQdgZg5p6eI7L0D6FLJYY7ag==",
"dev": true
},
"@types/normalize-package-data": {
@@ -9568,9 +9568,9 @@
}
},
"sweetalert2": {
- "version": "9.4.3",
- "resolved": "https://registry.npmjs.org/sweetalert2/-/sweetalert2-9.4.3.tgz",
- "integrity": "sha512-edh+30p2tlE7CyNsTDVUb6SGO/c9wuCF4qiketagLvsK/xcesrSPvF8u9Ljk83HX26CfOicKWulmxz+Z+MAWVw=="
+ "version": "9.5.3",
+ "resolved": "https://registry.npmjs.org/sweetalert2/-/sweetalert2-9.5.3.tgz",
+ "integrity": "sha512-4wzLUCmVby3NPQC8XHp0HRJgTm5tbAO7OOaqabATNe0U6JN/oyBTS7iJJG9V83MpcP6MLDUEWcGO/Y8i6g2jYw=="
},
"symbol-tree": {
"version": "3.2.4",
@@ -10184,9 +10184,9 @@
"dev": true
},
"vue": {
- "version": "2.6.10",
- "resolved": "https://registry.npmjs.org/vue/-/vue-2.6.10.tgz",
- "integrity": "sha512-ImThpeNU9HbdZL3utgMCq0oiMzAkt1mcgy3/E6zWC/G6AaQoeuFdsl9nDhTDU3X1R6FK7nsIUuRACVcjI+A2GQ=="
+ "version": "2.6.11",
+ "resolved": "https://registry.npmjs.org/vue/-/vue-2.6.11.tgz",
+ "integrity": "sha512-VfPwgcGABbGAue9+sfrD4PuwFar7gPb1yl1UK1MwXoQPAw0BKSqWfoYCT/ThFrdEVWoI51dBuyCoiNU9bZDZxQ=="
},
"vue-clickaway": {
"version": "2.2.2",
@@ -10240,9 +10240,9 @@
}
},
"vue-template-compiler": {
- "version": "2.6.10",
- "resolved": "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.6.10.tgz",
- "integrity": "sha512-jVZkw4/I/HT5ZMvRnhv78okGusqe0+qH2A0Em0Cp8aq78+NK9TII263CDVz2QXZsIT+yyV/gZc/j/vlwa+Epyg==",
+ "version": "2.6.11",
+ "resolved": "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.6.11.tgz",
+ "integrity": "sha512-KIq15bvQDrcCjpGjrAhx4mUlyyHfdmTaoNfeoATHLAiWB+MU3cx4lOzMwrnUh9cCxy0Lt1T11hAFY6TQgroUAA==",
"dev": true,
"requires": {
"de-indent": "^1.0.2",
diff --git a/package.json b/package.json
index e1cafc51..b1fb17e1 100644
--- a/package.json
+++ b/package.json
@@ -1,16 +1,16 @@
{
"name": "gaucho",
- "version": "0.7.0",
+ "version": "1.0.0",
"description": "Minimalistic task launcher",
"main": "main.js",
"dependencies": {
- "@fortawesome/fontawesome-free": "^5.11.2",
+ "@fortawesome/fontawesome-free": "^5.12.0",
"ansi-to-html": "^0.6.13",
"electron-store": "^5.1.0",
"mousetrap": "^1.6.3",
"run": "^1.4.0",
- "sweetalert2": "^9.4.3",
- "vue": "^2.6.10",
+ "sweetalert2": "^9.5.3",
+ "vue": "^2.6.11",
"vue-clickaway": "^2.2.2",
"vuedraggable": "^2.23.2",
"vuex": "^3.1.2",
@@ -22,8 +22,8 @@
"bulma-switch": "^2.0.0",
"chai": "^4.2.0",
"cross-env": "^6.0.3",
- "electron": "~6.0.0",
"electron-builder": "^21.2.0",
+ "electron": "~6.0.0",
"eslint": "^6.7.2",
"eslint-plugin-vue": "^6.0.1",
"husky": "^3.1.0",
@@ -31,7 +31,7 @@
"parcel-bundler": "^1.12.4",
"sass": "^1.23.7",
"sinon": "^7.5.0",
- "vue-template-compiler": "^2.6.10"
+ "vue-template-compiler": "^2.6.11"
},
"scripts": {
"build": "rm -rf public/ && parcel build src/app/index.html --target electron --public-url ./ --out-dir public --no-source-maps",
diff --git a/src/app/api/context_menu.js b/src/app/api/context_menu.js
index a452089b..398e13d7 100644
--- a/src/app/api/context_menu.js
+++ b/src/app/api/context_menu.js
@@ -1,5 +1,7 @@
"use strict";
const remote = require('electron').remote;
+const ipcRenderer = require('electron').ipcRenderer;
+
const {Menu, MenuItem} = remote;
const EventEmitter = require('events');
@@ -41,7 +43,8 @@ class DefaultContextMenu extends ContextMenu {
constructor(extraOptions = []) {
super(extraOptions.concat([{label: "Settings",
event: "settings"}, {label: "About",
- event: "about"}]));
+ event: "about"}, {label: "Quit",
+ event: "quit"}]));
}
toggle(extraData) {
@@ -51,6 +54,9 @@ class DefaultContextMenu extends ContextMenu {
this.on("about", () => {
aboutModal(store);
});
+ this.on("quit", () => {
+ ipcRenderer.send("close-app");
+ });
super.toggle(extraData);
}
From 16753060e1687bd1431e48bb06d2185c3abf3f1a Mon Sep 17 00:00:00 2001
From: angrykoala
Date: Tue, 24 Dec 2019 00:36:26 +0100
Subject: [PATCH 03/19] Alert styles improved
---
CHANGELOG.md | 5 +++++
src/app/api/about_modal.js | 1 -
src/app/api/app_alerts.js | 10 ++++++----
src/app/styles/alerts.scss | 7 +++++++
src/app/styles/main.scss | 1 +
src/app/styles/theme_styles.scss | 5 -----
6 files changed, 19 insertions(+), 10 deletions(-)
create mode 100644 src/app/styles/alerts.scss
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0b0b7133..18a23ea6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,8 @@
+0.7.1 / ####-##-##
+==================
+
+* Modal alerts styles changed to increase consistency
+
0.7.0 / 2019-08-12
==================
diff --git a/src/app/api/about_modal.js b/src/app/api/about_modal.js
index 1d5901ab..1af4656e 100644
--- a/src/app/api/about_modal.js
+++ b/src/app/api/about_modal.js
@@ -9,7 +9,6 @@ module.exports = function open(store) {
https://github.com/angrykoala/gaucho
`;
const modal = new AppAlert("Gaucho
", {
showCloseButton: false,
- confirmButtonColor: "#ee6e73",
confirmButtonText: "Close"
}).html(aboutHtml);
modal.toggle();
diff --git a/src/app/api/app_alerts.js b/src/app/api/app_alerts.js
index 81b1a95c..fcd345ac 100644
--- a/src/app/api/app_alerts.js
+++ b/src/app/api/app_alerts.js
@@ -4,6 +4,9 @@ const swal = require('sweetalert2');
let store;
+const confirmButtonColor = "#2bbbad";
+const dangerButtonColor = "#f14668";
+
function init(newStore) {
store = newStore;
}
@@ -17,7 +20,8 @@ class AppAlert {
this.alertOptions = Object.assign({
title: title,
customClass: getTheme(),
- heightAuto: false
+ heightAuto: false,
+ confirmButtonColor: confirmButtonColor
}, options);
}
@@ -46,10 +50,9 @@ class DeleteConfirmationAlert extends InteractiveAlert {
super("Are you sure?", Object.assign({
text: text,
showCancelButton: true,
- confirmButtonColor: "#ee6e73",
confirmButtonText: 'Yes, delete it!',
cancelButtonText: 'No, keep it',
- type: 'warning'
+ confirmButtonColor: dangerButtonColor,
}, options));
}
}
@@ -58,7 +61,6 @@ class InputAlert extends InteractiveAlert {
constructor(title, defaultValue = "", options = {}) {
super(title, Object.assign({
showCancelButton: true,
- confirmButtonColor: "#ee6e73",
confirmButtonText: 'Rename',
input: 'text',
inputValue: defaultValue
diff --git a/src/app/styles/alerts.scss b/src/app/styles/alerts.scss
new file mode 100644
index 00000000..534f9f0a
--- /dev/null
+++ b/src/app/styles/alerts.scss
@@ -0,0 +1,7 @@
+.swal2-popup {
+ button {
+ &:focus {
+ box-shadow: none;
+ }
+ }
+}
diff --git a/src/app/styles/main.scss b/src/app/styles/main.scss
index 76455ca9..6e3a086f 100644
--- a/src/app/styles/main.scss
+++ b/src/app/styles/main.scss
@@ -2,6 +2,7 @@
@import "variables"; // import variables before bulma for proper override
@import '~bulma/bulma';
@import '~bulma-switch/dist/css/bulma-switch';
+@import 'alerts';
@import "desktopify";
@import "theme_styles";
diff --git a/src/app/styles/theme_styles.scss b/src/app/styles/theme_styles.scss
index f06a573a..84b22d20 100644
--- a/src/app/styles/theme_styles.scss
+++ b/src/app/styles/theme_styles.scss
@@ -140,11 +140,6 @@
color: $default-color;
background-color: $dark-grey-background-color;
}
- button {
- &:focus {
- box-shadow: none;
- }
- }
}
}
From 3bac3757338c5481f9a146e0d604b17d74321d5d Mon Sep 17 00:00:00 2001
From: angrykoala
Date: Tue, 24 Dec 2019 13:48:59 +0100
Subject: [PATCH 04/19] Alerts styles improved
---
CHANGELOG.md | 2 +-
src/app/api/app_alerts.js | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 88de5ba6..50829ccc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,7 @@
==================
* Quit option in context menu
-* Modal alerts styles changed to increase consistency
+* Modal alerts styles changed for better consistency
0.7.0 / 2019-08-12
==================
diff --git a/src/app/api/app_alerts.js b/src/app/api/app_alerts.js
index 7b9469d3..41300d51 100644
--- a/src/app/api/app_alerts.js
+++ b/src/app/api/app_alerts.js
@@ -21,7 +21,8 @@ class AppAlert {
title: title,
customClass: getTheme(),
heightAuto: false,
- confirmButtonColor: confirmButtonColor
+ confirmButtonColor: confirmButtonColor,
+ animation: false
}, options);
}
From 351312f8ac7708a1900fba623b54d8b01dc8d233 Mon Sep 17 00:00:00 2001
From: angrykoala
Date: Tue, 24 Dec 2019 18:43:22 +0100
Subject: [PATCH 05/19] Add publish workflow
---
.github/workflows/publish.yml | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
create mode 100644 .github/workflows/publish.yml
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
new file mode 100644
index 00000000..8dc55457
--- /dev/null
+++ b/.github/workflows/publish.yml
@@ -0,0 +1,20 @@
+on:
+ release:
+ types: [created]
+
+name: Publish
+jobs:
+ build:
+ name: Publish Gaucho
+ runs-on: ubuntu-latest
+ steps:
+ - name: Checkout code
+ uses: actions/checkout@master
+ - name: Build project
+ run: npm run dist-all
+ - name: Upload files
+ uses: JasonEtco/upload-to-release@master
+ with:
+ args: dist/gaucho*
+ env:
+ GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
From ca902cc1c3cd89d779808d0085665b96a926fcb0 Mon Sep 17 00:00:00 2001
From: angrykoala
Date: Tue, 24 Dec 2019 18:58:35 +0100
Subject: [PATCH 06/19] popups style improved
---
src/app/api/app_alerts.js | 12 ++++++++++--
src/app/styles/alerts.scss | 8 ++++++++
2 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/src/app/api/app_alerts.js b/src/app/api/app_alerts.js
index 41300d51..db585a48 100644
--- a/src/app/api/app_alerts.js
+++ b/src/app/api/app_alerts.js
@@ -22,7 +22,12 @@ class AppAlert {
customClass: getTheme(),
heightAuto: false,
confirmButtonColor: confirmButtonColor,
- animation: false
+ showClass: {
+ popup: ''
+ },
+ hideClass: {
+ popup: ''
+ }
}, options);
}
@@ -74,7 +79,10 @@ class SchedulerAlert extends InputAlert {
super(title, "", Object.assign({
confirmButtonText: 'Schedule',
input: 'number',
- inputPlaceholder: 'Seconds'
+ inputPlaceholder: 'Seconds',
+ inputAttributes: {
+ min: 0
+ }
}, options));
}
}
diff --git a/src/app/styles/alerts.scss b/src/app/styles/alerts.scss
index 534f9f0a..97bd8547 100644
--- a/src/app/styles/alerts.scss
+++ b/src/app/styles/alerts.scss
@@ -4,4 +4,12 @@
box-shadow: none;
}
}
+
+ input {
+ &:focus{
+ box-shadow: none;
+ outline: none;
+ border: 1px solid #d9d9d9;
+ }
+ }
}
From cec385a93dd5886c5e8953f3b4fdaa8445a9fd26 Mon Sep 17 00:00:00 2001
From: angrykoala
Date: Fri, 27 Dec 2019 18:29:22 +0100
Subject: [PATCH 07/19] Removed beta
---
src/app/components/navbar/navbar.vue | 6 ------
1 file changed, 6 deletions(-)
diff --git a/src/app/components/navbar/navbar.vue b/src/app/components/navbar/navbar.vue
index 3f6124bc..9d67662d 100644
--- a/src/app/components/navbar/navbar.vue
+++ b/src/app/components/navbar/navbar.vue
@@ -5,7 +5,6 @@
Gaucho
-
Beta