MrUnknownDE/VRCX
1
0
Fork 0
mirror of https://github.com/MrUnknownDE/VRCX.git synced 2026-04-19 14:53:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix: Make userDialog group icon background transparent

Browse Source 
and fixed some vue's error
This commit is contained in:
pa
2025-02-12 12:21:36 +09:00
committed by Natsumi
parent 60d8d7682f
commit 2c59b69720
5 changed files with 33 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/mixins/dialogs/groupDialog.pug
View File

@@ -466,10 +466,8 @@ mixin groupDialog
br br
span {{ $t('dialog.group.info.role_permissions') }} span {{ $t('dialog.group.info.role_permissions') }}
br br
template( template(v-for='(permission, pIndex) in role.permissions')
v-for='(permission, pIndex) in role.permissions' span(:key='pIndex') {{ permission }}
:key='pIndex')
span {{ permission }}
br br
span {{ role.name }}{{ rIndex < groupDialog.memberRoles.length - 1 ? ', ' : '' }} span {{ role.name }}{{ rIndex < groupDialog.memberRoles.length - 1 ? ', ' : '' }}
el-tab-pane(:label='$t("dialog.group.posts.header")') el-tab-pane(:label='$t("dialog.group.posts.header")')

13
src/mixins/dialogs/userDialog.pug
View File

