@@ -228,6 +230,12 @@ export default {
},
parseTimestamp(timestamp) {
return moment(timestamp).format('YYYY-MM-DD HH:mm')
+ },
+ propertyExists(account, property, _secondProperty) {
+ if (_secondProperty) {
+ return account[property] && account[_secondProperty]
+ }
+ return account[property]
}
}
}
@@ -245,6 +253,11 @@ export default {
.account:hover {
text-decoration: underline;
}
+ .deactivated {
+ color: gray;
+ line-height: 28px;
+ vertical-align: middle;
+ }
.image {
width: 20%;
img {
@@ -267,7 +280,8 @@ export default {
.status-account-name {
display: inline-block;
margin: 0;
- font-size: 16px;
+ font-size: 15px;
+ font-weight: 500;
}
.status-body {
display: flex;
diff --git a/src/lang/en.js b/src/lang/en.js
index 86bc614c..291bbde3 100644
--- a/src/lang/en.js
+++ b/src/lang/en.js
@@ -238,7 +238,11 @@ export default {
unconfirmedEmail: 'User didn\'t confirm the email',
confirmAccount: 'Confirm account',
confirmAccounts: 'Confirm accounts',
- resendConfirmation: 'Resend confirmation email'
+ resendConfirmation: 'Resend confirmation email',
+ invalidAccount: 'This account has invalid nickname and can\'t be modified',
+ invalidNickname: 'invalid nickname',
+ passwordResetTokenGenerated: 'Password reset token was generated:',
+ linkToResetPassword: 'You can also use this link to reset password:'
},
statuses: {
statuses: 'Statuses',
diff --git a/src/store/modules/reports.js b/src/store/modules/reports.js
index 3a836a2f..6bc98993 100644
--- a/src/store/modules/reports.js
+++ b/src/store/modules/reports.js
@@ -61,9 +61,8 @@ const reports = {
const optimisticNote = {
user: {
avatar: rootState.user.avatar,
- display_name: rootState.user.name,
- url: `${rootState.user.authHost}/${rootState.user.name}`,
- acct: rootState.user.name
+ nickname: rootState.user.name,
+ id: rootState.user.id
},
content: content,
created_at: new Date().getTime()
diff --git a/src/store/modules/users.js b/src/store/modules/users.js
index e0645784..90b37e56 100644
--- a/src/store/modules/users.js
+++ b/src/store/modules/users.js
@@ -123,6 +123,10 @@ const users = {
dispatch('ApplyChanges', { updatedUsers, callApiFn, userId: _userId, statusId: _statusId })
},
+ ClearUsersState({ commit }) {
+ commit('SET_SEARCH_QUERY', '')
+ commit('SET_USERS_FILTERS', { local: false, external: false, active: false, deactivated: false })
+ },
async ClearFilters({ commit, dispatch, state }) {
commit('CLEAR_USERS_FILTERS')
dispatch('SearchUsers', { query: state.searchQuery, page: 1 })
diff --git a/src/views/reports/components/NoteCard.vue b/src/views/reports/components/NoteCard.vue
index 79637f16..a2a6a427 100644
--- a/src/views/reports/components/NoteCard.vue
+++ b/src/views/reports/components/NoteCard.vue
@@ -2,25 +2,14 @@
@@ -47,11 +36,29 @@ export default {
}
},
methods: {
+ handleNoteDeletion(noteID, reportID) {
+ this.$confirm('Are you sure you want to delete this note?', 'Warning', {
+ confirmButtonText: 'OK',
+ cancelButtonText: 'Cancel',
+ type: 'warning'
+ }).then(() => {
+ this.$store.dispatch('DeleteReportNote', { noteID, reportID })
+ this.$message({
+ type: 'success',
+ message: 'Delete completed'
+ })
+ }).catch(() => {
+ this.$message({
+ type: 'info',
+ message: 'Delete canceled'
+ })
+ })
+ },
parseTimestamp(timestamp) {
return moment(timestamp).format('YYYY-MM-DD HH:mm')
},
- handleNoteDeletion(noteID, reportID) {
- this.$store.dispatch('DeleteReportNote', { noteID, reportID })
+ propertyExists(account, property) {
+ return account[property]
}
}
}
@@ -76,7 +83,7 @@ export default {
}
.note-actor-name {
margin: 0;
- height: 22px;
+ height: 28px;
}
.note-avatar-img {
width: 15px;
@@ -96,6 +103,10 @@ export default {
.note-header {
display: flex;
justify-content: space-between;
+ align-items: center;
+ height: 28px;
+ font-size: 15px;
+ font-weight: 500;
}
@media only screen and (max-width:480px) {
@@ -105,14 +116,15 @@ export default {
.note-header {
display: flex;
flex-direction: column;
- height: 80px;
+ height: 65px;
}
- .note-actor-container {
+ .note-actor {
margin-bottom: 5px;
}
.note-header {
display: flex;
flex-direction: column;
+ align-items: flex-start;
}
}
diff --git a/src/views/reports/components/Report.vue b/src/views/reports/components/Report.vue
index 565b3cb0..cd938c91 100644
--- a/src/views/reports/components/Report.vue
+++ b/src/views/reports/components/Report.vue
@@ -10,9 +10,9 @@
@@ -54,22 +54,26 @@
-
+
@@ -142,9 +146,6 @@ export default {
}
},
methods: {
- accountExists(account, key) {
- return account[key]
- },
changeReportState(state, id) {
this.$store.dispatch('ChangeReportState', [{ state, id }])
},
@@ -177,6 +178,12 @@ export default {
parseTimestamp(timestamp) {
return moment(timestamp).format('L HH:mm')
},
+ propertyExists(account, property, _secondProperty) {
+ if (_secondProperty) {
+ return account[property] && account[_secondProperty]
+ }
+ return account[property]
+ },
showStatuses(statuses = []) {
return statuses.length > 0
}
@@ -262,6 +269,10 @@ export default {
font-style: italic;
color: gray;
}
+ .report-account-name {
+ font-size: 15px;
+ font-weight: 500;
+ }
.report-row-key {
font-size: 14px;
font-weight: 500;
diff --git a/src/views/statuses/show.vue b/src/views/statuses/show.vue
index 8ae05bcb..d6136129 100644
--- a/src/views/statuses/show.vue
+++ b/src/views/statuses/show.vue
@@ -2,13 +2,14 @@