Merge branch 'main' into #4-users-crud

# Conflicts:
#	composer.lock
#	resources/js/Shared/MainMenu.vue
This commit is contained in:
Adrian Hopek
2022-01-18 12:23:35 +01:00
15 changed files with 258 additions and 26 deletions

View File

@@ -38,6 +38,7 @@
</transition>
<div
class="sm:mx-auto sm:w-full sm:max-w-md text-white space-y-4 flex flex-col items-center rounded-lg px-4 py-8"
dusk="login-link"
>
<img
class="mx-auto h-50 w-auto"

View File

@@ -38,6 +38,7 @@
<div>
<MenuButton
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>
<img
@@ -54,6 +55,7 @@
>
<MenuItems
class="origin-top-right z-40 absolute -right-2 mt-2 w-48 rounded-md shadow-lg py-1 bg-white ring-1 ring-black ring-opacity-5 focus:outline-none"
dusk="user-menu-list"
>
<MenuItem
v-for="item in userNavigation"