Clean up to have much less redundant code.

This commit is contained in:
Shpuld Shpuldson 2017-08-18 11:51:17 +03:00
parent 6d7d173e4d
commit 1526b4560c
2 changed files with 34 additions and 58 deletions

View File

@ -5,12 +5,8 @@ const UserSettings = {
return { return {
newname: this.$store.state.users.currentUser.name, newname: this.$store.state.users.currentUser.name,
newbio: this.$store.state.users.currentUser.description, newbio: this.$store.state.users.currentUser.description,
previewavatar: null, uploading: [ false, false, false ],
previewbanner: null, previews: [ null, null, null ]
previewbg: null,
uploadingavatar: false,
uploadingbanner: false,
uploadingbg: false
} }
}, },
components: { components: {
@ -32,40 +28,22 @@ const UserSettings = {
} }
}) })
}, },
uploadAvatar ({target}) { uploadFile (slot, e) {
const file = target.files[0] const file = e.target.files[0]
if (!file) { return }
// eslint-disable-next-line no-undef // eslint-disable-next-line no-undef
const reader = new FileReader() const reader = new FileReader()
reader.onload = ({target}) => { reader.onload = ({target}) => {
const img = target.result const img = target.result
this.previewavatar = img this.previews[slot] = img
} this.$forceUpdate() // just changing the array with the index doesn't update the view
reader.readAsDataURL(file)
},
uploadBanner ({target}) {
const file = target.files[0]
// eslint-disable-next-line no-undef
const reader = new FileReader()
reader.onload = ({target}) => {
const img = target.result
this.previewbanner = img
}
reader.readAsDataURL(file)
},
uploadBg ({target}) {
const file = target.files[0]
// eslint-disable-next-line no-undef
const reader = new FileReader()
reader.onload = ({target}) => {
const img = target.result
this.previewbg = img
} }
reader.readAsDataURL(file) reader.readAsDataURL(file)
}, },
submitAvatar () { submitAvatar () {
if (!this.previewavatar) { return } if (!this.previews[0]) { return }
let img = this.previewavatar let img = this.previews[0]
// eslint-disable-next-line no-undef // eslint-disable-next-line no-undef
let imginfo = new Image() let imginfo = new Image()
let cropX, cropY, cropW, cropH let cropX, cropY, cropW, cropH
@ -81,20 +59,20 @@ const UserSettings = {
cropX = Math.floor((imginfo.width - imginfo.height) / 2) cropX = Math.floor((imginfo.width - imginfo.height) / 2)
cropW = imginfo.height cropW = imginfo.height
} }
this.uploadingavatar = true this.uploading[0] = true
this.$store.state.api.backendInteractor.updateAvatar({params: {img, cropX, cropY, cropW, cropH}}).then((user) => { this.$store.state.api.backendInteractor.updateAvatar({params: {img, cropX, cropY, cropW, cropH}}).then((user) => {
if (!user.error) { if (!user.error) {
this.$store.commit('addNewUsers', [user]) this.$store.commit('addNewUsers', [user])
this.$store.commit('setCurrentUser', user) this.$store.commit('setCurrentUser', user)
this.previewavatar = null this.previews[0] = null
} }
this.uploadingavatar = false this.uploading[0] = false
}) })
}, },
submitBanner () { submitBanner () {
if (!this.previewbanner) { return } if (!this.previews[1]) { return }
let banner = this.previewbanner let banner = this.previews[1]
// eslint-disable-next-line no-undef // eslint-disable-next-line no-undef
let imginfo = new Image() let imginfo = new Image()
/* eslint-disable camelcase */ /* eslint-disable camelcase */
@ -104,22 +82,22 @@ const UserSettings = {
height = imginfo.height height = imginfo.height
offset_top = 0 offset_top = 0
offset_left = 0 offset_left = 0
this.uploadingbanner = true this.uploading[1] = true
this.$store.state.api.backendInteractor.updateBanner({params: {banner, offset_top, offset_left, width, height}}).then((data) => { this.$store.state.api.backendInteractor.updateBanner({params: {banner, offset_top, offset_left, width, height}}).then((data) => {
if (!data.error) { if (!data.error) {
let clone = JSON.parse(JSON.stringify(this.$store.state.users.currentUser)) let clone = JSON.parse(JSON.stringify(this.$store.state.users.currentUser))
clone.cover_photo = data.url clone.cover_photo = data.url
this.$store.commit('addNewUsers', [clone]) this.$store.commit('addNewUsers', [clone])
this.$store.commit('setCurrentUser', clone) this.$store.commit('setCurrentUser', clone)
this.previewbanner = null this.previews[1] = null
} }
this.uploadingbanner = false this.uploading[1] = false
}) })
/* eslint-enable camelcase */ /* eslint-enable camelcase */
}, },
submitBg () { submitBg () {
if (!this.previewbg) { return } if (!this.previews[2]) { return }
let img = this.previewbg let img = this.previews[2]
// eslint-disable-next-line no-undef // eslint-disable-next-line no-undef
let imginfo = new Image() let imginfo = new Image()
let cropX, cropY, cropW, cropH let cropX, cropY, cropW, cropH
@ -128,20 +106,18 @@ const UserSettings = {
cropY = 0 cropY = 0
cropW = imginfo.width cropW = imginfo.width
cropH = imginfo.width cropH = imginfo.width
this.uploadingbg = true this.uploading[2] = true
this.$store.state.api.backendInteractor.updateBg({params: {img, cropX, cropY, cropW, cropH}}).then((data) => { this.$store.state.api.backendInteractor.updateBg({params: {img, cropX, cropY, cropW, cropH}}).then((data) => {
if (!data.error) { if (!data.error) {
let clone = JSON.parse(JSON.stringify(this.$store.state.users.currentUser)) let clone = JSON.parse(JSON.stringify(this.$store.state.users.currentUser))
clone.background_image = data.url clone.background_image = data.url
this.$store.commit('addNewUsers', [clone]) this.$store.commit('addNewUsers', [clone])
this.$store.commit('setCurrentUser', clone) this.$store.commit('setCurrentUser', clone)
this.previewbg = null this.previews[2] = null
} }
this.uploadingbg = false this.uploading[2] = false
}) })
} }
},
watch: {
} }
} }

