From aae8687c4755e3a4e126033ede287c568793de1e Mon Sep 17 00:00:00 2001 From: Natsumi Date: Mon, 19 Jul 2021 16:11:41 +1200 Subject: [PATCH] Small changes --- html/src/app.scss | 6 +- html/src/index.pug | 98 ++++++++++++++++----------------- html/src/repository/database.js | 7 ++- 3 files changed, 58 insertions(+), 53 deletions(-) diff --git a/html/src/app.scss b/html/src/app.scss index 9ca58941..e1284be9 100644 --- a/html/src/app.scss +++ b/html/src/app.scss @@ -540,10 +540,14 @@ i.x-user-status.busy { font-size: 15px; } +.toggle-list .toggle-item { + margin-bottom: 5px; +} + .toggle-list .toggle-name { display: inline-block; min-width: 170px; - padding: 2px 5px 2px 0; + padding-right: 5px; text-align: right; } diff --git a/html/src/index.pug b/html/src/index.pug index 6cdcec6b..39fae468 100644 --- a/html/src/index.pug +++ b/html/src/index.pug @@ -1752,141 +1752,141 @@ html //- dialog: Noty feed filters el-dialog.x-dialog(ref="notyFeedFiltersDialog" :visible.sync="notyFeedFiltersDialog.visible" title="Notification Filters" width="480px") - div.toggle-list - div + .toggle-list + .toggle-item span.toggle-name OnPlayerJoining el-radio-group(v-model="sharedFeedFilters.noty.OnPlayerJoining" size="mini") el-radio-button(label="Off") el-radio-button(label="VIP") el-radio-button(label="Friends") - div + .toggle-item span.toggle-name OnPlayerJoined el-radio-group(v-model="sharedFeedFilters.noty.OnPlayerJoined" size="mini") el-radio-button(label="Off") el-radio-button(label="VIP") el-radio-button(label="Friends") el-radio-button(label="Everyone") - div + .toggle-item span.toggle-name OnPlayerLeft el-radio-group(v-model="sharedFeedFilters.noty.OnPlayerLeft" size="mini") el-radio-button(label="Off") el-radio-button(label="VIP") el-radio-button(label="Friends") el-radio-button(label="Everyone") - div + .toggle-item span.toggle-name Online el-radio-group(v-model="sharedFeedFilters.noty.Online" size="mini") el-radio-button(label="Off") el-radio-button(label="VIP") el-radio-button(label="Friends") - div + .toggle-item span.toggle-name Offline el-radio-group(v-model="sharedFeedFilters.noty.Offline" size="mini") el-radio-button(label="Off") el-radio-button(label="VIP") el-radio-button(label="Friends") - div + .toggle-item span.toggle-name GPS el-radio-group(v-model="sharedFeedFilters.noty.GPS" size="mini") el-radio-button(label="Off") el-radio-button(label="VIP") el-radio-button(label="Friends") - div + .toggle-item span.toggle-name Status el-radio-group(v-model="sharedFeedFilters.noty.Status" size="mini") el-radio-button(label="Off") el-radio-button(label="VIP") el-radio-button(label="Friends") - div + .toggle-item span.toggle-name Invite el-radio-group(v-model="sharedFeedFilters.noty.invite" size="mini") el-radio-button(label="Off") el-radio-button(label="VIP") el-radio-button(label="Friends") - div + .toggle-item span.toggle-name Request Invite el-radio-group(v-model="sharedFeedFilters.noty.requestInvite" size="mini") el-radio-button(label="Off") el-radio-button(label="VIP") el-radio-button(label="Friends") - div + .toggle-item span.toggle-name Invite Response el-radio-group(v-model="sharedFeedFilters.noty.inviteResponse" size="mini") el-radio-button(label="Off") el-radio-button(label="VIP") el-radio-button(label="Friends") - div + .toggle-item span.toggle-name Request Invite Response el-radio-group(v-model="sharedFeedFilters.noty.requestInviteResponse" size="mini") el-radio-button(label="Off") el-radio-button(label="VIP") el-radio-button(label="Friends") - div + .toggle-item span.toggle-name Friend Request el-radio-group(v-model="sharedFeedFilters.noty.friendRequest" size="mini") el-radio-button(label="Off") el-radio-button(label="On") - div + .toggle-item span.toggle-name New Friend el-radio-group(v-model="sharedFeedFilters.noty.Friend" size="mini") el-radio-button(label="Off") el-radio-button(label="On") - div + .toggle-item span.toggle-name Unfriend el-radio-group(v-model="sharedFeedFilters.noty.Unfriend" size="mini") el-radio-button(label="Off") el-radio-button(label="On") - div + .toggle-item span.toggle-name Display Name el-radio-group(v-model="sharedFeedFilters.noty.DisplayName" size="mini") el-radio-button(label="Off") el-radio-button(label="VIP") el-radio-button(label="Friends") - div + .toggle-item span.toggle-name Trust Level el-radio-group(v-model="sharedFeedFilters.noty.TrustLevel" size="mini") el-radio-button(label="Off") el-radio-button(label="VIP") el-radio-button(label="Friends") - div + .toggle-item span.toggle-name Portal Spawn el-radio-group(v-model="sharedFeedFilters.noty.PortalSpawn" size="mini") el-radio-button(label="Off") el-radio-button(label="VIP") el-radio-button(label="Friends") el-radio-button(label="Everyone") - div + .toggle-item span.toggle-name Events el-radio-group(v-model="sharedFeedFilters.noty.Event" size="mini") el-radio-button(label="Off") el-radio-button(label="On") - div + .toggle-item span.toggle-name Video Play el-radio-group(v-model="sharedFeedFilters.noty.VideoPlay" size="mini") el-radio-button(label="Off") el-radio-button(label="On") - div + .toggle-item span.toggle-name Blocked Player Joins el-radio-group(v-model="sharedFeedFilters.noty.BlockedOnPlayerJoined" size="mini") el-radio-button(label="Off") el-radio-button(label="VIP") el-radio-button(label="Friends") el-radio-button(label="Everyone") - div + .toggle-item span.toggle-name Blocked Player Leaves el-radio-group(v-model="sharedFeedFilters.noty.BlockedOnPlayerLeft" size="mini") el-radio-button(label="Off") el-radio-button(label="VIP") el-radio-button(label="Friends") el-radio-button(label="Everyone") - div + .toggle-item span.toggle-name Muted Player Joins el-radio-group(v-model="sharedFeedFilters.noty.MutedOnPlayerJoined" size="mini") el-radio-button(label="Off") el-radio-button(label="VIP") el-radio-button(label="Friends") el-radio-button(label="Everyone") - div + .toggle-item span.toggle-name Muted Player Leaves el-radio-group(v-model="sharedFeedFilters.noty.MutedOnPlayerLeft" size="mini") el-radio-button(label="Off") @@ -1899,146 +1899,146 @@ html //- dialog: wrist feed filters el-dialog.x-dialog(ref="wristFeedFiltersDialog" :visible.sync="wristFeedFiltersDialog.visible" title="Wrist Feed Filters" width="480px") - div.toggle-list - div + .toggle-list + .toggle-item span.toggle-name Self Location el-radio-group(v-model="sharedFeedFilters.wrist.Location" size="mini") el-radio-button(label="Off") el-radio-button(label="On") - div + .toggle-item span.toggle-name OnPlayerJoining el-radio-group(v-model="sharedFeedFilters.wrist.OnPlayerJoining" size="mini") el-radio-button(label="Off") el-radio-button(label="VIP") el-radio-button(label="Friends") - div + .toggle-item span.toggle-name OnPlayerJoined el-radio-group(v-model="sharedFeedFilters.wrist.OnPlayerJoined" size="mini") el-radio-button(label="Off") el-radio-button(label="VIP") el-radio-button(label="Friends") el-radio-button(label="Everyone") - div + .toggle-item span.toggle-name OnPlayerLeft el-radio-group(v-model="sharedFeedFilters.wrist.OnPlayerLeft" size="mini") el-radio-button(label="Off") el-radio-button(label="VIP") el-radio-button(label="Friends") el-radio-button(label="Everyone") - div + .toggle-item span.toggle-name Online el-radio-group(v-model="sharedFeedFilters.wrist.Online" size="mini") el-radio-button(label="Off") el-radio-button(label="VIP") el-radio-button(label="Friends") - div + .toggle-item span.toggle-name Offline el-radio-group(v-model="sharedFeedFilters.wrist.Offline" size="mini") el-radio-button(label="Off") el-radio-button(label="VIP") el-radio-button(label="Friends") - div + .toggle-item span.toggle-name GPS el-radio-group(v-model="sharedFeedFilters.wrist.GPS" size="mini") el-radio-button(label="Off") el-radio-button(label="VIP") el-radio-button(label="Friends") - div + .toggle-item span.toggle-name Status el-radio-group(v-model="sharedFeedFilters.wrist.Status" size="mini") el-radio-button(label="Off") el-radio-button(label="VIP") el-radio-button(label="Friends") - div + .toggle-item span.toggle-name Invite el-radio-group(v-model="sharedFeedFilters.wrist.invite" size="mini") el-radio-button(label="Off") el-radio-button(label="VIP") el-radio-button(label="Friends") - div + .toggle-item span.toggle-name Request Invite el-radio-group(v-model="sharedFeedFilters.wrist.requestInvite" size="mini") el-radio-button(label="Off") el-radio-button(label="VIP") el-radio-button(label="Friends") - div + .toggle-item span.toggle-name Invite Response el-radio-group(v-model="sharedFeedFilters.wrist.inviteResponse" size="mini") el-radio-button(label="Off") el-radio-button(label="VIP") el-radio-button(label="Friends") - div + .toggle-item span.toggle-name Request Invite Response el-radio-group(v-model="sharedFeedFilters.wrist.requestInviteResponse" size="mini") el-radio-button(label="Off") el-radio-button(label="VIP") el-radio-button(label="Friends") - div + .toggle-item span.toggle-name Friend Request el-radio-group(v-model="sharedFeedFilters.wrist.friendRequest" size="mini") el-radio-button(label="Off") el-radio-button(label="On") - div + .toggle-item span.toggle-name New Friend el-radio-group(v-model="sharedFeedFilters.wrist.Friend" size="mini") el-radio-button(label="Off") el-radio-button(label="On") - div + .toggle-item span.toggle-name Unfriend el-radio-group(v-model="sharedFeedFilters.wrist.Unfriend" size="mini") el-radio-button(label="Off") el-radio-button(label="On") - div + .toggle-item span.toggle-name Display Name el-radio-group(v-model="sharedFeedFilters.wrist.DisplayName" size="mini") el-radio-button(label="Off") el-radio-button(label="VIP") el-radio-button(label="Friends") - div + .toggle-item span.toggle-name Trust Level el-radio-group(v-model="sharedFeedFilters.wrist.TrustLevel" size="mini") el-radio-button(label="Off") el-radio-button(label="VIP") el-radio-button(label="Friends") - div + .toggle-item span.toggle-name Portal Spawn el-radio-group(v-model="sharedFeedFilters.wrist.PortalSpawn" size="mini") el-radio-button(label="Off") el-radio-button(label="VIP") el-radio-button(label="Friends") el-radio-button(label="Everyone") - div + .toggle-item span.toggle-name Events el-radio-group(v-model="sharedFeedFilters.wrist.Event" size="mini") el-radio-button(label="Off") el-radio-button(label="On") - div + .toggle-item span.toggle-name Video Play el-radio-group(v-model="sharedFeedFilters.noty.VideoPlay" size="mini") el-radio-button(label="Off") el-radio-button(label="On") - div + .toggle-item span.toggle-name Blocked Player Joins el-radio-group(v-model="sharedFeedFilters.wrist.BlockedOnPlayerJoined" size="mini") el-radio-button(label="Off") el-radio-button(label="VIP") el-radio-button(label="Friends") el-radio-button(label="Everyone") - div + .toggle-item span.toggle-name Blocked Player Leaves el-radio-group(v-model="sharedFeedFilters.wrist.BlockedOnPlayerLeft" size="mini") el-radio-button(label="Off") el-radio-button(label="VIP") el-radio-button(label="Friends") el-radio-button(label="Everyone") - div + .toggle-item span.toggle-name Muted Player Joins el-radio-group(v-model="sharedFeedFilters.wrist.MutedOnPlayerJoined" size="mini") el-radio-button(label="Off") el-radio-button(label="VIP") el-radio-button(label="Friends") el-radio-button(label="Everyone") - div + .toggle-item span.toggle-name Muted Player Leaves el-radio-group(v-model="sharedFeedFilters.wrist.MutedOnPlayerLeft" size="mini") el-radio-button(label="Off") diff --git a/html/src/repository/database.js b/html/src/repository/database.js index 6194dcd3..7ccbd0e8 100644 --- a/html/src/repository/database.js +++ b/html/src/repository/database.js @@ -172,13 +172,14 @@ class Database { var items = ['userId', 'displayName', 'trustLevel']; for (var line of inputData) { for (var item of items) { + var field = {}; if (typeof line[item] !== 'undefined') { - line[item] = line[item].replace(/'/g, "\''"); + field[item] = line[item].replace(/'/g, "\''"); } else { - line[item] = ''; + field[item] = ''; } } - sqlValues += `('${line.userId}', '${line.displayName}', '${line.trustLevel}'), `; + sqlValues += `('${field.userId}', '${field.displayName}', '${field.trustLevel}'), `; } sqlValues = sqlValues.slice(0, -2); sqliteService.executeNonQuery(