Merge branch '313-delete-button-for-roomAdmin' into 'dev'

"Delete" button for roomAdmin added instead of "Leave" button

Closes #313

See merge request keanuapp/keanuapp-weblite!80

src/components/ChatHeader.vue

@@ -22,9 +22,25 @@
         <div class="num-members">{{ $tc("room.members", memberCount) }}</div>
       </v-col>
       <v-col cols="auto" class="text-end ma-0 pa-0">
-        <v-btn id="btn-leave-room" text class="leave-button" @click.stop="leaveRoom">{{
+        <v-btn
-          $t("room.leave")
+          id="btn-purge-room"
-        }}</v-btn>
+          v-if="userCanPurgeRoom"
+          color="red"
+          depressed
+          class="filled-button"
+          @click.stop="showPurgeConfirmation = true"
+        >
+          {{ $t("room_info.purge") }}
+        </v-btn>
+        <v-btn
+          id="btn-leave-room"
+          text
+          class="leave-button"
+          @click.stop="leaveRoom"
+          v-else
+        >
+          {{ $t("room.leave") }}
+        </v-btn>
       </v-col>
       <v-col cols="auto" class="text-end ma-0 pa-0 ms-2">
         <v-avatar
@@ -51,6 +67,12 @@
       :show="showProfileInfo"
       @close="showProfileInfo = false"
     />
+    <!-- PURGE ROOM POPUP -->
+    <PurgeRoomDialog
+      :show="showPurgeConfirmation"
+      :room="room"
+      @close="showPurgeConfirmation = false"
+    />
   </v-container>
 </template>
 
@@ -58,19 +80,24 @@
 import LeaveRoomDialog from "../components/LeaveRoomDialog";
 import ProfileInfoPopup from "../components/ProfileInfoPopup";
 import profileInfoMixin from "../components/profileInfoMixin";
+import PurgeRoomDialog from "../components/PurgeRoomDialog";
+
+import roomInfoMixin from "./roomInfoMixin";
 
 export default {
   name: "ChatHeader",
-  mixins: [profileInfoMixin],
+  mixins: [profileInfoMixin, roomInfoMixin],
   components: {
     LeaveRoomDialog,
     ProfileInfoPopup,
+    PurgeRoomDialog
   },
   data() {
     return {
       memberCount: null,
       showLeaveConfirmation: false,
       showProfileInfo: false,
+      showPurgeConfirmation: false
     };
   },
   mounted() {

src/components/RoomInfo.vue

@@ -167,19 +167,6 @@
       </v-card-text>
     </v-card>
 
-    <!-- PURGE ROOM -->
-    <div class="members ma-3 pa-3 text-center">
-      <v-btn
-        id="btn-purge-room"
-        v-if="userCanPurgeRoom"
-        color="red"
-        depressed
-        class="filled-button"
-        @click.stop="showPurgeConfirmation = true"
-        >{{ $t("room_info.purge") }}</v-btn
-      >
-    </div>
-
     <div class="build-version">
       {{ $t("room_info.version_info", { version: buildVersion }) }}
     </div>
@@ -190,12 +177,6 @@
       @close="showLeaveConfirmation = false"
     />
 
-    <PurgeRoomDialog
-      :show="showPurgeConfirmation"
-      :room="room"
-      @close="showPurgeConfirmation = false"
-    />
-
     <QRCodePopup :show="showFullScreenQR" :message="publicRoomLink" @close="showFullScreenQR = false" />
 
   </div>
@@ -203,7 +184,6 @@
 
 <script>
 import LeaveRoomDialog from "../components/LeaveRoomDialog";
-import PurgeRoomDialog from "../components/PurgeRoomDialog";
 import DeviceList from "../components/DeviceList";
 import QRCode from "qrcode";
 import roomInfoMixin from "./roomInfoMixin";
@@ -215,7 +195,6 @@ export default {
   mixins: [roomInfoMixin],
   components: {
     LeaveRoomDialog,
-    PurgeRoomDialog,
     DeviceList,
     QRCodePopup,
   },
@@ -226,7 +205,6 @@ export default {
       displayName: "",
       showAllMembers: false,
       showLeaveConfirmation: false,
-      showPurgeConfirmation: false,
       showFullScreenQR: false,
       expandedMembers: [],
       buildVersion: "",