Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

WIP(profile): removed refactoring crud, located where close icon should be (profileModal.vue)

Browse Source
This commit is contained in:
CuriousMagpie
2023-08-31 17:42:12 -04:00
parent 18b41acd94
commit b01f323b14
2 changed files with 86 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files
website/client/src/components/userMenu/profile.vue
+83 -93
View File
@@ -9,7 +9,6 @@
v-else-if="userLoaded"
class="profile"
>
<closeX />
<!-- HEADER -->
<div class="header">
<div class="profile-actions d-flex">
@@ -169,7 +168,7 @@
<!-- report player -->
<b-dropdown-item
class="selectListItem block-ban"
@click="block()"
@click="blockUser()"
>
<span class="with-icon">
<span
@@ -182,94 +181,94 @@
</span>
</span>
</b-dropdown-item>
<!-- Admin Tools header -->
<b-dropdown-item
class="selectListItem admin-tools"
<!-- Rest is visible only if user is Admin -->
<div
v-if="hasPermission(userLoggedIn, 'moderator')"
>
<span v-once>
<strong>{{ $t('adminTools') }}</strong>
</span>
</b-dropdown-item>
<!-- Admin Panel -->
<b-dropdown-item
class="selectListItem"
@click="viewAdminPanel()"
>
<span class="with-icon">
<span
v-once
class="svg-icon icon-16 color"
v-html="icons.crown"
></span>
<!-- Admin Tools header -->
<b-dropdown-item
class="selectListItem admin-tools"
>
<span v-once>
{{ $t('viewAdminPanel') }}
<strong>{{ $t('adminTools') }}</strong>
</span>
</span>
</b-dropdown-item>
</b-dropdown-item>
<!-- Ban user -->
<b-dropdown-item
class="selectListItem block-ban"
@click="adminBlockUser()"
>
<span class="with-icon">
<span
v-once
class="svg-icon icon-16 color"
v-html="icons.block"
></span>
<span v-once>
{{ $t('banPlayer') }}
<!-- Admin Panel -->
<b-dropdown-item
class="selectListItem"
@click="openAdminPanel()"
>
<span class="with-icon">
<span
v-once
class="svg-icon icon-16 color"
v-html="icons.crown"
></span>
<span v-once>
{{ $t('viewAdminPanel') }}
</span>
</span>
</span>
</b-dropdown-item>
</b-dropdown-item>
<!-- shadowmute player with toggle -->
<b-dropdown-item
class="selectListItem"
>
<span class="with-icon">
<span
v-once
class="svg-icon icon-16 color"
v-html="icons.shadowMute"
></span>
<span
v-once
v-b-tooltip.hover.bottom="'Turn on Shadow Muting'"
class="admin-action"
>
{{ $t('shadowMute') }}
<!-- Ban user -->
<b-dropdown-item
class="selectListItem block-ban"
>
<span class="with-icon">
<span
v-once
class="svg-icon icon-16 color"
v-html="icons.block"
></span>
<span v-once>
{{ $t('banPlayer') }}
</span>
</span>
<toggle
class="toggle-switch-outer ml-auto"
@click="adminTurnOnShadowMuting()"
/>
</span>
</b-dropdown-item>
</b-dropdown-item>
<!-- mute player with toggle -->
<b-dropdown-item
class="selectListItem"
@click="adminRevokeChat()"
>
<span class="with-icon">
<span
v-once
class="svg-icon icon-16 color"
v-html="icons.mute"
></span>
<span v-once>
{{ $t('mutePlayer') }}
<!-- shadowmute player with toggle -->
<b-dropdown-item
class="selectListItem"
>
<span class="with-icon">
<span
v-once
class="svg-icon icon-16 color"
v-html="icons.shadowMute"
></span>
<span
v-once
v-b-tooltip.hover.bottom="'Turn on Shadow Muting'"
class="admin-action"
>
{{ $t('shadowMute') }}
</span>
<toggle
class="toggle-switch-outer ml-auto"
/>
</span>
<toggle
class="toggle-switch-outer ml-auto"
/>
</span>
</b-dropdown-item>
</b-dropdown-item>
<!-- mute player with toggle -->
<b-dropdown-item
class="selectListItem"
>
<span class="with-icon">
<span
v-once
class="svg-icon icon-16 color"
v-html="icons.mute"
></span>
<span v-once>
{{ $t('mutePlayer') }}
</span>
<toggle
class="toggle-switch-outer ml-auto"
/>
</span>
</b-dropdown-item>
</div>
</b-dropdown>
</span>
@@ -383,12 +382,6 @@
</div>
</div>
<!-- ACHIEVEMENTS -->
<div>
<profileAchievs
v-show="selectedPage === 'achievements'"
:user="user"
/>
</div>
<div
v-show="selectedPage === 'achievements'"
v-if="user.achievements"
@@ -954,7 +947,6 @@ import moment from 'moment';
import axios from 'axios';
import each from 'lodash/each';
import cloneDeep from 'lodash/cloneDeep';
import closeX from '../ui/closeX';
import toggle from '../ui/toggleSwitch';
import { mapState } from '@/libs/store';
@@ -963,7 +955,6 @@ import markdown from '@/directives/markdown';
import achievementsLib from '@/../../common/script/libs/achievements';
import Content from '@/../../common/script/content';
import profileStats from './profileStats';
import profileAchievs from './profileAchievs';
import message from '@/assets/svg/message.svg';
import gift from '@/assets/svg/gift.svg';
@@ -992,9 +983,7 @@ export default {
components: {
MemberDetails,
profileStats,
profileAchievs,
error404,
closeX,
toggle,
},
mixins: [externalLinks, userCustomStateMixin('userLoggedIn')],
@@ -1283,6 +1272,10 @@ export default {
this.$store.dispatch('hall:updateHero', { heroDetails: this.hero });
},
adminOpenAdminPanel () {
this.hero = this.user.permissions.fullAccess || this.user.permissions.userSupport;
this.$store.dispatch('adminPanel', { uuid: this.user_id });
},
async toggleAdminTools () {
if (this.adminToolsLoaded) {
this.adminToolsLoaded = false;
@@ -1315,9 +1308,6 @@ export default {
const status = this.achievementsCategories[categoryKey].open;
this.achievementsCategories[categoryKey].open = !status;
},
close () {
this.$root.$emit('bv::hide::modal', 'profile');
},
toggle () {
this.isOpened = !this.isOpen;
this.$emit('toggled', this.isOpened);
website/client/src/components/userMenu/profileModal.vue
+3 -4
View File
@@ -6,8 +6,7 @@
@hide="beforeHide"
@shown="onShown()"
>
<close-icon
class="close-icon"
<close-x
@click="close()"
/>
<profile
@@ -48,12 +47,12 @@
<script>
import profile from './profile';
import closeIcon from '../shared/closeIcon.vue';
import closeX from '../ui/closeX';
export default {
components: {
profile,
closeIcon,
closeX,
},
data () {
return {