Merge branch 'develop' into 'fixes-and-tweaks'
# Conflicts: # src/i18n/messages.js
This commit is contained in:
commit
702dfcec10
6 changed files with 83 additions and 33 deletions
20
src/App.scss
20
src/App.scss
|
@ -441,3 +441,23 @@ nav {
|
||||||
text-align: right;
|
text-align: right;
|
||||||
padding-right: 20px;
|
padding-right: 20px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.visibility-tray {
|
||||||
|
font-size: 1.2em;
|
||||||
|
padding: 3px;
|
||||||
|
cursor: pointer;
|
||||||
|
|
||||||
|
.selected {
|
||||||
|
color: $fallback--lightFg;
|
||||||
|
color: var(--lightFg, $fallback--lightFg);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.visibility-notice {
|
||||||
|
padding: .5em;
|
||||||
|
border: 1px solid $fallback--faint;
|
||||||
|
border: 1px solid var(--faint, $fallback--faint);
|
||||||
|
border-radius: $fallback--inputRadius;
|
||||||
|
border-radius: var(--inputRadius, $fallback--inputRadius);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
|
@ -54,7 +54,7 @@ const PostStatusForm = {
|
||||||
newStatus: {
|
newStatus: {
|
||||||
status: statusText,
|
status: statusText,
|
||||||
files: [],
|
files: [],
|
||||||
visibility: this.messageScope || 'public'
|
visibility: this.messageScope || this.$store.state.users.currentUser.default_scope
|
||||||
},
|
},
|
||||||
caret: 0
|
caret: 0
|
||||||
}
|
}
|
||||||
|
|
|
@ -101,25 +101,6 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.post-status-form .visibility-tray {
|
|
||||||
font-size: 1.2em;
|
|
||||||
padding: 3px;
|
|
||||||
cursor: pointer;
|
|
||||||
|
|
||||||
.selected {
|
|
||||||
color: $fallback--lightFg;
|
|
||||||
color: var(--lightFg, $fallback--lightFg);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
.visibility-notice {
|
|
||||||
padding: .5em;
|
|
||||||
border: 1px solid $fallback--faint;
|
|
||||||
border: 1px solid var(--faint, $fallback--faint);
|
|
||||||
border-radius: $fallback--inputRadius;
|
|
||||||
border-radius: var(--inputRadius, $fallback--inputRadius);
|
|
||||||
}
|
|
||||||
|
|
||||||
.post-status-form, .login {
|
.post-status-form, .login {
|
||||||
.form-bottom {
|
.form-bottom {
|
||||||
display: flex;
|
display: flex;
|
||||||
|
|
|
@ -6,6 +6,7 @@ const UserSettings = {
|
||||||
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,
|
||||||
newlocked: this.$store.state.users.currentUser.locked,
|
newlocked: this.$store.state.users.currentUser.locked,
|
||||||
|
newdefaultScope: this.$store.state.users.currentUser.default_scope,
|
||||||
followList: null,
|
followList: null,
|
||||||
followImportError: false,
|
followImportError: false,
|
||||||
followsImported: false,
|
followsImported: false,
|
||||||
|
@ -17,7 +18,8 @@ const UserSettings = {
|
||||||
deleteAccountError: false,
|
deleteAccountError: false,
|
||||||
changePasswordInputs: [ '', '', '' ],
|
changePasswordInputs: [ '', '', '' ],
|
||||||
changedPassword: false,
|
changedPassword: false,
|
||||||
changePasswordError: false
|
changePasswordError: false,
|
||||||
|
activeTab: 'profile'
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
components: {
|
components: {
|
||||||
|
@ -29,6 +31,17 @@ const UserSettings = {
|
||||||
},
|
},
|
||||||
pleromaBackend () {
|
pleromaBackend () {
|
||||||
return this.$store.state.config.pleromaBackend
|
return this.$store.state.config.pleromaBackend
|
||||||
|
},
|
||||||
|
scopeOptionsEnabled () {
|
||||||
|
return this.$store.state.config.scopeOptionsEnabled
|
||||||
|
},
|
||||||
|
vis () {
|
||||||
|
return {
|
||||||
|
public: { selected: this.newdefaultScope === 'public' },
|
||||||
|
unlisted: { selected: this.newdefaultScope === 'unlisted' },
|
||||||
|
private: { selected: this.newdefaultScope === 'private' },
|
||||||
|
direct: { selected: this.newdefaultScope === 'direct' }
|
||||||
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
|
@ -36,12 +49,18 @@ const UserSettings = {
|
||||||
const name = this.newname
|
const name = this.newname
|
||||||
const description = this.newbio
|
const description = this.newbio
|
||||||
const locked = this.newlocked
|
const locked = this.newlocked
|
||||||
this.$store.state.api.backendInteractor.updateProfile({params: {name, description, locked}}).then((user) => {
|
/* eslint-disable camelcase */
|
||||||
|
const default_scope = this.newdefaultScope
|
||||||
|
this.$store.state.api.backendInteractor.updateProfile({params: {name, description, locked, default_scope}}).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)
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
/* eslint-enable camelcase */
|
||||||
|
},
|
||||||
|
changeVis (visibility) {
|
||||||
|
this.newdefaultScope = visibility
|
||||||
},
|
},
|
||||||
uploadFile (slot, e) {
|
uploadFile (slot, e) {
|
||||||
const file = e.target.files[0]
|
const file = e.target.files[0]
|
||||||
|
@ -217,6 +236,9 @@ const UserSettings = {
|
||||||
this.changePasswordError = res.error
|
this.changePasswordError = res.error
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
},
|
||||||
|
activateTab (tabName) {
|
||||||
|
this.activeTab = tabName
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -4,19 +4,33 @@
|
||||||
{{$t('settings.user_settings')}}
|
{{$t('settings.user_settings')}}
|
||||||
</div>
|
</div>
|
||||||
<div class="panel-body profile-edit">
|
<div class="panel-body profile-edit">
|
||||||
<div class="setting-item">
|
<div class="tab-switcher">
|
||||||
|
<button class="btn btn-default" @click="activateTab('profile')">{{$t('settings.profile_tab')}}</button>
|
||||||
|
<button class="btn btn-default" @click="activateTab('security')">{{$t('settings.security_tab')}}</button>
|
||||||
|
<button class="btn btn-default" @click="activateTab('data_import_export')" v-if="pleromaBackend">{{$t('settings.data_import_export_tab')}}</button>
|
||||||
|
</div>
|
||||||
|
<div class="setting-item" v-if="activeTab == 'profile'">
|
||||||
<h2>{{$t('settings.name_bio')}}</h2>
|
<h2>{{$t('settings.name_bio')}}</h2>
|
||||||
<p>{{$t('settings.name')}}</p>
|
<p>{{$t('settings.name')}}</p>
|
||||||
<input class='name-changer' id='username' v-model="newname"></input>
|
<input class='name-changer' id='username' v-model="newname"></input>
|
||||||
<p>{{$t('settings.bio')}}</p>
|
<p>{{$t('settings.bio')}}</p>
|
||||||
<textarea class="bio" v-model="newbio"></textarea>
|
<textarea class="bio" v-model="newbio"></textarea>
|
||||||
<div class="setting-item">
|
<p>
|
||||||
<input type="checkbox" v-model="newlocked" id="account-locked">
|
<input type="checkbox" v-model="newlocked" id="account-locked">
|
||||||
<label for="account-locked">{{$t('settings.lock_account_description')}}</label>
|
<label for="account-locked">{{$t('settings.lock_account_description')}}</label>
|
||||||
|
</p>
|
||||||
|
<div v-if="scopeOptionsEnabled">
|
||||||
|
<label for="default-vis">{{$t('settings.default_vis')}}</label>
|
||||||
|
<div id="default-vis" class="visibility-tray">
|
||||||
|
<i v-on:click="changeVis('direct')" class="icon-mail-alt" :class="vis.direct"></i>
|
||||||
|
<i v-on:click="changeVis('private')" class="icon-lock" :class="vis.private"></i>
|
||||||
|
<i v-on:click="changeVis('unlisted')" class="icon-lock-open-alt" :class="vis.unlisted"></i>
|
||||||
|
<i v-on:click="changeVis('public')" class="icon-globe" :class="vis.public"></i>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<button :disabled='newname.length <= 0' class="btn btn-default" @click="updateProfile">{{$t('general.submit')}}</button>
|
<button :disabled='newname.length <= 0' class="btn btn-default" @click="updateProfile">{{$t('general.submit')}}</button>
|
||||||
</div>
|
</div>
|
||||||
<div class="setting-item">
|
<div class="setting-item" v-if="activeTab == 'profile'">
|
||||||
<h2>{{$t('settings.avatar')}}</h2>
|
<h2>{{$t('settings.avatar')}}</h2>
|
||||||
<p>{{$t('settings.current_avatar')}}</p>
|
<p>{{$t('settings.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>
|
||||||
|
@ -29,7 +43,7 @@
|
||||||
<i class="icon-spin4 animate-spin" v-if="uploading[0]"></i>
|
<i class="icon-spin4 animate-spin" v-if="uploading[0]"></i>
|
||||||
<button class="btn btn-default" v-else-if="previews[0]" @click="submitAvatar">{{$t('general.submit')}}</button>
|
<button class="btn btn-default" v-else-if="previews[0]" @click="submitAvatar">{{$t('general.submit')}}</button>
|
||||||
</div>
|
</div>
|
||||||
<div class="setting-item">
|
<div class="setting-item" v-if="activeTab == 'profile'">
|
||||||
<h2>{{$t('settings.profile_banner')}}</h2>
|
<h2>{{$t('settings.profile_banner')}}</h2>
|
||||||
<p>{{$t('settings.current_profile_banner')}}</p>
|
<p>{{$t('settings.current_profile_banner')}}</p>
|
||||||
<img :src="user.cover_photo" class="banner"></img>
|
<img :src="user.cover_photo" class="banner"></img>
|
||||||
|
@ -42,7 +56,7 @@
|
||||||
<i class=" icon-spin4 animate-spin uploading" v-if="uploading[1]"></i>
|
<i class=" icon-spin4 animate-spin uploading" v-if="uploading[1]"></i>
|
||||||
<button class="btn btn-default" v-else-if="previews[1]" @click="submitBanner">{{$t('general.submit')}}</button>
|
<button class="btn btn-default" v-else-if="previews[1]" @click="submitBanner">{{$t('general.submit')}}</button>
|
||||||
</div>
|
</div>
|
||||||
<div class="setting-item">
|
<div class="setting-item" v-if="activeTab == 'profile'">
|
||||||
<h2>{{$t('settings.profile_background')}}</h2>
|
<h2>{{$t('settings.profile_background')}}</h2>
|
||||||
<p>{{$t('settings.set_new_profile_background')}}</p>
|
<p>{{$t('settings.set_new_profile_background')}}</p>
|
||||||
<img class="bg" v-bind:src="previews[2]" v-if="previews[2]">
|
<img class="bg" v-bind:src="previews[2]" v-if="previews[2]">
|
||||||
|
@ -53,7 +67,7 @@
|
||||||
<i class=" icon-spin4 animate-spin uploading" v-if="uploading[2]"></i>
|
<i class=" icon-spin4 animate-spin uploading" v-if="uploading[2]"></i>
|
||||||
<button class="btn btn-default" v-else-if="previews[2]" @click="submitBg">{{$t('general.submit')}}</button>
|
<button class="btn btn-default" v-else-if="previews[2]" @click="submitBg">{{$t('general.submit')}}</button>
|
||||||
</div>
|
</div>
|
||||||
<div class="setting-item">
|
<div class="setting-item" v-if="activeTab == 'security'">
|
||||||
<h2>{{$t('settings.change_password')}}</h2>
|
<h2>{{$t('settings.change_password')}}</h2>
|
||||||
<div>
|
<div>
|
||||||
<p>{{$t('settings.current_password')}}</p>
|
<p>{{$t('settings.current_password')}}</p>
|
||||||
|
@ -72,7 +86,7 @@
|
||||||
<p v-else-if="changePasswordError !== false">{{$t('settings.change_password_error')}}</p>
|
<p v-else-if="changePasswordError !== false">{{$t('settings.change_password_error')}}</p>
|
||||||
<p v-if="changePasswordError">{{changePasswordError}}</p>
|
<p v-if="changePasswordError">{{changePasswordError}}</p>
|
||||||
</div>
|
</div>
|
||||||
<div class="setting-item" v-if="pleromaBackend">
|
<div class="setting-item" v-if="pleromaBackend && activeTab == 'data_import_export'">
|
||||||
<h2>{{$t('settings.follow_import')}}</h2>
|
<h2>{{$t('settings.follow_import')}}</h2>
|
||||||
<p>{{$t('settings.import_followers_from_a_csv_file')}}</p>
|
<p>{{$t('settings.import_followers_from_a_csv_file')}}</p>
|
||||||
<form v-model="followImportForm">
|
<form v-model="followImportForm">
|
||||||
|
@ -89,15 +103,15 @@
|
||||||
<p>{{$t('settings.follow_import_error')}}</p>
|
<p>{{$t('settings.follow_import_error')}}</p>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="setting-item" v-if="enableFollowsExport">
|
<div class="setting-item" v-if="enableFollowsExport && activeTab == 'data_import_export'">
|
||||||
<h2>{{$t('settings.follow_export')}}</h2>
|
<h2>{{$t('settings.follow_export')}}</h2>
|
||||||
<button class="btn btn-default" @click="exportFollows">{{$t('settings.follow_export_button')}}</button>
|
<button class="btn btn-default" @click="exportFollows">{{$t('settings.follow_export_button')}}</button>
|
||||||
</div>
|
</div>
|
||||||
<div class="setting-item" v-else>
|
<div class="setting-item" v-else-if="activeTab == 'data_import_export'">
|
||||||
<h2>{{$t('settings.follow_export_processing')}}</h2>
|
<h2>{{$t('settings.follow_export_processing')}}</h2>
|
||||||
</div>
|
</div>
|
||||||
<hr>
|
<hr>
|
||||||
<div class="setting-item">
|
<div class="setting-item" v-if="activeTab == 'security'">
|
||||||
<h2>{{$t('settings.delete_account')}}</h2>
|
<h2>{{$t('settings.delete_account')}}</h2>
|
||||||
<p v-if="!deletingAccount">{{$t('settings.delete_account_description')}}</p>
|
<p v-if="!deletingAccount">{{$t('settings.delete_account_description')}}</p>
|
||||||
<div v-if="deletingAccount">
|
<div v-if="deletingAccount">
|
||||||
|
@ -137,4 +151,13 @@
|
||||||
margin: 0.25em;
|
margin: 0.25em;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.tab-switcher {
|
||||||
|
margin: 7px 7px;
|
||||||
|
display: inline-block;
|
||||||
|
|
||||||
|
button {
|
||||||
|
height: 30px;
|
||||||
|
}
|
||||||
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|
|
@ -336,7 +336,11 @@ const en = {
|
||||||
changed_password: 'Password changed successfully!',
|
changed_password: 'Password changed successfully!',
|
||||||
change_password_error: 'There was an issue changing your password.',
|
change_password_error: 'There was an issue changing your password.',
|
||||||
lock_account_description: 'Restrict your account to approved followers only',
|
lock_account_description: 'Restrict your account to approved followers only',
|
||||||
limited_availability: 'Unavailable in your browser'
|
limited_availability: 'Unavailable in your browser',
|
||||||
|
default_vis: 'Default visibility scope',
|
||||||
|
profile_tab: 'Profile',
|
||||||
|
security_tab: 'Security',
|
||||||
|
data_import_export_tab: 'Data Import / Export'
|
||||||
},
|
},
|
||||||
notifications: {
|
notifications: {
|
||||||
notifications: 'Notifications',
|
notifications: 'Notifications',
|
||||||
|
|
Loading…
Reference in a new issue