Skip to content

Commit

Permalink
Merge pull request #125 from roldanjr/development
Browse files Browse the repository at this point in the history
Development
  • Loading branch information
roldanjr authored Sep 16, 2020
2 parents 6bfd38f + 464ca99 commit 48ac47a
Show file tree
Hide file tree
Showing 9 changed files with 36 additions and 23 deletions.
7 changes: 3 additions & 4 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
---
name: Bug report
about: Create a report to help the app improve
title: 'Bug Report: Title of the Bug'
labels: ''
assignees: ''

title: "Bug Report: Title of the Bug"
labels: ""
assignees: ""
---

**Describe the bug**
Expand Down
7 changes: 3 additions & 4 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
---
name: Feature request
about: Suggest an idea for this project
title: ''
labels: ''
assignees: ''

title: ""
labels: ""
assignees: ""
---

**Is your feature request related to a problem? Please describe.**
Expand Down
22 changes: 17 additions & 5 deletions app/main/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "pomatez",
"version": "1.0.0",
"version": "1.1.0",
"private": true,
"license": "MIT",
"main": "./build/main.js",
Expand Down Expand Up @@ -40,8 +40,14 @@
"icon": "./src/assets/[email protected]"
},
"win": {
"artifactName": "Pomatez-v${version}-setup.${ext}",
"target": [
{
"target": "portable",
"arch": [
"x64",
"ia32"
]
},
{
"target": "nsis",
"arch": [
Expand All @@ -52,6 +58,12 @@
],
"icon": "./src/assets/logo-dark.ico"
},
"portable": {
"artifactName": "Pomatez-v${version}-portable.${ext}"
},
"nsis": {
"artifactName": "Pomatez-v${version}-setup.${ext}"
},
"linux": {
"artifactName": "Pomatez-v${version}-linux.${ext}",
"target": [
Expand All @@ -64,7 +76,7 @@
}
},
"dependencies": {
"@pomatez/shareables": "^1.0.0",
"@pomatez/shareables": "^1.1.0",
"electron-log": "^4.2.4",
"electron-store": "^6.0.0",
"electron-updater": "^4.3.4",
Expand All @@ -78,8 +90,8 @@
"@types/lodash.debounce": "^4.0.6",
"@types/node-notifier": "^6.0.1",
"@types/universal-analytics": "^0.4.4",
"@types/uuid": "^8.0.1",
"electron": "9.2.0",
"@types/uuid": "^8.3.0",
"electron": "10.1.2",
"electron-builder": "^22.8.0"
}
}
2 changes: 2 additions & 0 deletions app/main/src/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -284,6 +284,7 @@ ipcMain.on(SET_FULLSCREEN_BREAK, (e, args) => {
win?.focus();
win?.setAlwaysOnTop(true, "screen-saver");
win?.setSkipTaskbar(true);
win?.setResizable(true);
win?.setFullScreen(true);
win?.setVisibleOnAllWorkspaces(true);

Expand All @@ -309,6 +310,7 @@ ipcMain.on(SET_FULLSCREEN_BREAK, (e, args) => {

win?.setSkipTaskbar(false);
win?.setFullScreen(false);
win?.setResizable(false);
win?.setVisibleOnAllWorkspaces(false);

globalShortcut.register("Alt+Shift+H", () => {
Expand Down
4 changes: 2 additions & 2 deletions app/renderer/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@pomatez/renderer",
"version": "1.0.0",
"version": "1.1.0",
"private": true,
"license": "MIT",
"author": {
Expand Down Expand Up @@ -29,7 +29,7 @@
}
},
"dependencies": {
"@pomatez/shareables": "^1.0.0",
"@pomatez/shareables": "^1.1.0",
"@types/autosize": "^3.0.7",
"@types/jest": "^26.0.10",
"@types/node": "^14.6.0",
Expand Down
3 changes: 2 additions & 1 deletion app/shareables/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"name": "@pomatez/shareables",
"version": "1.0.0",
"version": "1.1.0",
"private": true,
"main": "build/index.js",
"source": "src/index.ts",
"license": "MIT",
Expand Down
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "independent",
"version": "1.1.0",
"npmClient": "yarn",
"useWorkspaces": true,
"packages": ["app/*", "website"]
Expand Down
2 changes: 1 addition & 1 deletion website/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@pomatez/website",
"version": "1.0.0",
"version": "1.1.0",
"private": true,
"license": "MIT",
"author": {
Expand Down
10 changes: 5 additions & 5 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3792,7 +3792,7 @@
resolved "https://registry.yarnpkg.com/@types/universal-analytics/-/universal-analytics-0.4.4.tgz#496a52b92b599a0112bec7c12414062de6ea8449"
integrity sha512-9g3F0SGxVr4UDd6y07bWtFnkpSSX1Ake7U7AGHgSFrwM6pF53/fV85bfxT2JLWS/3sjLCcyzoYzQlCxpkVo7wA==

"@types/uuid@^8.0.1":
"@types/uuid@^8.3.0":
version "8.3.0"
resolved "https://registry.yarnpkg.com/@types/uuid/-/uuid-8.3.0.tgz#215c231dff736d5ba92410e6d602050cce7e273f"
integrity sha512-eQ9qFW/fhfGJF8WKHGEHZEyVWfZxrT+6CLIJGBcZPfxUh/+BnEj+UCGYMlr9qZuX/2AltsvwrGqp0LhEW8D0zQ==
Expand Down Expand Up @@ -8028,10 +8028,10 @@ electron-updater@^4.3.4:
lodash.isequal "^4.5.0"
semver "^7.3.2"

electron@9.2.0:
version "9.2.0"
resolved "https://registry.yarnpkg.com/electron/-/electron-9.2.0.tgz#d9fc8c8c9e5109669c366bd7b9ba83b06095d7a4"
integrity sha512-4ecZ3rcGg//Gk4fAK3Jo61T+uh36JhU6HHR/PTujQqQiBw1g4tNPd4R2hGGth2d+7FkRIs5GdRNef7h64fQEMw==
electron@10.1.2:
version "10.1.2"
resolved "https://registry.yarnpkg.com/electron/-/electron-10.1.2.tgz#30b6fd7669f8daf08c56219a61dfa053fa2b0c70"
integrity sha512-SvN8DcKCmPZ0UcQSNAJBfaUu+LGACqtRhUn1rW0UBLHgdbbDM76L0GU5/XGQEllH5pu5bwlCZwax3srzIl+Aeg==
dependencies:
"@electron/get" "^1.0.1"
"@types/node" "^12.0.12"
Expand Down

0 comments on commit 48ac47a

Please sign in to comment.