Skip to content

Use common page structure for the main pages #695

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
elie222 merged 5 commits into from
Aug 19, 2025
Merged

Use common page structure for the main pages #695

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
66e7fc4
Use common page structure for the main pages
elie222 Aug 19, 2025
d1d32d9
fix up mobile page wrapper
elie222 Aug 19, 2025
d852ee5
fix bulk unsub mobile
elie222 Aug 19, 2025
64ba17b
clean up mobile stats
elie222 Aug 19, 2025
b97731d
v2.5.26
elie222 Aug 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
89 changes: 43 additions & 46 deletions apps/web/app/(app)/[emailAccountId]/automation/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import { PageHeading } from "@/components/Typography";
import { TabSelect } from "@/components/TabSelect";
import { RulesTab } from "@/app/(app)/[emailAccountId]/assistant/RulesTab";
import { AIChatButton } from "@/app/(app)/[emailAccountId]/assistant/AIChatButton";
import { PageWrapper } from "@/components/PageWrapper";

export const maxDuration = 300; // Applies to the actions

Expand Down Expand Up @@ -86,53 +87,49 @@ export default async function AutomationPage({
<Suspense>
<PermissionsCheck />

<div className="mx-4 mt-2">
<div className="w-screen-xl mx-auto max-w-screen-xl">
<div className="w-full">
<PremiumAlertWithData className="mb-2" />

<div className="flex items-center justify-between">
<PageHeading>Assistant</PageHeading>
<ExtraActions />
</div>

<div className="border-b border-neutral-200 pt-2">
<Suspense
fallback={
<TabSelect
options={tabOptions(emailAccountId)}
selected={tab ?? "rules"}
/>
}
>
<TabNavigation
emailAccountId={emailAccountId}
tab={tab}
hasPendingRule={hasPendingRule}
/>
</Suspense>
</div>

<Tabs defaultValue="rules">
<TabsContent value="rules" className="mb-10">
<RulesTab />
</TabsContent>
<TabsContent value="settings" className="mb-10">
<SettingsTab />
</TabsContent>
<TabsContent value="test" className="mb-10">
<Process />
</TabsContent>
<TabsContent value="history" className="mb-10">
<History />
</TabsContent>
<Suspense>
<PendingTab hasPendingRule={hasPendingRule} />
</Suspense>
</Tabs>
</div>
<PageWrapper>
<PremiumAlertWithData className="mb-2" />

<div className="flex items-center justify-between">
<PageHeading>Assistant</PageHeading>
<ExtraActions />
</div>

<div className="border-b border-neutral-200 pt-2">
<Suspense
fallback={
<TabSelect
options={tabOptions(emailAccountId)}
selected={tab ?? "rules"}
/>
}
>
<TabNavigation
emailAccountId={emailAccountId}
tab={tab}
hasPendingRule={hasPendingRule}
/>
</Suspense>
</div>
</div>

<Tabs defaultValue="rules">
<TabsContent value="rules" className="mb-10">
<RulesTab />
</TabsContent>
<TabsContent value="settings" className="mb-10">
<SettingsTab />
</TabsContent>
<TabsContent value="test" className="mb-10">
<Process />
</TabsContent>
<TabsContent value="history" className="mb-10">
<History />
</TabsContent>
<Suspense>
<PendingTab hasPendingRule={hasPendingRule} />
</Suspense>
</Tabs>
</PageWrapper>
</Suspense>
</EmailProvider>
);
Expand Down
2 changes: 1 addition & 1 deletion apps/web/app/(app)/[emailAccountId]/bulk-unsubscribe/BulkActions.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ export function BulkActions({
return (
<>
<PremiumTooltip showTooltip={!hasUnsubscribeAccess} openModal={openModal}>
<div className="flex items-center space-x-1.5">
<div className="flex items-center space-x-1.5 mt-2">
<div>
<Button
size="sm"
Expand Down
94 changes: 0 additions & 94 deletions apps/web/app/(app)/[emailAccountId]/bulk-unsubscribe/BulkUnsubscribe.tsx
View file
Open in desktop

This file was deleted.

Loading
Loading