From 2630f17cd54c7d4f723b12075cb6c839f02d99cc Mon Sep 17 00:00:00 2001 From: luce Date: Thu, 7 Aug 2025 10:57:00 +0200 Subject: [PATCH] snake_case to camelCase --- src/components/page_list/page_list.js | 38 ++++---- src/components/page_list/page_list.vue | 10 +-- .../settings_modal/admin_tabs/admin_card.js | 88 +++++++++---------- .../settings_modal/admin_tabs/admin_card.vue | 64 +++++++------- .../admin_tabs/admin_status_card.js | 22 ++--- .../admin_tabs/admin_status_card.vue | 28 +++--- .../settings_modal/admin_tabs/users_tab.js | 66 +++++++------- .../settings_modal/admin_tabs/users_tab.vue | 30 +++---- src/services/api/api.service.js | 22 ++--- 9 files changed, 186 insertions(+), 182 deletions(-) diff --git a/src/components/page_list/page_list.js b/src/components/page_list/page_list.js index c14cbd2ea..86bdd6801 100644 --- a/src/components/page_list/page_list.js +++ b/src/components/page_list/page_list.js @@ -5,48 +5,48 @@ const PageList = { SelectableList }, props: { - box_only: { + boxOnly: { type: Boolean, default: false }, - page_size: { + pageSize: { type: Number, default: 50 }, - fetch_page: { + fetchPage: { type: Function, default: async () => [] }, - single_page: { + singlePage: { type: Boolean, default: false } }, data () { return { - page_index: 1, + pageIndex: 1, items: [], - can_load_more: true, - is_loading: false + canLoadMore: true, + isLoading: false } }, methods: { reset () { - this.can_load_more = true - this.page_index = 1 + this.canLoadMore = true + this.pageIndex = 1 this.items = [] - this.is_loading = false - this.load_more() // load one page + this.isLoading = false + this.loadMore() // load one page }, - load_more () { - if (!this.is_loading && this.can_load_more) { - this.is_loading = true - this.fetch_page(this.$store, { - page: this.page_index++, - page_size: this.page_size + loadMore () { + if (!this.isLoading && this.canLoadMore) { + this.isLoading = true + this.fetchPage(this.$store, { + page: this.pageIndex++, + pageSize: this.pageSize }).then(items => { this.items = [...this.items, ...items] - this.is_loading = false + this.isLoading = false }) } }, @@ -55,7 +55,7 @@ const PageList = { } }, mounted () { - this.load_more() + this.loadMore() } } export default PageList diff --git a/src/components/page_list/page_list.vue b/src/components/page_list/page_list.vue index fc72a82fd..6e5e1d164 100644 --- a/src/components/page_list/page_list.vue +++ b/src/components/page_list/page_list.vue @@ -20,25 +20,25 @@ -
+
diff --git a/src/components/settings_modal/admin_tabs/admin_card.js b/src/components/settings_modal/admin_tabs/admin_card.js index d4505b28b..74ee57e99 100644 --- a/src/components/settings_modal/admin_tabs/admin_card.js +++ b/src/components/settings_modal/admin_tabs/admin_card.js @@ -4,16 +4,16 @@ import PageList from 'src/components/page_list/page_list.vue' import AdminStatusCard from 'src/components/settings_modal/admin_tabs/admin_status_card.vue' const AdminCard = { - props: ['user_details'], + props: ['userDetails'], data () { return { progress: false, - top_level_expanded: false, - json_expanded: false, - timeline_expanded: false, - just_approved: false, - just_confirmed: false, - just_deleted: false, + topLevelExpanded: false, + jsonExpanded: false, + timelineExpanded: false, + justApproved: false, + justConfirmed: false, + justDeleted: false, } }, computed: { @@ -21,45 +21,45 @@ const AdminCard = { return typeof(this.user) !== 'undefined' }, user () { - return this.$store.getters.findUser(this.user_details.id) + return this.$store.getters.findUser(this.userDetails.id) }, relationship () { - return this.$store.getters.relationship(this.user_details.id) + return this.$store.getters.relationship(this.userDetails.id) }, - is_local () { - const u = this.$store.getters.findUser(this.user_details.id) + isLocal () { + const u = this.$store.getters.findUser(this.userDetails.id) if (typeof(u) !== 'undefined') { return u.is_local === true } return false }, - is_admin () { - const u = this.$store.getters.findUser(this.user_details.id) + isAdmin () { + const u = this.$store.getters.findUser(this.userDetails.id) if (typeof(u) !== 'undefined') { return u.rights.admin === true } return false }, - is_moderator () { - const u = this.$store.getters.findUser(this.user_details.id) + isModerator () { + const u = this.$store.getters.findUser(this.userDetails.id) if (typeof(u) !== 'undefined') { return u.rights.moderator === true } return false }, - is_activated () { - const u = this.$store.getters.findUser(this.user_details.id) + isActivated () { + const u = this.$store.getters.findUser(this.userDetails.id) if (typeof(u) !== 'undefined') { return u.deactivated === false } return false }, - is_confirmed () { - const u = this.$store.getters.findUser(this.user_details.id) - return (u._original.pleroma.is_confirmed === true) || (this.just_confirmed === true) + isConfirmed () { + const u = this.$store.getters.findUser(this.userDetails.id) + return (u._original.pleroma.is_confirmed === true) || (this.justConfirmed === true) }, - is_approved () { - return (this.user_details._original.is_approved === true) || (this.just_approved === true) + isApproved () { + return (this.userDetails._original.is_approved === true) || (this.justApproved === true) } }, components: { @@ -69,62 +69,62 @@ const AdminCard = { AdminStatusCard, }, methods: { - toggle_admin (v) { - const u = this.$store.getters.findUser(this.user_details.id) + toggleAdmin (v) { + const u = this.$store.getters.findUser(this.userDetails.id) if (v === true) { this.$store.dispatch('adminAddUserToAdminGroup', u) } else { this.$store.dispatch('adminRemoveUserFromAdminGroup', u) } }, - toggle_moderator (v) { - const u = this.$store.getters.findUser(this.user_details.id) + toggleModerator (v) { + const u = this.$store.getters.findUser(this.userDetails.id) if (v === true) { this.$store.dispatch('adminAddUserToModeratorGroup', u) } else { this.$store.dispatch('adminRemoveUserFromModeratorGroup', u) } }, - toggle_activation (v) { - const u = this.$store.getters.findUser(this.user_details.id) + toggleActivation (v) { + const u = this.$store.getters.findUser(this.userDetails.id) if (v === true) { this.$store.dispatch('adminActivateUser', u) } else { this.$store.dispatch('adminDeactivateUser', u) } }, - confirm_user () { - const u = this.$store.getters.findUser(this.user_details.id) + confirmUser () { + const u = this.$store.getters.findUser(this.userDetails.id) this.$store.dispatch('adminConfirmUser', u) this.just_confirmed = true }, - resend_confirmation_email () { - const u = this.$store.getters.findUser(this.user_details.id) + resendConfirmationEmail () { + const u = this.$store.getters.findUser(this.userDetails.id) this.$store.dispatch('adminResendConfirmationEmail', u) }, - toggle_approval () { - const u = this.$store.getters.findUser(this.user_details.id) + toggleApproval () { + const u = this.$store.getters.findUser(this.userDetails.id) this.$store.dispatch('adminApproveUser', u) }, - force_update_user () { - this.$store.dispatch('fetchUser', this.user_details.id) + forceUpdateUser () { + this.$store.dispatch('fetchUser', this.userDetails.id) }, - delete_selection () { + deleteSelection () { const l = this.$refs.timelineList const s = l.getSelected() s.forEach(p => this.$store.dispatch('deleteStatus', p)) l.reset() }, - delete_user () { - if (!this.just_deleted) { - const u = this.$store.getters.findUser(this.user_details.id) + deleteUser () { + if (!this.justDeleted) { + const u = this.$store.getters.findUser(this.userDetails.id) this.$store.dispatch('adminDeleteUser', u) - this.just_deleted = true + this.justDeleted = true } }, - fetch_statuses (store, opts) { - const u = this.$store.getters.findUser(this.user_details.id) - const res = store.dispatch('adminListStatuses', { user: u, opts: { page_size: opts.pageSize, godmode: true, with_reblogs: true}}) + fetchStatuses (store, opts) { + const u = this.$store.getters.findUser(this.userDetails.id) + const res = store.dispatch('adminListStatuses', { user: u, opts: { pageSize: opts.pageSize, godmode: true, withReblogs: true}}) return Promise.resolve(res.then(r => r.activities)) } } diff --git a/src/components/settings_modal/admin_tabs/admin_card.vue b/src/components/settings_modal/admin_tabs/admin_card.vue index 3b61f363c..6d01d238c 100644 --- a/src/components/settings_modal/admin_tabs/admin_card.vue +++ b/src/components/settings_modal/admin_tabs/admin_card.vue @@ -1,16 +1,16 @@ diff --git a/src/components/settings_modal/admin_tabs/users_tab.js b/src/components/settings_modal/admin_tabs/users_tab.js index 65ff11a30..0cc030fdb 100644 --- a/src/components/settings_modal/admin_tabs/users_tab.js +++ b/src/components/settings_modal/admin_tabs/users_tab.js @@ -16,34 +16,36 @@ const UsersTab = { data() { return { init: false, - filters_origin: 'local', - filters_activity: 'all', - filters_permission: 'all', - filters_query: '', - filters_name: '', - filters_email: '', + filtersOrigin: 'local', + filtersActivity: 'all', + filtersPermission: 'all', + filtersNeedApproval: false, + filtersUnconfirmed: false, + filtersQuery: '', + filtersName: '', + filtersEmail: '', expandedUser: null, loading: false } }, computed: { - filters_is_admin () { - return this.filters_permission === 'admin' || this.filters_permission === 'modsnadmins' + filtersIsAdmin () { + return this.filtersPermission === 'admin' || this.filtersPermission === 'modsnadmins' }, - filters_is_moderator () { - return this.filters_permission === 'moderator' || this.filters_permission === 'modsnadmins' + filtersIsModerator () { + return this.filtersPermission === 'moderator' || this.filtersPermission === 'modsnadmins' }, - filters_active () { - return this.filters_activity === 'active' + filtersActive () { + return this.filtersActivity === 'active' }, - filters_deactivated () { - return this.filters_activity === 'deactivated' + filtersDeactivated () { + return this.filtersActivity === 'deactivated' }, - filters_local () { - return this.filters_origin === 'local' + filtersLocal () { + return this.filtersOrigin === 'local' }, - filters_external () { - return this.filters_origin === 'external' + filtersExternal () { + return this.filtersOrigin === 'external' } }, components: { @@ -56,36 +58,38 @@ const UsersTab = { TabSwitcher, }, methods: { - fetch_page (store, opts) { + fetchPage (store, opts) { if(!this.init) return new Promise(() => []) const filters = { - is_admin: this.filters_is_admin, - is_moderator: this.filters_is_moderator, - active: this.filters_active, - deactivated: this.filters_deactivated, - local: this.filters_local, - external: this.filters_external + isAdmin: this.filtersIsAdmin, + isModerator: this.filtersIsModerator, + active: this.filtersActive, + deactivated: this.filtersDeactivated, + local: this.filtersLocal, + external: this.filtersExternal, + needApproval: this.filtersNeedApproval, + unconfirmed: this.filtersUnconfirmeUnconfirmed } const users = store.dispatch('fetchAdminUsers', { ...opts, ...{ - query: this.filters_query, + query: this.filtersQuery, filters, - name: this.filters_name, - email: this.filters_email + name: this.filtersName, + email: this.filtersEmail }}) return users }, reset () { this.$refs.userList.reset() }, - activate_selection () { + activateSelection () { const s = this.$refs.userList.getSelected() s.forEach(u => this.$store.dispatch('adminActivateUser', this.$store.getters.findUser(u.id))) }, - deactivate_selection () { + deactivateSelection () { const s = this.$refs.userList.getSelected() s.forEach(u => this.$store.dispatch('adminDeactivateUser', this.$store.getters.findUser(u.id))) }, - delete_selection () { + deleteSelection () { const s = this.$refs.userList.getSelected() s.forEach(u => this.$store.dispatch('adminDeleteUser', this.$store.getters.findUser(u.id))) this.reset() diff --git a/src/components/settings_modal/admin_tabs/users_tab.vue b/src/components/settings_modal/admin_tabs/users_tab.vue index 22e584571..3abd5a1aa 100644 --- a/src/components/settings_modal/admin_tabs/users_tab.vue +++ b/src/components/settings_modal/admin_tabs/users_tab.vue @@ -7,7 +7,7 @@ >