diff options
| author | lambda <pleromagit@rogerbraun.net> | 2018-05-24 17:23:44 +0000 |
|---|---|---|
| committer | lambda <pleromagit@rogerbraun.net> | 2018-05-24 17:23:44 +0000 |
| commit | 648f31f44c2e4daee3394b0df10b3f9f5ca41c66 (patch) | |
| tree | 215fac8494032d75c246b107cc9f1480cc69d69b /src/components/user_settings/user_settings.vue | |
| parent | f06fef26b169a07d95afbf1d40764f9196ee37de (diff) | |
| parent | 5ae7fb871ebdb8b7c56f0aed6494f5f4fde8cd15 (diff) | |
Merge branch 'feature/change-password' into 'develop'
Feature/change password
See merge request pleroma/pleroma-fe!268
Diffstat (limited to 'src/components/user_settings/user_settings.vue')
| -rw-r--r-- | src/components/user_settings/user_settings.vue | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/src/components/user_settings/user_settings.vue b/src/components/user_settings/user_settings.vue index ea9763f3..fbf3f651 100644 --- a/src/components/user_settings/user_settings.vue +++ b/src/components/user_settings/user_settings.vue @@ -49,6 +49,25 @@ <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> </div> + <div class="setting-item"> + <h3>{{$t('settings.change_password')}}</h3> + <div> + <p>{{$t('settings.current_password')}}</p> + <input type="password" v-model="changePasswordInputs[0]"> + </div> + <div> + <p>{{$t('settings.new_password')}}</p> + <input type="password" v-model="changePasswordInputs[1]"> + </div> + <div> + <p>{{$t('settings.confirm_new_password')}}</p> + <input type="password" v-model="changePasswordInputs[2]"> + </div> + <button class="btn btn-default" @click="changePassword">{{$t('general.submit')}}</button> + <p v-if="changedPassword">{{$t('settings.changed_password')}}</p> + <p v-else-if="changePasswordError !== false">{{$t('settings.change_password_error')}}</p> + <p v-if="changePasswordError">{{changePasswordError}}</p> + </div> <div class="setting-item" v-if="pleromaBackend"> <h3>{{$t('settings.follow_import')}}</h3> <p>{{$t('settings.import_followers_from_a_csv_file')}}</p> @@ -62,7 +81,7 @@ <p>{{$t('settings.follows_imported')}}</p> </div> <div v-else-if="followImportError"> - <i class="icon-cross" @click="dismissImported"</i> + <i class="icon-cross" @click="dismissImported"></i> <p>{{$t('settings.follow_import_error')}}</p> </div> </div> |