diff options
| -rw-r--r-- | src/App.scss | 5 | ||||
| -rw-r--r-- | src/components/user_card_content/user_card_content.vue | 8 | ||||
| -rw-r--r-- | src/components/user_panel/user_panel.vue | 1 | ||||
| -rw-r--r-- | src/components/user_settings/user_settings.js | 145 | ||||
| -rw-r--r-- | src/components/user_settings/user_settings.vue | 90 | ||||
| -rw-r--r-- | src/main.js | 4 | ||||
| -rw-r--r-- | src/services/api/api.service.js | 68 | ||||
| -rw-r--r-- | src/services/backend_interactor_service/backend_interactor_service.js | 7 |
8 files changed, 327 insertions, 1 deletions
diff --git a/src/App.scss b/src/App.scss index 15c908d9..23f7304f 100644 --- a/src/App.scss +++ b/src/App.scss @@ -42,6 +42,11 @@ button{ &:hover { box-shadow: 0px 0px 4px rgba(255, 255, 255, 0.3); } + + &:disabled { + cursor: not-allowed; + opacity: 0.5; + } } .container { diff --git a/src/components/user_card_content/user_card_content.vue b/src/components/user_card_content/user_card_content.vue index ff1b108c..1c044f9a 100644 --- a/src/components/user_card_content/user_card_content.vue +++ b/src/components/user_card_content/user_card_content.vue @@ -2,6 +2,9 @@ <div id="heading" class="profile-panel-background" :style="headingStyle"> <div class="panel-heading text-center"> <div class='user-info'> + <router-link to='/user-settings' style="float: right;"> + <i class="icon-cog usersettings"></i> + </router-link> <div class='container'> <img :src="user.profile_image_url"> <span class="glyphicon glyphicon-user"></span> @@ -128,6 +131,11 @@ padding: 16px 16px 16px 16px; margin-bottom: -4em; + .usersettings { + color: white; + opacity: 0.8; + } + .container{ display: flex; flex-wrap: wrap; diff --git a/src/components/user_panel/user_panel.vue b/src/components/user_panel/user_panel.vue index c5a5ff43..69da422c 100644 --- a/src/components/user_panel/user_panel.vue +++ b/src/components/user_panel/user_panel.vue @@ -6,6 +6,7 @@ <div class="panel-footer base00-background"> <post-status-form v-if='user'></post-status-form> + </div> </div> <login-form v-if='!user'></login-form> diff --git a/src/components/user_settings/user_settings.js b/src/components/user_settings/user_settings.js new file mode 100644 index 00000000..c22411dd --- /dev/null +++ b/src/components/user_settings/user_settings.js @@ -0,0 +1,145 @@ +import StyleSwitcher from '../style_switcher/style_switcher.vue' +import { filter, trim } from 'lodash' + +const UserSettings = { + data () { + return { + newname: this.$store.state.users.currentUser.name, + newbio: this.$store.state.users.currentUser.description, + previewavatar: null, + previewbanner: null, + previewbg: null, + uploadingavatar: false, + uploadingbanner: false, + uploadingbg: false + } + }, + components: { + StyleSwitcher + }, + computed: { + user () { + return this.$store.state.users.currentUser + } + }, + methods: { + updateProfile () { + const name = this.newname + const description = this.newbio + this.$store.state.api.backendInteractor.updateProfile({params: {name, description}}).then((user) => { + if(!user.error) { + this.$store.commit('addNewUsers', [user]) + this.$store.commit('setCurrentUser', user) + } + }) + }, + uploadAvatar ({target}) { + const file = target.files[0] + // eslint-disable-next-line no-undef + const reader = new FileReader() + reader.onload = ({target}) => { + const img = target.result + this.previewavatar = img + } + 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) + }, + submitAvatar () { + if (!this.previewavatar) { return } + + let img = this.previewavatar + // eslint-disable-next-line no-undef + let imginfo = new Image() + let cropX, cropY, cropW, cropH + imginfo.src = img + if (imginfo.height > imginfo.width) { + cropX = 0 + cropW = imginfo.width + cropY = Math.floor((imginfo.height - imginfo.width) / 2) + cropH = imginfo.width + } else { + cropY = 0 + cropH = imginfo.height + cropX = Math.floor((imginfo.width - imginfo.height) / 2) + cropW = imginfo.height + } + this.uploadingavatar = true + this.$store.state.api.backendInteractor.updateAvatar({params: {img, cropX, cropY, cropW, cropH}}).then((user) => { + if (!user.error) { + this.$store.commit('addNewUsers', [user]) + this.$store.commit('setCurrentUser', user) + this.previewavatar = null + } + this.uploadingavatar = false + }) + }, + submitBanner () { + if (!this.previewbanner) { return } + + let banner = this.previewbanner + let imginfo = new Image() + let offset_top, offset_left, width, height + imginfo.src = banner + width = imginfo.width + height = imginfo.height + offset_top = 0 + offset_left = 0 + this.uploadingbanner = true + this.$store.state.api.backendInteractor.updateBanner({params: {banner, offset_top, offset_left, width, height}}).then((data) => { + if (!data.error) { + let clone = JSON.parse(JSON.stringify(this.$store.state.users.currentUser)) + clone.cover_photo = data.url + this.$store.commit('addNewUsers', [clone]) + this.$store.commit('setCurrentUser', clone) + this.previewbanner = null + } + this.uploadingbanner = false + }) + }, + submitBg () { + if (!this.previewbg) { return } + let img = this.previewbg + let imginfo = new Image() + let cropX, cropY, cropW, cropH + imginfo.src = img + cropX = 0 + cropY = 0 + cropW = imginfo.width + cropH = imginfo.width + this.uploadingbg = true + this.$store.state.api.backendInteractor.updateBg({params: {img, cropX, cropY, cropW, cropH}}).then((data) => { + if (!data.error) { + let clone = JSON.parse(JSON.stringify(this.$store.state.users.currentUser)) + clone.background_image = data.url + this.$store.commit('addNewUsers', [clone]) + this.$store.commit('setCurrentUser', clone) + this.previewbg = null + } + this.uploadingbg = false + }) + } + }, + watch: { + } +} + +export default UserSettings diff --git a/src/components/user_settings/user_settings.vue b/src/components/user_settings/user_settings.vue new file mode 100644 index 00000000..b7521a32 --- /dev/null +++ b/src/components/user_settings/user_settings.vue @@ -0,0 +1,90 @@ +<template> + <div class="settings panel panel-default base00-background"> + <div class="panel-heading base01-background base04"> + User Settings + </div> + <div class="panel-body profile-edit"> + <div class="setting-item"> + <h3>Name & Bio</h3> + <p>Name</p> + <input class='name-changer base03-border' id='username' v-model="newname" :value="user.screen_name"></input> + <p>Bio</p> + <textarea class="bio base03-border" v-model="newbio"></textarea> + <button :disabled='newname.length <= 0' class="btn btn-default base05 base01-background" @click="updateProfile">Submit</button> + </div> + <div class="setting-item"> + <h3>Avatar</h3> + <p>Your current avatar:</p> + <img :src="user.profile_image_url_original" class="old-avatar"></img> + <p>Set new avatar:</p> + <img class="new-avatar" v-bind:src="previewavatar" v-if="previewavatar"> + </img> + <div> + <input type="file" @change="uploadAvatar" ></input> + </div> + <i class="fa icon-spin4 animate-spin" v-if="uploadingavatar"></i> + <button class="btn btn-default base05 base01-background" v-else-if="previewavatar" @click="submitAvatar">Submit</button> + </div> + <div class="setting-item"> + <h3>Profile Banner</h3> + <p>Your current profile banner:</p> + <img :src="user.cover_photo" class="banner"></img> + <p>Set new profile banner:</p> + <img class="banner" v-bind:src="previewbanner" v-if="previewbanner"> + </img> + <div> + <input type="file" @change="uploadBanner" ></input> + </div> + <i class="fa icon-spin4 animate-spin uploading" v-if="uploadingbanner"></i> + <button class="btn btn-default base05 base01-background" v-else-if="previewbanner" @click="submitBanner">Submit</button> + </div> + <div class="setting-item"> + <h3>Profile Background</h3> + <p>Set new profile background:</p> + <img class="bg" v-bind:src="previewbg" v-if="previewbg"> + </img> + <div> + <input type="file" @change="uploadBg" ></input> + </div> + <i class="fa icon-spin4 animate-spin uploading" v-if="uploadingbg"></i> + <button class="btn btn-default base05 base01-background" v-else-if="previewbg" @click="submitBg">Submit</button> + </div> + </div> + </div> +</template> + +<script src="./user_settings.js"> +</script> + +<style lang="scss"> +.profile-edit { + .name-changer { + border-width: 1px; + border-style: solid; + border-radius: 5px; + padding: 0.2em 0.2em 0.2em 0.2em; + } + .name-submit { + padding: 0.2em 0.5em 0.2em 0.5em; + } + .bio { + border-width: 1px; + border-style: solid; + border-radius: 5px; + margin: 0; + } + .banner { + max-width: 400px; + border-radius: 5px; + } + + .bg { + max-width: 400px; + border-radius: 5px; + } + .uploading { + font-size: 1.5em; + margin: 0.25em; + } +} +</style> diff --git a/src/main.js b/src/main.js index 4b7891ed..8d3a6775 100644 --- a/src/main.js +++ b/src/main.js @@ -10,6 +10,7 @@ import Mentions from './components/mentions/mentions.vue' import UserProfile from './components/user_profile/user_profile.vue' import Settings from './components/settings/settings.vue' import Registration from './components/registration/registration.vue' +import UserSettings from './components/user_settings/user_settings.vue' import statusesModule from './modules/statuses.js' import usersModule from './modules/users.js' @@ -62,7 +63,8 @@ const routes = [ { name: 'user-profile', path: '/users/:id', component: UserProfile }, { name: 'mentions', path: '/:username/mentions', component: Mentions }, { name: 'settings', path: '/settings', component: Settings }, - { name: 'registration', path: '/registration', component: Registration } + { name: 'registration', path: '/registration', component: Registration }, + { name: 'user-settings', path: '/user-settings', component: UserSettings } ] const router = new VueRouter({ diff --git a/src/services/api/api.service.js b/src/services/api/api.service.js index e848d076..b88447d5 100644 --- a/src/services/api/api.service.js +++ b/src/services/api/api.service.js @@ -19,6 +19,9 @@ const UNFOLLOWING_URL = '/api/friendships/destroy.json' const QVITTER_USER_PREF_URL = '/api/qvitter/set_profile_pref.json' const REGISTRATION_URL = '/api/account/register.json' const AVATAR_UPDATE_URL = '/api/qvitter/update_avatar.json' +const BG_UPDATE_URL = '/api/qvitter/update_background_image.json' +const BANNER_UPDATE_URL = '/api/account/update_profile_banner.json' +const PROFILE_UPDATE_URL = '/api/account/update_profile.json' const EXTERNAL_PROFILE_URL = '/api/externalprofile/show.json' const QVITTER_USER_TIMELINE_URL = '/api/qvitter/statuses/user_timeline.json' // const USER_URL = '/api/users/show.json' @@ -56,6 +59,68 @@ const updateAvatar = ({credentials, params}) => { }).then((data) => data.json()) } +const updateBg = ({credentials, params}) => { + let url = BG_UPDATE_URL + + const form = new FormData() + + each(params, (value, key) => { + if (value) { + form.append(key, value) + } + }) + return fetch(url, { + headers: authHeaders(credentials), + method: 'POST', + body: form + }).then((data) => data.json()) +} + +// Params +// height +// width +// offset_left +// offset_top +// banner (base 64 encodend data url) +const updateBanner = ({credentials, params}) => { + let url = BANNER_UPDATE_URL + + const form = new FormData() + + each(params, (value, key) => { + if (value) { + form.append(key, value) + } + }) + return fetch(url, { + headers: authHeaders(credentials), + method: 'POST', + body: form + }).then((data) => data.json()) +} + +// Params +// name +// url +// location +// description +const updateProfile = ({credentials, params}) => { + let url = PROFILE_UPDATE_URL + + const form = new FormData() + + each(params, (value, key) => { + if (value) { + form.append(key, value) + } + }) + return fetch(url, { + headers: authHeaders(credentials), + method: 'POST', + body: form + }).then((data) => data.json()) +} + // Params needed: // nickname // email @@ -273,6 +338,9 @@ const apiService = { fetchMutes, register, updateAvatar, + updateBg, + updateProfile, + updateBanner, externalProfile } diff --git a/src/services/backend_interactor_service/backend_interactor_service.js b/src/services/backend_interactor_service/backend_interactor_service.js index 5dbbf4b3..5311f268 100644 --- a/src/services/backend_interactor_service/backend_interactor_service.js +++ b/src/services/backend_interactor_service/backend_interactor_service.js @@ -38,6 +38,10 @@ const backendInteractorService = (credentials) => { const register = (params) => apiService.register(params) const updateAvatar = ({params}) => apiService.updateAvatar({credentials, params}) + const updateBg = ({params}) => apiService.updateBg({credentials, params}) + const updateBanner = ({params}) => apiService.updateBanner({credentials, params}) + const updateProfile = ({params}) => apiService.updateProfile({credentials, params}) + const externalProfile = (profileUrl) => apiService.externalProfile(profileUrl) const backendInteractorServiceInstance = { @@ -53,6 +57,9 @@ const backendInteractorService = (credentials) => { fetchMutes, register, updateAvatar, + updateBg, + updateBanner, + updateProfile, externalProfile } |