aboutsummaryrefslogtreecommitdiff
path: root/src/components
diff options
context:
space:
mode:
Diffstat (limited to 'src/components')
-rw-r--r--src/components/notifications/notifications.vue8
-rw-r--r--src/components/post_status_form/post_status_form.js25
-rw-r--r--src/components/post_status_form/post_status_form.vue13
-rw-r--r--src/components/settings/settings.js41
-rw-r--r--src/components/settings/settings.vue12
-rw-r--r--src/components/status/status.vue11
-rw-r--r--src/components/user_card_content/user_card_content.vue36
-rw-r--r--src/components/user_panel/user_panel.vue1
-rw-r--r--src/components/user_profile/user_profile.js6
-rw-r--r--src/components/user_settings/user_settings.js124
-rw-r--r--src/components/user_settings/user_settings.vue86
11 files changed, 282 insertions, 81 deletions
diff --git a/src/components/notifications/notifications.vue b/src/components/notifications/notifications.vue
index c9113bc4..2ad7c488 100644
--- a/src/components/notifications/notifications.vue
+++ b/src/components/notifications/notifications.vue
@@ -8,9 +8,11 @@
</div>
<div class="panel-body base03-border">
<div v-for="notification in visibleNotifications" :key="notification" class="notification" :class='{"unseen": !notification.seen}'>
- <a :href="notification.action.user.statusnet_profile_url">
- <img class='avatar' :src="notification.action.user.profile_image_url_original">
- </a>
+ <div>
+ <a :href="notification.action.user.statusnet_profile_url" target="_blank">
+ <img class='avatar' :src="notification.action.user.profile_image_url_original">
+ </a>
+ </div>
<div class='text' style="width: 100%;">
<div v-if="notification.type === 'favorite'">
<h1>
diff --git a/src/components/post_status_form/post_status_form.js b/src/components/post_status_form/post_status_form.js
index c0970263..af5b81d4 100644
--- a/src/components/post_status_form/post_status_form.js
+++ b/src/components/post_status_form/post_status_form.js
@@ -39,6 +39,8 @@ const PostStatusForm = {
return {
dropFiles: [],
submitDisabled: false,
+ error: null,
+ posting: false,
newStatus: {
status: statusText,
files: []
@@ -85,19 +87,28 @@ const PostStatusForm = {
this.caret = selectionStart
},
postStatus (newStatus) {
+ if (this.posting) { return }
+ this.posting = true
statusPoster.postStatus({
status: newStatus.status,
media: newStatus.files,
store: this.$store,
inReplyToStatusId: this.replyTo
+ }).then((data) => {
+ if (!data.error) {
+ this.newStatus = {
+ status: '',
+ files: []
+ }
+ this.$emit('posted')
+ let el = this.$el.querySelector('textarea')
+ el.style.height = '16px'
+ this.error = null
+ } else {
+ this.error = data.error
+ }
+ this.posting = false
})
- this.newStatus = {
- status: '',
- files: []
- }
- this.$emit('posted')
- let el = this.$el.querySelector('textarea')
- el.style.height = '16px'
},
addMediaFile (fileInfo) {
this.newStatus.files.push(fileInfo)
diff --git a/src/components/post_status_form/post_status_form.vue b/src/components/post_status_form/post_status_form.vue
index a17d6479..e775c45e 100644
--- a/src/components/post_status_form/post_status_form.vue
+++ b/src/components/post_status_form/post_status_form.vue
@@ -17,7 +17,11 @@
</div>
<div class='form-bottom'>
<media-upload @uploading="disableSubmit" @uploaded="addMediaFile" @upload-failed="enableSubmit" :drop-files="dropFiles"></media-upload>
- <button :disabled="submitDisabled" type="submit" class="btn btn-default base05 base01-background">Submit</button>
+ <button v-if="posting" disabled class="btn btn-default base05 base01-background">Posting</button>
+ <button v-else :disabled="submitDisabled" type="submit" class="btn btn-default base05 base01-background">Submit</button>
+ </div>
+ <div class='error' v-if="error">
+ Error: {{ error }}
</div>
<div class="attachments">
<div class="attachment" v-for="file in newStatus.files">
@@ -61,6 +65,13 @@
width: 10em;
}
}
+ .error {
+ border-radius: 5px;
+ text-align: center;
+ background-color: rgba(255, 48, 16, 0.65);
+ padding: 0.25em;
+ margin: 0.35em;
+ }
.attachments {
padding: 0 0.5em;
diff --git a/src/components/settings/settings.js b/src/components/settings/settings.js
index 8d6a6713..b3bb8290 100644
--- a/src/components/settings/settings.js
+++ b/src/components/settings/settings.js
@@ -9,8 +9,7 @@ const settings = {
hideNsfwLocal: this.$store.state.config.hideNsfw,
muteWordsString: this.$store.state.config.muteWords.join('\n'),
autoLoadLocal: this.$store.state.config.autoLoad,
- hoverPreviewLocal: this.$store.state.config.hoverPreview,
- previewfile: null
+ hoverPreviewLocal: this.$store.state.config.hoverPreview
}
},
components: {
@@ -21,44 +20,6 @@ const settings = {
return this.$store.state.users.currentUser
}
},
- methods: {
- 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.previewfile = img
- }
- reader.readAsDataURL(file)
- },
- submitAvatar () {
- if (!this.previewfile) { return }
-
- const img = this.previewfile
- // eslint-disable-next-line no-undef
- let imginfo = new Image()
- let cropX, cropY, cropW, cropH
- imginfo.src = this.previewfile
- 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.$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)
- }
- })
- }
- },
watch: {
hideAttachmentsLocal (value) {
this.$store.dispatch('setOption', { name: 'hideAttachments', value })
diff --git a/src/components/settings/settings.vue b/src/components/settings/settings.vue
index 1abb1789..6ff96fec 100644
--- a/src/components/settings/settings.vue
+++ b/src/components/settings/settings.vue
@@ -8,18 +8,6 @@
<h2>Theme</h2>
<style-switcher></style-switcher>
</div>
- <div class="setting-item" v-if="user">
- <h2>Avatar</h2>
- <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="previewfile" v-if="previewfile">
- </img>
- <div>
- <input name="avatar-upload" id="avatar-upload" type="file" @change="uploadAvatar" ></input>
- </div>
- <button class="btn btn-default base05 base01-background" v-if="previewfile" @click="submitAvatar">Submit</button>
- </div>
<div class="setting-item">
<h2>Filtering</h2>
<p>All notices containing these words will be muted, one per line</p>
diff --git a/src/components/status/status.vue b/src/components/status/status.vue
index 04c4235f..b8f71dd4 100644
--- a/src/components/status/status.vue
+++ b/src/components/status/status.vue
@@ -194,12 +194,11 @@
}
.media-left {
- img {
- margin-top: 0.2em;
- float: right;
- margin-right: 0.3em;
- border-radius: 5px;
- }
+ margin: 0.2em 0.3em 0 0;
+ img {
+ float: right;
+ border-radius: 5px;
+ }
}
.retweet-info {
diff --git a/src/components/user_card_content/user_card_content.vue b/src/components/user_card_content/user_card_content.vue
index b0b5849b..e4e3394e 100644
--- a/src/components/user_card_content/user_card_content.vue
+++ b/src/components/user_card_content/user_card_content.vue
@@ -2,12 +2,19 @@
<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;" v-if="!isOtherUser">
+ <i class="icon-cog usersettings"></i>
+ </router-link>
<div class='container'>
- <img :src="user.profile_image_url">
+ <router-link :to="{ name: 'user-profile', params: { id: user.id } }">
+ <img :src="user.profile_image_url_original">
+ </router-link>
<span class="glyphicon glyphicon-user"></span>
<div class="name-and-screen-name">
<div class='user-name'>{{user.name}}</div>
- <div class='user-screen-name'>@{{user.screen_name}}</div>
+ <router-link :to="{ name: 'user-profile', params: { id: user.id } }">
+ <div class='user-screen-name'>@{{user.screen_name}}</div>
+ </router-link>
</div>
</div>
<div v-if="isOtherUser" class="user-interactions">
@@ -137,25 +144,31 @@
.user-info {
color: white;
- padding: 16px 16px 16px 16px;
+ padding: 0 16px 16px 16px;
margin-bottom: -4em;
+ .usersettings {
+ color: white;
+ opacity: 0.8;
+ }
+
.container{
+ padding: 16px 10px 4px 10px;
display: flex;
flex-wrap: wrap;
flex-direction: column;
align-content: flex-start;
justify-content: center;
- max-height: 60px;
+ max-height: 56px;
overflow: hidden;
}
img {
- border: 2px solid;
border-radius: 5px;
flex: 1 0 100%;
- width: 48px;
- height: 48px;
+ width: 56px;
+ height: 56px;
+ box-shadow: 0px 1px 8px rgba(0,0,0,0.75);
object-fit: cover;
}
@@ -163,7 +176,6 @@
.name-and-screen-name {
display: block;
- margin-top: 0.0em;
margin-left: 0.6em;
text-align: left;
text-overflow: ellipsis;
@@ -171,9 +183,11 @@
}
.user-name{
+ color: white;
}
.user-screen-name {
+ color: white;
font-weight: lighter;
font-size: 15px;
padding-right: 0.1em;
@@ -211,14 +225,12 @@
}
button {
- border: solid;
- border-width: 1px;
width: 92%;
height: 100%;
}
.pressed {
- border: solid;
- border-width: 1px;
+ border-bottom-color: rgba(255, 255, 255, 0.2);
+ border-top-color: rgba(0, 0, 0, 0.2);
}
}
}
diff --git a/src/components/user_panel/user_panel.vue b/src/components/user_panel/user_panel.vue
index 5a9ec0e8..07c0c90f 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_profile/user_profile.js b/src/components/user_profile/user_profile.js
index 5f9d4d08..48a8a073 100644
--- a/src/components/user_profile/user_profile.js
+++ b/src/components/user_profile/user_profile.js
@@ -22,6 +22,12 @@ const UserProfile = {
}
}
},
+ watch: {
+ userId () {
+ this.$store.commit('clearTimeline', { timeline: 'user' })
+ this.$store.dispatch('startFetching', ['user', this.userId])
+ }
+ },
components: {
UserCardContent,
Timeline
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 @@
+<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="previews[0]" v-if="previews[0]">
+ </img>
+ <div>
+ <input type="file" @change="uploadFile(0, $event)" ></input>
+ </div>
+ <i class="fa icon-spin4 animate-spin" v-if="uploading[0]"></i>
+ <button class="btn btn-default base05 base01-background" v-else-if="previews[0]" @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="previews[1]" v-if="previews[1]">
+ </img>
+ <div>
+ <input type="file" @change="uploadFile(1, $event)" ></input>
+ </div>
+ <i class="fa icon-spin4 animate-spin uploading" v-if="uploading[1]"></i>
+ <button class="btn btn-default base05 base01-background" v-else-if="previews[1]" @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="previews[2]" v-if="previews[2]">
+ </img>
+ <div>
+ <input type="file" @change="uploadFile(2, $event)" ></input>
+ </div>
+ <i class="fa icon-spin4 animate-spin uploading" v-if="uploading[2]"></i>
+ <button class="btn btn-default base05 base01-background" v-else-if="previews[2]" @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;
+ }
+
+ .uploading {
+ font-size: 1.5em;
+ margin: 0.25em;
+ }
+}
+</style>
generated by cgit v1.2.3-70-g09d2 (git 2.49.0) at 2025-11-11 16:13:02 +0000