#4 - cr fix
This commit is contained in:
@@ -291,7 +291,7 @@ export default {
|
||||
name: 'Payroll',
|
||||
href: '#',
|
||||
iconForeground: 'text-yellow-700',
|
||||
iconBackground: 'bg-yellow-50'
|
||||
iconBackground: 'bg-yellow-50',
|
||||
},
|
||||
{
|
||||
icon: ReceiptRefundIcon,
|
||||
|
@@ -80,7 +80,7 @@ export default {
|
||||
errors: {
|
||||
type: Object,
|
||||
default: () => ({oauth: null}),
|
||||
}
|
||||
},
|
||||
},
|
||||
};
|
||||
</script>
|
||||
|
@@ -201,6 +201,6 @@ export default {
|
||||
}))
|
||||
.post('/users');
|
||||
},
|
||||
}
|
||||
},
|
||||
};
|
||||
</script>
|
||||
|
@@ -205,6 +205,6 @@ export default {
|
||||
}))
|
||||
.put(`/users/${this.user.id}`);
|
||||
},
|
||||
}
|
||||
},
|
||||
};
|
||||
</script>
|
||||
|
@@ -71,7 +71,7 @@
|
||||
<tr
|
||||
v-for="user in users.data"
|
||||
:key="user.id"
|
||||
:class="{ 'bg-red-50': user.trashed, 'hover:bg-blumilk-25': !user.trashed }"
|
||||
:class="{ 'bg-red-50': user.deleted, 'hover:bg-blumilk-25': !user.deleted }"
|
||||
>
|
||||
<td class="px-4 py-4 whitespace-nowrap text-sm text-gray-500">
|
||||
<div class="flex">
|
||||
@@ -125,7 +125,7 @@
|
||||
>
|
||||
<MenuItems class="origin-top-right absolute right-0 mt-2 w-56 z-10 rounded-md shadow-lg bg-white ring-1 ring-black ring-opacity-5 focus:outline-none">
|
||||
<div
|
||||
v-if="!user.trashed"
|
||||
v-if="!user.deleted"
|
||||
class="py-1"
|
||||
>
|
||||
<MenuItem
|
||||
@@ -295,6 +295,6 @@ export default {
|
||||
return {
|
||||
search,
|
||||
};
|
||||
}
|
||||
},
|
||||
};
|
||||
</script>
|
||||
|
@@ -40,7 +40,7 @@
|
||||
class="rounded-full flex text-sm ring-2 ring-white ring-opacity-20 focus:outline-none focus:ring-opacity-100"
|
||||
dusk="user-menu"
|
||||
>
|
||||
<span class="sr-only">Open user menu</span>
|
||||
<span class="sr-only">{{ user.avatar }}</span>
|
||||
<img
|
||||
class="h-8 w-8 rounded-full"
|
||||
:src="user.avatar"
|
||||
@@ -241,7 +241,7 @@ import {
|
||||
PopoverOverlay,
|
||||
PopoverPanel,
|
||||
TransitionChild,
|
||||
TransitionRoot
|
||||
TransitionRoot,
|
||||
} from '@headlessui/vue';
|
||||
import {BellIcon, MenuIcon, XIcon} from '@heroicons/vue/outline';
|
||||
import {computed} from 'vue';
|
||||
@@ -284,7 +284,7 @@ export default {
|
||||
navigation,
|
||||
userNavigation,
|
||||
};
|
||||
}
|
||||
},
|
||||
};
|
||||
|
||||
</script>
|
||||
|
@@ -33,6 +33,6 @@ Flatpickr.setDefaults({
|
||||
dateFormat: 'Y-m-d',
|
||||
enableTime: false,
|
||||
altFormat: 'j F Y',
|
||||
altInput: true
|
||||
altInput: true,
|
||||
});
|
||||
|
||||
|
Reference in New Issue
Block a user