@@ -154,8 +154,8 @@ mixin userDialog
:style='{ color: userDialog.ref.$customTagColour, "border-color": userDialog.ref.$customTagColour }' :style='{ color: userDialog.ref.$customTagColour, "border-color": userDialog.ref.$customTagColour }'
style='margin-right: 5px; margin-top: 5px') style='margin-right: 5px; margin-top: 5px')
br br
template(v-for='badge in userDialog.ref.badges' :key='badge.badgeId') template(v-for='badge in userDialog.ref.badges')
el-tooltip(placement='top') el-tooltip(placement='top' :key='badge.badgeId')
template(#content) template(#content)
span {{ badge.badgeName }} span {{ badge.badgeName }}
span(v-if='badge.hidden') &nbsp;(Hidden) span(v-if='badge.hidden') &nbsp;(Hidden)
@@ -324,7 +324,7 @@ mixin userDialog
divided divided
style='color: #f56c6c') {{ $t('dialog.user.actions.unfriend') }} style='color: #f56c6c') {{ $t('dialog.user.actions.unfriend') }}
el-tabs(ref='userDialogTabs' @tab-click='userDialogTabClick') el-tabs(ref='userDialogTabs' @tab-click='userDialogTabClick')
el-tab-pane(:label='$t("dialog.user.info.header")' lazy) el-tab-pane(:label='$t("dialog.user.info.header")')
template(v-if='isFriendOnline(userDialog.friend) || API.currentUser.id === userDialog.id') template(v-if='isFriendOnline(userDialog.friend) || API.currentUser.id === userDialog.id')
div( div(
v-if='userDialog.ref.location' v-if='userDialog.ref.location'
@@ -459,7 +459,8 @@ mixin userDialog
slot='reference' slot='reference'
v-loading='userDialog.isRepresentedGroupLoading' v-loading='userDialog.isRepresentedGroupLoading'
:src='userDialog.representedGroup.iconUrl' :src='userDialog.representedGroup.iconUrl'
style='flex: none; width: 60px; height: 60px; border-radius: 4px; object-fit: cover; background: #f5f7fa' style='flex: none; width: 60px; height: 60px; border-radius: 4px; object-fit: cover'
:style='{ background: userDialog.isRepresentedGroupLoading ? "#f5f7fa" : "" }'
@load='userDialog.isRepresentedGroupLoading = false') @load='userDialog.isRepresentedGroupLoading = false')
div(slot='error') div(slot='error')
img.x-link( img.x-link(
@@ -922,8 +923,8 @@ mixin userDialog
ref='favoriteWorlds' ref='favoriteWorlds'
v-loading='userDialog.isFavoriteWorldsLoading' v-loading='userDialog.isFavoriteWorldsLoading'
style='margin-top: 10px') style='margin-top: 10px')
template(v-for='(list, index) in userFavoriteWorlds' :key='index') template(v-for='(list, index) in userFavoriteWorlds')
el-tab-pane(lazy) el-tab-pane(:key='index' lazy)
span(slot='label') span(slot='label')
span(v-text='list[0]' style='font-weight: bold; font-size: 16px') span(v-text='list[0]' style='font-weight: bold; font-size: 16px')
i.x-status-icon( i.x-status-icon(

22
src/mixins/tabs/favorites.pug
View File

@@ -89,9 +89,9 @@ mixin favoritesTab
el-dropdown-menu(#default='dropdown') el-dropdown-menu(#default='dropdown')
template( template(
v-if='groupAPI.name !== group.name' v-if='groupAPI.name !== group.name'
v-for='groupAPI in API.favoriteFriendGroups' v-for='groupAPI in API.favoriteFriendGroups')
:key='groupAPI.name')
el-dropdown-item( el-dropdown-item(
:key='groupAPI.name'
style='display: block; margin: 10px 0' style='display: block; margin: 10px 0'
@click.native='moveFavorite(favorite.ref, groupAPI, "friend")' @click.native='moveFavorite(favorite.ref, groupAPI, "friend")'
:disabled='groupAPI.count >= groupAPI.capacity') {{ groupAPI.displayName }} ({{ groupAPI.count }} / {{ groupAPI.capacity }}) :disabled='groupAPI.count >= groupAPI.capacity') {{ groupAPI.displayName }} ({{ groupAPI.count }} / {{ groupAPI.capacity }})
@@ -245,9 +245,9 @@ mixin favoritesTab
el-dropdown-menu(#default='dropdown') el-dropdown-menu(#default='dropdown')
template( template(
v-if='groupAPI.name !== group.name' v-if='groupAPI.name !== group.name'
v-for='groupAPI in API.favoriteWorldGroups' v-for='groupAPI in API.favoriteWorldGroups')
:key='groupAPI.name')
el-dropdown-item( el-dropdown-item(
:key='groupAPI.name'
style='display: block; margin: 10px 0' style='display: block; margin: 10px 0'
@click.native='moveFavorite(favorite.ref, groupAPI, "world")' @click.native='moveFavorite(favorite.ref, groupAPI, "world")'
:disabled='groupAPI.count >= groupAPI.capacity') {{ groupAPI.displayName }} ({{ groupAPI.count }} / {{ groupAPI.capacity }}) :disabled='groupAPI.count >= groupAPI.capacity') {{ groupAPI.displayName }} ({{ groupAPI.count }} / {{ groupAPI.capacity }})
@@ -378,10 +378,9 @@ mixin favoritesTab
:disabled='hideTooltips') :disabled='hideTooltips')
el-button(type='default' icon='el-icon-back' size='mini' circle) el-button(type='default' icon='el-icon-back' size='mini' circle)
el-dropdown-menu(#default='dropdown') el-dropdown-menu(#default='dropdown')
template( template(v-for='groupAPI in API.favoriteWorldGroups')
v-for='groupAPI in API.favoriteWorldGroups'
:key='groupAPI.name')
el-dropdown-item( el-dropdown-item(
:key='groupAPI.name'
style='display: block; margin: 10px 0' style='display: block; margin: 10px 0'
@click.native='addFavoriteWorld(favorite, groupAPI, true)' @click.native='addFavoriteWorld(favorite, groupAPI, true)'
:disabled='groupAPI.count >= groupAPI.capacity') {{ groupAPI.displayName }} ({{ groupAPI.count }} / {{ groupAPI.capacity }}) :disabled='groupAPI.count >= groupAPI.capacity') {{ groupAPI.displayName }} ({{ groupAPI.count }} / {{ groupAPI.capacity }})
@@ -521,9 +520,9 @@ mixin favoritesTab
el-dropdown-menu(#default='dropdown') el-dropdown-menu(#default='dropdown')
template( template(
v-if='groupAPI.name !== group.name' v-if='groupAPI.name !== group.name'
v-for='groupAPI in API.favoriteAvatarGroups' v-for='groupAPI in API.favoriteAvatarGroups')
:key='groupAPI.name')
el-dropdown-item( el-dropdown-item(
:key='groupAPI.name'
style='display: block; margin: 10px 0' style='display: block; margin: 10px 0'
@click.native='moveFavorite(favorite.ref, groupAPI, "avatar")' @click.native='moveFavorite(favorite.ref, groupAPI, "avatar")'
:disabled='groupAPI.count >= groupAPI.capacity') {{ groupAPI.displayName }} ({{ groupAPI.count }} / {{ groupAPI.capacity }}) :disabled='groupAPI.count >= groupAPI.capacity') {{ groupAPI.displayName }} ({{ groupAPI.count }} / {{ groupAPI.capacity }})
@@ -709,10 +708,9 @@ mixin favoritesTab
:disabled='hideTooltips') :disabled='hideTooltips')
el-button(type='default' icon='el-icon-back' size='mini' circle) el-button(type='default' icon='el-icon-back' size='mini' circle)
el-dropdown-menu(#default='dropdown') el-dropdown-menu(#default='dropdown')
template( template(v-for='groupAPI in API.favoriteAvatarGroups')
v-for='groupAPI in API.favoriteAvatarGroups'
:key='groupAPI.name')
el-dropdown-item( el-dropdown-item(
:key='groupAPI.name'
style='display: block; margin: 10px 0' style='display: block; margin: 10px 0'
@click.native='addFavoriteAvatar(favorite, groupAPI, true)' @click.native='addFavoriteAvatar(favorite, groupAPI, true)'
:disabled='groupAPI.count >= groupAPI.capacity') {{ groupAPI.displayName }} ({{ groupAPI.count }} / {{ groupAPI.capacity }}) :disabled='groupAPI.count >= groupAPI.capacity') {{ groupAPI.displayName }} ({{ groupAPI.count }} / {{ groupAPI.capacity }})

18
src/mixins/tabs/playerList.pug
View File

@@ -80,17 +80,13 @@ mixin playerListTab
effect='plain' effect='plain'
size='mini' size='mini'
style='margin-right: 5px') style='margin-right: 5px')
span(v-text='currentInstanceWorld.cacheSize') span(v-text='currentInstanceWorld.cacheSize') {{ $t('dialog.world.tags.cache') }}
|
| {{ $t('dialog.world.tags.cache') }}
div(style='margin-top: 5px') div(style='margin-top: 5px')
location-world( location-world(
:locationobject='currentInstanceLocation' :locationobject='currentInstanceLocation'
:currentuserid='API.currentUser.id') :currentuserid='API.currentUser.id')
span(v-if='lastLocation.playerList.size > 0' style='margin-left: 5px') span(v-if='lastLocation.playerList.size > 0' style='margin: 0 5px') {{ lastLocation.playerList.size }} {{ `(${lastLocation.friendList.size})` }}
| {{ lastLocation.playerList.size }} timer(v-if='lastLocation.date' :epoch='lastLocation.date')
| #[template(v-if='lastLocation.friendList.size > 0') ({{ lastLocation.friendList.size }})]
| &nbsp;&horbar; #[timer(v-if='lastLocation.date' :epoch='lastLocation.date')]
div(style='margin-top: 5px') div(style='margin-top: 5px')
span( span(
v-show='currentInstanceWorld.ref.name !== currentInstanceWorld.ref.description' v-show='currentInstanceWorld.ref.name !== currentInstanceWorld.ref.description'
@@ -173,9 +169,7 @@ mixin playerListTab
span.avatar-info-public(v-if='scope.row.avatar.releaseStatus === "public"') {{ $t('dialog.avatar.labels.public') }} span.avatar-info-public(v-if='scope.row.avatar.releaseStatus === "public"') {{ $t('dialog.avatar.labels.public') }}
span.avatar-info-own(v-else-if='scope.row.avatar.releaseStatus === "private"') {{ $t('dialog.avatar.labels.private') }} span.avatar-info-own(v-else-if='scope.row.avatar.releaseStatus === "private"') {{ $t('dialog.avatar.labels.private') }}
template( template(
v-if='scope.row.avatar.description && scope.row.avatar.name !== scope.row.avatar.description') v-if='scope.row.avatar.description && scope.row.avatar.name !== scope.row.avatar.description') {{ scope.row.avatar.description }}
|
| - {{ scope.row.avatar.description }}
template(v-else-if='scope.row.type === "ChangeStatus"') template(v-else-if='scope.row.type === "ChangeStatus"')
template(v-if='scope.row.status !== scope.row.previousStatus') template(v-if='scope.row.status !== scope.row.previousStatus')
el-tooltip(placement='top') el-tooltip(placement='top')
@@ -285,9 +279,7 @@ mixin playerListTab
span.avatar-info-public(v-if='scope.row.avatar.releaseStatus === "public"') {{ $t('dialog.avatar.labels.public') }} span.avatar-info-public(v-if='scope.row.avatar.releaseStatus === "public"') {{ $t('dialog.avatar.labels.public') }}
span.avatar-info-own(v-else-if='scope.row.avatar.releaseStatus === "private"') {{ $t('dialog.avatar.labels.private') }} span.avatar-info-own(v-else-if='scope.row.avatar.releaseStatus === "private"') {{ $t('dialog.avatar.labels.private') }}
template( template(
v-if='scope.row.avatar.description && scope.row.avatar.name !== scope.row.avatar.description') v-if='scope.row.avatar.description && scope.row.avatar.name !== scope.row.avatar.description') {{ scope.row.avatar.description }}
|
| - {{ scope.row.avatar.description }}
template(v-else-if='scope.row.type === "ChangeStatus"') template(v-else-if='scope.row.type === "ChangeStatus"')
template(v-if='scope.row.status !== scope.row.previousStatus') template(v-if='scope.row.status !== scope.row.previousStatus')
el-tooltip(placement='top') el-tooltip(placement='top')

11
webpack.config.js
View File

@@ -115,13 +115,20 @@ module.exports = {
to: './images/' to: './images/'
} }
] ]
}) }),
new webpack.ProgressPlugin({})
], ],
optimization: { optimization: {
minimizer: [ minimizer: [
new TerserPlugin({ new TerserPlugin({
extractComments: false extractComments: false,
terserOptions: {
ecma: 2020
}
}) })
] ]
},
watchOptions: {
ignored: /node_modules/
} }
}; };