Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/lacymorrow/crossover
Browse files Browse the repository at this point in the history
  • Loading branch information
lacymorrow committed Feb 22, 2020
2 parents 8e5341d + 66177b0 commit 5df87da
Show file tree
Hide file tree
Showing 9 changed files with 671 additions and 359 deletions.
2 changes: 1 addition & 1 deletion index.js
@@ -1,6 +1,6 @@
'use strict'

// App entry
const main = require('./src/main')
const main = require( './src/main' )

main()
2 changes: 1 addition & 1 deletion license
@@ -1,6 +1,6 @@
MIT License

Copyright (c) <%= name %> <<%= email %>> (<%= website %>)
Copyright (c) Lacy Morrow <me@lacymorrow.com> (lacymorrow.com)

Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

Expand Down
41 changes: 38 additions & 3 deletions package.json
@@ -1,7 +1,7 @@
{
"name": "crossover",
"productName": "CrossOver",
"version": "0.2.14",
"version": "0.2.15",
"description": "🎯 A Crosshair Overlay for any screen",
"license": "MIT",
"repository": "lacymorrow/crossover",
Expand All @@ -15,7 +15,7 @@
"url": "https://github.com/lacymorrow/crossover/issues"
},
"engines": {
"node": ">=10.0.0 <13.0.0"
"node": ">=10 <14"
},
"scripts": {
"postinstall": "electron-builder install-app-deps",
Expand Down Expand Up @@ -52,14 +52,49 @@
"node",
"browser"
],
"rules": {
"array-bracket-spacing": [
"error",
"always"
],
"padded-blocks": [
"error",
{
"blocks": "always",
"switches": "always",
"classes": "always"
}
],
"padding-line-between-statements": [
"error",
{
"blankLine": "always",
"prev": "multiline-block-like",
"next": "*"
},
{
"blankLine": "always",
"prev": "*",
"next": "return"
}
],
"object-curly-spacing": [
"error",
"always"
],
"space-in-parens": [
"error",
"always"
]
},
"semicolon": false
},
"np": {
"publish": false,
"releaseDraft": false
},
"build": {
"appId": "com.lacymorrow.CrossOver",
"appId": "com.lacymorrow.crossover",
"publish": "github",
"mac": {
"category": "public.app-category.utilities",
Expand Down
6 changes: 3 additions & 3 deletions src/config.js
@@ -1,5 +1,5 @@
'use strict'
const Store = require('electron-store')
const Store = require( 'electron-store' )

const defaults = {
crosshair: 'leupold-dot',
Expand All @@ -15,6 +15,6 @@ const defaults = {

module.exports.defaults = defaults

module.exports.config = new Store({
module.exports.config = new Store( {
defaults
})
} )

0 comments on commit 5df87da

Please sign in to comment.