Merge pull request #8 from timschwab/feature.standard-formatting

Add Prettier and git commit hooks

.prettierrc.json

@@ -0,0 +1,7 @@
+{
+	"useTabs": true,
+	"singleQuote": true,
+	"arrowParens": "avoid",
+	"bracketSpacing": false,
+	"semi": false
+}

app.js

@@ -22,10 +22,7 @@ function main() {
 	const menu = Menu.buildFromTemplate([
 		{
 			label: 'File',
-			submenu: [
-				{ label: 'Install sheet' },
-				{ label: 'Remove sheet' }
-			]
+			submenu: [{label: 'Install sheet'}, {label: 'Remove sheet'}]
 		},
 		{
 			label: 'View',
@@ -46,12 +43,24 @@ function main() {
 }
 
 // Routes
-ipcMain.on('search', (event, query) => { timeLog(event, query, searchHandler.search) })
-ipcMain.on('get', (event, id) => { timeLog(event, id, getHandler.get) })
-ipcMain.on('add', (event, data) => { timeLog(event, data, addHandler.add) })
-ipcMain.on('edit:get', (event, data) => { timeLog(event, data, editHandler.get) })
-ipcMain.on('edit:change', (event, data) => { timeLog(event, data, editHandler.change) })
-ipcMain.on('delete', (event, id) => { timeLog(event, id, deleteHandler.delete) })
+ipcMain.on('search', (event, query) => {
+	timeLog(event, query, searchHandler.search)
+})
+ipcMain.on('get', (event, id) => {
+	timeLog(event, id, getHandler.get)
+})
+ipcMain.on('add', (event, data) => {
+	timeLog(event, data, addHandler.add)
+})
+ipcMain.on('edit:get', (event, data) => {
+	timeLog(event, data, editHandler.get)
+})
+ipcMain.on('edit:change', (event, data) => {
+	timeLog(event, data, editHandler.change)
+})
+ipcMain.on('delete', (event, id) => {
+	timeLog(event, id, deleteHandler.delete)
+})
 
 // Wrap the handlers in a timer
 function timeLog(event, request, fn) {
@@ -65,4 +74,3 @@ function timeLog(event, request, fn) {
 
 // Start app
 app.on('ready', main)
-

client/AddForm.js

@@ -33,7 +33,7 @@ Vue.component('add-form', {
 			if (this.solution) {
 				return marked(this.solution)
 			} else {
-				return "<p>Preview of markdown rendering of the solution</p>"
+				return '<p>Preview of markdown rendering of the solution</p>'
 			}
 		}
 	},
@@ -55,7 +55,10 @@ Vue.component('add-form', {
 			if (!this.problem) {
 				this.$emit('message', 'You gotta input a problem to add it, bro')
 			} else if (!this.solution) {
-				this.$emit('message', 'It isn\'t very helpful to have a problem with no solution, now is it?')
+				this.$emit(
+					'message',
+					"It isn't very helpful to have a problem with no solution, now is it?"
+				)
 			} else if (this.keywords.length == 0) {
 				this.$emit('message', 'Keywords are your friend')
 			} else {

client/AddPage.js

@@ -6,7 +6,7 @@ const addForm = require('./AddForm')
 let vm
 
 Vue.component('add-page', {
-	created: function (){
+	created: function() {
 		vm = this
 	},
 	template: `

client/App.js

@@ -15,16 +15,16 @@ document.addEventListener('DOMContentLoaded', () => {
 		},
 		computed: {
 			showSearchPage: function() {
-				return (this.page == 'search')
+				return this.page == 'search'
 			},
 			showViewPage: function() {
-				return (this.page.slice(0,5) == 'view:')
+				return this.page.slice(0, 5) == 'view:'
 			},
 			showAddPage: function() {
-				return (this.page == 'add')
+				return this.page == 'add'
 			},
 			showEditPage: function() {
-				return (this.page.slice(0,5) == 'edit:')
+				return this.page.slice(0, 5) == 'edit:'
 			},
 			viewingKey: function() {
 				if (this.showViewPage) {
@@ -82,10 +82,3 @@ document.addEventListener('DOMContentLoaded', () => {
 		`
 	})
 })
-
-
-
-
-
-
-

client/EditPage.js

@@ -6,7 +6,7 @@ const addForm = require('./AddForm')
 let vm
 
 Vue.component('edit-page', {
-	created: function (){
+	created: function() {
 		vm = this
 	},
 	props: ['snippetKey'],

client/MessageDisplay.js

@@ -10,4 +10,3 @@ Vue.component('message-display', {
 })
 
 module.exports = {}
-

client/SearchPage.js

@@ -4,7 +4,7 @@ const Vue = require('vue/dist/vue.js')
 let vm
 
 Vue.component('search-page', {
-	created: function (){
+	created: function() {
 		vm = this
 	},
 	data: function() {
@@ -49,7 +49,7 @@ ipcRenderer.on('search-result', (event, results) => {
 	vm.results = results
 
 	if (results.length == 0) {
-		vm.$emit('message', 'Search returned no results :\'(')
+		vm.$emit('message', "Search returned no results :'(")
 	} else {
 		vm.$emit('message', 'Showing ' + results.length + ' results.')
 	}
@@ -64,8 +64,6 @@ ipcRenderer.on('delete-result', (event, result) => {
 	}
 })
 
-
-
 Vue.component('snippet-preview', {
 	props: ['snippet'],
 	template: `
@@ -82,4 +80,4 @@ Vue.component('snippet-preview', {
 	}
 })
 
-module.exports = {}
+module.exports = {}

client/ViewPage.js

@@ -72,4 +72,4 @@ ipcRenderer.on('delete-result', (event, result) => {
 	}
 })
 
-module.exports = {}
+module.exports = {}

client/index.html

@@ -1,16 +1,14 @@
 <!DOCTYPE html>
 <html>
+	<head>
+		<meta charset="UTF-8" />
+		<title>CheatSheet</title>
 
-<head>
-	<meta charset="UTF-8">
-	<title>CheatSheet</title>
-
-	<link rel="stylesheet" type="text/css" href="style.css">
-	<script src="App.js"></script>
-</head>
-
-<body>
-	<div id="app"></div>
-</body>
+		<link rel="stylesheet" type="text/css" href="style.css" />
+		<script src="App.js"></script>
+	</head>
 
+	<body>
+		<div id="app"></div>
+	</body>
 </html>

client/style.css

@@ -5,6 +5,3 @@
 #query {
 	width: 50%;
 }
-
-
-

data/settings.json

@@ -1,9 +1,5 @@
 {
-	"excluded-words": [
-		"the",
-		"and",
-		"it"
-	],
+	"excluded-words": ["the", "and", "it"],
 	"allowed-characters": [
 		{"character": ",", "allowed": false},
 		{"character": "-", "allowed": true},

data/sheets/test.json

@@ -2,22 +2,12 @@
 	"name": "test",
 	"sheet": [
 		{
-			"keywords": [
-				"html",
-				"new",
-				"tab",
-				"link"
-			],
+			"keywords": ["html", "new", "tab", "link"],
 			"problem": "How do I have a link open a new tab?",
 			"solution": "<a href='' target='_blank'></a>"
 		},
 		{
-			"keywords": [
-				"C#",
-				"exit",
-				"terminate",
-				"stop"
-			],
+			"keywords": ["C#", "exit", "terminate", "stop"],
 			"problem": "How do I stop execution in C#?",
 			"solution": "Environment.Exit([exit code]);"
 		}