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

apply status system changes

Browse Source
This commit is contained in:
pypy
2020-02-25 22:32:16 +09:00
parent 7dbd0d7006
commit 5a3068ccbc
4 changed files with 40 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
html/app.css
View File

@@ -303,14 +303,14 @@ a {
background: #67C23A; background: #67C23A;
} }
.x-friend-item>.avatar.inactive::after {
background: #FD9200;
}
.x-friend-item>.avatar.joinme::after { .x-friend-item>.avatar.joinme::after {
background: #409EFF; background: #409EFF;
} }
.x-friend-item>.avatar.askme::after {
background: #FD9200;
}
.x-friend-item>.avatar.busy::after { .x-friend-item>.avatar.busy::after {
background: #F56C6C; background: #F56C6C;
} }
@@ -374,14 +374,14 @@ i.x-user-status.active {
background: #67C23A; background: #67C23A;
} }
i.x-user-status.inactive {
background: #FD9200;
}
i.x-user-status.joinme { i.x-user-status.joinme {
background: #409EFF; background: #409EFF;
} }
i.x-user-status.askme {
background: #FD9200;
}
i.x-user-status.busy { i.x-user-status.busy {
background: #F56C6C; background: #F56C6C;
} }

2
html/app.dark.css
View File

@@ -278,7 +278,7 @@ For a copy, see <https://opensource.org/licenses/MIT>.
background: #3e3e3e; background: #3e3e3e;
} }
.x-friend-item>.avatar.active::after, .x-friend-item>.avatar.joinme::after, .x-friend-item>.avatar.busy::after { .x-friend-item>.avatar.active::after, .x-friend-item>.avatar.joinme::after, .x-friend-item>.avatar.askme::after, .x-friend-item>.avatar.busy::after {
border: 2px solid #000; border: 2px solid #000;
} }

15
html/app.js
View File

