make time entry create in calendar use minimal interval instead of 1h duration

also rename them so that they do not conflict with the datepicker calendar component

app/Http/Middleware/HandleInertiaRequests.php

@@ -41,7 +41,6 @@ class HandleInertiaRequests extends Middleware
     {
         $hasBilling = Module::has('Billing') && Module::isEnabled('Billing');
         $hasInvoicing = Module::has('Invoicing') && Module::isEnabled('Invoicing');
-        $hasServices = Module::has('Services') && Module::isEnabled('Services');
 
         /** @var BillingContract $billing */
         $billing = app(BillingContract::class);
@@ -51,7 +50,6 @@ class HandleInertiaRequests extends Middleware
         return array_merge(parent::share($request), [
             'has_billing_extension' => $hasBilling,
             'has_invoicing_extension' => $hasInvoicing,
-            'has_services_extension' => $hasServices,
             'billing' => $currentOrganization !== null ? [
                 'has_subscription' => $billing->hasSubscription($currentOrganization),
                 'has_trial' => $billing->hasTrial($currentOrganization),

docker/local/minio/create_bucket.sh

@@ -2,7 +2,7 @@
 
 # Source: https://helgesver.re/articles/laravel-sail-create-minio-bucket-automatically
 
-/usr/bin/mc alias set local ${S3_ENDPOINT} ${S3_ACCESS_KEY_ID} ${S3_SECRET_ACCESS_KEY};
+/usr/bin/mc config host add local ${S3_ENDPOINT} ${S3_ACCESS_KEY_ID} ${S3_SECRET_ACCESS_KEY};
 /usr/bin/mc rm -r --force local/${S3_BUCKET};
 /usr/bin/mc mb --ignore-existing local/${S3_BUCKET};
 /usr/bin/mc anonymous set public local/${S3_BUCKET};

docker/prod/Dockerfile

@@ -16,7 +16,7 @@ RUN CGO_ENABLED=1 \
     XCADDY_GO_BUILD_FLAGS="-ldflags='-w -s' -tags=nobadger,nomysql,nopgx" \
     CGO_CFLAGS=$(php-config --includes) \
     CGO_LDFLAGS="$(php-config --ldflags) $(php-config --libs)" \
-    xcaddy build v2.10.0 \
+    xcaddy build \
         --output /usr/local/bin/frankenphp \
         --with github.com/dunglas/frankenphp=./ \
         --with github.com/dunglas/frankenphp/caddy=./caddy/ \

resources/js/Components/NotificationContainer.vue

@@ -1,7 +1,7 @@
 <template>
     <div
         aria-live="assertive"
-        class="pointer-events-none fixed inset-0 flex items-end px-4 py-6 sm:items-end sm:p-6 z-[70]">
+        class="pointer-events-none fixed inset-0 flex items-end px-4 py-6 sm:items-end sm:p-6 sm:pb-24 z-[70]">
         <div class="flex w-full flex-col items-center space-y-4 sm:items-end">
             <Notification
                 v-for="notification in notifications"

resources/js/Components/OrganizationSwitcher.vue

@@ -1,23 +1,12 @@
 <script setup lang="ts">
 import { ChevronDownIcon } from '@heroicons/vue/20/solid';
-import { Link, usePage } from '@inertiajs/vue3';
+import Dropdown from '@/packages/ui/src/Input/Dropdown.vue';
-import {
+import DropdownLink from '@/Components/DropdownLink.vue';
-    Cog6ToothIcon,
+import { usePage } from '@inertiajs/vue3';
-    PlusCircleIcon,
-    CheckCircleIcon,
-    ArrowRightIcon,
-} from '@heroicons/vue/24/solid';
 import type { Organization, User } from '@/types/models';
 import { isBillingActivated } from '@/utils/billing';
 import { canManageBilling } from '@/utils/permissions';
 import { switchOrganization } from '@/utils/useOrganization';
-import {
-    DropdownMenu,
-    DropdownMenuTrigger,
-    DropdownMenuContent,
-    DropdownMenuItem,
-    DropdownMenuLabel,
-} from '@/Components/ui/dropdown-menu';
 
 const page = usePage<{
     jetstream: {
@@ -39,79 +28,84 @@ const switchToTeam = (organization: Organization) => {
 </script>
 
 <template>
-    <DropdownMenu v-if="page.props.jetstream.hasTeamFeatures">
+    <Dropdown v-if="page.props.jetstream.hasTeamFeatures" align="center" width="60">
-        <DropdownMenuTrigger
+        <template #trigger>
-            class="flex w-full text-left hover:bg-white/10 focus-visible:ring-2 focus-visible:ring-ring cursor-pointer transition pl-2 py-1 rounded w-full items-center justify-between"
+            <div
-            as-child>
+                data-testid="organization_switcher"
-            <button data-testid="organization_switcher">
+                class="flex hover:bg-white/10 cursor-pointer transition px-2 py-1 rounded-lg w-full items-center justify-between font-medium">
                 <div class="flex flex-1 space-x-2 items-center w-[calc(100%-30px)]">
                     <div
-                        class="rounded bg-blue-900 font-medium text-xs flex-shrink-0 text-white w-5 h-5 flex items-center justify-center">
+                        class="rounded sm:rounded-lg bg-blue-900 font-semibold text-xs sm:text-sm flex-shrink-0 text-white w-5 sm:w-6 h-5 sm:h-6 flex items-center justify-center">
                         {{ page.props.auth.user.current_team.name.slice(0, 1).toUpperCase() }}
                     </div>
-                    <span class="text-xs flex-1 truncate font-medium">
+                    <span class="text-sm flex-1 truncate font-semibold">
                         {{ page.props.auth.user.current_team.name }}
                     </span>
                 </div>
                 <div class="w-[30px]">
-                    <div class="p-1 rounded-full flex items-center w-6 h-6">
+                    <button
-                        <ChevronDownIcon class="w-4 sm:w-full mt-[1px]"></ChevronDownIcon>
+                        class="p-1 transition hover:bg-white/10 rounded-full flex items-center w-8 h-8">
-                    </div>
+                        <ChevronDownIcon class="w-5 sm:w-full mt-[1px]"></ChevronDownIcon>
+                    </button>
                 </div>
-            </button>
+            </div>
-        </DropdownMenuTrigger>
+        </template>
 
-        <DropdownMenuContent align="start">
+        <template #content>
             <div class="w-60">
-                <DropdownMenuLabel>Manage Organization</DropdownMenuLabel>
+                <!-- Organization Management -->
+                <div class="block px-4 py-2 text-xs text-text-secondary">Manage Organization</div>
 
-                <DropdownMenuItem as-child>
+                <!-- Organization Settings -->
-                    <Link
+                <DropdownLink :href="route('teams.show', page.props.auth.user.current_team.id)">
-                        :href="route('teams.show', page.props.auth.user.current_team.id)"
+                    Organization Settings
-                        class="inline-flex items-center gap-2.5 w-full">
+                </DropdownLink>
-                        <Cog6ToothIcon class="w-5 h-5 text-icon-default" />
-                        <span>Organization Settings</span>
-                    </Link>
-                </DropdownMenuItem>
 
-                <DropdownMenuItem v-if="canManageBilling() && isBillingActivated()" as-child>
+                <DropdownLink v-if="canManageBilling() && isBillingActivated()" href="/billing">
-                    <Link href="/billing" class="inline-flex items-center w-full"> Billing </Link>
+                    Billing
-                </DropdownMenuItem>
+                </DropdownLink>
 
-                <DropdownMenuItem v-if="page.props.jetstream.canCreateTeams" as-child>
+                <DropdownLink
-                    <Link
+                    v-if="page.props.jetstream.canCreateTeams"
-                        :href="route('teams.create')"
+                    :href="route('teams.create')">
-                        class="inline-flex items-center gap-2.5 w-full">
+                    Create new organization
-                        <PlusCircleIcon class="w-5 h-5 text-icon-default" />
+                </DropdownLink>
-                        <span>Create new organization</span>
-                    </Link>
-                </DropdownMenuItem>
 
+                <!-- Organization Switcher -->
                 <template v-if="page.props.auth.user.all_teams.length > 1">
                     <div class="border-t border-card-background-separator" />
 
-                    <DropdownMenuLabel>Switch Organizations</DropdownMenuLabel>
+                    <div class="block px-4 py-2 text-xs text-text-secondary">
+                        Switch Organizations
+                    </div>
 
                     <template v-for="team in page.props.auth.user.all_teams" :key="team.id">
                         <form @submit.prevent="switchToTeam(team)">
-                            <DropdownMenuItem
+                            <DropdownLink as="button">
-                                as-child
+                                <div class="flex items-center">
-                                class="inline-flex gap-2.5 items-center w-full">
+                                    <svg
-                                <button type="submit">
-                                    <CheckCircleIcon
                                         v-if="team.id == page.props.auth.user.current_team_id"
-                                        class="h-5 w-5 text-green-400" />
+                                        class="me-2 h-5 w-5 text-green-400"
-                                    <ArrowRightIcon v-else class="h-5 w-5 text-icon-default" />
+                                        xmlns="http://www.w3.org/2000/svg"
+                                        fill="none"
+                                        viewBox="0 0 24 24"
+                                        stroke-width="1.5"
+                                        stroke="currentColor">
+                                        <path
+                                            stroke-linecap="round"
+                                            stroke-linejoin="round"
+                                            d="M9 12.75L11.25 15 15 9.75M21 12a9 9 0 11-18 0 9 9 0 0118 0z" />
+                                    </svg>
 
-                                    <div class="w-full truncate text-left">
+                                    <div>
                                         {{ team.name }}
                                     </div>
-                                </button>
+                                </div>
-                            </DropdownMenuItem>
+                            </DropdownLink>
                         </form>
                     </template>
                 </template>
             </div>
-        </DropdownMenuContent>
+        </template>
-    </DropdownMenu>
+    </Dropdown>
 </template>

resources/js/Components/UserSettingsIcon.vue

@@ -1,24 +1,10 @@
 <script setup lang="ts">
-import { Link, router, usePage } from '@inertiajs/vue3';
+import { router, usePage } from '@inertiajs/vue3';
 import type { Organization, User } from '@/types/models';
-import {
+import DropdownLink from '@/Components/DropdownLink.vue';
-    DropdownMenu,
+import Dropdown from '@/packages/ui/src/Input/Dropdown.vue';
-    DropdownMenuTrigger,
-    DropdownMenuContent,
-    DropdownMenuItem,
-    DropdownMenuLabel,
-} from '@/Components/ui/dropdown-menu';
-import {
-    UserCircleIcon,
-    KeyIcon,
-    ArrowLeftOnRectangleIcon,
-    ChatBubbleLeftRightIcon,
-} from '@heroicons/vue/24/solid';
-import { openFeedback } from '@/utils/feedback';
 
 const page = usePage<{
-    has_services_extension?: boolean;
-    has_billing_extension?: boolean;
     jetstream: {
         canCreateTeams: boolean;
         hasTeamFeatures: boolean;
@@ -37,58 +23,60 @@ const logout = () => {
 };
 </script>
 <template>
-    <div class="relative">
+    <div class="ms-3 relative">
-        <DropdownMenu>
+        <Dropdown align="center" width="48">
-            <DropdownMenuTrigger
+            <template #trigger>
-                class="flex text-sm border-2 outline-none border-transparent rounded-full focus-visible:ring-2 focus-visible:ring-ring transition"
+                <button
-                as-child>
+                    v-if="page.props.jetstream.managesProfilePhotos"
-                <button data-testid="current_user_button">
+                    data-testid="current_user_button"
+                    class="flex text-sm border-2 border-transparent rounded-full focus:outline-none focus:border-gray-300 transition">
                     <img
-                        class="h-7 w-7 rounded-full object-cover"
+                        class="h-8 w-8 rounded-full object-cover"
                         :src="page.props.auth.user.profile_photo_url"
                         :alt="page.props.auth.user.name" />
                 </button>
-            </DropdownMenuTrigger>
-            <DropdownMenuContent align="center" class="max-w-48">
-                <DropdownMenuLabel>Manage Account</DropdownMenuLabel>
 
-                <DropdownMenuItem as-child>
+                <span v-else class="inline-flex rounded-md">
-                    <Link
-                        :href="route('profile.show')"
-                        class="inline-flex items-center gap-2.5 w-full">
-                        <UserCircleIcon class="w-5 h-5 text-icon-default" />
-                        <span>Profile Settings</span>
-                    </Link>
-                </DropdownMenuItem>
-
-                <DropdownMenuItem v-if="page.props.jetstream.hasApiFeatures" as-child>
-                    <Link
-                        :href="route('api-tokens.index')"
-                        class="inline-flex items-center gap-2.5 w-full">
-                        <KeyIcon class="w-5 h-5 text-icon-default" />
-                        <span>API Tokens</span>
-                    </Link>
-                </DropdownMenuItem>
-
-                <DropdownMenuItem v-if="page.props.has_services_extension" as-child>
                     <button
                         type="button"
-                        class="inline-flex items-center gap-2.5 w-full"
+                        class="inline-flex items-center px-3 py-2 border border-transparent text-sm leading-4 font-medium rounded-md text-gray-500 bg-white hover:text-gray-700 focus:outline-none focus:bg-gray-50 active:bg-gray-50 transition ease-in-out duration-150">
-                        @click="openFeedback">
+                        {{ page.props.auth.user.name }}
-                        <ChatBubbleLeftRightIcon class="w-5 h-5 text-icon-default" />
-                        <span>Feedback</span>
-                    </button>
-                </DropdownMenuItem>
 
-                <form class="w-full" @submit.prevent="logout">
+                        <svg
-                    <DropdownMenuItem as-child class="inline-flex items-center gap-2.5 w-full">
+                            class="ms-2 -me-0.5 h-4 w-4"
-                        <button type="submit" data-testid="logout_button">
+                            xmlns="http://www.w3.org/2000/svg"
-                            <ArrowLeftOnRectangleIcon class="w-5 h-5 text-icon-default" />
+                            fill="none"
-                            <span>Log Out</span>
+                            viewBox="0 0 24 24"
-                        </button>
+                            stroke-width="1.5"
-                    </DropdownMenuItem>
+                            stroke="currentColor">
+                            <path
+                                stroke-linecap="round"
+                                stroke-linejoin="round"
+                                d="M19.5 8.25l-7.5 7.5-7.5-7.5" />
+                        </svg>
+                    </button>
+                </span>
+            </template>
+
+            <template #content>
+                <!-- Account Management -->
+                <div class="block px-4 py-2 text-xs text-gray-400">Manage Account</div>
+
+                <DropdownLink :href="route('profile.show')"> Profile </DropdownLink>
+
+                <DropdownLink
+                    v-if="page.props.jetstream.hasApiFeatures"
+                    :href="route('api-tokens.index')">
+                    API Tokens
+                </DropdownLink>
+
+                <div class="border-t border-card-border" />
+
+                <!-- Authentication -->
+                <form @submit.prevent="logout">
+                    <DropdownLink as="button" data-testid="logout_button"> Log Out </DropdownLink>
                 </form>
-            </DropdownMenuContent>
+            </template>
-        </DropdownMenu>
+        </Dropdown>
     </div>
 </template>

resources/js/Components/ui/dropdown-menu/DropdownMenuLabel.vue

@@ -19,7 +19,7 @@ const forwardedProps = useForwardProps(delegatedProps);
 <template>
     <DropdownMenuLabel
         v-bind="forwardedProps"
-        :class="cn('block px-2 py-2 text-xs text-gray-400', inset && 'pl-8', props.class)">
+        :class="cn('px-2 py-1.5 text-sm font-semibold', inset && 'pl-8', props.class)">
         <slot />
     </DropdownMenuLabel>
 </template>

resources/js/Layouts/AppLayout.vue

@@ -47,8 +47,6 @@ import { api } from '@/packages/api/src';
 import { getCurrentOrganizationId } from '@/utils/useUser';
 import LoadingSpinner from '@/packages/ui/src/LoadingSpinner.vue';
 import { twMerge } from 'tailwind-merge';
-import Button from '@/Components/ui/button/Button.vue';
-import { openFeedback } from '@/utils/feedback';
 
 defineProps({
     title: String,
@@ -96,8 +94,8 @@ onMounted(async () => {
         }, 100);
     };
 });
+
 const page = usePage<{
-    has_services_extension?: boolean;
     auth: {
         user: User;
     };
@@ -108,7 +106,7 @@ const page = usePage<{
     <div v-bind="$attrs" class="flex flex-wrap bg-background text-text-secondary">
         <div
             :class="{
-                '!flex bg-default-background w-full z-30': showSidebarMenu,
+                '!flex bg-default-background w-full z-[9999999999]': showSidebarMenu,
             }"
             class="flex-shrink-0 h-screen hidden fixed w-[230px] 2xl:w-[250px] px-2.5 2xl:px-3 py-4 lg:flex flex-col justify-between">
             <div class="flex flex-col h-full">
@@ -244,23 +242,14 @@ const page = usePage<{
                 <div class="justify-self-end">
                     <UpdateSidebarNotification></UpdateSidebarNotification>
                     <ul
-                        class="border-t border-default-background-separator pt-3 gap-1 pr-2 flex justify-between items-center">
+                        class="border-t border-default-background-separator pt-3 flex justify-between pr-4 items-center">
-                        <UserSettingsIcon></UserSettingsIcon>
-
                         <NavigationSidebarItem
                             class="flex-1"
                             title="Profile Settings"
                             :icon="Cog6ToothIcon"
                             :href="route('profile.show')"></NavigationSidebarItem>
 
-                        <Button
+                        <UserSettingsIcon></UserSettingsIcon>
-                            v-if="page.props.has_services_extension"
-                            variant="outline"
-                            size="xs"
-                            class="rounded-full ml-2 flex h-6 w-6 items-center text-xs text-icon-default justify-center"
-                            @click="openFeedback">
-                            ?
-                        </Button>
                     </ul>
                 </div>
             </div>

resources/js/packages/ui/src/FullCalendar/TimeEntryCalendar.vue

@@ -451,7 +451,6 @@ watch(showEditTimeEntryModal, (value) => {
     cursor: pointer;
     box-shadow: var(--theme-shadow-card);
     opacity: 0.9;
-    overflow: hidden;
 }
 
 .fullcalendar :deep(.fc-v-event) {

resources/js/utils/feedback.ts

@@ -1,9 +0,0 @@
-export function openFeedback(): void {
-    if (
-        typeof window !== 'undefined' &&
-        'showChatWindow' in window &&
-        typeof window.showChatWindow === 'function'
-    ) {
-        window.showChatWindow();
-    }
-}