+
+
+
@@ -132,6 +135,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 @@
diff --git a/src/components/user_settings/user_settings.js b/src/components/user_settings/user_settings.js
new file mode 100644
index 00000000..fd20a6ad
--- /dev/null
+++ b/src/components/user_settings/user_settings.js
@@ -0,0 +1,124 @@
+import StyleSwitcher from '../style_switcher/style_switcher.vue'
+
+const UserSettings = {
+ data () {
+ return {
+ newname: this.$store.state.users.currentUser.name,
+ newbio: this.$store.state.users.currentUser.description,
+ uploading: [ false, false, false ],
+ previews: [ null, null, null ]
+ }
+ },
+ 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)
+ }
+ })
+ },
+ uploadFile (slot, e) {
+ const file = e.target.files[0]
+ if (!file) { return }
+ // eslint-disable-next-line no-undef
+ const reader = new FileReader()
+ reader.onload = ({target}) => {
+ const img = target.result
+ this.previews[slot] = img
+ this.$forceUpdate() // just changing the array with the index doesn't update the view
+ }
+ reader.readAsDataURL(file)
+ },
+ submitAvatar () {
+ if (!this.previews[0]) { return }
+
+ let img = this.previews[0]
+ // 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.uploading[0] = 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.previews[0] = null
+ }
+ this.uploading[0] = false
+ })
+ },
+ submitBanner () {
+ if (!this.previews[1]) { return }
+
+ let banner = this.previews[1]
+ // eslint-disable-next-line no-undef
+ let imginfo = new Image()
+ /* eslint-disable camelcase */
+ let offset_top, offset_left, width, height
+ imginfo.src = banner
+ width = imginfo.width
+ height = imginfo.height
+ offset_top = 0
+ offset_left = 0
+ this.uploading[1] = 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.previews[1] = null
+ }
+ this.uploading[1] = false
+ })
+ /* eslint-enable camelcase */
+ },
+ submitBg () {
+ if (!this.previews[2]) { return }
+ let img = this.previews[2]
+ // eslint-disable-next-line no-undef
+ let imginfo = new Image()
+ let cropX, cropY, cropW, cropH
+ imginfo.src = img
+ cropX = 0
+ cropY = 0
+ cropW = imginfo.width
+ cropH = imginfo.width
+ this.uploading[2] = 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.previews[2] = null
+ }
+ this.uploading[2] = false
+ })
+ }
+ }
+}
+
+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..11da79e4
--- /dev/null
+++ b/src/components/user_settings/user_settings.vue
@@ -0,0 +1,86 @@
+
+
+
+ User Settings
+
+
+
+
Name & Bio
+
Name
+
+
Bio
+
+
+
+
+
Avatar
+
Your current avatar:
+
+
Set new avatar:
+
+
+
+
+
+
+
+
+
+
Profile Banner
+
Your current profile banner:
+
+
Set new profile banner:
+
+
+
+
+
+
+
+
+
+
Profile Background
+
Set new profile background:
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
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 9b51f19d..95c339cc 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'
@@ -57,6 +60,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
@@ -274,6 +339,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
}