change owner to admin

Author: Bot

server/rooms.js

@@ -56,8 +56,8 @@ module.exports = (http) => {
 
         const playerData = {
           ...playerDataTemplate,
-          name: data.ownerName,
-          owner: true,
+          name: data.adminName,
+          admin: true,
           ready: true,
         };
 
@@ -148,7 +148,7 @@ module.exports = (http) => {
     });
 
     socket.on('reset', () => {
-      if (rooms[roomName].players[socket.id].owner) {
+      if (rooms[roomName].players[socket.id].admin) {
         console.warn(`room "${roomName}" reset`);
         io.in(roomName).emit('reset');
       }
@@ -161,9 +161,9 @@ module.exports = (http) => {
 
         socket.to(roomName).emit('player_disconnected', {
           playerName: player.name,
-          owner: player.owner,
+          admin: player.admin,
         });
-        if (player.owner) {
+        if (player.admin) {
           delete rooms[roomName];
           console.warn(`room ${roomName} deleted`);
         } else {

src/components/LanguagesList.vue

@@ -22,11 +22,11 @@
       ref="languagesList"
       tabindex="0"
       class="languages list"
-      :class="{'showStats': !($route.path !== '/' || (room.connected && !room.owner)), 'forceStats': forceStats} "
+      :class="{'showStats': !($route.path !== '/' || (room.connected && !room.admin)), 'forceStats': forceStats} "
       @keydown.shift.capture.prevent="toggleStats"
     >
       <button
-        :disabled="room.connected && !room.owner"
+        :disabled="room.connected && !room.admin"
         class="language random-btn"
         :class="{'selected': language.index === null}"
         :style="{'--col-span': randomBtnColSpan}"
@@ -47,7 +47,7 @@
           v-model="language"
           type="radio"
           class="language-radio"
-          :disabled="room.connected && !room.owner"
+          :disabled="room.connected && !room.admin"
           :value="languagesList[filteredLanguage.index]"
           :data-index="filteredLanguage.index"
           @input="setRoomLanguage"
@@ -94,7 +94,7 @@ export default {
     },
   },
   watch: {
-    'room.owner': {
+    'room.admin': {
       deep: true,
       handler(current) {
         if (current && this.language.index) {
@@ -105,7 +105,7 @@ export default {
     'language.index': {
       deep: true,
       handler(current) {
-        if (this.room.connected && !this.room.owner && current) {
+        if (this.room.connected && !this.room.admin && current) {
           this.$refs.languagesList.querySelector(`label[data-index="${current}"]`).scrollIntoView({
             block: 'center',
             behavior: 'smooth',
@@ -139,7 +139,7 @@ export default {
           this.selectRandom();
         }
         this.language = this.filteredList[index];
-        if (this.room.owner) {
+        if (this.room.admin) {
           this.$socket.client.emit('languageChange', index);
         }
         this.$refs.languagesList.querySelector(`label[data-index="${index}"]`).scrollIntoView({
@@ -156,7 +156,7 @@ export default {
       }
     },
     setRoomLanguage(ev) {
-      if (this.room.owner) {
+      if (this.room.admin) {
         this.$nextTick(() => this.$socket.client.emit('languageChange', ev.target.getAttribute('data-index')));
       }
     },

src/components/PlayersList.vue

@@ -27,19 +27,19 @@
             </span>
             <div class="icons">
               <fa
-                v-if="player.owner && $route.path !== '/results'"
+                v-if="player.admin && $route.path !== '/results'"
                 class="icon"
                 :icon="['fas', 'user-cog']"
                 size="xs"
               />
               <fa
-                v-show="player.inLobby && player.ready && !player.owner"
+                v-show="player.inLobby && player.ready && !player.admin"
                 class="icon"
                 :icon="['fas', 'check']"
                 size="xs"
               />
               <fa
-                v-show="($route.path === '/results' && !player.place) || ($route.path !== '/results' && !player.inLobby && !player.owner)"
+                v-show="($route.path === '/results' && !player.place) || ($route.path !== '/results' && !player.inLobby && !player.admin)"
                 class="icon"
                 :icon="['fas', 'hourglass-end']"
                 size="xs"
@@ -106,8 +106,8 @@ export default {
             return -1;
           }
         }
-        if (p1.owner) {
-          console.log('owner');
+        if (p1.admin) {
+          console.log('admin');
           return -1;
         }
 

src/components/RoomPanel.vue

@@ -87,7 +87,7 @@
           <fa :icon="['fas', 'sign-out-alt']" size="lg" />
         </button>
       </div>
-      <div v-if="room.owner && showRoomLink && $route.path === '/'" class="linkContainer">
+      <div v-if="room.admin && showRoomLink && $route.path === '/'" class="linkContainer">
         <p>
           Share this link with other players:
         </p>
@@ -117,7 +117,7 @@
 
     <PlayersList v-if="room.connected && $route.path !== '/run'" class="playersList" />
 
-    <div v-if="room.newGameRequest && !room.owner" class="moveToLobby popUp">
+    <div v-if="room.newGameRequest && !room.admin" class="moveToLobby popUp">
       <div class="wrapper">
         <h2>Room owner wants to start a new game.</h2>
         <h3>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.</h3>
@@ -170,7 +170,7 @@ export default {
       this.$store.commit('SET_ROOM_PROPERTY', ['connected', true]);
       this.$store.commit('SET_ROOM_PROPERTY', ['name', this.roomName]);
       this.$store.commit('SET_ROOM_PROPERTY', ['myName', this.playerName]);
-      this.$store.commit('SET_ROOM_PROPERTY', ['owner', true]);
+      this.$store.commit('SET_ROOM_PROPERTY', ['admin', true]);
       setTimeout(() => this.$refs.closeInfoBtn.focus(), 100);
     },
     room_exist() {
@@ -230,7 +230,7 @@ export default {
     },
     createRoom() {
       this.$socket.client.emit('createRoom', {
-        ownerName: this.playerName,
+        adminName: this.playerName,
         roomName: this.roomName,
         options: {
           codeLength: this.options.codeLength,
@@ -259,7 +259,7 @@ export default {
       this.$socket.client.close();
       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', ['admin', false]);
       this.$store.commit('SET_ROOM_PROPERTY', ['newGameRequest', false]);
       this.$store.commit('SET_ROOM_PROPERTY', ['players', {}]);
       if (action) {

src/components/SettingsMenu.vue

@@ -106,11 +106,11 @@ export default {
     ...mapGetters(['room']),
     ...mapFields(['selectedTheme', 'selectedMode', 'underScore', 'codeLength', 'lineNumbers', 'autoIndent']),
     block() {
-      return this.room.connected && !this.room.owner;
+      return this.room.connected && !this.room.admin;
     },
   },
   watch: {
-    'room.owner': {
+    'room.admin': {
       deep: true,
       handler(current) {
         if (current) {
@@ -133,7 +133,7 @@ export default {
   },
   methods: {
     updateOption(ev) {
-      if (this.room.owner && ev.target.name) {
+      if (this.room.admin && ev.target.name) {
         const payload = {
           name: ev.target.name,
           value: ev.target.checked,

src/components/UploadCode.vue

@@ -31,7 +31,7 @@
             @change="toggleExpand"
           >
         </label>
-        <span v-show="!language.index && !(room.connected && !room.owner)" class="language-warning">
+        <span v-show="!language.index && !(room.connected && !room.admin)" class="language-warning">
           Choose language <fa class="arrow" :icon="['fas', 'play']" />
         </span>
       </div>
@@ -83,7 +83,7 @@ export default {
     cmOptions() {
       return {
         tabSize: this.selectedSize,
-        readOnly: this.room.connected && !this.room.owner,
+        readOnly: this.room.connected && !this.room.admin,
         lineNumbers: true,
         mathBrackets: true,
         styleSelectedText: true,
@@ -108,13 +108,13 @@ export default {
       immediate: true,
       deep: true,
       handler(current) {
-        if (this.room.connected && !this.room.owner) {
+        if (this.room.connected && !this.room.admin) {
           this.code = current.text;
           this.selectedSize = current.tabSize || 2;
         }
       },
     },
-    'room.owner': {
+    'room.admin': {
       deep: true,
       handler(current) {
         if (current) {
@@ -128,7 +128,7 @@ export default {
       },
     },
     selectedSize() {
-      if (this.room.owner) {
+      if (this.room.admin) {
         this.$socket.client.emit('customCodeData', {
           text: this.code,
           tabSize: this.selectedSize,
@@ -184,7 +184,7 @@ export default {
           short: this.customCode.text.length < 30 || this.customCode.lines < 4,
         };
         this.$store.commit('SET_CUSTOM_CODE', data);
-        if (this.room.owner) {
+        if (this.room.admin) {
           this.$socket.client.emit('customCodeData', data);
         }
       }, 50);

src/store/modules/room.js

@@ -6,7 +6,7 @@ const state = {
     name: '',
     players: {},
     myName: '',
-    owner: false,
+    admin: false,
   },
 };
 
@@ -17,12 +17,12 @@ const getters = {
 
 const actions = {
   socket_playerDisconnected({ commit }, msg) {
-    if (msg.owner) {
+    if (msg.admin) {
       console.log('admin disconnected');
       this._vm.$socket.client.disconnect();
       commit('SET_ROOM_PROPERTY', ['connected', false]);
       commit('SET_ROOM_PROPERTY', ['name', '']);
-      commit('SET_ROOM_PROPERTY', ['owner', false]);
+      commit('SET_ROOM_PROPERTY', ['admin', false]);
       commit('SET_ROOM_PROPERTY', ['newGameRequest', false]);
       commit('SET_ROOM_PROPERTY', ['players', {}]);
     }

src/views/Run.vue

@@ -87,8 +87,8 @@ export default {
     codeSource() {
       if (this.codeInfo.name) {
         return this.codeInfo.source === 'own' ? 'Łukasz Wielgus archive' : this.codeInfo.source;
-      } if (this.room.connected && !this.room.owner) {
-        return 'Code provided by room owner';
+      } if (this.room.connected && !this.room.admin) {
+        return 'Code provided by room admin';
       }
       return 'Code provided by You';
     },

src/views/Start.vue

@@ -21,12 +21,12 @@
           <span>{{ uploadCodeText }}</span>
           <input
             :checked="customCode.showEditor"
-            :disabled="room.connected && !room.owner"
+            :disabled="room.connected && !room.admin"
             type="checkbox"
             @input="useCustomCode($event.target.checked)"
           >
         </label>
-        <label v-if="room.connected && !room.owner" class="button ready-btn" :class="{ highlight: isReady }">
+        <label v-if="room.connected && !room.admin" class="button ready-btn" :class="{ highlight: isReady }">
           <span>Ready</span>
           <input
             v-model="isReady"
@@ -36,9 +36,9 @@
           >
         </label>
         <button
-          :disabled="room.connected && !room.owner"
+          :disabled="room.connected && !room.admin"
           class="button start-btn"
-          :class="{ highlight: language.name && !(room.connected && !room.owner) }"
+          :class="{ highlight: language.name && !(room.connected && !room.admin) }"
           @click="run"
         >
           START
@@ -87,7 +87,7 @@ export default {
         this.error = '';
       }
     },
-    'room.owner': {
+    'room.admin': {
       deep: true,
       handler(current) {
         if (current) {
@@ -99,7 +99,7 @@ export default {
       immediate: true,
       deep: true,
       handler(current) {
-        if (this.room.connected && !this.room.owner) {
+        if (this.room.connected && !this.room.admin) {
           if (current.showEditor) {
             this.showEditor = current.showEditor;
           } else {
@@ -126,13 +126,13 @@ export default {
       });
     }
 
-    if (this.room.connected && !this.room.owner) {
+    if (this.room.connected && !this.room.admin) {
       this.$socket.client.emit('playerInLobby', true);
     }
   },
   methods: {
     handleEnter() {
-      if (!(this.room.connected && !this.room.owner) && !this.showEditor) {
+      if (!(this.room.connected && !this.room.admin) && !this.showEditor) {
         this.run();
       }
     },
@@ -160,7 +160,7 @@ export default {
           this.showEditor = value;
         }, 500);
       }
-      if (this.room.owner) {
+      if (this.room.admin) {
         this.$socket.client.emit('useCustomCode', value);
       }
 
@@ -191,12 +191,12 @@ export default {
         }
       }
 
-      if (this.showEditor && this.room.owner) {
+      if (this.showEditor && this.room.admin) {
         this.$socket.client.emit('customCodeData', this.customCode);
       }
 
       this.prepareCodeInfo();
-      if (this.room.owner) {
+      if (this.room.admin) {
         this.$socket.client.emit('start', Date.now());
       }
 
@@ -211,7 +211,7 @@ export default {
         fileIndex = Math.floor(Math.random() * this.language.files.length);
       }
       this.$store.dispatch('generateCodeInfo', fileIndex);
-      if (this.room.owner) {
+      if (this.room.admin) {
         this.$socket.client.emit('fileIndex', fileIndex);
       }
     },