From 2e4c0cca9b95c24b586351a579703d963552a509 Mon Sep 17 00:00:00 2001 From: Prateek Shourya Date: Mon, 16 Sep 2024 17:07:04 +0530 Subject: [PATCH 1/2] chore: minor improvements in billing and changelogs. --- packages/ui/src/icons/discord-icon.tsx | 22 ++++++++++++------- turbo.json | 5 +---- web/ce/components/workspace/billing/root.tsx | 2 +- .../workspace/upgrade/one-plan-upgrade.tsx | 2 +- .../workspace/upgrade/pro-plan-upgrade.tsx | 6 +++-- .../workspace/sidebar/help-section.tsx | 17 +++++++------- 6 files changed, 29 insertions(+), 25 deletions(-) diff --git a/packages/ui/src/icons/discord-icon.tsx b/packages/ui/src/icons/discord-icon.tsx index 42cd42bd02f..6a2e0083aae 100644 --- a/packages/ui/src/icons/discord-icon.tsx +++ b/packages/ui/src/icons/discord-icon.tsx @@ -2,7 +2,7 @@ import * as React from "react"; import { ISvgIcons } from "./type"; -export const DiscordIcon: React.FC = ({ width = "24", height = "24", className, color }) => ( +export const DiscordIcon: React.FC = ({ width = "24", height = "24", className }) => ( = ({ width = "24", height = "24", fill="currentColor" xmlns="http://www.w3.org/2000/svg" > - - + + + + + + + - - + + diff --git a/turbo.json b/turbo.json index 1ac892aa842..edfcd6771c9 100644 --- a/turbo.json +++ b/turbo.json @@ -23,10 +23,7 @@ "SENTRY_PROJECT_ID", "NEXT_PUBLIC_SENTRY_ENVIRONMENT", "NEXT_PUBLIC_SENTRY_DSN", - "SENTRY_MONITORING_ENABLED", - "NEXT_PUBLIC_PRO_PLAN_MONTHLY_PAYMENT_URL", - "NEXT_PUBLIC_PRO_PLAN_YEARLY_PAYMENT_URL", - "NEXT_PUBLIC_PLANE_ONE_PAYMENT_URL" + "SENTRY_MONITORING_ENABLED" ], "tasks": { "build": { diff --git a/web/ce/components/workspace/billing/root.tsx b/web/ce/components/workspace/billing/root.tsx index 842a5a28fca..50ad7c81526 100644 --- a/web/ce/components/workspace/billing/root.tsx +++ b/web/ce/components/workspace/billing/root.tsx @@ -4,7 +4,7 @@ import { Button } from "@plane/ui"; import { MARKETING_PRICING_PAGE_LINK } from "@/constants/common"; export const BillingRoot = () => ( -
+

Billing and Plans

diff --git a/web/ce/components/workspace/upgrade/one-plan-upgrade.tsx b/web/ce/components/workspace/upgrade/one-plan-upgrade.tsx index 5bf05115a8d..6476d207693 100644 --- a/web/ce/components/workspace/upgrade/one-plan-upgrade.tsx +++ b/web/ce/components/workspace/upgrade/one-plan-upgrade.tsx @@ -12,7 +12,7 @@ export type OnePlanUpgradeProps = { export const OnePlanUpgrade: FC = (props) => { const { features, verticalFeatureList = false, extraFeatures } = props; // env - const PLANE_ONE_PAYMENT_URL = process.env.NEXT_PUBLIC_PLANE_ONE_PAYMENT_URL ?? "https://plane.so/one"; + const PLANE_ONE_PAYMENT_URL = "https://prime.plane.so/"; return (
diff --git a/web/ce/components/workspace/upgrade/pro-plan-upgrade.tsx b/web/ce/components/workspace/upgrade/pro-plan-upgrade.tsx index 9852f9ca6b5..814c43095d6 100644 --- a/web/ce/components/workspace/upgrade/pro-plan-upgrade.tsx +++ b/web/ce/components/workspace/upgrade/pro-plan-upgrade.tsx @@ -1,3 +1,5 @@ +"use client"; + import { FC, useState } from "react"; import { CheckCircle } from "lucide-react"; import { Tab } from "@headlessui/react"; @@ -43,8 +45,8 @@ export const ProPlanUpgrade: FC = (props) => { const yearlyPrice = PRO_PLAN_PRICES.find((price) => price.recurring === "year")?.price ?? 0; const yearlyDiscount = calculateYearlyDiscount(monthlyPrice, yearlyPrice); // env - const PRO_PLAN_MONTHLY_PAYMENT_URL = process.env.NEXT_PUBLIC_PRO_PLAN_MONTHLY_PAYMENT_URL ?? "https://plane.so/pro"; - const PRO_PLAN_YEARLY_PAYMENT_URL = process.env.NEXT_PUBLIC_PRO_PLAN_YEARLY_PAYMENT_URL ?? "https://plane.so/pro"; + const PRO_PLAN_MONTHLY_PAYMENT_URL = "https://app.plane.so/upgrade/pro/self-hosted?plan=month"; + const PRO_PLAN_YEARLY_PAYMENT_URL = "https://app.plane.so/upgrade/pro/self-hosted?plan=year"; return (
diff --git a/web/core/components/workspace/sidebar/help-section.tsx b/web/core/components/workspace/sidebar/help-section.tsx index d7e2bb18c94..c2af0c3b5ef 100644 --- a/web/core/components/workspace/sidebar/help-section.tsx +++ b/web/core/components/workspace/sidebar/help-section.tsx @@ -2,7 +2,6 @@ import React, { useState } from "react"; import { observer } from "mobx-react"; -import Link from "next/link"; import { FileText, HelpCircle, MessagesSquare, MoveLeft, User } from "lucide-react"; // ui import { CustomMenu, Tooltip } from "@plane/ui"; @@ -41,7 +40,7 @@ export const SidebarHelpSection: React.FC = observer( setIsChangeLogOpen(false)} />
= observer( closeOnSelect > - Documentation - + {config?.intercom_app_id && config?.is_intercom_enabled && ( @@ -96,14 +95,14 @@ export const SidebarHelpSection: React.FC = observer( )} - Contact sales - +
@@ -117,13 +116,13 @@ export const SidebarHelpSection: React.FC = observer( - - Community - + Discord +
From d14ec81c8918194042b1602e09857bb8a72da9f6 Mon Sep 17 00:00:00 2001 From: Prateek Shourya Date: Mon, 16 Sep 2024 17:07:24 +0530 Subject: [PATCH 2/2] fix: lint errors. --- web/app/[workspaceSlug]/(projects)/settings/layout.tsx | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/web/app/[workspaceSlug]/(projects)/settings/layout.tsx b/web/app/[workspaceSlug]/(projects)/settings/layout.tsx index 6e947c4877b..9bd133cc147 100644 --- a/web/app/[workspaceSlug]/(projects)/settings/layout.tsx +++ b/web/app/[workspaceSlug]/(projects)/settings/layout.tsx @@ -3,14 +3,16 @@ import { FC, ReactNode } from "react"; import { observer } from "mobx-react"; // components +import { NotAuthorizedView } from "@/components/auth-screens"; import { AppHeader } from "@/components/core"; +// hooks +import { useUserPermissions } from "@/hooks/store"; +// plane web constants +import { EUserPermissions, EUserPermissionsLevel } from "@/plane-web/constants/user-permissions"; // local components import { WorkspaceSettingHeader } from "./header"; import { MobileWorkspaceSettingsTabs } from "./mobile-header-tabs"; import { WorkspaceSettingsSidebar } from "./sidebar"; -import { NotAuthorizedView } from "@/components/auth-screens"; -import { useUserPermissions } from "@/hooks/store"; -import { EUserPermissions, EUserPermissionsLevel } from "@/plane-web/constants/user-permissions"; export interface IWorkspaceSettingLayout { children: ReactNode;