diff --git a/.eslintrc.js b/.eslintrc.js index 67c085d..c062c83 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -22,6 +22,7 @@ module.exports = { // allow async-await 'generator-star-spacing': 0, // allow debugger during development - 'no-debugger': process.env.NODE_ENV === 'production' ? 2 : 0 + 'no-debugger': process.env.NODE_ENV === 'production' ? 2 : 0, + 'no-unneeded-ternary': 0 } } diff --git a/server.js b/server.js index 644699c..a1db30f 100644 --- a/server.js +++ b/server.js @@ -3,6 +3,7 @@ const path = require('path'); const bodyParser = require("body-parser"); const app = express(); const Pusher = require('pusher'); +const crypto = require("crypto"); const pusher = new Pusher({ appId: '351311', @@ -31,18 +32,6 @@ app.use( (req, res, next) => { app.set('port', (process.env.PORT || 5000)); -function generateUUID () { - var d = new Date().getTime(); - var uuid = 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function(c) { - var r = (d + Math.random() * 16) % 16 | 0; - d = Math.floor(d / 16); - return (c == 'x' ? r : (r & 0x3 | 0x8)).toString(16); - }); - return uuid; -} - -let user_id = generateUUID() - app.get('/', (req,res) => { res.send('Welcome') }) @@ -51,7 +40,7 @@ app.post('/pusher/auth', (req, res) => { let socketId = req.body.socket_id; let channel = req.body.channel_name; let presenceData = { - user_id: user_id + user_id: crypto.randomBytes(16).toString("hex") }; let auth = pusher.authenticate(socketId, channel, presenceData); res.send(auth); diff --git a/src/components/ChannelDetails.vue b/src/components/ChannelDetails.vue new file mode 100644 index 0000000..7059d59 --- /dev/null +++ b/src/components/ChannelDetails.vue @@ -0,0 +1,27 @@ + diff --git a/src/components/Home.vue b/src/components/Home.vue index 56e613e..ff436f9 100644 --- a/src/components/Home.vue +++ b/src/components/Home.vue @@ -1,22 +1,290 @@ @@ -60,4 +328,84 @@ export default { .fade-enter, .fade-leave-to { opacity: 0 } + a { + color: #fff; + } + p { + color: #fff; + } + h1 { + font-size: 3rem; + font-weight: bold; + text-align: center; + } + .fade-enter-active, .fade-leave-active { + transition: opacity .5s + } + .fade-enter, .fade-leave-to /* .fade-leave-active in <2.1.8 */ { + opacity: 0 + } + .play--button { + background-color: white; + color: #7fd4d3; + font-weight: bold; + border-radius: 20px; + letter-spacing: 1px; + padding: 20px; + transition: all .3s ease; + text-shadow: 0 1px 3px rgba(36,180,126,.4); + text-transform: uppercase; + box-shadow: 0 4px 6px rgba(50,50,93,.11), 0 1px 3px rgba(0,0,0,.08); + position: absolute; + top: 20px; + right: 20px; + z-index: 5; + } + .play--button:hover { + background-color: white; + color: #7fd4d3; + transform: translateY(-1px); + box-shadow: 0 7px 14px rgba(50,50,93,.1), 0 3px 6px rgba(0,0,0,.08); + } + .hamilton--header--text { + margin-top: 50px; + } + .hamilton--inner { + margin-top: 20px; + } + .hamilton--inner .left{ + text-align: left; + } + .hamilton--inner .right{ + text-align: right; + } + .title { + font-weight: bold; + } + .hamilton--lyrics--text { + width: 600px; + margin: 0 auto; + } + .hamilton--lyrics--text p { + font-weight: bold; + } + .hamilton--answers a{ + display: block; + border: 3px solid white; + border-radius: 50px; + margin: 20px auto; + width: 500px; + padding: 10px; + } + .wronganswer { + background-color: #ec6969; + border: none !important; + opacity: 0.4; + transition: background-color 0.5s ease; + } + .correctanswer { + background-color: #00c4a7; + border: none !important; + transition: background-color 0.5s ease; + } diff --git a/src/components/Play.vue b/src/components/Play.vue deleted file mode 100644 index 5cc07d2..0000000 --- a/src/components/Play.vue +++ /dev/null @@ -1,255 +0,0 @@ - - - - - diff --git a/src/router/index.js b/src/router/index.js index 66d1355..fd1ee90 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -1,7 +1,6 @@ import Vue from 'vue' import Router from 'vue-router' import Home from '@/components/Home' -import Play from '@/components/Play' Vue.use(Router) @@ -11,11 +10,6 @@ export default new Router({ path: '/', name: 'Home', component: Home - }, - { - path: '/play', - name: 'Play', - component: Play } ] })