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

This commit is contained in:
10G Meow 2022-04-25 08:44:25 +00:00 committed by N Pex
parent ecfde40147
commit 70d055ec22
2 changed files with 31 additions and 26 deletions

View file

@ -22,9 +22,25 @@
<div class="num-members">{{ $tc("room.members", memberCount) }}</div> <div class="num-members">{{ $tc("room.members", memberCount) }}</div>
</v-col> </v-col>
<v-col cols="auto" class="text-end ma-0 pa-0"> <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>
<v-col cols="auto" class="text-end ma-0 pa-0 ms-2"> <v-col cols="auto" class="text-end ma-0 pa-0 ms-2">
<v-avatar <v-avatar
@ -51,6 +67,12 @@
:show="showProfileInfo" :show="showProfileInfo"
@close="showProfileInfo = false" @close="showProfileInfo = false"
/> />
<!-- PURGE ROOM POPUP -->
<PurgeRoomDialog
:show="showPurgeConfirmation"
:room="room"
@close="showPurgeConfirmation = false"
/>
</v-container> </v-container>
</template> </template>
@ -58,19 +80,24 @@
import LeaveRoomDialog from "../components/LeaveRoomDialog"; import LeaveRoomDialog from "../components/LeaveRoomDialog";
import ProfileInfoPopup from "../components/ProfileInfoPopup"; import ProfileInfoPopup from "../components/ProfileInfoPopup";
import profileInfoMixin from "../components/profileInfoMixin"; import profileInfoMixin from "../components/profileInfoMixin";
import PurgeRoomDialog from "../components/PurgeRoomDialog";
import roomInfoMixin from "./roomInfoMixin";
export default { export default {
name: "ChatHeader", name: "ChatHeader",
mixins: [profileInfoMixin], mixins: [profileInfoMixin, roomInfoMixin],
components: { components: {
LeaveRoomDialog, LeaveRoomDialog,
ProfileInfoPopup, ProfileInfoPopup,
PurgeRoomDialog
}, },
data() { data() {
return { return {
memberCount: null, memberCount: null,
showLeaveConfirmation: false, showLeaveConfirmation: false,
showProfileInfo: false, showProfileInfo: false,
showPurgeConfirmation: false
}; };
}, },
mounted() { mounted() {

View file

@ -167,19 +167,6 @@
</v-card-text> </v-card-text>
</v-card> </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"> <div class="build-version">
{{ $t("room_info.version_info", { version: buildVersion }) }} {{ $t("room_info.version_info", { version: buildVersion }) }}
</div> </div>
@ -190,12 +177,6 @@
@close="showLeaveConfirmation = false" @close="showLeaveConfirmation = false"
/> />
<PurgeRoomDialog
:show="showPurgeConfirmation"
:room="room"
@close="showPurgeConfirmation = false"
/>
<QRCodePopup :show="showFullScreenQR" :message="publicRoomLink" @close="showFullScreenQR = false" /> <QRCodePopup :show="showFullScreenQR" :message="publicRoomLink" @close="showFullScreenQR = false" />
</div> </div>
@ -203,7 +184,6 @@
<script> <script>
import LeaveRoomDialog from "../components/LeaveRoomDialog"; import LeaveRoomDialog from "../components/LeaveRoomDialog";
import PurgeRoomDialog from "../components/PurgeRoomDialog";
import DeviceList from "../components/DeviceList"; import DeviceList from "../components/DeviceList";
import QRCode from "qrcode"; import QRCode from "qrcode";
import roomInfoMixin from "./roomInfoMixin"; import roomInfoMixin from "./roomInfoMixin";
@ -215,7 +195,6 @@ export default {
mixins: [roomInfoMixin], mixins: [roomInfoMixin],
components: { components: {
LeaveRoomDialog, LeaveRoomDialog,
PurgeRoomDialog,
DeviceList, DeviceList,
QRCodePopup, QRCodePopup,
}, },
@ -226,7 +205,6 @@ export default {
displayName: "", displayName: "",
showAllMembers: false, showAllMembers: false,
showLeaveConfirmation: false, showLeaveConfirmation: false,
showPurgeConfirmation: false,
showFullScreenQR: false, showFullScreenQR: false,
expandedMembers: [], expandedMembers: [],
buildVersion: "", buildVersion: "",