Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
21 changes: 11 additions & 10 deletions apps/web/app/(all)/[workspaceSlug]/(projects)/drafts/header.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { observer } from "mobx-react";
import { EUserPermissions, EUserPermissionsLevel } from "@plane/constants";
import { useTranslation } from "@plane/i18n";
// ui
import { Button } from "@plane/propel/button";
import { Button } from "@makeplane/propel/components/button";
import { DraftIcon } from "@plane/propel/icons";
import { EIssuesStoreType } from "@plane/types";
import { Breadcrumbs, Header } from "@plane/ui";
Expand Down Expand Up @@ -66,15 +66,16 @@ export const WorkspaceDraftHeader = observer(function WorkspaceDraftHeader() {

<Header.RightItem>
{joinedProjectIds && joinedProjectIds.length > 0 && (
<Button
variant="primary"
size="lg"
className="items-center gap-1"
onClick={() => setIsDraftIssueModalOpen(true)}
disabled={!isAuthorizedUser}
>
{t("workspace_draft_issues.draft_an_issue")}
</Button>
<span className="items-center gap-1">
<Button
variant="primary"
size="md"
stretch="auto"
label={t("workspace_draft_issues.draft_an_issue")}
onClick={() => setIsDraftIssueModalOpen(true)}
disabled={!isAuthorizedUser}
/>
</span>
)}
</Header.RightItem>
</Header>
Expand Down
31 changes: 21 additions & 10 deletions apps/web/app/(all)/[workspaceSlug]/(projects)/header.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ import { observer } from "mobx-react";
import { Shapes } from "lucide-react";
// plane imports
import { useTranslation } from "@plane/i18n";
import { Button } from "@plane/propel/button";
import { Button } from "@makeplane/propel/components/button";
import { IconButton } from "@makeplane/propel/components/icon-button";
import { HomeIcon } from "@plane/propel/icons";
import { Breadcrumbs, Header } from "@plane/ui";
// components
Expand Down Expand Up @@ -37,15 +38,25 @@ export const WorkspaceDashboardHeader = observer(function WorkspaceDashboardHead
</div>
</Header.LeftItem>
<Header.RightItem>
<Button
variant="secondary"
size="lg"
onClick={() => toggleWidgetSettings(true)}
className="my-auto mb-0"
prependIcon={<Shapes />}
>
<div className="hidden sm:hidden md:block">{t("home.manage_widgets")}</div>
</Button>
<span className="my-auto mb-0 hidden md:inline-flex">
<Button
variant="secondary"
size="md"
stretch="auto"
onClick={() => toggleWidgetSettings(true)}
icon={<Shapes className="size-4" />}
label={t("home.manage_widgets")}
Comment thread
coderabbitai[bot] marked this conversation as resolved.
/>
</span>
<span className="my-auto mb-0 md:hidden">
<IconButton
variant="secondary"
size="md"
aria-label={t("home.manage_widgets")}
icon={<Shapes className="size-4" />}
onClick={() => toggleWidgetSettings(true)}
/>
</span>
</Header.RightItem>
</Header>
</>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { observer } from "mobx-react";
// plane imports
import { EUserPermissions, EUserPermissionsLevel } from "@plane/constants";
import { useTranslation } from "@plane/i18n";
import { Button } from "@plane/propel/button";
import { Button } from "@makeplane/propel/components/button";
// components
import { PageHead } from "@/components/core/page-title";
import { DownloadActivityButton } from "@/components/profile/activity/download-button";
Expand Down Expand Up @@ -64,9 +64,13 @@ function ProfileActivityPage() {
{activityPages}
{pageCount < totalPages && resultsCount !== 0 && (
<div className="flex w-full items-center justify-center text-11">
<Button variant="secondary" onClick={handleLoadMore}>
{t("common.load_more")}
</Button>
<Button
variant="secondary"
size="sm"
stretch="auto"
label={t("common.load_more")}
onClick={handleLoadMore}
/>
</div>
)}
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import { ProfileIssuesFilter } from "@/components/profile/profile-issues-filter"
// hooks
import { useAppTheme } from "@/hooks/store/use-app-theme";
import { useUser, useUserPermissions } from "@/hooks/store/user";
import { Button } from "@plane/propel/button";
import { IconButton } from "@makeplane/propel/components/icon-button";

type TUserProfileHeader = {
userProjectsData: IUserProfileProjectSegregation | undefined;
Expand Down Expand Up @@ -96,16 +96,17 @@ export const UserProfileHeader = observer(function UserProfileHeader(props: TUse
))}
</CustomMenu>
<div className="shrink-0 md:hidden">
<Button
<IconButton
variant="ghost"
size="lg"
onClick={() => {
toggleProfileSidebar();
}}
appendIcon={
<PanelRight className={!profileSidebarCollapsed ? "text-accent-primary" : "text-secondary"} />
size="md"
aria-label="Toggle profile sidebar"
icon={
<PanelRight
className={`size-4 ${!profileSidebarCollapsed ? "text-accent-primary" : "text-secondary"}`}
/>
}
></Button>
onClick={() => toggleProfileSidebar()}
/>
</div>
</div>
</Header.RightItem>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { useRouter } from "next/navigation";
import useSWR from "swr";
// ui
import { Banner } from "@plane/propel/banner";
import { Button } from "@plane/propel/button";
import { Button } from "@makeplane/propel/components/button";
import { ArchiveIcon } from "@plane/propel/icons";
import { Loader } from "@plane/ui";
// components
Expand Down Expand Up @@ -74,10 +74,11 @@ function ArchivedIssueDetailsPage({ params }: Route.ComponentProps) {
action={
<Button
variant="secondary"
size="sm"
stretch="auto"
label="Go to archives"
onClick={() => router.push(`/${workspaceSlug}/projects/${projectId}/archives/issues/`)}
>
Go to archives
</Button>
/>
}
className="border-b border-subtle"
/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { useCallback, useRef, useState } from "react";
import { observer } from "mobx-react";
import { useParams } from "next/navigation";
// icons
import { ChartNoAxesColumn, PanelRight, SlidersHorizontal } from "lucide-react";
import { PanelRight, SlidersHorizontal } from "lucide-react";
// plane imports
import {
EIssueFilterType,
Expand All @@ -18,7 +18,7 @@ import {
} from "@plane/constants";
import { usePlatformOS } from "@plane/hooks";
import { useTranslation } from "@plane/i18n";
import { Button } from "@plane/propel/button";
import { Button } from "@makeplane/propel/components/button";
import { IconButton } from "@plane/propel/icon-button";
import { CycleIcon } from "@plane/propel/icons";
import { Tooltip } from "@plane/propel/tooltip";
Expand Down Expand Up @@ -232,22 +232,23 @@ export const CycleIssuesHeader = observer(function CycleIssuesHeader() {

{canUserCreateIssue && (
<>
<Button onClick={() => setAnalyticsModal(true)} variant="secondary" size="lg">
<span className="hidden @4xl:flex">Analytics</span>
<span className="@4xl:hidden">
<ChartNoAxesColumn className="size-3.5" />
</span>
</Button>
<Button
variant="secondary"
size="md"
stretch="auto"
label="Analytics"
onClick={() => setAnalyticsModal(true)}
/>
{!isCompletedCycle && (
<Button
variant="primary"
size="lg"
size="md"
stretch="auto"
label={t("issue.add.label")}
onClick={() => {
toggleCreateIssueModal(true, EIssuesStoreType.CYCLE);
}}
>
{t("issue.add.label")}
</Button>
/>
)}
</>
)}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { useParams } from "next/navigation";
// ui
import { EUserPermissions, EUserPermissionsLevel } from "@plane/constants";
import { useTranslation } from "@plane/i18n";
import { Button } from "@plane/propel/button";
import { Button } from "@makeplane/propel/components/button";
import { CycleIcon } from "@plane/propel/icons";
import { Breadcrumbs, Header } from "@plane/ui";
// components
Expand Down Expand Up @@ -60,16 +60,30 @@ export const CyclesListHeader = observer(function CyclesListHeader() {
{canUserCreateCycle && currentProjectDetails ? (
<Header.RightItem>
<CyclesViewHeader projectId={currentProjectDetails.id} />
<Button
variant="primary"
size="lg"
onClick={() => {
toggleCreateCycleModal(true);
}}
>
<div className="block sm:hidden">{t("add")}</div>
<div className="hidden sm:block">{t("project_cycles.add_cycle")}</div>
</Button>
<>
<span className="block sm:hidden">
<Button
variant="primary"
size="md"
stretch="auto"
label={t("add")}
onClick={() => {
toggleCreateCycleModal(true);
}}
/>
</span>
<span className="hidden sm:block">
<Button
variant="primary"
size="md"
stretch="auto"
label={t("project_cycles.add_cycle")}
onClick={() => {
toggleCreateCycleModal(true);
}}
/>
</span>
</>
</Header.RightItem>
) : (
<></>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@ import { useCallback, useRef, useState } from "react";
import { observer } from "mobx-react";
import { useParams } from "next/navigation";
// icons
import { ChartNoAxesColumn, PanelRight, SlidersHorizontal } from "lucide-react";
import { PanelRight, SlidersHorizontal } from "lucide-react";
// plane imports
import {
EIssueFilterType,
ISSUE_DISPLAY_FILTERS_BY_PAGE,
EUserPermissions,
EUserPermissionsLevel,
} from "@plane/constants";
import { Button } from "@plane/propel/button";
import { Button } from "@makeplane/propel/components/button";
import { ModuleIcon } from "@plane/propel/icons";
import { Tooltip } from "@plane/propel/tooltip";
import type { ICustomSearchSelectOption, IIssueDisplayFilterOptions, IIssueDisplayProperties } from "@plane/types";
Expand Down Expand Up @@ -227,22 +227,26 @@ export const ModuleIssuesHeader = observer(function ModuleIssuesHeader() {

{canUserCreateIssue ? (
<>
<Button className="hidden md:block" onClick={() => setAnalyticsModal(true)} variant="secondary" size="lg">
<span className="hidden @4xl:flex">Analytics</span>
<span className="@4xl:hidden">
<ChartNoAxesColumn className="size-3.5" />
</span>
</Button>
<Button
variant="primary"
size="lg"
className="hidden sm:flex"
onClick={() => {
toggleCreateIssueModal(true, EIssuesStoreType.MODULE);
}}
>
Add work item
</Button>
<span className="hidden md:block">
<Button
variant="secondary"
size="md"
stretch="auto"
label="Analytics"
onClick={() => setAnalyticsModal(true)}
/>
</span>
<span className="hidden sm:flex">
<Button
variant="primary"
size="md"
stretch="auto"
label="Add work item"
onClick={() => {
toggleCreateIssueModal(true, EIssuesStoreType.MODULE);
}}
/>
</span>
</>
) : (
<></>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import { useParams } from "next/navigation";
import { EUserPermissions, EUserPermissionsLevel } from "@plane/constants";
import { useTranslation } from "@plane/i18n";
// ui
import { Button } from "@plane/propel/button";
import { Button } from "@makeplane/propel/components/button";
import { ModuleIcon } from "@plane/propel/icons";
import { Breadcrumbs, Header } from "@plane/ui";
// components
Expand Down Expand Up @@ -65,16 +65,30 @@ export const ModulesListHeader = observer(function ModulesListHeader() {
<Header.RightItem>
<ModuleViewHeader />
{canUserCreateModule ? (
<Button
variant="primary"
onClick={() => {
toggleCreateModuleModal(true);
}}
size="lg"
>
<div className="block sm:hidden">{t("add")}</div>
<div className="hidden sm:block">{t("project_module.add_module")}</div>
</Button>
<>
<span className="block sm:hidden">
<Button
variant="primary"
size="md"
stretch="auto"
label={t("add")}
onClick={() => {
toggleCreateModuleModal(true);
}}
/>
</span>
<span className="hidden sm:block">
<Button
variant="primary"
size="md"
stretch="auto"
label={t("project_module.add_module")}
onClick={() => {
toggleCreateModuleModal(true);
}}
/>
</span>
</>
) : (
<></>
)}
Expand Down
Loading
Loading