Skip to content

Commit

Permalink
chore: revert to match before the prettier changes
Browse files Browse the repository at this point in the history
  • Loading branch information
sekwah41 committed Dec 20, 2022
1 parent b12930a commit 9e5959d
Show file tree
Hide file tree
Showing 22 changed files with 2,047 additions and 2,110 deletions.
216 changes: 108 additions & 108 deletions app/main/package.json
Original file line number Diff line number Diff line change
@@ -1,110 +1,110 @@
{
"name": "pomatez",
"version": "1.2.1",
"private": true,
"license": "MIT",
"main": "./build/main.js",
"author": {
"name": "Roldan Montilla Jr",
"email": "[email protected]",
"url": "https://github.com/roldanjr"
},
"repository": "https://github.com/roldanjr/pomatez",
"description": "Attractive pomodoro timer for Windows, Mac, and Linux.",
"scripts": {
"prepare": "yarn build",
"clean": "rimraf dist/ build/",
"predev:main": "wait-on http://localhost:3000",
"dev:main": "nodemon --exec \"yarn build && electron .\"",
"start": "yarn dev:main",
"build": "tsc && copyfiles \"src/assets\" build/assets",
"build:mwl": "electron-builder -mwl",
"build:dir": "electron-builder --dir",
"build:win": "electron-builder --win --publish=never",
"build:mac": "electron-builder --mac --publish=never",
"build:linux": "electron-builder --linux --publish=never",
"build:snap": "electron-builder --linux snap",
"release:mw": "electron-builder --publish always --mac --win",
"release": "electron-builder --publish always",
"test": "jest --watchAll"
},
"build": {
"productName": "Pomatez",
"appId": "com.roldanjr.pomatez",
"copyright": "Copyright © 2020 ${author}",
"files": [
"build"
],
"mac": {
"artifactName": "Pomatez-v${version}-mac.${ext}",
"category": "public.app-category.productivity",
"icon": "./build/assets/[email protected]"
},
"win": {
"target": [
{
"target": "portable",
"arch": [
"x64",
"ia32"
]
},
{
"target": "nsis",
"arch": [
"x64",
"ia32"
]
}
],
"icon": "./build/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": [
"AppImage",
"deb",
"rpm"
],
"icon": "./build/assets/",
"category": "Utility"
},
"snap": {
"category": "Utility"
}
},
"dependencies": {
"@pomatez/shareables": "^1.0.0",
"electron-log": "^4.2.4",
"electron-store": "^6.0.0",
"electron-is-dev": "^2.0.0",
"electron-updater": "^4.3.4",
"lodash.debounce": "^4.0.8",
"node-notifier": "^8.0.0",
"universal-analytics": "^0.4.23",
"uuid": "7.0.3",
"v8-compile-cache": "^2.1.1"
},
"devDependencies": {
"nodemon": "2.0.20",
"@jest-runner/electron": "^3.0.0",
"electron-devtools-installer": "^3.2.0",
"@types/lodash.debounce": "^4.0.6",
"@types/node-notifier": "^6.0.1",
"@types/universal-analytics": "^0.4.4",
"@types/uuid": "7.0.3",
"babel-core": "^6.26.3",
"babel-jest": "^26.6.3",
"electron": "18.1.0",
"electron-builder": "23.6.0",
"regenerator-runtime": "^0.13.7",
"electron-reload": "2.0.0-alpha.1",
"ts-jest": "^26.5.1"
}
"name": "pomatez",
"version": "1.2.1",
"private": true,
"license": "MIT",
"main": "./build/main.js",
"author": {
"name": "Roldan Montilla Jr",
"email": "[email protected]",
"url": "https://github.com/roldanjr"
},
"repository": "https://github.com/roldanjr/pomatez",
"description": "Attractive pomodoro timer for Windows, Mac, and Linux.",
"scripts": {
"prepare": "yarn build",
"clean": "rimraf dist/ build/",
"predev:main": "wait-on http://localhost:3000",
"dev:main": "nodemon --exec \"yarn build && electron .\"",
"start": "yarn dev:main",
"build": "tsc && copyfiles \"src/assets\" build/assets",
"build:mwl": "electron-builder -mwl",
"build:dir": "electron-builder --dir",
"build:win": "electron-builder --win --publish=never",
"build:mac": "electron-builder --mac --publish=never",
"build:linux": "electron-builder --linux --publish=never",
"build:snap": "electron-builder --linux snap",
"release:mw": "electron-builder --publish always --mac --win",
"release": "electron-builder --publish always",
"test": "jest --watchAll"
},
"build": {
"productName": "Pomatez",
"appId": "com.roldanjr.pomatez",
"copyright": "Copyright © 2020 ${author}",
"files": [
"build"
],
"mac": {
"artifactName": "Pomatez-v${version}-mac.${ext}",
"category": "public.app-category.productivity",
"icon": "./build/assets/[email protected]"
},
"win": {
"target": [
{
"target": "portable",
"arch": [
"x64",
"ia32"
]
},
{
"target": "nsis",
"arch": [
"x64",
"ia32"
]
}
],
"icon": "./build/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": [
"AppImage",
"deb",
"rpm"
],
"icon": "./build/assets/",
"category": "Utility"
},
"snap": {
"category": "Utility"
}
},
"dependencies": {
"@pomatez/shareables": "^1.0.0",
"electron-log": "^4.2.4",
"electron-store": "^6.0.0",
"electron-is-dev": "^2.0.0",
"electron-updater": "^4.3.4",
"lodash.debounce": "^4.0.8",
"node-notifier": "^8.0.0",
"universal-analytics": "^0.4.23",
"uuid": "7.0.3",
"v8-compile-cache": "^2.1.1"
},
"devDependencies": {
"nodemon": "2.0.20",
"@jest-runner/electron": "^3.0.0",
"electron-devtools-installer": "^3.2.0",
"@types/lodash.debounce": "^4.0.6",
"@types/node-notifier": "^6.0.1",
"@types/universal-analytics": "^0.4.4",
"@types/uuid": "7.0.3",
"babel-core": "^6.26.3",
"babel-jest": "^26.6.3",
"electron": "18.1.0",
"electron-builder": "23.6.0",
"regenerator-runtime": "^0.13.7",
"electron-reload": "2.0.0-alpha.1",
"ts-jest": "^26.5.1"
}
}
24 changes: 12 additions & 12 deletions app/main/src/helpers/globalShortcuts.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,26 +3,26 @@ import { globalShortcut } from "electron";
const EXIT_SHORTCUTS = { ESCAPE: "Esc", QUIT: "CommandOrControl+W" };

type ShortCut = {
key: string;
callback: () => void;
key: string;
callback: () => void;
};

export function activateGlobalShortcuts(shortcuts: ShortCut[]) {
shortcuts.map(({ key, callback }) => {
globalShortcut.register(key, callback);
});
shortcuts.map(({ key, callback }) => {
globalShortcut.register(key, callback);
});
}

export function activateFullScreenShortcuts(
exitFullScreenCallback: () => void
exitFullScreenCallback: () => void
) {
globalShortcut.registerAll(
[EXIT_SHORTCUTS.ESCAPE, EXIT_SHORTCUTS.QUIT],
exitFullScreenCallback
);
globalShortcut.registerAll(
[EXIT_SHORTCUTS.ESCAPE, EXIT_SHORTCUTS.QUIT],
exitFullScreenCallback
);
}

export function deactivateFullScreenShortcuts() {
globalShortcut.unregister(EXIT_SHORTCUTS.ESCAPE);
globalShortcut.unregister(EXIT_SHORTCUTS.QUIT);
globalShortcut.unregister(EXIT_SHORTCUTS.ESCAPE);
globalShortcut.unregister(EXIT_SHORTCUTS.QUIT);
}
Loading

0 comments on commit 9e5959d

Please sign in to comment.