@@ -1098,7 +1098,7 @@ CefSharp.BindObjectAsync(
/* /*
params: { params: {
status: string ('active', 'join me', 'busy', 'offline'), status: string ('active', 'offline', 'busy', 'ask me', 'join me'),
statusDescription: string statusDescription: string
} }
*/ */
@@ -3756,17 +3756,20 @@ CefSharp.BindObjectAsync(
$app.methods.userStatusClass = function (user) { $app.methods.userStatusClass = function (user) {
var style = {}; var style = {};
if (user !== undefined) { if (user !== undefined) {
// due to social status, check if the user isn't currentUser if (user.location === 'offline') {
if (user.state === 'active' && // Offline
user.id !== API.currentUser.id) {
style.inactive = true;
} else if (user.location === 'offline') {
style.offline = true; style.offline = true;
} else if (user.status === 'active') { } else if (user.status === 'active') {
// Online
style.active = true; style.active = true;
} else if (user.status === 'join me') { } else if (user.status === 'join me') {
// Join Me
style.joinme = true; style.joinme = true;
} else if (user.status === 'ask me') {
// Ask Me
style.askme = true;
} else if (user.status === 'busy') { } else if (user.status === 'busy') {
// Do Not Disturb
style.busy = true; style.busy = true;
} }
} }

37
html/index.html
View File

@@ -128,9 +128,10 @@
<template v-else-if="scope.row.type === 'Status'"> <template v-else-if="scope.row.type === 'Status'">
<el-tooltip placement="top"> <el-tooltip placement="top">
<template #content> <template #content>
<span v-if="scope.row.status[1].status === 'active'">Active</span> <span v-if="scope.row.status[1].status === 'active'">Online</span>
<span v-else-if="scope.row.status[1].status === 'join me'">Join Me</span> <span v-else-if="scope.row.status[1].status === 'join me'">Join Me</span>
<span v-else-if="scope.row.status[1].status === 'busy'">Busy</span> <span v-else-if="scope.row.status[1].status === 'ask me'">Ask Me</span>
<span v-else-if="scope.row.status[1].status === 'busy'">Do Not Disturb</span>
<span v-else>Offline</span> <span v-else>Offline</span>
</template> </template>
<i class="x-user-status" :class="userStatusClass(scope.row.status[1])"></i> <i class="x-user-status" :class="userStatusClass(scope.row.status[1])"></i>
@@ -140,9 +141,10 @@
<span><i class="el-icon-right"></i></span> <span><i class="el-icon-right"></i></span>
<el-tooltip placement="top"> <el-tooltip placement="top">
<template #content> <template #content>
<span v-if="scope.row.status[0].status === 'active'">Active</span> <span v-if="scope.row.status[0].status === 'active'">Online</span>
<span v-else-if="scope.row.status[0].status === 'join me'">Join Me</span> <span v-else-if="scope.row.status[0].status === 'join me'">Join Me</span>
<span v-else-if="scope.row.status[0].status === 'busy'">Busy</span> <span v-else-if="scope.row.status[0].status === 'ask me'">Ask Me</span>
<span v-else-if="scope.row.status[0].status === 'busy'">Do Not Disturb</span>
<span v-else>Offline</span> <span v-else>Offline</span>
</template> </template>
<i class="x-user-status" :class="userStatusClass(scope.row.status[0])"></i> <i class="x-user-status" :class="userStatusClass(scope.row.status[0])"></i>
@@ -179,9 +181,10 @@
<template v-else-if="scope.row.type === 'Status'"> <template v-else-if="scope.row.type === 'Status'">
<el-tooltip placement="top"> <el-tooltip placement="top">
<template #content> <template #content>
<span v-if="scope.row.status[0].status === 'active'">Active</span> <span v-if="scope.row.status[0].status === 'active'">Online</span>
<span v-else-if="scope.row.status[0].status === 'join me'">Join Me</span> <span v-else-if="scope.row.status[0].status === 'join me'">Join Me</span>
<span v-else-if="scope.row.status[0].status === 'busy'">Busy</span> <span v-else-if="scope.row.status[0].status === 'ask me'">Ask Me</span>
<span v-else-if="scope.row.status[0].status === 'busy'">Do Not Disturb</span>
<span v-else>Offline</span> <span v-else>Offline</span>
</template> </template>
<i class="x-user-status" :class="userStatusClass(scope.row.status[0])"></i> <i class="x-user-status" :class="userStatusClass(scope.row.status[0])"></i>
@@ -585,9 +588,10 @@
<span class="extra"> <span class="extra">
<el-tooltip placement="top"> <el-tooltip placement="top">
<template #content> <template #content>
<span v-if="API.currentUser.status === 'active'">Active</span> <span v-if="API.currentUser.status === 'active'">Online</span>
<span v-else-if="API.currentUser.status === 'join me'">Join Me</span> <span v-else-if="API.currentUser.status === 'join me'">Join Me</span>
<span v-else-if="API.currentUser.status === 'busy'">Busy</span> <span v-else-if="API.currentUser.status === 'ask me'">Ask Me</span>
<span v-else-if="API.currentUser.status === 'busy'">Do Not Disturb</span>
<span v-else>Offline</span> <span v-else>Offline</span>
</template> </template>
<i class="x-user-status" :class="userStatusClass(API.currentUser)"></i> <i class="x-user-status" :class="userStatusClass(API.currentUser)"></i>
@@ -884,11 +888,11 @@
<div> <div>
<el-tooltip v-if="userDialog.ref.status" placement="top"> <el-tooltip v-if="userDialog.ref.status" placement="top">
<template #content> <template #content>
<span v-if="userDialog.ref.state === 'active'">Active</span> <span v-if="userDialog.ref.location === 'offline'">Offline</span>
<span v-else-if="userDialog.ref.location === 'offline'">Offline</span> <span v-else-if="userDialog.ref.status === 'active'">Online</span>
<span v-else-if="userDialog.ref.status === 'active'">Active</span>
<span v-else-if="userDialog.ref.status === 'join me'">Join Me</span> <span v-else-if="userDialog.ref.status === 'join me'">Join Me</span>
<span v-else-if="userDialog.ref.status === 'busy'">Busy</span> <span v-else-if="userDialog.ref.status === 'ask me'">Ask Me</span>
<span v-else-if="userDialog.ref.status === 'busy'">Do Not Disturb</span>
<span v-else>Offline</span> <span v-else>Offline</span>
</template> </template>
<i class="x-user-status" :class="userStatusClass(userDialog.ref)"></i> <i class="x-user-status" :class="userStatusClass(userDialog.ref)"></i>
@@ -1367,14 +1371,17 @@
<el-row v-loading="socialStatusDialog.loading"> <el-row v-loading="socialStatusDialog.loading">
<el-col :span="9"> <el-col :span="9">
<el-select v-model="socialStatusDialog.status"> <el-select v-model="socialStatusDialog.status">
<el-option label="Active" value="active"> <el-option label="Online" value="active">
<i class="x-user-status active"></i> Active <i class="x-user-status active"></i> Online
</el-option> </el-option>
<el-option label="Join Me" value="join me"> <el-option label="Join Me" value="join me">
<i class="x-user-status joinme"></i> Join Me <i class="x-user-status joinme"></i> Join Me
</el-option> </el-option>
<el-option label="Ask Me" value="ask me">
<i class="x-user-status askme"></i> Ask Me
</el-option>
<el-option label="Busy" value="busy"> <el-option label="Busy" value="busy">
<i class="x-user-status busy"></i> Busy <i class="x-user-status busy"></i> Do Not Disturb
</el-option> </el-option>
<el-option label="Offline" value="offline"> <el-option label="Offline" value="offline">
<i class="x-user-status offline"></i> Offline <i class="x-user-status offline"></i> Offline