Skip to content

Rallly is an open-source scheduling and collaboration tool designed to make organizing events and meetings easier.

♻️ Refinements

Luke Vellacc70e04b15fa
diff --git a/apps/web/src/app/components/page-layout.tsx b/apps/web/src/app/components/page-layout.tsx
index 13727b6af..7a53816ab 100644
--- a/apps/web/src/app/components/page-layout.tsx
+++ b/apps/web/src/app/components/page-layout.tsx
@@ -43,12 +43,7 @@ export function PageHeader({
className?: string;
}) {
return (
- <div
- className={cn(
- "flex flex-col gap-4 md:flex-row md:items-start md:justify-between",
- className,
- )}
- >
+ <div className={cn("flex items-start justify-between gap-4", className)}>
{children}
</div>
);
diff --git a/apps/web/src/features/navigation/config.tsx b/apps/web/src/features/navigation/config.tsx
index af5929a6d..ffc9ee0b0 100644
--- a/apps/web/src/features/navigation/config.tsx
+++ b/apps/web/src/features/navigation/config.tsx
@@ -4,6 +4,7 @@ import type { LucideIcon } from "lucide-react";
import { BarChart2Icon, CalendarIcon, HomeIcon, UsersIcon } from "lucide-react";
import { usePathname } from "next/navigation";
import React from "react";
+import { isSpacesEnabled } from "@/features/space/constants";
import { useTranslation } from "@/i18n/client";
export interface NavigationItem {
@@ -65,7 +66,7 @@ export const useSpaceMenu = () => {
},
],
},
- ...(process.env.NODE_ENV === "development"
+ ...(isSpacesEnabled
? [
{
id: "manage",
diff --git a/apps/web/src/features/space/components/space-dropdown.tsx b/apps/web/src/features/space/components/space-dropdown.tsx
index f256efa50..c77232927 100644
--- a/apps/web/src/features/space/components/space-dropdown.tsx
+++ b/apps/web/src/features/space/components/space-dropdown.tsx
@@ -1,6 +1,5 @@
"use client";
-import { cn } from "@rallly/ui";
import { useDialog } from "@rallly/ui/dialog";
import {
DropdownMenu,
@@ -15,6 +14,7 @@ import { Icon } from "@rallly/ui/icon";
import { CirclePlusIcon, SettingsIcon } from "lucide-react";
import Link from "next/link";
import { ProBadge } from "@/components/pro-badge";
+import { RouterLoadingIndicator } from "@/components/router-loading-indicator";
import { Trans } from "@/components/trans";
import { setActiveSpaceAction } from "@/features/space/actions";
import { useSafeAction } from "@/lib/safe-action/client";
@@ -44,12 +44,7 @@ export function SpaceDropdown({
return (
<>
<DropdownMenu>
- <DropdownMenuTrigger
- className={cn({
- "animate-pulse duration-500": setActiveSpace.isExecuting,
- })}
- asChild={Boolean(children)}
- >
+ <DropdownMenuTrigger asChild={Boolean(children)}>
{children}
</DropdownMenuTrigger>
<DropdownMenuContent
@@ -59,6 +54,7 @@ export function SpaceDropdown({
<DropdownMenuRadioGroup
value={activeSpaceId}
onValueChange={(value) => {
+ if (value === activeSpaceId) return;
setActiveSpace.execute({ spaceId: value });
}}
>
@@ -91,6 +87,7 @@ export function SpaceDropdown({
</DropdownMenuItem>
</DropdownMenuContent>
</DropdownMenu>
+ {setActiveSpace.isExecuting ? <RouterLoadingIndicator /> : null}
<CreateSpaceDialog {...newSpaceDialog.dialogProps} />
</>
);