diff --git a/html/src/app.js b/html/src/app.js index 8b11b84a..ef242927 100644 --- a/html/src/app.js +++ b/html/src/app.js @@ -351,9 +351,8 @@ import gameLogService from './service/gamelog.js' if (req !== undefined) { return req; } - } else if (init.test === 'a') { - delete init.test; - console.log("test"); + } else if (init.VRCPlusIcon) { + delete init.VRCPlusIcon; console.log(init); } else { @@ -7530,9 +7529,9 @@ import gameLogService from './service/gamelog.js' }); }; - $app.methods.onFileChange = function (e) { + // requres decoding base64 body on C# side + $app.methods.onFileChangeVRCPlusIcon = function (e) { var files = e.target.files || e.dataTransfer.files; - console.log(e); if (!files.length) { return; } @@ -7542,7 +7541,6 @@ import gameLogService from './service/gamelog.js' var bodyEnd = '\n---------------------------26696829785232761561272838397--\n'; var body = bodyStart + r.result + bodyEnd var base64Body = btoa(body); - console.log(base64Body); API.uploadVRCPlusIcon(base64Body ).then((args) => { this.$message({ @@ -7559,10 +7557,9 @@ import gameLogService from './service/gamelog.js' return this.call('icon', { method: 'POST', headers: { - 'Content-Type': 'multipart/form-data; boundary=-------------------------26696829785232761561272838397', - 'Content-Transfer-Encoding': 'base64' + 'Content-Type': 'multipart/form-data; boundary=-------------------------26696829785232761561272838397' }, - test: 'a', + VRCPlusIcon: true, body: params }).then((json) => { var args = { diff --git a/html/src/index.pug b/html/src/index.pug index 36491810..4ce1d509 100644 --- a/html/src/index.pug +++ b/html/src/index.pug @@ -436,6 +436,7 @@ html el-button(type="default" @click="displayVRCPlusIconsTable()" size="mini" icon="el-icon-refresh" circle style="margin-left:5px") el-button(type="default" @click="VRCPlusIconsTable = []" size="mini" icon="el-icon-delete" circle style="margin-left:0") el-button(type="default" @click="setVRCPlusIcon('')" size="mini" icon="el-icon-close" circle style="margin:0" :disabled="!API.currentUser.userIcon") + //- input(type="file" @change="onFileChangeVRCPlusIcon") br .x-friend-item(v-for="icon in VRCPlusIconsTable" :key="icon.id" style="display:inline-block;cursor:auto;") .vrcplus-icon(style="" @click="setVRCPlusIcon(icon.id)" :class="{ 'current-vrcplus-icon': 'https://api.vrchat.cloud/api/1/file/' + icon.id + '/1' === API.currentUser.userIcon }")