QT/InvoiceShelf
1
0
Fork 0
mirror of https://github.com/InvoiceShelf/InvoiceShelf.git synced 2026-07-19 07:15:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename company-scoped Users to Members throughout

Browse Source 
Complete rename across backend and frontend:
- Controller: Company/Users/UsersController -> Company/Members/MembersController
- Service: UserService -> MemberService
- Requests: UserRequest -> MemberRequest, DeleteUserRequest -> DeleteMemberRequest
- API routes: /api/v1/users -> /api/v1/members (company-scoped only)
- Sidebar menu: "Users" -> "Members"
- Frontend: views/users -> views/members, stores/users -> stores/members
- Router: users.index -> members.index, /admin/users -> /admin/members
- i18n: new "members" section with invitation-related keys
- Tests: UserTest -> MemberTest

Admin/super-admin Users (system-wide user management) remains unchanged.
This commit is contained in:
Darko Gjorgjijoski
2026-04-03 23:12:30 +02:00
parent 92a1baced4
commit 8a6c085288
18 changed files with 178 additions and 214 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
resources/scripts/admin/admin-router.js vendored
View File

@@ -66,9 +66,9 @@ const ItemCreate = () => import('@/scripts/admin/views/items/Create.vue')
const ExpensesIndex = () => import('@/scripts/admin/views/expenses/Index.vue')
const ExpenseCreate = () => import('@/scripts/admin/views/expenses/Create.vue')
// Users
const UserIndex = () => import('@/scripts/admin/views/users/Index.vue')
const UserCreate = () => import('@/scripts/admin/views/users/Create.vue')
// Members
const MemberIndex = () => import('@/scripts/admin/views/members/Index.vue')
const MemberCreate = () => import('@/scripts/admin/views/members/Create.vue')
// Estimates
const EstimateIndex = () => import('@/scripts/admin/views/estimates/Index.vue')
@@ -391,24 +391,24 @@ export default [
component: ExpenseCreate,
},
// Users
// Members
{
path: 'users',
name: 'users.index',
path: 'members',
name: 'members.index',
meta: { isOwner: true },
component: UserIndex,
component: MemberIndex,
},
{
path: 'users/create',
path: 'members/create',
meta: { isOwner: true },
name: 'users.create',
component: UserCreate,
name: 'members.create',
component: MemberCreate,
},
{
path: 'users/:id/edit',
name: 'users.edit',
path: 'members/:id/edit',
name: 'members.edit',
meta: { isOwner: true },
component: UserCreate,
component: MemberCreate,
},
// Estimates

10
resources/scripts/admin/components/dropdowns/UserIndexDropdown.vue → resources/scripts/admin/components/dropdowns/MemberIndexDropdown.vue
View File

