From 05b1d079479a667e15c6dcf18f1eb132b19c3849 Mon Sep 17 00:00:00 2001 From: Wyatt Miller Date: Wed, 6 Jun 2018 16:29:37 -0400 Subject: [PATCH] messing with files of little importance --- .eslintrc.json | 30 ++++++++++++++++++++++++++++++ .gitignore | 6 ++++++ .vscode/settings.json | 3 +++ Dockerfile | 2 +- src/main.js | 37 +++++++++++++++++++++++-------------- src/twitch-player.js | 4 ++-- 6 files changed, 65 insertions(+), 17 deletions(-) create mode 100644 .eslintrc.json create mode 100644 .gitignore create mode 100644 .vscode/settings.json diff --git a/.eslintrc.json b/.eslintrc.json new file mode 100644 index 0000000..5e8d80c --- /dev/null +++ b/.eslintrc.json @@ -0,0 +1,30 @@ +{ + "env": { + "browser": true + }, + "extends": "eslint:recommended", + "rules": { + "indent": [ + "error", + 4 + ], + "linebreak-style": [ + "error", + "unix" + ], + "quotes": [ + "error", + "double" + ], + "semi": [ + "error", + "always" + ], + "no-undef": [ + "warn" + ], + "no-unused-vars": [ + "warn" + ] + } +} \ No newline at end of file diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..b577859 --- /dev/null +++ b/.gitignore @@ -0,0 +1,6 @@ +vendor +.vscode +composer.json +composer.lock +.eslintrc.json + diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..b1549cb --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,3 @@ +{ + "lua.targetVersion": "5.3" +} \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index c6e3a77..3d37dbf 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ # Licensed by the MIT # # Copying files in the dockerfile is kind of a mess. Actually not really. -# Just remember when linking files, follow the method below. +# Just remember when linking files in code, follow the method below. FROM php:7.0-apache RUN /bin/bash -c "cd /var/www/html && mkdir assets && mkdir css && mkdir img && mkdir webfonts" COPY src/ /var/www/html diff --git a/src/main.js b/src/main.js index 6e8909a..ade78f0 100644 --- a/src/main.js +++ b/src/main.js @@ -9,20 +9,20 @@ function mediaDetect(){ var ScreenWidth = window.screen.width; var ScreenHeight = window.screen.height; - console.log("width: " + ScreenWidth); - console.log("height: " + ScreenHeight); + print("width: " + ScreenWidth); + print("height: " + ScreenHeight); if (ScreenWidth < 768){ - console.log("user has a phone!"); + print("user has a phone!"); } else if (ScreenWidth < 992) { - console.log("user has a tablet!"); + print("user has a tablet!"); } else if (ScreenWidth < 1200) { - console.log("user has a desktop!"); + print("user has a desktop!"); } else if (ScreenWidth < 2048) { - console.log("user has a hd display!"); + print("user has a hd display!"); } else if (ScreenWidth < 4096) { - console.log("user has a display greater than fhd!"); + print("user has a display greater than fhd!"); } else { - console.log("what do you spend your money on?") + print("what do you spend your money on?"); } } @@ -30,11 +30,20 @@ function whatTimeIsIt(){ var death = new Date(); function isPastNoon(){ - if (death.getHours > 12) { - death.getHours()-12; + if (death.getHours() > 12) { + print(death.getHours()-12); } else { - death.getHours(); - }} - console.log(isPastNoon(), ":", death.getMinutes(), ":", death.getSeconds()); + print(death.getHours()); + } + } + print(isPastNoon(), ":", death.getMinutes(), ":", death.getSeconds()); -} \ No newline at end of file +} + +function backToTop(){ + // code goes here + // this function has a button where js moves the page/screen back to the top +} + +mediaDetect(); +whatTimeIsIt(); \ No newline at end of file diff --git a/src/twitch-player.js b/src/twitch-player.js index 0acf125..7f3ffd0 100644 --- a/src/twitch-player.js +++ b/src/twitch-player.js @@ -14,6 +14,6 @@ new Twitch.Embed("twitch-embed", { }); var follow = document.getElementById("twitch-follow"); -follow.addEventListener('click', function(user){ - //code goes here +follow.addEventListener("click", function(user){ + this.user = user; }, false);