Skip to content

WIP: New version #61

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 9 commits into
base: master
Choose a base branch
from
Draft

WIP: New version #61

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
e4878eb
upgrade minor deps
mfix22 Aug 14, 2019
72a509b
upgrade dev deps
mfix22 Aug 14, 2019
a9cabec
upgrade major deps
mfix22 Aug 14, 2019
cdd01ec
update stuff
mfix22 Aug 14, 2019
a825a45
upgrade react-sortable-hoc
mfix22 Aug 14, 2019
3234e3b
remove babel register
mfix22 Aug 14, 2019
b09788f
Merge branch 'master' into dep
mfix22 Aug 14, 2019
05d561a
new eslint
mfix22 Aug 14, 2019
8426fcb
new eslint
mfix22 Aug 14, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 29 additions & 19 deletions .eslintrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,32 @@
{
"extends": "airbnb",
"installedESLint": true,
"rules": {
"no-var": 0,
"func-names": 0,
"space-before-function-paren": 0,
"comma-dangle": 0,
"semi": ["error", "never"],
"no-unexpected-multiline": 1,
"no-plusplus": ["error", { "allowForLoopAfterthoughts": true }],
"max-len": 0,
"react/prop-types": 0,
"arrow-body-style": 0,
"no-use-before-define": ["error", { "functions": false, "classes": true }],
"no-multi-spaces": ["error", { "exceptions": { "VariableDeclarator": true } }],
"curly": 0,
"no-nested-ternary": 0,
"no-unused-vars": 2,
"no-shadow": 0,
"parser": "babel-eslint",
"env": {
"browser": true,
"es6": true,
"node": true,
"jest": true
},
"extends": ["eslint:recommended", "plugin:react/recommended", "plugin:jsx-a11y/recommended"],
"parserOptions": {
"ecmaFeatures": {
"experimentalObjectRestSpread": true,
"jsx": true
},
"sourceType": "module"
},
"plugins": ["import", "react", "react-hooks"],
"rules": {
"import/no-unresolved": "error",
"no-duplicate-imports": "error",
"react/prop-types": "off",
"react/display-name": "off",
"react-hooks/rules-of-hooks": "error",
"react-hooks/exhaustive-deps": "error",
"no-console": ["error", { "allow": ["error"] }]
},
"settings": {
"react": {
"version": "detect"
}
}
}
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,5 @@ public
packaged

.DS_Store

package-lock.json
9 changes: 3 additions & 6 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,13 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="UTF-8">
<meta charset="UTF-8" />
<title>Sanitizer</title>
<link rel="stylesheet" href="public/main.css">
<link rel="stylesheet" href="public/main.css" />
</head>
<body style="margin: 0; padding: 0; height: 100vh; width: 100vw;">
<div id="root"></div>
</body>

<script>
// You can also require other files to run in this process
require('./public/main.js')
</script>
<script src="public/main.js"></script>
</html>
17 changes: 11 additions & 6 deletions main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,18 @@
const menubar = require('menubar')
const { menubar } = require('menubar')
const { ipcMain } = require('electron')

const configure = require('./src/helpers/configure')

const mb = menubar({
alwaysOnTop: true,
browserWindow: {
alwaysOnTop: true,
width: 292,
height: 360,
webPreferences: {
nodeIntegration: true
}
},
resizable: false,
width: 292,
height: 344,
icon: `${__dirname}/img/iconTemplate.png`
})

Expand All @@ -18,8 +23,8 @@ mb.on('ready', () => {
mb.tray.on('drag-enter', () => mb.showWindow())
})

mb.on('focus-lost', () => mb.hideWindow());
mb.on('focus-lost', () => mb.hideWindow())

ipcMain.on('APP_PATH_REQUEST', (event) => {
ipcMain.on('APP_PATH_REQUEST', event => {
event.sender.send('APP_PATH_REPLY', mb.app.getAppPath())
})
Loading