From a32767ca1a2f172d57cd4a68cbf1e8a9de9810d1 Mon Sep 17 00:00:00 2001 From: Wyatt Miller Date: Thu, 24 May 2018 23:43:26 -0400 Subject: [PATCH] added .eslintrc, .gitignore --- .eslintrc.json | 25 +++++++++++++++++++++++++ .gitignore | 1 + src/analytics.js | 4 ++-- src/footer.php | 4 +--- src/header.php | 4 +--- src/index.php | 8 +++----- src/main.js | 5 +++-- src/style.css | 2 +- src/twitch-player.js | 23 ++++++++++++++++++++++- 9 files changed, 59 insertions(+), 17 deletions(-) create mode 100644 .eslintrc.json create mode 100644 .gitignore diff --git a/.eslintrc.json b/.eslintrc.json new file mode 100644 index 0000000..5b50b53 --- /dev/null +++ b/.eslintrc.json @@ -0,0 +1,25 @@ +{ + "env": { + "browser": true, + "es6": true + }, + "extends": "eslint:recommended", + "rules": { + "indent": [ + "error", + 4 + ], + "linebreak-style": [ + "error", + "unix" + ], + "quotes": [ + "error", + "double" + ], + "semi": [ + "error", + "always" + ] + } +} \ No newline at end of file diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..22d0d82 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +vendor diff --git a/src/analytics.js b/src/analytics.js index fef1fbf..7e6e374 100644 --- a/src/analytics.js +++ b/src/analytics.js @@ -10,5 +10,5 @@ function gtag(){ dataLayer.push(arguments); } -gtag('js', new Date()); -gtag('config', 'UA-119564631-1'); +gtag("js", new Date()); +gtag("config", "UA-119564631-1"); diff --git a/src/footer.php b/src/footer.php index b325a92..b0cd691 100644 --- a/src/footer.php +++ b/src/footer.php @@ -1,4 +1,3 @@ - @@ -20,5 +19,4 @@

© Entourage Solutions, Wyatt J. Miller - Licensed by the MIT

- - \ No newline at end of file + \ No newline at end of file diff --git a/src/header.php b/src/header.php index 706fa0a..b7a7846 100644 --- a/src/header.php +++ b/src/header.php @@ -1,4 +1,3 @@ - @@ -22,5 +21,4 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/src/index.php b/src/index.php index 536b9d3..d586c90 100644 --- a/src/index.php +++ b/src/index.php @@ -1,4 +1,3 @@ - Wyatt J. Miller - Home @@ -13,7 +12,7 @@ - +
@@ -24,6 +23,5 @@
- - - \ No newline at end of file + + \ No newline at end of file diff --git a/src/main.js b/src/main.js index 6e8909a..6353c55 100644 --- a/src/main.js +++ b/src/main.js @@ -34,7 +34,8 @@ function whatTimeIsIt(){ death.getHours()-12; } else { death.getHours(); - }} - console.log(isPastNoon(), ":", death.getMinutes(), ":", death.getSeconds()); + } + } + console.log(isPastNoon(), ":", death.getMinutes(), ":", death.getSeconds()); } \ No newline at end of file diff --git a/src/style.css b/src/style.css index c7c35bb..8458197 100644 --- a/src/style.css +++ b/src/style.css @@ -1,5 +1,5 @@ /* Imports */ -@import url('https://fonts.googleapis.com/css?family=Oswald|Pacifico|Ubuntu|Kavivanar'); +@import url('https://fonts.googleapis.com/css?family=Oswald|Pacifico|Kavivanar'); /* Global rules */ /* Elements */ diff --git a/src/twitch-player.js b/src/twitch-player.js index 0acf125..0290887 100644 --- a/src/twitch-player.js +++ b/src/twitch-player.js @@ -14,6 +14,27 @@ new Twitch.Embed("twitch-embed", { }); var follow = document.getElementById("twitch-follow"); -follow.addEventListener('click', function(user){ +follow.addEventListener("click", function() { //code goes here }, false); + +/* +var a = 42; +var b = Number(a); +console.log(a); +console.log(b); + +function foo(){ + this.bar = bar; + this.foo = foo; + console.log(foo, bar); +} + +var obj = { + foo: "bar", + bar: "foo" +}; + +foo(); +new foo(); +*/ \ No newline at end of file