From 5f76285f10fea15444a59b97f0af048054c99d8f Mon Sep 17 00:00:00 2001
From: Luke Vella <me@lukevella.com>
Date: Mon, 14 Apr 2025 17:50:17 +0100
Subject: [PATCH] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20Rename=20space=20folder=20?=
 =?UTF-8?q?(#1666)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/app/[locale]/(admin)/dashboard.tsx    |  75 ---------
 .../src/app/[locale]/(admin)/polls/actions.ts |  49 ------
 .../{(admin) => (space)}/app-card.tsx         |   0
 .../sidebar/app-sidebar-provider.tsx          |   0
 .../components/sidebar/app-sidebar.tsx        |   0
 .../components/sidebar/nav-item.tsx           |   0
 .../components/sidebar/nav-user.tsx           |   0
 .../components/top-bar.tsx                    |   0
 .../components/upgrade-button.tsx             |   0
 .../events/event-list.tsx                     |   3 +-
 .../{(admin) => (space)}/events/page.tsx      |   3 +-
 .../events/past-events.tsx                    |   3 +-
 .../{(admin) => (space)}/events/types.ts      |   0
 .../events/upcoming-events.tsx                |   3 +-
 .../events/user-scheduled-events.tsx          |   5 +-
 .../[locale]/{(admin) => (space)}/layout.tsx  |   4 +-
 .../[locale]/{(admin) => (space)}/loading.tsx |   0
 .../mobile-navigation.tsx                     |   0
 .../[locale]/{(admin) => (space)}/page.tsx    |   0
 .../{(admin) => (space)}/polls/page.tsx       |   0
 .../polls/polls-tabbed-view.tsx               |   0
 .../polls/search-input.tsx                    |   0
 .../recently-updated-polls-grid.tsx           |   0
 .../billing/components/payment-method.tsx     |   0
 .../billing/components/subscription-price.tsx |   0
 .../components/subscription-status.tsx        |   0
 .../settings/billing/page.tsx                 |   8 +-
 .../components/date-time-preferences.tsx      |   0
 .../components/language-preference.tsx        |   0
 .../settings/components/settings-layout.tsx   |   0
 .../settings/components/sign-out-button.tsx   |   0
 .../{(admin) => (space)}/settings/layout.tsx  |   0
 .../{(admin) => (space)}/settings/loading.tsx |   0
 .../settings/preferences/loading.tsx          |   0
 .../settings/preferences/page.tsx             |   0
 .../settings/preferences/preferences-page.tsx |   9 +-
 .../profile/delete-account-dialog.tsx         |   0
 .../settings/profile/page.tsx                 |   0
 .../profile/profile-email-address.tsx         |   0
 .../settings/profile/profile-page.tsx         |  12 +-
 .../settings/profile/profile-picture.tsx      |   0
 .../settings/profile/profile-settings.tsx     |   3 +-
 .../settings/settings-menu.tsx                |   0
 apps/web/src/app/components/page-icons.tsx    |  47 +++---
 .../src/components/layouts/poll-layout.tsx    |   4 +-
 .../src/features/poll-selection/context.tsx   | 130 ----------------
 .../poll-selection-action-bar.tsx             | 142 ------------------
 .../quick-create/quick-create-widget.tsx      |   6 +-
 48 files changed, 58 insertions(+), 448 deletions(-)
 delete mode 100644 apps/web/src/app/[locale]/(admin)/dashboard.tsx
 delete mode 100644 apps/web/src/app/[locale]/(admin)/polls/actions.ts
 rename apps/web/src/app/[locale]/{(admin) => (space)}/app-card.tsx (100%)
 rename apps/web/src/app/[locale]/{(admin) => (space)}/components/sidebar/app-sidebar-provider.tsx (100%)
 rename apps/web/src/app/[locale]/{(admin) => (space)}/components/sidebar/app-sidebar.tsx (100%)
 rename apps/web/src/app/[locale]/{(admin) => (space)}/components/sidebar/nav-item.tsx (100%)
 rename apps/web/src/app/[locale]/{(admin) => (space)}/components/sidebar/nav-user.tsx (100%)
 rename apps/web/src/app/[locale]/{(admin) => (space)}/components/top-bar.tsx (100%)
 rename apps/web/src/app/[locale]/{(admin) => (space)}/components/upgrade-button.tsx (100%)
 rename apps/web/src/app/[locale]/{(admin) => (space)}/events/event-list.tsx (97%)
 rename apps/web/src/app/[locale]/{(admin) => (space)}/events/page.tsx (92%)
 rename apps/web/src/app/[locale]/{(admin) => (space)}/events/past-events.tsx (93%)
 rename apps/web/src/app/[locale]/{(admin) => (space)}/events/types.ts (100%)
 rename apps/web/src/app/[locale]/{(admin) => (space)}/events/upcoming-events.tsx (94%)
 rename apps/web/src/app/[locale]/{(admin) => (space)}/events/user-scheduled-events.tsx (89%)
 rename apps/web/src/app/[locale]/{(admin) => (space)}/layout.tsx (88%)
 rename apps/web/src/app/[locale]/{(admin) => (space)}/loading.tsx (100%)
 rename apps/web/src/app/[locale]/{(admin) => (space)}/mobile-navigation.tsx (100%)
 rename apps/web/src/app/[locale]/{(admin) => (space)}/page.tsx (100%)
 rename apps/web/src/app/[locale]/{(admin) => (space)}/polls/page.tsx (100%)
 rename apps/web/src/app/[locale]/{(admin) => (space)}/polls/polls-tabbed-view.tsx (100%)
 rename apps/web/src/app/[locale]/{(admin) => (space)}/polls/search-input.tsx (100%)
 rename apps/web/src/app/[locale]/{(admin) => (space)}/recently-updated-polls-grid.tsx (100%)
 rename apps/web/src/app/[locale]/{(admin) => (space)}/settings/billing/components/payment-method.tsx (100%)
 rename apps/web/src/app/[locale]/{(admin) => (space)}/settings/billing/components/subscription-price.tsx (100%)
 rename apps/web/src/app/[locale]/{(admin) => (space)}/settings/billing/components/subscription-status.tsx (100%)
 rename apps/web/src/app/[locale]/{(admin) => (space)}/settings/billing/page.tsx (99%)
 rename apps/web/src/app/[locale]/{(admin) => (space)}/settings/components/date-time-preferences.tsx (100%)
 rename apps/web/src/app/[locale]/{(admin) => (space)}/settings/components/language-preference.tsx (100%)
 rename apps/web/src/app/[locale]/{(admin) => (space)}/settings/components/settings-layout.tsx (100%)
 rename apps/web/src/app/[locale]/{(admin) => (space)}/settings/components/sign-out-button.tsx (100%)
 rename apps/web/src/app/[locale]/{(admin) => (space)}/settings/layout.tsx (100%)
 rename apps/web/src/app/[locale]/{(admin) => (space)}/settings/loading.tsx (100%)
 rename apps/web/src/app/[locale]/{(admin) => (space)}/settings/preferences/loading.tsx (100%)
 rename apps/web/src/app/[locale]/{(admin) => (space)}/settings/preferences/page.tsx (100%)
 rename apps/web/src/app/[locale]/{(admin) => (space)}/settings/preferences/preferences-page.tsx (75%)
 rename apps/web/src/app/[locale]/{(admin) => (space)}/settings/profile/delete-account-dialog.tsx (100%)
 rename apps/web/src/app/[locale]/{(admin) => (space)}/settings/profile/page.tsx (100%)
 rename apps/web/src/app/[locale]/{(admin) => (space)}/settings/profile/profile-email-address.tsx (100%)
 rename apps/web/src/app/[locale]/{(admin) => (space)}/settings/profile/profile-page.tsx (88%)
 rename apps/web/src/app/[locale]/{(admin) => (space)}/settings/profile/profile-picture.tsx (100%)
 rename apps/web/src/app/[locale]/{(admin) => (space)}/settings/profile/profile-settings.tsx (96%)
 rename apps/web/src/app/[locale]/{(admin) => (space)}/settings/settings-menu.tsx (100%)
 delete mode 100644 apps/web/src/features/poll-selection/context.tsx
 delete mode 100644 apps/web/src/features/poll-selection/poll-selection-action-bar.tsx

diff --git a/apps/web/src/app/[locale]/(admin)/dashboard.tsx b/apps/web/src/app/[locale]/(admin)/dashboard.tsx
deleted file mode 100644
index ff2c10cbb..000000000
--- a/apps/web/src/app/[locale]/(admin)/dashboard.tsx
+++ /dev/null
@@ -1,75 +0,0 @@
-"use client";
-import { Button } from "@rallly/ui/button";
-import { Icon } from "@rallly/ui/icon";
-import { PlusIcon } from "lucide-react";
-import Link from "next/link";
-
-import {
-  AppCard,
-  AppCardContent,
-  AppCardDescription,
-  AppCardFooter,
-  AppCardIcon,
-  AppCardName,
-  GroupPollIcon,
-} from "@/app/[locale]/(admin)/app-card";
-import { Spinner } from "@/components/spinner";
-import { Trans } from "@/components/trans";
-import { trpc } from "@/trpc/client";
-
-export default function Dashboard() {
-  const { data } = trpc.dashboard.info.useQuery();
-
-  if (!data) {
-    return <Spinner />;
-  }
-
-  return (
-    <div className="space-y-4">
-      <div className="grid md:flex">
-        <AppCard className="basis-96">
-          <AppCardIcon>
-            <GroupPollIcon size="lg" />
-          </AppCardIcon>
-          <AppCardContent>
-            <div>
-              <AppCardName>
-                <Trans i18nKey="groupPoll" defaults="Group Poll" />
-              </AppCardName>
-              <AppCardDescription>
-                <Trans
-                  i18nKey="groupPollDescription"
-                  defaults="Share your availability with a group of people and find the best time to meet."
-                />
-              </AppCardDescription>
-            </div>
-          </AppCardContent>
-          <AppCardFooter className="flex items-center justify-between gap-4">
-            <div className="inline-flex items-center gap-1 text-sm">
-              <Link
-                className="text-primary font-medium hover:underline"
-                href="/polls?status=live"
-              >
-                <Trans
-                  i18nKey="activePollCount"
-                  defaults="{activePollCount} Live"
-                  values={{
-                    activePollCount: data.activePollCount,
-                  }}
-                />
-              </Link>
-            </div>
-            <Button asChild>
-              <Link href="/new">
-                <Icon>
-                  <PlusIcon />
-                </Icon>
-                <Trans i18nKey="create" defaults="Create" />
-              </Link>
-            </Button>
-          </AppCardFooter>
-        </AppCard>
-      </div>
-    </div>
-  );
-}
diff --git a/apps/web/src/app/[locale]/(admin)/polls/actions.ts b/apps/web/src/app/[locale]/(admin)/polls/actions.ts
deleted file mode 100644
index f5df9007f..000000000
--- a/apps/web/src/app/[locale]/(admin)/polls/actions.ts
+++ /dev/null
@@ -1,49 +0,0 @@
-"use server";
-
-import { prisma } from "@rallly/database";
-import { revalidatePath } from "next/cache";
-
-import { auth } from "@/next-auth";
-
-/**
- * Deletes multiple polls by their IDs
- * Only allows deletion of polls owned by the current user
- */
-export async function deletePolls(pollIds: string[]) {
-  try {
-    // Get the current user session
-    const session = await auth();
-
-    if (!session?.user?.id) {
-      throw new Error("Unauthorized");
-    }
-
-    // Delete polls that belong to the current user
-    const result = await prisma.poll.updateMany({
-      where: {
-        id: {
-          in: pollIds,
-        },
-        userId: session.user.id,
-      },
-      data: {
-        deleted: true,
-        deletedAt: new Date(),
-      },
-    });
-
-    // Revalidate the polls page to reflect the changes
-    revalidatePath("/polls");
-
-    return {
-      success: true,
-      count: result.count,
-    };
-  } catch (error) {
-    console.error("Failed to delete polls:", error);
-    return {
-      success: false,
-      error: "Failed to delete polls",
-    };
-  }
-}
diff --git a/apps/web/src/app/[locale]/(admin)/app-card.tsx b/apps/web/src/app/[locale]/(space)/app-card.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/(admin)/app-card.tsx
rename to apps/web/src/app/[locale]/(space)/app-card.tsx
diff --git a/apps/web/src/app/[locale]/(admin)/components/sidebar/app-sidebar-provider.tsx b/apps/web/src/app/[locale]/(space)/components/sidebar/app-sidebar-provider.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/(admin)/components/sidebar/app-sidebar-provider.tsx
rename to apps/web/src/app/[locale]/(space)/components/sidebar/app-sidebar-provider.tsx
diff --git a/apps/web/src/app/[locale]/(admin)/components/sidebar/app-sidebar.tsx b/apps/web/src/app/[locale]/(space)/components/sidebar/app-sidebar.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/(admin)/components/sidebar/app-sidebar.tsx
rename to apps/web/src/app/[locale]/(space)/components/sidebar/app-sidebar.tsx
diff --git a/apps/web/src/app/[locale]/(admin)/components/sidebar/nav-item.tsx b/apps/web/src/app/[locale]/(space)/components/sidebar/nav-item.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/(admin)/components/sidebar/nav-item.tsx
rename to apps/web/src/app/[locale]/(space)/components/sidebar/nav-item.tsx
diff --git a/apps/web/src/app/[locale]/(admin)/components/sidebar/nav-user.tsx b/apps/web/src/app/[locale]/(space)/components/sidebar/nav-user.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/(admin)/components/sidebar/nav-user.tsx
rename to apps/web/src/app/[locale]/(space)/components/sidebar/nav-user.tsx
diff --git a/apps/web/src/app/[locale]/(admin)/components/top-bar.tsx b/apps/web/src/app/[locale]/(space)/components/top-bar.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/(admin)/components/top-bar.tsx
rename to apps/web/src/app/[locale]/(space)/components/top-bar.tsx
diff --git a/apps/web/src/app/[locale]/(admin)/components/upgrade-button.tsx b/apps/web/src/app/[locale]/(space)/components/upgrade-button.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/(admin)/components/upgrade-button.tsx
rename to apps/web/src/app/[locale]/(space)/components/upgrade-button.tsx
diff --git a/apps/web/src/app/[locale]/(admin)/events/event-list.tsx b/apps/web/src/app/[locale]/(space)/events/event-list.tsx
similarity index 97%
rename from apps/web/src/app/[locale]/(admin)/events/event-list.tsx
rename to apps/web/src/app/[locale]/(space)/events/event-list.tsx
index c56a23ec2..c22c6496a 100644
--- a/apps/web/src/app/[locale]/(admin)/events/event-list.tsx
+++ b/apps/web/src/app/[locale]/(space)/events/event-list.tsx
@@ -3,11 +3,12 @@
 import { getCoreRowModel, useReactTable } from "@tanstack/react-table";
 import dayjs from "dayjs";
 
-import type { ScheduledEvent } from "@/app/[locale]/(admin)/events/types";
 import { Trans } from "@/components/trans";
 import { generateGradient } from "@/utils/color-hash";
 import { useDayjs } from "@/utils/dayjs";
 
+import type { ScheduledEvent } from "./types";
+
 export function EventList({ data }: { data: ScheduledEvent[] }) {
   const table = useReactTable({
     data,
diff --git a/apps/web/src/app/[locale]/(admin)/events/page.tsx b/apps/web/src/app/[locale]/(space)/events/page.tsx
similarity index 92%
rename from apps/web/src/app/[locale]/(admin)/events/page.tsx
rename to apps/web/src/app/[locale]/(space)/events/page.tsx
index b6f58521d..de14d0388 100644
--- a/apps/web/src/app/[locale]/(admin)/events/page.tsx
+++ b/apps/web/src/app/[locale]/(space)/events/page.tsx
@@ -1,4 +1,3 @@
-import { UserScheduledEvents } from "@/app/[locale]/(admin)/events/user-scheduled-events";
 import type { Params } from "@/app/[locale]/types";
 import { EventPageIcon } from "@/app/components/page-icons";
 import {
@@ -11,6 +10,8 @@ import {
 import { Trans } from "@/components/trans";
 import { getTranslation } from "@/i18n/server";
 
+import { UserScheduledEvents } from "./user-scheduled-events";
+
 export default async function Page({ params }: { params: Params }) {
   await getTranslation(params.locale);
   return (
diff --git a/apps/web/src/app/[locale]/(admin)/events/past-events.tsx b/apps/web/src/app/[locale]/(space)/events/past-events.tsx
similarity index 93%
rename from apps/web/src/app/[locale]/(admin)/events/past-events.tsx
rename to apps/web/src/app/[locale]/(space)/events/past-events.tsx
index 3a0e83228..b4d67cb0d 100644
--- a/apps/web/src/app/[locale]/(admin)/events/past-events.tsx
+++ b/apps/web/src/app/[locale]/(space)/events/past-events.tsx
@@ -1,7 +1,6 @@
 "use client";
 import { CalendarPlusIcon } from "lucide-react";
 
-import { EventList } from "@/app/[locale]/(admin)/events/event-list";
 import {
   EmptyState,
   EmptyStateDescription,
@@ -12,6 +11,8 @@ import { Spinner } from "@/components/spinner";
 import { Trans } from "@/components/trans";
 import { trpc } from "@/trpc/client";
 
+import { EventList } from "./event-list";
+
 export function PastEvents() {
   const { data } = trpc.scheduledEvents.list.useQuery({
     period: "past",
diff --git a/apps/web/src/app/[locale]/(admin)/events/types.ts b/apps/web/src/app/[locale]/(space)/events/types.ts
similarity index 100%
rename from apps/web/src/app/[locale]/(admin)/events/types.ts
rename to apps/web/src/app/[locale]/(space)/events/types.ts
diff --git a/apps/web/src/app/[locale]/(admin)/events/upcoming-events.tsx b/apps/web/src/app/[locale]/(space)/events/upcoming-events.tsx
similarity index 94%
rename from apps/web/src/app/[locale]/(admin)/events/upcoming-events.tsx
rename to apps/web/src/app/[locale]/(space)/events/upcoming-events.tsx
index 9967ebc17..39be20d21 100644
--- a/apps/web/src/app/[locale]/(admin)/events/upcoming-events.tsx
+++ b/apps/web/src/app/[locale]/(space)/events/upcoming-events.tsx
@@ -1,7 +1,6 @@
 "use client";
 import { CalendarPlusIcon } from "lucide-react";
 
-import { EventList } from "@/app/[locale]/(admin)/events/event-list";
 import {
   EmptyState,
   EmptyStateDescription,
@@ -12,6 +11,8 @@ import { Spinner } from "@/components/spinner";
 import { Trans } from "@/components/trans";
 import { trpc } from "@/trpc/client";
 
+import { EventList } from "./event-list";
+
 export function UpcomingEvents() {
   const { data } = trpc.scheduledEvents.list.useQuery({ period: "upcoming" });
 
diff --git a/apps/web/src/app/[locale]/(admin)/events/user-scheduled-events.tsx b/apps/web/src/app/[locale]/(space)/events/user-scheduled-events.tsx
similarity index 89%
rename from apps/web/src/app/[locale]/(admin)/events/user-scheduled-events.tsx
rename to apps/web/src/app/[locale]/(space)/events/user-scheduled-events.tsx
index 3fd0fad71..04b6bb897 100644
--- a/apps/web/src/app/[locale]/(admin)/events/user-scheduled-events.tsx
+++ b/apps/web/src/app/[locale]/(space)/events/user-scheduled-events.tsx
@@ -4,10 +4,11 @@ import { Tabs, TabsList, TabsTrigger } from "@rallly/ui/page-tabs";
 import { useRouter, useSearchParams } from "next/navigation";
 import { z } from "zod";
 
-import { PastEvents } from "@/app/[locale]/(admin)/events/past-events";
-import { UpcomingEvents } from "@/app/[locale]/(admin)/events/upcoming-events";
 import { Trans } from "@/components/trans";
 
+import { PastEvents } from "./past-events";
+import { UpcomingEvents } from "./upcoming-events";
+
 const eventPeriodSchema = z.enum(["upcoming", "past"]).catch("upcoming");
 
 export function UserScheduledEvents() {
diff --git a/apps/web/src/app/[locale]/(admin)/layout.tsx b/apps/web/src/app/[locale]/(space)/layout.tsx
similarity index 88%
rename from apps/web/src/app/[locale]/(admin)/layout.tsx
rename to apps/web/src/app/[locale]/(space)/layout.tsx
index a7ead2083..6b9e10a2a 100644
--- a/apps/web/src/app/[locale]/(admin)/layout.tsx
+++ b/apps/web/src/app/[locale]/(space)/layout.tsx
@@ -3,12 +3,12 @@ import { Button } from "@rallly/ui/button";
 import { SidebarInset, SidebarTrigger } from "@rallly/ui/sidebar";
 import Link from "next/link";
 
-import { AppSidebar } from "@/app/[locale]/(admin)/components/sidebar/app-sidebar";
-import { AppSidebarProvider } from "@/app/[locale]/(admin)/components/sidebar/app-sidebar-provider";
 import { OptimizedAvatarImage } from "@/components/optimized-avatar-image";
 import { getUser } from "@/data/get-user";
 import { CommandMenu } from "@/features/navigation/command-menu";
 
+import { AppSidebar } from "./components/sidebar/app-sidebar";
+import { AppSidebarProvider } from "./components/sidebar/app-sidebar-provider";
 import { TopBar, TopBarLeft, TopBarRight } from "./components/top-bar";
 
 export default async function Layout({
diff --git a/apps/web/src/app/[locale]/(admin)/loading.tsx b/apps/web/src/app/[locale]/(space)/loading.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/(admin)/loading.tsx
rename to apps/web/src/app/[locale]/(space)/loading.tsx
diff --git a/apps/web/src/app/[locale]/(admin)/mobile-navigation.tsx b/apps/web/src/app/[locale]/(space)/mobile-navigation.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/(admin)/mobile-navigation.tsx
rename to apps/web/src/app/[locale]/(space)/mobile-navigation.tsx
diff --git a/apps/web/src/app/[locale]/(admin)/page.tsx b/apps/web/src/app/[locale]/(space)/page.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/(admin)/page.tsx
rename to apps/web/src/app/[locale]/(space)/page.tsx
diff --git a/apps/web/src/app/[locale]/(admin)/polls/page.tsx b/apps/web/src/app/[locale]/(space)/polls/page.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/(admin)/polls/page.tsx
rename to apps/web/src/app/[locale]/(space)/polls/page.tsx
diff --git a/apps/web/src/app/[locale]/(admin)/polls/polls-tabbed-view.tsx b/apps/web/src/app/[locale]/(space)/polls/polls-tabbed-view.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/(admin)/polls/polls-tabbed-view.tsx
rename to apps/web/src/app/[locale]/(space)/polls/polls-tabbed-view.tsx
diff --git a/apps/web/src/app/[locale]/(admin)/polls/search-input.tsx b/apps/web/src/app/[locale]/(space)/polls/search-input.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/(admin)/polls/search-input.tsx
rename to apps/web/src/app/[locale]/(space)/polls/search-input.tsx
diff --git a/apps/web/src/app/[locale]/(admin)/recently-updated-polls-grid.tsx b/apps/web/src/app/[locale]/(space)/recently-updated-polls-grid.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/(admin)/recently-updated-polls-grid.tsx
rename to apps/web/src/app/[locale]/(space)/recently-updated-polls-grid.tsx
diff --git a/apps/web/src/app/[locale]/(admin)/settings/billing/components/payment-method.tsx b/apps/web/src/app/[locale]/(space)/settings/billing/components/payment-method.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/(admin)/settings/billing/components/payment-method.tsx
rename to apps/web/src/app/[locale]/(space)/settings/billing/components/payment-method.tsx
diff --git a/apps/web/src/app/[locale]/(admin)/settings/billing/components/subscription-price.tsx b/apps/web/src/app/[locale]/(space)/settings/billing/components/subscription-price.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/(admin)/settings/billing/components/subscription-price.tsx
rename to apps/web/src/app/[locale]/(space)/settings/billing/components/subscription-price.tsx
diff --git a/apps/web/src/app/[locale]/(admin)/settings/billing/components/subscription-status.tsx b/apps/web/src/app/[locale]/(space)/settings/billing/components/subscription-status.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/(admin)/settings/billing/components/subscription-status.tsx
rename to apps/web/src/app/[locale]/(space)/settings/billing/components/subscription-status.tsx
diff --git a/apps/web/src/app/[locale]/(admin)/settings/billing/page.tsx b/apps/web/src/app/[locale]/(space)/settings/billing/page.tsx
similarity index 99%
rename from apps/web/src/app/[locale]/(admin)/settings/billing/page.tsx
rename to apps/web/src/app/[locale]/(space)/settings/billing/page.tsx
index f8c0dce60..5fa936089 100644
--- a/apps/web/src/app/[locale]/(admin)/settings/billing/page.tsx
+++ b/apps/web/src/app/[locale]/(space)/settings/billing/page.tsx
@@ -15,10 +15,6 @@ import {
 import Link from "next/link";
 import { notFound, redirect } from "next/navigation";
 
-import {
-  SettingsContent,
-  SettingsSection,
-} from "@/app/[locale]/(admin)/settings/components/settings-layout";
 import {
   DescriptionDetails,
   DescriptionList,
@@ -37,6 +33,10 @@ import { Trans } from "@/components/trans";
 import { requireUser } from "@/next-auth";
 import { isSelfHosted } from "@/utils/constants";
 
+import {
+  SettingsContent,
+  SettingsSection,
+} from "../components/settings-layout";
 import { PaymentMethod } from "./components/payment-method";
 import { SubscriptionPrice } from "./components/subscription-price";
 import { SubscriptionStatus } from "./components/subscription-status";
diff --git a/apps/web/src/app/[locale]/(admin)/settings/components/date-time-preferences.tsx b/apps/web/src/app/[locale]/(space)/settings/components/date-time-preferences.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/(admin)/settings/components/date-time-preferences.tsx
rename to apps/web/src/app/[locale]/(space)/settings/components/date-time-preferences.tsx
diff --git a/apps/web/src/app/[locale]/(admin)/settings/components/language-preference.tsx b/apps/web/src/app/[locale]/(space)/settings/components/language-preference.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/(admin)/settings/components/language-preference.tsx
rename to apps/web/src/app/[locale]/(space)/settings/components/language-preference.tsx
diff --git a/apps/web/src/app/[locale]/(admin)/settings/components/settings-layout.tsx b/apps/web/src/app/[locale]/(space)/settings/components/settings-layout.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/(admin)/settings/components/settings-layout.tsx
rename to apps/web/src/app/[locale]/(space)/settings/components/settings-layout.tsx
diff --git a/apps/web/src/app/[locale]/(admin)/settings/components/sign-out-button.tsx b/apps/web/src/app/[locale]/(space)/settings/components/sign-out-button.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/(admin)/settings/components/sign-out-button.tsx
rename to apps/web/src/app/[locale]/(space)/settings/components/sign-out-button.tsx
diff --git a/apps/web/src/app/[locale]/(admin)/settings/layout.tsx b/apps/web/src/app/[locale]/(space)/settings/layout.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/(admin)/settings/layout.tsx
rename to apps/web/src/app/[locale]/(space)/settings/layout.tsx
diff --git a/apps/web/src/app/[locale]/(admin)/settings/loading.tsx b/apps/web/src/app/[locale]/(space)/settings/loading.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/(admin)/settings/loading.tsx
rename to apps/web/src/app/[locale]/(space)/settings/loading.tsx
diff --git a/apps/web/src/app/[locale]/(admin)/settings/preferences/loading.tsx b/apps/web/src/app/[locale]/(space)/settings/preferences/loading.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/(admin)/settings/preferences/loading.tsx
rename to apps/web/src/app/[locale]/(space)/settings/preferences/loading.tsx
diff --git a/apps/web/src/app/[locale]/(admin)/settings/preferences/page.tsx b/apps/web/src/app/[locale]/(space)/settings/preferences/page.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/(admin)/settings/preferences/page.tsx
rename to apps/web/src/app/[locale]/(space)/settings/preferences/page.tsx
diff --git a/apps/web/src/app/[locale]/(admin)/settings/preferences/preferences-page.tsx b/apps/web/src/app/[locale]/(space)/settings/preferences/preferences-page.tsx
similarity index 75%
rename from apps/web/src/app/[locale]/(admin)/settings/preferences/preferences-page.tsx
rename to apps/web/src/app/[locale]/(space)/settings/preferences/preferences-page.tsx
index 1ccec7e05..1d1f5cf6c 100644
--- a/apps/web/src/app/[locale]/(admin)/settings/preferences/preferences-page.tsx
+++ b/apps/web/src/app/[locale]/(space)/settings/preferences/preferences-page.tsx
@@ -1,12 +1,13 @@
 "use client";
 
-import { DateTimePreferences } from "@/app/[locale]/(admin)/settings/components/date-time-preferences";
-import { LanguagePreference } from "@/app/[locale]/(admin)/settings/components/language-preference";
+import { Trans } from "@/components/trans";
+
+import { DateTimePreferences } from "../components/date-time-preferences";
+import { LanguagePreference } from "../components/language-preference";
 import {
   SettingsContent,
   SettingsSection,
-} from "@/app/[locale]/(admin)/settings/components/settings-layout";
-import { Trans } from "@/components/trans";
+} from "../components/settings-layout";
 
 export function PreferencesPage() {
   return (
diff --git a/apps/web/src/app/[locale]/(admin)/settings/profile/delete-account-dialog.tsx b/apps/web/src/app/[locale]/(space)/settings/profile/delete-account-dialog.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/(admin)/settings/profile/delete-account-dialog.tsx
rename to apps/web/src/app/[locale]/(space)/settings/profile/delete-account-dialog.tsx
diff --git a/apps/web/src/app/[locale]/(admin)/settings/profile/page.tsx b/apps/web/src/app/[locale]/(space)/settings/profile/page.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/(admin)/settings/profile/page.tsx
rename to apps/web/src/app/[locale]/(space)/settings/profile/page.tsx
diff --git a/apps/web/src/app/[locale]/(admin)/settings/profile/profile-email-address.tsx b/apps/web/src/app/[locale]/(space)/settings/profile/profile-email-address.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/(admin)/settings/profile/profile-email-address.tsx
rename to apps/web/src/app/[locale]/(space)/settings/profile/profile-email-address.tsx
diff --git a/apps/web/src/app/[locale]/(admin)/settings/profile/profile-page.tsx b/apps/web/src/app/[locale]/(space)/settings/profile/profile-page.tsx
similarity index 88%
rename from apps/web/src/app/[locale]/(admin)/settings/profile/profile-page.tsx
rename to apps/web/src/app/[locale]/(space)/settings/profile/profile-page.tsx
index 92bc67ee2..084aa2d31 100644
--- a/apps/web/src/app/[locale]/(admin)/settings/profile/profile-page.tsx
+++ b/apps/web/src/app/[locale]/(space)/settings/profile/profile-page.tsx
@@ -3,16 +3,16 @@ import { Button } from "@rallly/ui/button";
 import { DialogTrigger } from "@rallly/ui/dialog";
 import { TrashIcon } from "lucide-react";
 
-import {
-  SettingsContent,
-  SettingsSection,
-} from "@/app/[locale]/(admin)/settings/components/settings-layout";
-import { DeleteAccountDialog } from "@/app/[locale]/(admin)/settings/profile/delete-account-dialog";
-import { ProfileSettings } from "@/app/[locale]/(admin)/settings/profile/profile-settings";
 import { Trans } from "@/components/trans";
 import { useUser } from "@/components/user-provider";
 
+import {
+  SettingsContent,
+  SettingsSection,
+} from "../components/settings-layout";
+import { DeleteAccountDialog } from "./delete-account-dialog";
 import { ProfileEmailAddress } from "./profile-email-address";
+import { ProfileSettings } from "./profile-settings";
 
 export const ProfilePage = () => {
   const { user } = useUser();
diff --git a/apps/web/src/app/[locale]/(admin)/settings/profile/profile-picture.tsx b/apps/web/src/app/[locale]/(space)/settings/profile/profile-picture.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/(admin)/settings/profile/profile-picture.tsx
rename to apps/web/src/app/[locale]/(space)/settings/profile/profile-picture.tsx
diff --git a/apps/web/src/app/[locale]/(admin)/settings/profile/profile-settings.tsx b/apps/web/src/app/[locale]/(space)/settings/profile/profile-settings.tsx
similarity index 96%
rename from apps/web/src/app/[locale]/(admin)/settings/profile/profile-settings.tsx
rename to apps/web/src/app/[locale]/(space)/settings/profile/profile-settings.tsx
index 7e3195074..70ca74209 100644
--- a/apps/web/src/app/[locale]/(admin)/settings/profile/profile-settings.tsx
+++ b/apps/web/src/app/[locale]/(space)/settings/profile/profile-settings.tsx
@@ -12,11 +12,12 @@ import { Input } from "@rallly/ui/input";
 import { useForm } from "react-hook-form";
 import { z } from "zod";
 
-import { ProfilePicture } from "@/app/[locale]/(admin)/settings/profile/profile-picture";
 import { Trans } from "@/components/trans";
 import { useUser } from "@/components/user-provider";
 import { trpc } from "@/trpc/client";
 
+import { ProfilePicture } from "./profile-picture";
+
 const profileSettingsFormData = z.object({
   name: z.string().min(1).max(100),
 });
diff --git a/apps/web/src/app/[locale]/(admin)/settings/settings-menu.tsx b/apps/web/src/app/[locale]/(space)/settings/settings-menu.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/(admin)/settings/settings-menu.tsx
rename to apps/web/src/app/[locale]/(space)/settings/settings-menu.tsx
diff --git a/apps/web/src/app/components/page-icons.tsx b/apps/web/src/app/components/page-icons.tsx
index 093464ff3..e91bed255 100644
--- a/apps/web/src/app/components/page-icons.tsx
+++ b/apps/web/src/app/components/page-icons.tsx
@@ -17,30 +17,29 @@ import {
 } from "lucide-react";
 import React from "react";
 
-const pageIconVariants = cva(
-  "inline-flex size-7 items-center justify-center rounded-lg",
-  {
-    variants: {
-      color: {
-        darkGray: "bg-gray-700 text-white",
-        indigo: "bg-indigo-500 text-white",
-        gray: "bg-gray-200 text-gray-600",
-        lime: "bg-lime-500 text-white",
-        blue: "bg-blue-500 text-white",
-        rose: "bg-rose-500 text-white",
-        purple: "bg-purple-500 text-white",
-      },
-      size: {
-        sm: "size-5",
-        md: "size-7",
-      },
+const pageIconVariants = cva("inline-flex items-center justify-center", {
+  variants: {
+    color: {
+      darkGray: "bg-gray-700 text-white",
+      indigo: "bg-indigo-500 text-white",
+      gray: "bg-gray-200 text-gray-600",
+      lime: "bg-lime-500 text-white",
+      blue: "bg-blue-500 text-white",
+      rose: "bg-rose-500 text-white",
+      purple: "bg-purple-500 text-white",
     },
-    defaultVariants: {
-      color: "gray",
-      size: "md",
+    size: {
+      sm: "size-6 [&_svg]:size-3 rounded-md",
+      md: "size-7 [&_svg]:size-4 rounded-lg",
+      lg: "size-9 [&_svg]:size-5 rounded-xl",
+      xl: "size-10 [&_svg]:size-5 rounded-xl",
     },
   },
-);
+  defaultVariants: {
+    color: "gray",
+    size: "md",
+  },
+});
 
 type PageIconVariantProps = VariantProps<typeof pageIconVariants>;
 
@@ -53,7 +52,7 @@ export function PageIcon({
 } & PageIconVariantProps) {
   return (
     <span className={pageIconVariants({ color, size })}>
-      <Slot className="size-4">{children}</Slot>
+      <Slot>{children}</Slot>
     </span>
   );
 }
@@ -111,9 +110,9 @@ export function CreatePageIcon() {
   );
 }
 
-export function PollPageIcon() {
+export function PollPageIcon(props: PageIconVariantProps) {
   return (
-    <PageIcon color="purple" size="md">
+    <PageIcon color="purple" size="md" {...props}>
       <BarChart2Icon />
     </PageIcon>
   );
diff --git a/apps/web/src/components/layouts/poll-layout.tsx b/apps/web/src/components/layouts/poll-layout.tsx
index a2d819bd6..a179ec8d7 100644
--- a/apps/web/src/components/layouts/poll-layout.tsx
+++ b/apps/web/src/components/layouts/poll-layout.tsx
@@ -13,8 +13,8 @@ import Link from "next/link";
 import { useParams, usePathname } from "next/navigation";
 import React from "react";
 
-import { GroupPollIcon } from "@/app/[locale]/(admin)/app-card";
 import { LogoutButton } from "@/app/components/logout-button";
+import { PollPageIcon } from "@/app/components/page-icons";
 import { InviteDialog } from "@/components/invite-dialog";
 import { LoginLink } from "@/components/login-link";
 import {
@@ -67,7 +67,7 @@ const Layout = ({ children }: React.PropsWithChildren) => {
             </Button>
           )}
           <div>
-            <GroupPollIcon size="xs" />
+            <PollPageIcon size="sm" />
           </div>
           <h1 className="truncate text-sm font-semibold">{poll.title}</h1>
         </div>
diff --git a/apps/web/src/features/poll-selection/context.tsx b/apps/web/src/features/poll-selection/context.tsx
deleted file mode 100644
index 1af6c1b14..000000000
--- a/apps/web/src/features/poll-selection/context.tsx
+++ /dev/null
@@ -1,130 +0,0 @@
-"use client";
-
-import type { ReactNode } from "react";
-import { createContext, useCallback, useMemo, useState } from "react";
-
-import { useRequiredContext } from "@/components/use-required-context";
-
-import { PollSelectionActionBar } from "./poll-selection-action-bar";
-
-type RowSelectionState = Record<string, boolean>;
-
-type PollSelectionContextType = {
-  selectedPolls: RowSelectionState;
-  setSelectedPolls: (selection: RowSelectionState) => void;
-  selectPolls: (pollIds: string[]) => void;
-  unselectPolls: (pollIds: string[]) => void;
-  togglePollSelection: (pollId: string) => void;
-  clearSelection: () => void;
-  isSelected: (pollId: string) => boolean;
-  getSelectedPollIds: () => string[];
-  selectedCount: number;
-};
-
-const PollSelectionContext = createContext<PollSelectionContextType | null>(
-  null,
-);
-
-type PollSelectionProviderProps = {
-  children: ReactNode;
-};
-
-export const PollSelectionProvider = ({
-  children,
-}: PollSelectionProviderProps) => {
-  const [selectedPolls, setSelectedPolls] = useState<RowSelectionState>({});
-
-  const selectPolls = useCallback((pollIds: string[]) => {
-    setSelectedPolls((prev) => {
-      const newSelection = { ...prev };
-      pollIds.forEach((id) => {
-        newSelection[id] = true;
-      });
-      return newSelection;
-    });
-  }, []);
-
-  const unselectPolls = useCallback(
-    (pollIds: string[]) =>
-      setSelectedPolls((prev) => {
-        const newSelection = { ...prev };
-        pollIds.forEach((id) => {
-          delete newSelection[id];
-        });
-        return newSelection;
-      }),
-    [],
-  );
-
-  const togglePollSelection = useCallback(
-    (pollId: string) =>
-      setSelectedPolls((prev) => {
-        const newSelection = { ...prev };
-        if (newSelection[pollId]) {
-          delete newSelection[pollId];
-        } else {
-          newSelection[pollId] = true;
-        }
-        return newSelection;
-      }),
-    [],
-  );
-
-  const clearSelection = useCallback(() => setSelectedPolls({}), []);
-
-  const isSelected = useCallback(
-    (pollId: string) => Boolean(selectedPolls[pollId]),
-    [selectedPolls],
-  );
-
-  const getSelectedPollIds = useCallback(
-    () => Object.keys(selectedPolls),
-    [selectedPolls],
-  );
-
-  const selectedCount = useMemo(
-    () => Object.keys(selectedPolls).length,
-    [selectedPolls],
-  );
-
-  const value = useMemo(
-    () => ({
-      selectedPolls,
-      setSelectedPolls,
-      selectPolls,
-      unselectPolls,
-      togglePollSelection,
-      clearSelection,
-      isSelected,
-      getSelectedPollIds,
-      selectedCount,
-    }),
-    [
-      selectedPolls,
-      setSelectedPolls,
-      selectPolls,
-      unselectPolls,
-      togglePollSelection,
-      clearSelection,
-      isSelected,
-      getSelectedPollIds,
-      selectedCount,
-    ],
-  );
-
-  return (
-    <PollSelectionContext.Provider value={value}>
-      {children}
-      <PollSelectionActionBar />
-    </PollSelectionContext.Provider>
-  );
-};
-
-export const usePollSelection = () => {
-  const context = useRequiredContext(
-    PollSelectionContext,
-    "usePollSelection must be used within a PollSelectionProvider",
-  );
-
-  return context;
-};
diff --git a/apps/web/src/features/poll-selection/poll-selection-action-bar.tsx b/apps/web/src/features/poll-selection/poll-selection-action-bar.tsx
deleted file mode 100644
index 899812783..000000000
--- a/apps/web/src/features/poll-selection/poll-selection-action-bar.tsx
+++ /dev/null
@@ -1,142 +0,0 @@
-"use client";
-
-import {
-  ActionBarContainer,
-  ActionBarContent,
-  ActionBarGroup,
-  ActionBarPortal,
-} from "@rallly/ui/action-bar";
-import { Button } from "@rallly/ui/button";
-import {
-  Dialog,
-  DialogContent,
-  DialogFooter,
-  DialogHeader,
-  DialogTitle,
-} from "@rallly/ui/dialog";
-import { AnimatePresence, motion } from "framer-motion";
-import { TrashIcon } from "lucide-react";
-import * as React from "react";
-
-import { deletePolls } from "@/app/[locale]/(admin)/polls/actions";
-import { Trans } from "@/components/trans";
-
-import { usePollSelection } from "./context";
-
-const MActionBar = motion(ActionBarContainer);
-
-export function PollSelectionActionBar() {
-  const { selectedCount, clearSelection, getSelectedPollIds } =
-    usePollSelection();
-  const [isDeleteDialogOpen, setIsDeleteDialogOpen] = React.useState(false);
-  const [isDeleting, setIsDeleting] = React.useState(false);
-
-  const handleDelete = async () => {
-    const selectedPollIds = getSelectedPollIds();
-    if (selectedPollIds.length === 0) {
-      return;
-    }
-
-    setIsDeleting(true);
-    try {
-      const result = await deletePolls(selectedPollIds);
-
-      if (result.success) {
-        setIsDeleteDialogOpen(false);
-        clearSelection();
-      } else {
-        // Handle error case
-        console.error("Failed to delete polls:", result.error);
-      }
-    } finally {
-      setIsDeleting(false);
-    }
-  };
-
-  return (
-    <ActionBarPortal>
-      <AnimatePresence>
-        {selectedCount > 0 && (
-          <MActionBar
-            initial={{ opacity: 0, y: 20 }}
-            animate={{ opacity: 1, y: 0 }}
-            exit={{ opacity: 0, y: 20 }}
-            transition={{
-              type: "spring",
-              stiffness: 500,
-              damping: 30,
-              mass: 0.5,
-            }}
-          >
-            <ActionBarContent>
-              <span className="text-sm font-medium">
-                <Trans
-                  i18nKey="selectedPolls"
-                  defaults="{count} {count, plural, one {poll} other {polls}} selected"
-                  values={{ count: selectedCount }}
-                />
-              </span>
-            </ActionBarContent>
-            <ActionBarGroup>
-              <Button
-                variant="actionBar"
-                onClick={clearSelection}
-                className="text-action-bar-foreground"
-              >
-                <Trans i18nKey="unselectAll" defaults="Unselect All" />
-              </Button>
-              <Button
-                variant="destructive"
-                onClick={() => setIsDeleteDialogOpen(true)}
-              >
-                <TrashIcon className="size-4" />
-                <Trans i18nKey="delete" defaults="Delete" />
-              </Button>
-            </ActionBarGroup>
-          </MActionBar>
-        )}
-      </AnimatePresence>
-
-      {/* Delete Polls Dialog */}
-      <Dialog open={isDeleteDialogOpen} onOpenChange={setIsDeleteDialogOpen}>
-        <DialogContent size="sm">
-          <DialogHeader>
-            <DialogTitle>
-              <Trans i18nKey="deletePolls" defaults="Delete Polls" />
-            </DialogTitle>
-          </DialogHeader>
-          <p className="text-sm">
-            {selectedCount === 1 ? (
-              <Trans
-                i18nKey="deletePollDescription"
-                defaults="Are you sure you want to delete this poll? This action cannot be undone."
-              />
-            ) : (
-              <Trans
-                i18nKey="deletePollsDescription"
-                defaults="Are you sure you want to delete these {count} polls? This action cannot be undone."
-                values={{ count: selectedCount }}
-              />
-            )}
-          </p>
-          <DialogFooter>
-            <Button
-              onClick={() => {
-                setIsDeleteDialogOpen(false);
-              }}
-            >
-              <Trans i18nKey="cancel" defaults="Cancel" />
-            </Button>
-            <Button
-              variant="destructive"
-              onClick={handleDelete}
-              loading={isDeleting}
-            >
-              <Trans i18nKey="delete" defaults="Delete" />
-            </Button>
-          </DialogFooter>
-        </DialogContent>
-      </Dialog>
-    </ActionBarPortal>
-  );
-}
diff --git a/apps/web/src/features/quick-create/quick-create-widget.tsx b/apps/web/src/features/quick-create/quick-create-widget.tsx
index d900108f3..bc311e9f8 100644
--- a/apps/web/src/features/quick-create/quick-create-widget.tsx
+++ b/apps/web/src/features/quick-create/quick-create-widget.tsx
@@ -4,7 +4,7 @@ import { CheckIcon, PlusIcon, ZapIcon } from "lucide-react";
 import Link from "next/link";
 import { Trans } from "react-i18next/TransWithoutContext";
 
-import { GroupPollIcon } from "@/app/[locale]/(admin)/app-card";
+import { PollPageIcon } from "@/app/components/page-icons";
 import { getGuestPolls } from "@/features/quick-create/lib/get-guest-polls";
 import { getTranslation } from "@/i18n/server";
 
@@ -50,10 +50,10 @@ export async function QuickCreateWidget() {
                 <li key={poll.id}>
                   <Link
                     href={`/poll/${poll.id}`}
-                    className="flex items-center gap-3 rounded-xl border bg-white p-3 hover:bg-gray-50 active:bg-gray-100"
+                    className="flex items-center gap-3 rounded-2xl border bg-white p-3 hover:bg-gray-50 active:bg-gray-100"
                   >
                     <div>
-                      <GroupPollIcon size="lg" />
+                      <PollPageIcon size="xl" />
                     </div>
                     <div className="min-w-0 flex-1">
                       <div className="truncate font-medium">{poll.title}</div>