View File

@ -17,37 +17,37 @@
<p>Your current avatar:</p> <p>Your current avatar:</p>
<img :src="user.profile_image_url_original" class="old-avatar"></img> <img :src="user.profile_image_url_original" class="old-avatar"></img>
<p>Set new avatar:</p> <p>Set new avatar:</p>
<img class="new-avatar" v-bind:src="previewavatar" v-if="previewavatar"> <img class="new-avatar" v-bind:src="previews[0]" v-if="previews[0]">
</img> </img>
<div> <div>
<input type="file" @change="uploadAvatar" ></input> <input type="file" @change="uploadFile(0, $event)" ></input>
</div> </div>
<i class="fa icon-spin4 animate-spin" v-if="uploadingavatar"></i> <i class="fa icon-spin4 animate-spin" v-if="uploading[0]"></i>
<button class="btn btn-default base05 base01-background" v-else-if="previewavatar" @click="submitAvatar">Submit</button> <button class="btn btn-default base05 base01-background" v-else-if="previews[0]" @click="submitAvatar">Submit</button>
</div> </div>
<div class="setting-item"> <div class="setting-item">
<h3>Profile Banner</h3> <h3>Profile Banner</h3>
<p>Your current profile banner:</p> <p>Your current profile banner:</p>
<img :src="user.cover_photo" class="banner"></img> <img :src="user.cover_photo" class="banner"></img>
<p>Set new profile banner:</p> <p>Set new profile banner:</p>
<img class="banner" v-bind:src="previewbanner" v-if="previewbanner"> <img class="banner" v-bind:src="previews[1]" v-if="previews[1]">
</img> </img>
<div> <div>
<input type="file" @change="uploadBanner" ></input> <input type="file" @change="uploadFile(1, $event)" ></input>
</div> </div>
<i class="fa icon-spin4 animate-spin uploading" v-if="uploadingbanner"></i> <i class="fa icon-spin4 animate-spin uploading" v-if="uploading[1]"></i>
<button class="btn btn-default base05 base01-background" v-else-if="previewbanner" @click="submitBanner">Submit</button> <button class="btn btn-default base05 base01-background" v-else-if="previews[1]" @click="submitBanner">Submit</button>
</div> </div>
<div class="setting-item"> <div class="setting-item">
<h3>Profile Background</h3> <h3>Profile Background</h3>
<p>Set new profile background:</p> <p>Set new profile background:</p>
<img class="bg" v-bind:src="previewbg" v-if="previewbg"> <img class="bg" v-bind:src="previews[2]" v-if="previews[2]">
</img> </img>
<div> <div>
<input type="file" @change="uploadBg" ></input> <input type="file" @change="uploadFile(2, $event)" ></input>
</div> </div>
<i class="fa icon-spin4 animate-spin uploading" v-if="uploadingbg"></i> <i class="fa icon-spin4 animate-spin uploading" v-if="uploading[2]"></i>
<button class="btn btn-default base05 base01-background" v-else-if="previewbg" @click="submitBg">Submit</button> <button class="btn btn-default base05 base01-background" v-else-if="previews[2]" @click="submitBg">Submit</button>
</div> </div>
</div> </div>
</div> </div>