diff --git a/public/code/Python/UrlParser.py b/public/code/Python/UrlParser.py index 7723f78c2..ceb3153ea 100644 --- a/public/code/Python/UrlParser.py +++ b/public/code/Python/UrlParser.py @@ -1,4 +1,4 @@ - @property +@property def port(self): port = self._hostinfo[1] if port is not None: diff --git a/server/rooms.js b/server/rooms.js index b50c7784c..bcd649570 100644 --- a/server/rooms.js +++ b/server/rooms.js @@ -111,10 +111,15 @@ module.exports = (http) => { }); socket.on('start', () => { + rooms[roomName].playersCompleted = 0; io.in(roomName).emit('reset'); socket.to(roomName).emit('start'); }); + socket.on('requestNewGame', () => { + socket.to(roomName).emit('requestNewGame'); + }); + socket.on('completed', () => { console.log(`player "${rooms[roomName].players[socket.id].name} completed`); @@ -143,8 +148,6 @@ module.exports = (http) => { }); socket.on('reset', () => { - rooms[roomName].playersCompleted = 0; - if (rooms[roomName].players[socket.id].owner) { console.warn(`room "${roomName}" reset`); io.in(roomName).emit('reset'); diff --git a/src/App.vue b/src/App.vue index b288f5a69..a39d27b52 100644 --- a/src/App.vue +++ b/src/App.vue @@ -32,9 +32,9 @@ export default { computed: { ...mapGetters(['room', 'trackedContainers', 'smallScreen']), isThin() { - console.log('UPDATE'); const { path } = this.$route; - return path === '/run' || (this.innerWidth < 1300 && !this.room.connected && path !== '/'); + // newGameRequest exception because of webkit bug with position: fixed and transfrom http://code.google.com/p/chromium/issues/detail?id=20574 + return !this.room.newGameRequest && (path === '/run' || (this.innerWidth < 1300 && !this.room.connected && path !== '/')); }, }, created() { diff --git a/src/components/CodeEditor.vue b/src/components/CodeEditor.vue index d7e6309a3..231a01965 100644 --- a/src/components/CodeEditor.vue +++ b/src/components/CodeEditor.vue @@ -15,7 +15,7 @@ @blur="onUnFocus" /> -
+

We can't generate accurate results from this round. diff --git a/src/components/LanguagesList.vue b/src/components/LanguagesList.vue index 5420069fa..bc391b645 100644 --- a/src/components/LanguagesList.vue +++ b/src/components/LanguagesList.vue @@ -6,6 +6,7 @@ type="text" placeholder="Search" class="searchInput" + :disabled="room.connected && !room.admin" maxlength="12" autofocus @keydown.enter.stop="selectFirstFromSearch" @@ -26,8 +27,9 @@ >

-

+

{{ roomInfoMsg }}

@@ -117,7 +117,7 @@ -
+

Room owner wants to start a new game.

If you want to stay on current page {{ $route.path === '/results' ? 'and continue reading the results' : '' }} you have to leave the room. You can always join again later.

@@ -156,7 +156,6 @@ export default { origin: window.location.origin, popUp: false, hidePopUp: false, - requestNewGame: false, }; }, computed: { @@ -203,11 +202,6 @@ export default { console.error('PLAYER NAME TAKEN'); this.roomInfoMsg = `Nick "${this.playerName}" is already taken.`; }, - reset() { - if (this.$route.path === '/results' || this.$route.path === '/run') { - this.requestNewGame = true; - } - }, }, mounted() { if (this.$route.params.roomName) { @@ -266,6 +260,7 @@ export default { this.$store.commit('SET_ROOM_PROPERTY', ['connected', false]); this.$store.commit('SET_ROOM_PROPERTY', ['name', '']); this.$store.commit('SET_ROOM_PROPERTY', ['owner', false]); + this.$store.commit('SET_ROOM_PROPERTY', ['newGameRequest', false]); if (action) { this.askForPlayerName = false; this.roomName = ''; @@ -281,7 +276,7 @@ export default { this.roomInfoMsg = ''; }, acceptNewGame() { - this.requestNewGame = false; + this.$store.commit('SET_ROOM_PROPERTY', ['newGameRequest', false]); this.$router.push('/'); }, }, @@ -312,33 +307,33 @@ input .popUp + display: flex + align-items: center + justify-content: space-around + position: fixed + top: 0 + bottom: 0 + left: 0 + right: 0 + background-color: rgba($navy-grey, .7) + transition: opacity 2s ease-in-out + z-index: 10 + user-select: none + pointer-events: all + + &.hide-popUp + opacity: 0 + + .wrapper display: flex align-items: center - justify-content: space-around - position: fixed - top: 0 - bottom: 0 - left: 0 - right: 0 - background-color: rgba($navy-grey, .7) - transition: opacity 2s ease-in-out - z-index: 10 - user-select: none - pointer-events: all - - &.hide-popUp - opacity: 0 - - .wrapper - display: flex - align-items: center - flex-direction: column - flex-wrap: wrap - text-align: center - width: 50vw - - h2 - font-size: 2.5rem + flex-direction: column + flex-wrap: wrap + text-align: center + width: 50vw + + h2 + font-size: 2.5rem .roomNotConnected diff --git a/src/main.js b/src/main.js index 00ea4a3b4..964b9ec4f 100644 --- a/src/main.js +++ b/src/main.js @@ -6,7 +6,7 @@ import { FontAwesomeIcon, FontAwesomeLayers } from '@fortawesome/vue-fontawesome // import only used icons to reduce bundle size import { - faUsers, faPlay, faInfo, faFileCode, faShareAlt, faTimes, faLink, faHeart, faServer, faUser, faSignOutAlt, faCopy, faUserCog, faCheck, faHourglassEnd, faSignal, faSlash, faCompressAlt, faExpandAlt, + faUsers, faPlay, faHome, faInfo, faFileCode, faShareAlt, faTimes, faLink, faHeart, faServer, faUser, faSignOutAlt, faCopy, faUserCog, faCheck, faHourglassEnd, faSignal, faSlash, faCompressAlt, faExpandAlt, } from '@fortawesome/free-solid-svg-icons'; import { @@ -17,7 +17,7 @@ import App from './App.vue'; import router from './router'; import store from './store'; -library.add(faUsers, faPlay, faInfo, faFileCode, faShareAlt, faTimes, faLink, faFacebookF, faFacebookMessenger, faTwitter, faHeart, faServer, faUser, faSignOutAlt, faCopy, faUserCog, faCheck, faHourglassEnd, faSignal, faSlash, faCompressAlt, faExpandAlt); +library.add(faUsers, faPlay, faHome, faInfo, faFileCode, faShareAlt, faTimes, faLink, faFacebookF, faFacebookMessenger, faTwitter, faHeart, faServer, faUser, faSignOutAlt, faCopy, faUserCog, faCheck, faHourglassEnd, faSignal, faSlash, faCompressAlt, faExpandAlt); Vue.component('fa', FontAwesomeIcon); Vue.component('faStack', FontAwesomeLayers); diff --git a/src/store/modules/room.js b/src/store/modules/room.js index ae5861568..a1ff17260 100644 --- a/src/store/modules/room.js +++ b/src/store/modules/room.js @@ -51,7 +51,7 @@ const actions = { commit('SET_ROOM_PROPERTY', ['players', playersObject]); if (roomState.languageIndex) { - commit('SET_LANGUAGE', rootState.other.languagesList[roomState.languageIndex]); + commit('SET_LANGUAGE', rootState.misc.languagesList[roomState.languageIndex]); } else { commit('SET_LANGUAGE', { index: null, @@ -84,7 +84,7 @@ const actions = { commit('SET_OPTION', option); }, socket_languageChange({ commit, rootState }, languageIndex) { - commit('SET_LANGUAGE', rootState.other.languagesList[languageIndex]); + commit('SET_LANGUAGE', rootState.misc.languagesList[languageIndex]); }, socket_fileIndex({ dispatch }, fileIndex) { dispatch('generateCodeInfo', fileIndex); @@ -100,6 +100,11 @@ const actions = { commit('RESET_PLAYER', playerName); }); }, + socket_requestNewGame({ commit, state }) { + if (!state.room.players[state.room.myName].inLobby) { + commit('SET_ROOM_PROPERTY', ['newGameRequest', true]); + } + }, }; const mutations = { diff --git a/src/views/Run.vue b/src/views/Run.vue index 102849fe8..bf6a98df0 100644 --- a/src/views/Run.vue +++ b/src/views/Run.vue @@ -106,6 +106,8 @@ export default { } }, beforeRouteUpdate(to, from, next) { + console.red('routeUpdate'); + if (to.path === '/results') { setTimeout(() => { this.$refs.results.scrollIntoView({ @@ -122,6 +124,10 @@ export default { if (this.intervalId) { window.clearInterval(this.intervalId); } + if (this.room.connected) { + // reset players locally but let them finish and view results until admin clicks start again + this.$store.dispatch('socket_reset'); + } }, methods: { reset() { diff --git a/src/views/Start.vue b/src/views/Start.vue index 29f41ea70..55cbdddf7 100644 --- a/src/views/Start.vue +++ b/src/views/Start.vue @@ -174,8 +174,8 @@ export default { } if (this.room.connected && !this.playersInLobby) { - this.error = 'To start a new game all of the players must be in lobby'; - this.$socket.client.emit('reset'); + this.error = 'To start a new game all players must be in lobby'; + this.$socket.client.emit('requestNewGame'); return; } @@ -276,6 +276,8 @@ export default { width: 150px height: 47px max-width: 250px + &:disabled + cursor: not-allowed .start-btn, .ready-btn background: linear-gradient(to right, $purple, $dark-pink 50%, $navy-grey 50% 100%)