diff --git a/src/mixins/dialogs/favoritesDialog.pug b/src/mixins/dialogs/favoritesDialog.pug index aee79ee5..22ea995f 100644 --- a/src/mixins/dialogs/favoritesDialog.pug +++ b/src/mixins/dialogs/favoritesDialog.pug @@ -22,24 +22,28 @@ mixin favoritesDialog @click='addFavorite(group)') {{ group.displayName }} ({{ group.count }} / {{ group.capacity }}) div(v-if='favoriteDialog.visible && favoriteDialog.type === "world"' style='margin-top: 20px') span(style='display: block; text-align: center') {{ $t('dialog.favorite.local_favorites') }} - template(v-for='group in localWorldFavoriteGroups' :key='group') + template(v-for='group in localWorldFavoriteGroups') el-button( v-if='hasLocalWorldFavorite(favoriteDialog.objectId, group)' + :key='group' style='display: block; width: 100%; margin: 10px 0' @click='removeLocalWorldFavorite(favoriteDialog.objectId, group)') #[i.el-icon-check] {{ group }} ({{ getLocalWorldFavoriteGroupLength(group) }}) el-button( v-else style='display: block; width: 100%; margin: 10px 0' + :key='group' @click='addLocalWorldFavorite(favoriteDialog.objectId, group)') {{ group }} ({{ getLocalWorldFavoriteGroupLength(group) }}) div(v-if='favoriteDialog.visible && favoriteDialog.type === "avatar"' style='margin-top: 20px') span(style='display: block; text-align: center') {{ $t('dialog.favorite.local_avatar_favorites') }} - template(v-for='group in localAvatarFavoriteGroups' :key='group') + template(v-for='group in localAvatarFavoriteGroups') el-button( v-if='hasLocalAvatarFavorite(favoriteDialog.objectId, group)' + :key='group' style='display: block; width: 100%; margin: 10px 0' @click='removeLocalAvatarFavorite(favoriteDialog.objectId, group)') #[i.el-icon-check] {{ group }} ({{ getLocalAvatarFavoriteGroupLength(group) }}) el-button( v-else + :key='group' style='display: block; width: 100%; margin: 10px 0' :disabled='!isLocalUserVrcplusSupporter()' @click='addLocalAvatarFavorite(favoriteDialog.objectId, group)') {{ group }} ({{ getLocalAvatarFavoriteGroupLength(group) }}) @@ -108,16 +112,17 @@ mixin favoritesDialog v-model='exportSelectedOptions' @change='updateWorldExportDialog()' style='margin-bottom: 10px') - template(v-for='option in exportSelectOptions' :key='option.value') - el-checkbox(:label='option.label') + template(v-for='option in exportSelectOptions') + el-checkbox(:key='option.value' :label='option.label') el-dropdown(@click.native.stop trigger='click' size='small') el-button(size='mini') span(v-if='worldExportFavoriteGroup') {{ worldExportFavoriteGroup.displayName }} ({{ worldExportFavoriteGroup.count }}/{{ worldExportFavoriteGroup.capacity }}) #[i.el-icon-arrow-down.el-icon--right] span(v-else) All Favorites #[i.el-icon-arrow-down.el-icon--right] el-dropdown-menu(#default='dropdown') el-dropdown-item(style='display: block; margin: 10px 0' @click.native='selectWorldExportGroup(null)') None - template(v-for='groupAPI in API.favoriteWorldGroups' :key='groupAPI.name') + template(v-for='groupAPI in API.favoriteWorldGroups') el-dropdown-item( + :key='groupAPI.name' style='display: block; margin: 10px 0' @click.native='selectWorldExportGroup(groupAPI)') {{ groupAPI.displayName }} ({{ groupAPI.count }}/{{ groupAPI.capacity }}) el-dropdown(@click.native.stop trigger='click' size='small' style='margin-left: 10px') @@ -125,9 +130,12 @@ mixin favoritesDialog span(v-if='worldExportLocalFavoriteGroup') {{ worldExportLocalFavoriteGroup }} ({{ getLocalWorldFavoriteGroupLength(worldExportLocalFavoriteGroup) }}) #[i.el-icon-arrow-down.el-icon--right] span(v-else) Select Group #[i.el-icon-arrow-down.el-icon--right] el-dropdown-menu(#default='dropdown') - el-dropdown-item(style='display: block; margin: 10px 0' @click.native='selectWorldExportLocalGroup(null)') None - template(v-for='group in localWorldFavoriteGroups' :key='group') + el-dropdown-item( + style='display: block; margin: 10px 0' + @click.native='selectWorldExportLocalGroup(null)') None + template(v-for='group in localWorldFavoriteGroups') el-dropdown-item( + :key='group' style='display: block; margin: 10px 0' @click.native='selectWorldExportLocalGroup(group)') {{ group }} ({{ localWorldFavorites[group].length }}) br @@ -171,8 +179,9 @@ mixin favoritesDialog span(v-if='worldImportDialog.worldImportFavoriteGroup') {{ worldImportDialog.worldImportFavoriteGroup.displayName }} ({{ worldImportDialog.worldImportFavoriteGroup.count }}/{{ worldImportDialog.worldImportFavoriteGroup.capacity }}) #[i.el-icon-arrow-down.el-icon--right] span(v-else) {{ $t('dialog.world_import.select_vrchat_group_placeholder') }} #[i.el-icon-arrow-down.el-icon--right] el-dropdown-menu(#default='dropdown') - template(v-for='groupAPI in API.favoriteWorldGroups' :key='groupAPI.name') + template(v-for='groupAPI in API.favoriteWorldGroups') el-dropdown-item( + :key='groupAPI.name' style='display: block; margin: 10px 0' @click.native='selectWorldImportGroup(groupAPI)' :disabled='groupAPI.count >= groupAPI.capacity') {{ groupAPI.displayName }} ({{ groupAPI.count }}/{{ groupAPI.capacity }}) @@ -181,8 +190,9 @@ mixin favoritesDialog span(v-if='worldImportDialog.worldImportLocalFavoriteGroup') {{ worldImportDialog.worldImportLocalFavoriteGroup }} ({{ getLocalWorldFavoriteGroupLength(worldImportDialog.worldImportLocalFavoriteGroup) }}) #[i.el-icon-arrow-down.el-icon--right] span(v-else) {{ $t('dialog.world_import.select_local_group_placeholder') }} #[i.el-icon-arrow-down.el-icon--right] el-dropdown-menu(#default='dropdown') - template(v-for='group in localWorldFavoriteGroups' :key='group') + template(v-for='group in localWorldFavoriteGroups') el-dropdown-item( + :key='group' style='display: block; margin: 10px 0' @click.native='selectWorldImportLocalGroup(group)') {{ group }} ({{ getLocalWorldFavoriteGroupLength(group) }}) span(v-if='worldImportDialog.worldImportFavoriteGroup' style='margin-left: 5px') {{ worldImportTable.data.length }} / {{ worldImportDialog.worldImportFavoriteGroup.capacity - worldImportDialog.worldImportFavoriteGroup.count }} @@ -241,16 +251,17 @@ mixin favoritesDialog v-model='exportSelectedOptions' @change='updateAvatarExportDialog()' style='margin-bottom: 10px') - template(v-for='option in exportSelectOptions' :key='option.value') - el-checkbox(:label='option.label') + template(v-for='option in exportSelectOptions') + el-checkbox(:key='option.value' :label='option.label') el-dropdown(@click.native.stop trigger='click' size='small') el-button(size='mini') span(v-if='avatarExportFavoriteGroup') {{ avatarExportFavoriteGroup.displayName }} ({{ avatarExportFavoriteGroup.count }}/{{ avatarExportFavoriteGroup.capacity }}) #[i.el-icon-arrow-down.el-icon--right] span(v-else) All Favorites #[i.el-icon-arrow-down.el-icon--right] el-dropdown-menu(#default='dropdown') el-dropdown-item(style='display: block; margin: 10px 0' @click.native='selectAvatarExportGroup(null)') All Favorites - template(v-for='groupAPI in API.favoriteAvatarGroups' :key='groupAPI.name') + template(v-for='groupAPI in API.favoriteAvatarGroups') el-dropdown-item( + :key='groupAPI.name' style='display: block; margin: 10px 0' @click.native='selectAvatarExportGroup(groupAPI)') {{ groupAPI.displayName }} ({{ groupAPI.count }}/{{ groupAPI.capacity }}) el-dropdown(@click.native.stop trigger='click' size='small' style='margin-left: 10px') @@ -261,8 +272,9 @@ mixin favoritesDialog el-dropdown-item( style='display: block; margin: 10px 0' @click.native='selectAvatarExportLocalGroup(null)') None - template(v-for='group in localAvatarFavoriteGroups' :key='group') + template(v-for='group in localAvatarFavoriteGroups') el-dropdown-item( + :key='group' style='display: block; margin: 10px 0' @click.native='selectAvatarExportLocalGroup(group)') {{ group }} ({{ getLocalAvatarFavoriteGroupLength(group) }}) br @@ -306,8 +318,9 @@ mixin favoritesDialog span(v-if='avatarImportDialog.avatarImportFavoriteGroup') {{ avatarImportDialog.avatarImportFavoriteGroup.displayName }} ({{ avatarImportDialog.avatarImportFavoriteGroup.count }}/{{ avatarImportDialog.avatarImportFavoriteGroup.capacity }}) #[i.el-icon-arrow-down.el-icon--right] span(v-else) {{ $t('dialog.avatar_import.select_group_placeholder') }} #[i.el-icon-arrow-down.el-icon--right] el-dropdown-menu(#default='dropdown') - template(v-for='groupAPI in API.favoriteAvatarGroups' :key='groupAPI.name') + template(v-for='groupAPI in API.favoriteAvatarGroups') el-dropdown-item( + :key='groupAPI.name' style='display: block; margin: 10px 0' @click.native='selectAvatarImportGroup(groupAPI)' :disabled='groupAPI.count >= groupAPI.capacity') {{ groupAPI.displayName }} ({{ groupAPI.count }}/{{ groupAPI.capacity }}) @@ -316,8 +329,9 @@ mixin favoritesDialog span(v-if='avatarImportDialog.avatarImportLocalFavoriteGroup') {{ avatarImportDialog.avatarImportLocalFavoriteGroup }} ({{ getLocalAvatarFavoriteGroupLength(avatarImportDialog.avatarImportLocalFavoriteGroup) }}) #[i.el-icon-arrow-down.el-icon--right] span(v-else) {{ $t('dialog.avatar_import.select_group_placeholder') }} #[i.el-icon-arrow-down.el-icon--right] el-dropdown-menu(#default='dropdown') - template(v-for='group in localAvatarFavoriteGroups' :key='group') + template(v-for='group in localAvatarFavoriteGroups') el-dropdown-item( + :key='group' style='display: block; margin: 10px 0' @click.native='selectAvatarImportLocalGroup(group)') {{ group }} ({{ getLocalAvatarFavoriteGroupLength(group) }}) span(v-if='avatarImportDialog.avatarImportFavoriteGroup' style='margin-left: 5px') {{ avatarImportTable.data.length }} / {{ avatarImportDialog.avatarImportFavoriteGroup.capacity - avatarImportDialog.avatarImportFavoriteGroup.count }} @@ -378,8 +392,9 @@ mixin favoritesDialog span(v-else) All Favorites #[i.el-icon-arrow-down.el-icon--right] el-dropdown-menu(#default='dropdown') el-dropdown-item(style='display: block; margin: 10px 0' @click.native='selectFriendExportGroup(null)') All Favorites - template(v-for='groupAPI in API.favoriteFriendGroups' :key='groupAPI.name') + template(v-for='groupAPI in API.favoriteFriendGroups') el-dropdown-item( + :key='groupAPI.name' style='display: block; margin: 10px 0' @click.native='selectFriendExportGroup(groupAPI)') {{ groupAPI.displayName }} ({{ groupAPI.count }}/{{ groupAPI.capacity }}) br @@ -423,8 +438,9 @@ mixin favoritesDialog span(v-if='friendImportDialog.friendImportFavoriteGroup') {{ friendImportDialog.friendImportFavoriteGroup.displayName }} ({{ friendImportDialog.friendImportFavoriteGroup.count }}/{{ friendImportDialog.friendImportFavoriteGroup.capacity }}) #[i.el-icon-arrow-down.el-icon--right] span(v-else) {{ $t('dialog.friend_import.select_group_placeholder') }} #[i.el-icon-arrow-down.el-icon--right] el-dropdown-menu(#default='dropdown') - template(v-for='groupAPI in API.favoriteFriendGroups' :key='groupAPI.name') + template(v-for='groupAPI in API.favoriteFriendGroups') el-dropdown-item( + :key='groupAPI.name' style='display: block; margin: 10px 0' @click.native='selectFriendImportGroup(groupAPI)' :disabled='groupAPI.count >= groupAPI.capacity') {{ groupAPI.displayName }} ({{ groupAPI.count }}/{{ groupAPI.capacity }}) diff --git a/src/mixins/dialogs/groupDialog.pug b/src/mixins/dialogs/groupDialog.pug index c77a2c4c..d1975aa9 100644 --- a/src/mixins/dialogs/groupDialog.pug +++ b/src/mixins/dialogs/groupDialog.pug @@ -344,7 +344,7 @@ mixin groupDialog template(#content) span {{ $t('dialog.group.posts.visibility') }} br - template(v-for='roleId in groupDialog.announcement.roleIds' :key='roleId') + template(v-for='roleId in groupDialog.announcement.roleIds') span( v-for='(role, rIndex) in groupDialog.ref.roles' :key='rIndex' @@ -454,8 +454,8 @@ mixin groupDialog span.name {{ $t('dialog.group.info.roles') }} span.extra(v-if='groupDialog.memberRoles.length === 0') - span.extra(v-else) - template(v-for='(role, rIndex) in groupDialog.memberRoles' :key='rIndex') - el-tooltip(placement='top') + template(v-for='(role, rIndex) in groupDialog.memberRoles') + el-tooltip(:key='rIndex' placement='top') template(#content) span {{ $t('dialog.group.info.role') }} {{ role.name }} br @@ -507,7 +507,7 @@ mixin groupDialog template(#content) span {{ $t('dialog.group.posts.visibility') }} br - template(v-for='roleId in post.roleIds' :key='roleId') + template(v-for='roleId in post.roleIds') span( v-for='(role, rIndex) in groupDialog.ref.roles' :key='rIndex' @@ -586,6 +586,7 @@ mixin groupDialog el-dropdown-menu(#default='dropdown') el-dropdown-item( v-for='item in groupDialogSortingOptions' + :key='item.name' v-text='item.name' @click.native='setGroupMemberSortOrder(item)') span(style='margin-right: 5px') {{ $t('dialog.group.members.filter') }} @@ -600,10 +601,12 @@ mixin groupDialog el-dropdown-menu(#default='dropdown') el-dropdown-item( v-for='item in groupDialogFilterOptions' + :key='item.name' v-text='item.name' @click.native='setGroupMemberFilter(item)') el-dropdown-item( v-for='item in groupDialog.ref.roles' + :key='item.name' v-if='!item.defaultRole' v-text='item.name' @click.native='setGroupMemberFilter(item)') @@ -648,7 +651,7 @@ mixin groupDialog br span {{ user.managerNotes }} i.el-icon-edit-outline(style='margin-right: 5px') - template(v-for='roleId in user.roleIds' :key='roleId') + template(v-for='roleId in user.roleIds') span( v-for='(role, rIndex) in groupDialog.ref.roles' :key='rIndex' @@ -689,7 +692,7 @@ mixin groupDialog br span {{ user.managerNotes }} i.el-icon-edit-outline(style='margin-right: 5px') - template(v-for='roleId in user.roleIds' :key='roleId') + template(v-for='roleId in user.roleIds') span( v-for='(role, rIndex) in groupDialog.ref.roles' :key='rIndex' diff --git a/src/mixins/dialogs/groups.pug b/src/mixins/dialogs/groups.pug index c8a9ce0f..ea949da2 100644 --- a/src/mixins/dialogs/groups.pug +++ b/src/mixins/dialogs/groups.pug @@ -149,6 +149,7 @@ mixin groups el-dropdown-menu(#default='dropdown') el-dropdown-item( v-for='item in groupDialogSortingOptions' + :key='item.name' v-text='item.name' @click.native='setGroupMemberSortOrder(item)') span(style='margin-right: 5px') {{ $t('dialog.group.members.filter') }} @@ -163,10 +164,12 @@ mixin groups el-dropdown-menu(#default='dropdown') el-dropdown-item( v-for='item in groupDialogFilterOptions' + :key='item.name' v-text='item.name' @click.native='setGroupMemberFilter(item)') el-dropdown-item( v-for='item in groupDialog.ref.roles' + :key='item.name' v-if='!item.defaultRole' v-text='item.name' @click.native='setGroupMemberFilter(item)') @@ -209,7 +212,7 @@ mixin groups span(v-else v-text='scope.row.user.displayName') el-table-column(:label='$t("dialog.group_member_moderation.roles")' prop='roleIds' sortable) template(#default='scope') - template(v-for='roleId in scope.row.roleIds' :key='roleId') + template(v-for='roleId in scope.row.roleIds') span( v-for='(role, rIndex) in groupMemberModeration.groupRef.roles' :key='rIndex' @@ -286,7 +289,7 @@ mixin groups span(v-else v-text='scope.row.user.displayName') el-table-column(:label='$t("dialog.group_member_moderation.roles")' prop='roleIds' sortable) template(#default='scope') - template(v-for='roleId in scope.row.roleIds' :key='roleId') + template(v-for='roleId in scope.row.roleIds') span( v-for='(role, rIndex) in groupMemberModeration.groupRef.roles' :key='rIndex' @@ -726,8 +729,8 @@ mixin groups v-model='checkedGroupLogsExportLogsOptions' @change='updateGrouptLogsExporContent()' style='margin-bottom: 10px') - template(v-for='option in checkGroupsLogsExportLogsOptions' :key='option.label') - el-checkbox(:label='option.label') {{ $t(option.text) }} + template(v-for='option in checkGroupsLogsExportLogsOptions') + el-checkbox(:key='option.label' :label='option.label') {{ $t(option.text) }} br el-input( type='textarea' diff --git a/src/mixins/friendsListSidebar.pug b/src/mixins/friendsListSidebar.pug index 1dc01a39..6d938634 100644 --- a/src/mixins/friendsListSidebar.pug +++ b/src/mixins/friendsListSidebar.pug @@ -38,7 +38,7 @@ mixin friendsListSidebar icon='el-icon-refresh' circle style='margin-right: 10px') - el-tabs.zero-margin-tabs(stretch='true' style='height: calc(100% - 60px); margin-top: 5px') + el-tabs.zero-margin-tabs(stretch style='height: calc(100% - 60px); margin-top: 5px') el-tab-pane template(#label) span {{ $t('side_panel.friends') }} diff --git a/src/mixins/tabs/settings.pug b/src/mixins/tabs/settings.pug index f931e1e7..0cd4b778 100644 --- a/src/mixins/tabs/settings.pug +++ b/src/mixins/tabs/settings.pug @@ -223,6 +223,7 @@ mixin settingsTab el-dropdown-menu(#default='dropdown') el-dropdown-item( v-for='(obj, language) in $i18n.messages' + :key='language' v-text='obj.language' @click.native='changeAppLanguage(language)') .options-container-item @@ -294,6 +295,7 @@ mixin settingsTab el-dropdown-menu(#default='dropdown') el-dropdown-item( v-for='number in [10, 15, 25, 50, 100]' + :key='number' v-text='number' @click.native='setTablePageSize(number)') .options-container-item diff --git a/webpack.config.js b/webpack.config.js index fc4ed45f..8b37bbe6 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -73,10 +73,7 @@ module.exports = { resolve: { extensions: ['.css', '.js', '.scss'], alias: { - vue: path.join( - __dirname, - './node_modules/vue/dist/vue.common.prod.js' - ) + vue: 'vue/dist/vue.common.js' } }, performance: {