@@ -1,14 +1,14 @@
<template>
<BaseDropdown>
<template #activator>
<BaseButton v-if="route.name === 'users.view'" variant="primary">
<BaseButton v-if="route.name === 'members.view'" variant="primary">
<BaseIcon name="EllipsisHorizontalIcon" class="h-5 text-white" />
</BaseButton>
<BaseIcon v-else name="EllipsisHorizontalIcon" class="h-5 text-gray-500" />
</template>
<!-- edit user -->
<router-link :to="`/admin/users/${row.id}/edit`">
<router-link :to="`/admin/members/${row.id}/edit`">
<BaseDropdownItem>
<BaseIcon
name="PencilIcon"
@@ -36,7 +36,7 @@ import { useI18n } from 'vue-i18n'
import { useUserStore } from '@/scripts/admin/stores/user'
import { useRoute, useRouter } from 'vue-router'
import { inject } from 'vue'
import { useUsersStore } from '@/scripts/admin/stores/users'
import { useMembersStore } from '@/scripts/admin/stores/members'
const props = defineProps({
row: {
@@ -59,7 +59,7 @@ const { t } = useI18n()
const userStore = useUserStore()
const route = useRoute()
const router = useRouter()
const usersStore = useUsersStore()
const usersStore = useMembersStore()
const $utils = inject('utils')
@@ -67,7 +67,7 @@ function removeUser(id) {
dialogStore
.openDialog({
title: t('general.are_you_sure'),
message: t('users.confirm_delete', 1),
message: t('members.confirm_delete', 1),
yesLabel: t('general.ok'),
noLabel: t('general.cancel'),
variant: 'danger',

24
resources/scripts/admin/stores/users.js → resources/scripts/admin/stores/members.js vendored
View File

@@ -3,11 +3,11 @@ import { defineStore } from 'pinia'
import { useNotificationStore } from '@/scripts/stores/notification'
import { handleError } from '@/scripts/helpers/error-handling'
export const useUsersStore = (useWindow = false) => {
export const useMembersStore = (useWindow = false) => {
const defineStoreFunc = useWindow ? window.pinia.defineStore : defineStore
const { global } = window.i18n
return defineStoreFunc('users', {
return defineStoreFunc('members', {
state: () => ({
roles: [],
users: [],
@@ -42,7 +42,7 @@ export const useUsersStore = (useWindow = false) => {
fetchUsers(params) {
return new Promise((resolve, reject) => {
http
.get(`/api/v1/users`, { params })
.get(`/api/v1/members`, { params })
.then((response) => {
this.users = response.data.data
this.totalUsers = response.data.meta.total
@@ -58,7 +58,7 @@ export const useUsersStore = (useWindow = false) => {
fetchUser(id) {
return new Promise((resolve, reject) => {
http
.get(`/api/v1/users/${id}`)
.get(`/api/v1/members/${id}`)
.then((response) => {
this.userData = response.data.data
if (this.userData?.companies?.length) {
@@ -97,14 +97,14 @@ export const useUsersStore = (useWindow = false) => {
addUser(data) {
return new Promise((resolve, reject) => {
http
.post('/api/v1/users', data)
.post('/api/v1/members', data)
.then((response) => {
this.users.push(response.data)
const notificationStore = useNotificationStore()
notificationStore.showNotification({
type: 'success',
message: global.t('users.created_message'),
message: global.t('members.created_message'),
})
resolve(response)
})
@@ -118,7 +118,7 @@ export const useUsersStore = (useWindow = false) => {
updateUser(data) {
return new Promise((resolve, reject) => {
http
.put(`/api/v1/users/${data.id}`, data)
.put(`/api/v1/members/${data.id}`, data)
.then((response) => {
if (response) {
let pos = this.users.findIndex(
@@ -129,7 +129,7 @@ export const useUsersStore = (useWindow = false) => {
const notificationStore = useNotificationStore()
notificationStore.showNotification({
type: 'success',
message: global.t('users.updated_message'),
message: global.t('members.updated_message'),
})
resolve(response)
})
@@ -145,13 +145,13 @@ export const useUsersStore = (useWindow = false) => {
return new Promise((resolve, reject) => {
http
.post(`/api/v1/users/delete`, { users: id.ids })
.post(`/api/v1/members/delete`, { users: id.ids })
.then((response) => {
let index = this.users.findIndex((user) => user.id === id)
this.users.splice(index, 1)
notificationStore.showNotification({
type: 'success',
message: global.t('users.deleted_message', 1),
message: global.t('members.deleted_message', 1),
})
resolve(response)
})
@@ -165,7 +165,7 @@ export const useUsersStore = (useWindow = false) => {
deleteMultipleUsers() {
return new Promise((resolve, reject) => {
http
.post(`/api/v1/users/delete`, { users: this.selectedUsers })
.post(`/api/v1/members/delete`, { users: this.selectedUsers })
.then((response) => {
this.selectedUsers.forEach((user) => {
let index = this.users.findIndex(
@@ -176,7 +176,7 @@ export const useUsersStore = (useWindow = false) => {
const notificationStore = useNotificationStore()
notificationStore.showNotification({
type: 'success',
message: global.t('users.deleted_message', 2),
message: global.t('members.deleted_message', 2),
})
resolve(response)
})

4
resources/scripts/admin/stores/reset.js vendored
View File

@@ -23,7 +23,7 @@ import { useRecurringInvoiceStore } from './recurring-invoice'
import { useRoleStore } from './role'
import { useTaxTypeStore } from './tax-type'
import { useUserStore } from './user'
import { useUsersStore } from './users'
import { useMembersStore } from './users'
export const useResetStore = (useWindow = false) => {
const defineStoreFunc = useWindow ? window.pinia.defineStore : defineStore
@@ -56,7 +56,7 @@ export const useResetStore = (useWindow = false) => {
const roleStore = useRoleStore()
const taxTypeStore = useTaxTypeStore()
const userStore = useUserStore()
const usersStore = useUsersStore()
const usersStore = useMembersStore()
backupStore.$reset()
categoryStore.$reset()

26
resources/scripts/admin/views/users/Create.vue → resources/scripts/admin/views/members/Create.vue
View File

@@ -3,7 +3,7 @@
<BasePageHeader :title="pageTitle">
<BaseBreadcrumb>
<BaseBreadcrumbItem :title="$t('general.home')" to="dashboard" />
<BaseBreadcrumbItem :title="$t('users.user', 2)" to="/admin/users" />
<BaseBreadcrumbItem :title="$t('members.user', 2)" to="/admin/members" />
<BaseBreadcrumbItem :title="pageTitle" to="#" active />
</BaseBreadcrumb>
</BasePageHeader>
@@ -14,7 +14,7 @@
<BaseInputGrid layout="one-column">
<BaseInputGroup
:content-loading="isFetchingInitialData"
:label="$t('users.name')"
:label="$t('members.name')"
:error="
v$.userData.name.$error && v$.userData.name.$errors[0].$message
"
@@ -31,7 +31,7 @@
<BaseInputGroup
:content-loading="isFetchingInitialData"
:label="$t('users.email')"
:label="$t('members.email')"
:error="
v$.userData.email.$error &&
v$.userData.email.$errors[0].$message
@@ -50,7 +50,7 @@
<BaseInputGroup
:content-loading="isFetchingInitialData"
:label="$t('users.companies')"
:label="$t('members.companies')"
:error="
v$.userData.companies.$error &&
v$.userData.companies.$errors[0].$message
@@ -85,7 +85,7 @@
<BaseInputGroup
:content-loading="isFetchingInitialData"
:label="
$t('users.select_company_role', { company: company.name })
$t('members.select_company_role', { company: company.name })
"
:error="v.role.$error && v.role.$errors[0].$message"
required
@@ -109,7 +109,7 @@
<BaseInputGroup
:content-loading="isFetchingInitialData"
:label="$t('users.password')"
:label="$t('members.password')"
:error="
v$.userData.password.$error &&
v$.userData.password.$errors[0].$message
@@ -130,7 +130,7 @@
<BaseInputGroup
:content-loading="isFetchingInitialData"
:label="$t('users.phone')"
:label="$t('members.phone')"
>
<BaseInput
v-model.trim="userStore.userData.phone"
@@ -153,7 +153,7 @@
:class="slotProps.class"
/>
</template>
{{ isEdit ? $t('users.update_user') : $t('users.save_user') }}
{{ isEdit ? $t('members.update_user') : $t('members.save_user') }}
</BaseButton>
</BaseCard>
</div>
@@ -175,9 +175,9 @@ import {
import useVuelidate from '@vuelidate/core'
import { ValidateEach } from '@vuelidate/components'
import { useI18n } from 'vue-i18n'
import { useUsersStore } from '@/scripts/admin/stores/users'
import { useMembersStore } from '@/scripts/admin/stores/members'
const userStore = useUsersStore()
const userStore = useMembersStore()
const { t } = useI18n()
const route = useRoute()
@@ -189,10 +189,10 @@ let isFetchingInitialData = ref(false)
let selectedCompanies = ref([])
let companies = ref([])
const isEdit = computed(() => route.name === 'users.edit')
const isEdit = computed(() => route.name === 'members.edit')
const pageTitle = computed(() =>
isEdit.value ? t('users.edit_user') : t('users.new_user')
isEdit.value ? t('members.edit_user') : t('members.new_user')
)
const rules = computed(() => {
@@ -285,7 +285,7 @@ async function submitUser() {
const action = isEdit.value ? userStore.updateUser : userStore.addUser
await action(data)
router.push('/admin/users')
router.push('/admin/members')
isSaving.value = false
} catch (error) {
isSaving.value = false

38
resources/scripts/admin/views/users/Index.vue → resources/scripts/admin/views/members/Index.vue
View File

@@ -1,10 +1,10 @@
<template>
<BasePage>
<!-- Page Header Section -->
<BasePageHeader :title="$t('users.title')">
<BasePageHeader :title="$t('members.title')">
<BaseBreadcrumb>
<BaseBreadcrumbItem :title="$t('general.home')" to="dashboard" />
<BaseBreadcrumbItem :title="$t('users.title', 2)" to="#" active />
<BaseBreadcrumbItem :title="$t('members.title', 2)" to="#" active />
</BaseBreadcrumb>
<template #actions>
@@ -36,14 +36,14 @@
aria-hidden="true"
/>
</template>
{{ $t('users.add_user') }}
{{ $t('members.add_user') }}
</BaseButton>
</div>
</template>
</BasePageHeader>
<BaseFilterWrapper :show="showFilters" class="mt-3" @clear="clearFilter">
<BaseInputGroup :label="$t('users.name')" class="flex-1 mt-2 mr-4">
<BaseInputGroup :label="$t('members.name')" class="flex-1 mt-2 mr-4">
<BaseInput
v-model="filters.name"
type="text"
@@ -52,7 +52,7 @@
/>
</BaseInputGroup>
<BaseInputGroup :label="$t('users.email')" class="flex-1 mt-2 mr-4">
<BaseInputGroup :label="$t('members.email')" class="flex-1 mt-2 mr-4">
<BaseInput
v-model="filters.email"
type="text"
@@ -61,7 +61,7 @@
/>
</BaseInputGroup>
<BaseInputGroup class="flex-1 mt-2" :label="$t('users.phone')">
<BaseInputGroup class="flex-1 mt-2" :label="$t('members.phone')">
<BaseInput
v-model="filters.phone"
type="text"
@@ -75,8 +75,8 @@
<BaseEmptyPlaceholder
v-show="showEmptyScreen"
:title="$t('users.no_users')"
:description="$t('users.list_of_users')"
:title="$t('members.no_users')"
:description="$t('members.list_of_users')"
>
<AstronautIcon class="mt-5 mb-4" />
@@ -84,12 +84,12 @@
<BaseButton
v-if="userStore.currentUser.is_owner"
variant="primary-outline"
@click="$router.push('/admin/users/create')"
@click="$router.push('/admin/members/create')"
>
<template #left="slotProps">
<BaseIcon name="PlusIcon" :class="slotProps.class" />
</template>
{{ $t('users.add_user') }}
{{ $t('members.add_user') }}
</BaseButton>
</template>
</BaseEmptyPlaceholder>
@@ -188,17 +188,17 @@
import { computed, onUnmounted, ref, reactive, onMounted, watch } from 'vue'
import { useI18n } from 'vue-i18n'
import { useRouter } from 'vue-router'
import { useUsersStore } from '@/scripts/admin/stores/users'
import { useMembersStore } from '@/scripts/admin/stores/members'
import { useNotificationStore } from '@/scripts/stores/notification'
import { useDialogStore } from '@/scripts/stores/dialog'
import { useUserStore } from '@/scripts/admin/stores/user'
import AstronautIcon from '@/scripts/components/icons/empty/AstronautIcon.vue'
import UserDropdown from '@/scripts/admin/components/dropdowns/UserIndexDropdown.vue'
import UserDropdown from '@/scripts/admin/components/dropdowns/MemberIndexDropdown.vue'
import abilities from '@/scripts/admin/stub/abilities'
const notificationStore = useNotificationStore()
const dialogStore = useDialogStore()
const usersStore = useUsersStore()
const usersStore = useMembersStore()
const userStore = useUserStore()
const router = useRouter()
@@ -227,18 +227,18 @@ const userTableColumns = computed(() => {
},
{
key: 'name',
label: t('users.name'),
label: t('members.name'),
thClass: 'extra',
tdClass: 'font-medium text-gray-900',
},
{ key: 'email', label: 'Email' },
{
key: 'phone',
label: t('users.phone'),
label: t('members.phone'),
},
{
key: 'created_at',
label: t('users.added_on'),
label: t('members.added_on'),
},
{
key: 'actions',
@@ -342,7 +342,7 @@ function removeUser(id) {
dialogStore
.openDialog({
title: t('general.are_you_sure'),
message: t('users.confirm_delete', 1),
message: t('members.confirm_delete', 1),
yesLabel: t('general.ok'),
noLabel: t('general.cancel'),
variant: 'danger',
@@ -361,7 +361,7 @@ function removeUser(id) {
if (response.data.error === 'user_attached') {
notificationStore.showNotification({
type: 'error',
message: t('users.user_attached_message'),
message: t('members.user_attached_message'),
})
return true
}
@@ -374,7 +374,7 @@ function removeMultipleUsers() {
dialogStore
.openDialog({
title: t('general.are_you_sure'),
message: t('users.confirm_delete', 2),
message: t('members.confirm_delete', 2),
yesLabel: t('general.ok'),
noLabel: t('general.cancel'),
variant: 'danger',