From 146d4e72a488d6e5e718b05673fa97c431f4b4d7 Mon Sep 17 00:00:00 2001 From: Aaryan Khandelwal Date: Fri, 9 Feb 2024 13:01:46 +0530 Subject: [PATCH] chore: updated page and component backgrounds --- packages/editor/core/src/styles/editor.css | 2 +- packages/editor/core/src/styles/table.css | 8 +- .../table/table-header/table-header.ts | 2 +- .../ui/extensions/table/table/table-view.tsx | 23 +++--- .../src/ui/components/editor-header.tsx | 2 +- .../src/ui/components/page-renderer.tsx | 4 +- .../tailwind-config-custom/tailwind.config.js | 8 -- .../progress/linear-progress-indicator.tsx | 8 +- .../accounts/sign-in-forms/email-form.tsx | 2 +- .../accounts/sign-in-forms/password.tsx | 2 +- .../sign-in-forms/self-hosted-sign-in.tsx | 2 +- .../accounts/sign-in-forms/unique-code.tsx | 2 +- .../issues/peek-overview/issue-reaction.tsx | 2 +- .../account/sign-in-forms/email.tsx | 2 +- .../sign-in-forms/optional-set-password.tsx | 4 +- .../account/sign-in-forms/password.tsx | 6 +- .../account/sign-in-forms/unique-code.tsx | 2 +- .../account/sign-up-forms/email.tsx | 2 +- .../sign-up-forms/optional-set-password.tsx | 4 +- .../account/sign-up-forms/password.tsx | 6 +- .../account/sign-up-forms/unique-code.tsx | 2 +- .../scope-and-demand/year-wise-issues.tsx | 5 +- .../core/sidebar/progress-chart.tsx | 2 +- .../sidebar/sidebar-menu-hamburger-toggle.tsx | 2 +- web/components/cycles/cycles-list-item.tsx | 2 +- .../dashboard/widgets/assigned-issues.tsx | 2 +- .../dashboard/widgets/created-issues.tsx | 2 +- .../widgets/issue-panels/tabs-list.tsx | 4 +- .../dashboard/widgets/issues-by-priority.tsx | 2 +- .../widgets/issues-by-state-group.tsx | 2 +- .../dashboard/widgets/overview-stats.tsx | 2 +- .../dropdowns/member/workspace-member.tsx | 4 +- web/components/estimates/estimates-list.tsx | 2 +- web/components/headers/projects.tsx | 2 +- web/components/headers/user-profile.tsx | 8 +- .../instance/setup-form/sign-in-form.tsx | 6 +- web/components/instance/sidebar-dropdown.tsx | 2 +- web/components/instance/sidebar-menu.tsx | 2 +- .../issues/issue-detail/relation-select.tsx | 2 +- .../calendar/base-calendar-root.tsx | 2 +- .../issue-layouts/calendar/day-tile.tsx | 14 ++-- .../issue-layouts/calendar/issue-blocks.tsx | 7 +- .../issue-layouts/calendar/week-header.tsx | 4 +- .../issue-layouts/kanban/base-kanban-root.tsx | 6 +- .../issues/issue-layouts/kanban/block.tsx | 4 +- .../issues/issue-layouts/list/block.tsx | 2 +- .../spreadsheet/issue-column.tsx | 2 +- .../issue-layouts/spreadsheet/issue-row.tsx | 2 +- .../spreadsheet/spreadsheet-header-column.tsx | 2 +- .../spreadsheet/spreadsheet-header.tsx | 2 +- .../spreadsheet/spreadsheet-view.tsx | 2 +- web/components/issues/issue-update-status.tsx | 2 +- .../labels/label-block/drag-handle.tsx | 4 +- .../page-views/workspace-dashboard.tsx | 2 +- .../pages/pages-list/recent-pages-list.tsx | 2 +- web/components/project/integration-card.tsx | 2 +- .../project/settings/features-list.tsx | 2 +- .../states/create-update-state-inline.tsx | 5 +- .../project-setting-state-list-item.tsx | 2 +- web/components/workspace/sidebar-dropdown.tsx | 6 +- .../workspace-active-cycles-upgrade.tsx | 20 +++-- web/helpers/string.helper.ts | 10 +-- web/layouts/admin-layout/layout.tsx | 2 +- web/layouts/admin-layout/sidebar.tsx | 2 +- web/layouts/app-layout/layout.tsx | 2 +- web/layouts/app-layout/sidebar.tsx | 2 +- web/layouts/auth-layout/admin-wrapper.tsx | 3 +- web/layouts/auth-layout/project-wrapper.tsx | 4 +- web/layouts/auth-layout/user-wrapper.tsx | 5 +- web/layouts/auth-layout/workspace-wrapper.tsx | 4 +- .../settings-layout/profile/layout.tsx | 2 +- .../profile/preferences/layout.tsx | 78 ++++++++++--------- .../profile/preferences/sidebar.tsx | 2 +- .../settings-layout/profile/sidebar.tsx | 4 +- .../settings-layout/project/sidebar.tsx | 2 +- web/pages/[workspaceSlug]/analytics.tsx | 2 +- .../projects/[projectId]/cycles/index.tsx | 6 +- .../projects/[projectId]/issues/index.tsx | 2 +- .../workspace-views/[globalViewId].tsx | 2 +- web/pages/accounts/reset-password.tsx | 4 +- web/styles/command-pallette.css | 2 +- web/styles/globals.css | 23 +++--- 82 files changed, 200 insertions(+), 207 deletions(-) diff --git a/packages/editor/core/src/styles/editor.css b/packages/editor/core/src/styles/editor.css index 6c76b36f3..2c56378a1 100644 --- a/packages/editor/core/src/styles/editor.css +++ b/packages/editor/core/src/styles/editor.css @@ -197,7 +197,7 @@ ul[data-type="taskList"] li[data-checked="true"] > div > p { th { font-weight: bold; text-align: left; - background-color: rgb(var(--color-primary-100)); + background-color: var(--color-primary-90); } td:hover { diff --git a/packages/editor/core/src/styles/table.css b/packages/editor/core/src/styles/table.css index a682a1746..685425160 100644 --- a/packages/editor/core/src/styles/table.css +++ b/packages/editor/core/src/styles/table.css @@ -43,7 +43,7 @@ .tableWrapper table th { font-weight: bold; text-align: left; - background-color: rgba(var(--color-primary-100)); + background-color: var(--color-primary-90); } .tableWrapper table th * { @@ -112,7 +112,7 @@ } .tableWrapper .tableControls .rowsControlDiv { - background-color: rgba(var(--color-primary-100)); + background-color: var(--color-primary-90); border: 1px solid var(--color-neutral-70); border-radius: 2px; background-size: 1.25rem; @@ -127,7 +127,7 @@ } .tableWrapper .tableControls .columnsControlDiv { - background-color: rgba(var(--color-primary-100)); + background-color: var(--color-primary-90); border: 1px solid var(--color-neutral-70); border-radius: 2px; background-size: 1.25rem; @@ -166,7 +166,7 @@ .tableWrapper .tableControls .tableToolbox .toolboxItem:hover, .tableWrapper .tableControls .tableColorPickerToolbox .toolboxItem:hover { - background-color: rgba(var(--color-background-100), 0.5); + background-color: var(--color-neutral-30); } .tableWrapper .tableControls .tableToolbox .toolboxItem .iconContainer, diff --git a/packages/editor/core/src/ui/extensions/table/table-header/table-header.ts b/packages/editor/core/src/ui/extensions/table/table-header/table-header.ts index c0decdbf8..c112635c9 100644 --- a/packages/editor/core/src/ui/extensions/table/table-header/table-header.ts +++ b/packages/editor/core/src/ui/extensions/table/table-header/table-header.ts @@ -33,7 +33,7 @@ export const TableHeader = Node.create({ }, }, background: { - default: "rgb(var(--color-primary-100))", + default: "var(--color-primary-90)", }, }; }, diff --git a/packages/editor/core/src/ui/extensions/table/table/table-view.tsx b/packages/editor/core/src/ui/extensions/table/table/table-view.tsx index bd96ff1b1..8a991dece 100644 --- a/packages/editor/core/src/ui/extensions/table/table/table-view.tsx +++ b/packages/editor/core/src/ui/extensions/table/table/table-view.tsx @@ -224,7 +224,7 @@ function createColorPickerToolbox({ onSelectColor?: (color: string) => void; }) { const items = { - Default: "rgb(var(--color-primary-100))", + Default: "var(--color-primary-90)", Orange: "#FFE5D1", Grey: "#F1F1F1", Yellow: "#FEF3C7", @@ -437,16 +437,19 @@ export class TableView implements NodeView { } updateControls() { - const { hoveredTable: table, hoveredCell: cell } = Object.values(this.decorations).reduce((acc, curr) => { - if (curr.spec.hoveredCell !== undefined) { - acc["hoveredCell"] = curr.spec.hoveredCell; - } + const { hoveredTable: table, hoveredCell: cell } = Object.values(this.decorations).reduce( + (acc, curr) => { + if (curr.spec.hoveredCell !== undefined) { + acc["hoveredCell"] = curr.spec.hoveredCell; + } - if (curr.spec.hoveredTable !== undefined) { - acc["hoveredTable"] = curr.spec.hoveredTable; - } - return acc; - }, {} as Record) as any; + if (curr.spec.hoveredTable !== undefined) { + acc["hoveredTable"] = curr.spec.hoveredTable; + } + return acc; + }, + {} as Record + ) as any; if (table === undefined || cell === undefined) { return this.root.classList.add("controls--disabled"); diff --git a/packages/editor/document-editor/src/ui/components/editor-header.tsx b/packages/editor/document-editor/src/ui/components/editor-header.tsx index 7b1227f2b..ef7111cb5 100644 --- a/packages/editor/document-editor/src/ui/components/editor-header.tsx +++ b/packages/editor/document-editor/src/ui/components/editor-header.tsx @@ -83,7 +83,7 @@ export const EditorHeader = (props: IEditorHeader) => { }`} > {isSubmitting !== "submitted" && isSubmitting !== "saved" && ( - + )} {isSubmitting === "submitting" ? "Saving..." : "Saved"} diff --git a/packages/editor/document-editor/src/ui/components/page-renderer.tsx b/packages/editor/document-editor/src/ui/components/page-renderer.tsx index c60ac0e7a..05f680e51 100644 --- a/packages/editor/document-editor/src/ui/components/page-renderer.tsx +++ b/packages/editor/document-editor/src/ui/components/page-renderer.tsx @@ -156,13 +156,13 @@ export const PageRenderer = (props: IPageRenderer) => { {!readonly ? ( handlePageTitleChange(e.target.value)} - className="-mt-2 w-full break-words border-none bg-custom-background pr-5 text-4xl font-bold outline-none" + className="-mt-2 w-full break-words border-none pr-5 text-4xl font-bold outline-none bg-transparent" value={pageTitle} /> ) : ( handlePageTitleChange(e.target.value)} - className="-mt-2 w-full overflow-x-clip break-words border-none bg-custom-background pr-5 text-4xl font-bold outline-none" + className="-mt-2 w-full overflow-x-clip break-words border-none pr-5 text-4xl font-bold outline-none" value={pageTitle} disabled /> diff --git a/packages/tailwind-config-custom/tailwind.config.js b/packages/tailwind-config-custom/tailwind.config.js index b2d734a97..1dbb44e5c 100644 --- a/packages/tailwind-config-custom/tailwind.config.js +++ b/packages/tailwind-config-custom/tailwind.config.js @@ -310,14 +310,6 @@ export const theme = { }, extend: { keyframes: { - leftToaster: { - "0%": { left: "-20rem" }, - "100%": { left: "0" }, - }, - rightToaster: { - "0%": { right: "-20rem" }, - "100%": { right: "0" }, - }, "bar-loader": { from: { left: "-100%" }, to: { left: "100%" }, diff --git a/packages/ui/src/progress/linear-progress-indicator.tsx b/packages/ui/src/progress/linear-progress-indicator.tsx index 7cf9717a0..c6b665e14 100644 --- a/packages/ui/src/progress/linear-progress-indicator.tsx +++ b/packages/ui/src/progress/linear-progress-indicator.tsx @@ -45,9 +45,13 @@ export const LinearProgressIndicator: React.FC = ({ })} > {total === 0 ? ( -
{bars}
+
+ {bars} +
) : ( -
{bars}
+
+ {bars} +
)} ); diff --git a/space/components/accounts/sign-in-forms/email-form.tsx b/space/components/accounts/sign-in-forms/email-form.tsx index 4f8ed4294..0fe749005 100644 --- a/space/components/accounts/sign-in-forms/email-form.tsx +++ b/space/components/accounts/sign-in-forms/email-form.tsx @@ -105,7 +105,7 @@ export const EmailForm: React.FC = (props) => { /> {value.length > 0 && ( onChange("")} /> )} diff --git a/space/components/accounts/sign-in-forms/password.tsx b/space/components/accounts/sign-in-forms/password.tsx index 22c9cb73e..e9ba234c3 100644 --- a/space/components/accounts/sign-in-forms/password.tsx +++ b/space/components/accounts/sign-in-forms/password.tsx @@ -160,7 +160,7 @@ export const PasswordForm: React.FC = (props) => { /> {value.length > 0 && ( onChange("")} /> )} diff --git a/space/components/accounts/sign-in-forms/self-hosted-sign-in.tsx b/space/components/accounts/sign-in-forms/self-hosted-sign-in.tsx index af1e5d68f..f207b63e5 100644 --- a/space/components/accounts/sign-in-forms/self-hosted-sign-in.tsx +++ b/space/components/accounts/sign-in-forms/self-hosted-sign-in.tsx @@ -102,7 +102,7 @@ export const SelfHostedSignInForm: React.FC = (props) => { /> {value.length > 0 && ( onChange("")} /> )} diff --git a/space/components/accounts/sign-in-forms/unique-code.tsx b/space/components/accounts/sign-in-forms/unique-code.tsx index d96476bed..dda902fdc 100644 --- a/space/components/accounts/sign-in-forms/unique-code.tsx +++ b/space/components/accounts/sign-in-forms/unique-code.tsx @@ -187,7 +187,7 @@ export const UniqueCodeForm: React.FC = (props) => { /> {value.length > 0 && ( onChange("")} /> )} diff --git a/space/components/issues/peek-overview/issue-reaction.tsx b/space/components/issues/peek-overview/issue-reaction.tsx index 79b45f104..fb55a122e 100644 --- a/space/components/issues/peek-overview/issue-reaction.tsx +++ b/space/components/issues/peek-overview/issue-reaction.tsx @@ -11,7 +11,7 @@ export const IssueReactions: React.FC = () => {
-
+
)} {projectStore?.deploySettings?.reactions && ( diff --git a/web/components/account/sign-in-forms/email.tsx b/web/components/account/sign-in-forms/email.tsx index 67ef720fe..f196a21d0 100644 --- a/web/components/account/sign-in-forms/email.tsx +++ b/web/components/account/sign-in-forms/email.tsx @@ -93,7 +93,7 @@ export const SignInEmailForm: React.FC = observer((props) => { /> {value.length > 0 && ( onChange("")} /> )} diff --git a/web/components/account/sign-in-forms/optional-set-password.tsx b/web/components/account/sign-in-forms/optional-set-password.tsx index d7a595298..ae0235af6 100644 --- a/web/components/account/sign-in-forms/optional-set-password.tsx +++ b/web/components/account/sign-in-forms/optional-set-password.tsx @@ -131,12 +131,12 @@ export const SignInOptionalSetPasswordForm: React.FC = (props) => { /> {showPassword ? ( setShowPassword(false)} /> ) : ( setShowPassword(true)} /> )} diff --git a/web/components/account/sign-in-forms/password.tsx b/web/components/account/sign-in-forms/password.tsx index f28a6f0d5..9c9cbec7a 100644 --- a/web/components/account/sign-in-forms/password.tsx +++ b/web/components/account/sign-in-forms/password.tsx @@ -139,7 +139,7 @@ export const SignInPasswordForm: React.FC = observer((props) => { /> {value.length > 0 && ( { if (isSmtpConfigured) handleEmailClear(); else onChange(""); @@ -170,12 +170,12 @@ export const SignInPasswordForm: React.FC = observer((props) => { /> {showPassword ? ( setShowPassword(false)} /> ) : ( setShowPassword(true)} /> )} diff --git a/web/components/account/sign-in-forms/unique-code.tsx b/web/components/account/sign-in-forms/unique-code.tsx index ee90472a3..a2f72e96e 100644 --- a/web/components/account/sign-in-forms/unique-code.tsx +++ b/web/components/account/sign-in-forms/unique-code.tsx @@ -154,7 +154,7 @@ export const SignInUniqueCodeForm: React.FC = (props) => { /> {value.length > 0 && ( )} diff --git a/web/components/account/sign-up-forms/email.tsx b/web/components/account/sign-up-forms/email.tsx index 0d5861b4e..0292d45a5 100644 --- a/web/components/account/sign-up-forms/email.tsx +++ b/web/components/account/sign-up-forms/email.tsx @@ -93,7 +93,7 @@ export const SignUpEmailForm: React.FC = observer((props) => { /> {value.length > 0 && ( onChange("")} /> )} diff --git a/web/components/account/sign-up-forms/optional-set-password.tsx b/web/components/account/sign-up-forms/optional-set-password.tsx index db14f0ccb..dca386ea2 100644 --- a/web/components/account/sign-up-forms/optional-set-password.tsx +++ b/web/components/account/sign-up-forms/optional-set-password.tsx @@ -135,12 +135,12 @@ export const SignUpOptionalSetPasswordForm: React.FC = (props) => { /> {showPassword ? ( setShowPassword(false)} /> ) : ( setShowPassword(true)} /> )} diff --git a/web/components/account/sign-up-forms/password.tsx b/web/components/account/sign-up-forms/password.tsx index 293e03ef8..6495921e0 100644 --- a/web/components/account/sign-up-forms/password.tsx +++ b/web/components/account/sign-up-forms/password.tsx @@ -98,7 +98,7 @@ export const SignUpPasswordForm: React.FC = observer((props) => { /> {value.length > 0 && ( onChange("")} /> )} @@ -126,12 +126,12 @@ export const SignUpPasswordForm: React.FC = observer((props) => { /> {showPassword ? ( setShowPassword(false)} /> ) : ( setShowPassword(true)} /> )} diff --git a/web/components/account/sign-up-forms/unique-code.tsx b/web/components/account/sign-up-forms/unique-code.tsx index aad1a1816..30776bb05 100644 --- a/web/components/account/sign-up-forms/unique-code.tsx +++ b/web/components/account/sign-up-forms/unique-code.tsx @@ -155,7 +155,7 @@ export const SignUpUniqueCodeForm: React.FC = (props) => { /> {value.length > 0 && ( )} diff --git a/web/components/analytics/scope-and-demand/year-wise-issues.tsx b/web/components/analytics/scope-and-demand/year-wise-issues.tsx index 3768eb554..e3dad5912 100644 --- a/web/components/analytics/scope-and-demand/year-wise-issues.tsx +++ b/web/components/analytics/scope-and-demand/year-wise-issues.tsx @@ -19,7 +19,7 @@ export const AnalyticsYearWiseIssues: React.FC = ({ defaultAnalytics }) = data={[ { id: "issues_closed", - color: "rgb(var(--color-primary-100))", + color: "var(--color-primary-90)", data: Object.entries(MONTHS_LIST).map(([index, month]) => ({ x: month.shortTitle, y: @@ -41,9 +41,6 @@ export const AnalyticsYearWiseIssues: React.FC = ({ defaultAnalytics }) = {datum.slice.points[0].data.xFormatted}
)} - theme={{ - background: "var(--color-neutral-30)", - }} enableArea /> ) : ( diff --git a/web/components/core/sidebar/progress-chart.tsx b/web/components/core/sidebar/progress-chart.tsx index 3da92dbdc..cb63434dc 100644 --- a/web/components/core/sidebar/progress-chart.tsx +++ b/web/components/core/sidebar/progress-chart.tsx @@ -140,7 +140,7 @@ const ProgressChart: React.FC = ({ distribution, startDate, endDate, tota axis: { domain: { line: { - stroke: "rgb(var(--color-border))", + stroke: "var(--color-neutral-70)", strokeWidth: 1, }, }, diff --git a/web/components/core/sidebar/sidebar-menu-hamburger-toggle.tsx b/web/components/core/sidebar/sidebar-menu-hamburger-toggle.tsx index 627343306..5fc2fb546 100644 --- a/web/components/core/sidebar/sidebar-menu-hamburger-toggle.tsx +++ b/web/components/core/sidebar/sidebar-menu-hamburger-toggle.tsx @@ -7,7 +7,7 @@ export const SidebarHamburgerToggle: FC = observer(() => { const { theme: themStore } = useApplication(); return (
themStore.toggleSidebar()} > diff --git a/web/components/cycles/cycles-list-item.tsx b/web/components/cycles/cycles-list-item.tsx index 998258745..97d0e2f38 100644 --- a/web/components/cycles/cycles-list-item.tsx +++ b/web/components/cycles/cycles-list-item.tsx @@ -159,7 +159,7 @@ export const CyclesListItem: FC = (props) => { projectId={projectId} /> -
+
diff --git a/web/components/dashboard/widgets/assigned-issues.tsx b/web/components/dashboard/widgets/assigned-issues.tsx index c3f1b73e0..e59bdac84 100644 --- a/web/components/dashboard/widgets/assigned-issues.tsx +++ b/web/components/dashboard/widgets/assigned-issues.tsx @@ -71,7 +71,7 @@ export const AssignedIssuesWidget: React.FC = observer((props) => { if (!widgetDetails || !widgetStats) return ; return ( -
+
= observer((props) => { if (!widgetDetails || !widgetStats) return ; return ( -
+
= observer((props) => { >
= observer((props) => { className={cn( "relative z-[1] font-semibold text-xs rounded-[3px] py-1.5 text-neutral-text-subtle focus:outline-none transition duration-500", { - "text-neutral-text-strong bg-custom-background-100": selectedTab === tab.key, + "text-neutral-text-strong bg-neutral-component-surface-light": selectedTab === tab.key, "hover:text-neutral-text-medium": selectedTab !== tab.key, } )} diff --git a/web/components/dashboard/widgets/issues-by-priority.tsx b/web/components/dashboard/widgets/issues-by-priority.tsx index fc44b22a5..1a5b4e845 100644 --- a/web/components/dashboard/widgets/issues-by-priority.tsx +++ b/web/components/dashboard/widgets/issues-by-priority.tsx @@ -132,7 +132,7 @@ export const IssuesByPriorityWidget: React.FC = observer((props) => }; return ( -
+
= observer((props) }; return ( -
+
= observer((props) => { return (
div>a>div]:border-r [&>div:last-child>a>div]:border-0 [&>div>a>div]:border-neutral-border-medium diff --git a/web/components/dropdowns/member/workspace-member.tsx b/web/components/dropdowns/member/workspace-member.tsx index ba83c3269..475a874c6 100644 --- a/web/components/dropdowns/member/workspace-member.tsx +++ b/web/components/dropdowns/member/workspace-member.tsx @@ -184,12 +184,12 @@ export const WorkspaceMemberDropdown: React.FC = observer(( {isOpen && (
-
+
{ {projectEstimates ? ( projectEstimates.length > 0 ? ( -
+
{projectEstimates.map((estimate) => ( {
{workspaceProjectIds && workspaceProjectIds?.length > 0 && ( -
+
= observer((props) => {
- {type} + {type}
} - customButtonClassName="flex flex-grow justify-center text-custom-text-200 text-sm" + customButtonClassName="flex flex-grow justify-center text-neutral-text-medium text-sm" closeOnSelect > <> @@ -81,7 +81,7 @@ export const UserProfileHeader: FC = observer((props) => { diff --git a/web/components/instance/setup-form/sign-in-form.tsx b/web/components/instance/setup-form/sign-in-form.tsx index f4b6a4904..c08926d4a 100644 --- a/web/components/instance/setup-form/sign-in-form.tsx +++ b/web/components/instance/setup-form/sign-in-form.tsx @@ -95,7 +95,7 @@ export const InstanceSetupSignInForm: FC = (props) => { /> {value.length > 0 && ( setValue("email", "")} /> )} @@ -120,12 +120,12 @@ export const InstanceSetupSignInForm: FC = (props) => { /> {showPassword ? ( setShowPassword(false)} /> ) : ( setShowPassword(true)} /> )} diff --git a/web/components/instance/sidebar-dropdown.tsx b/web/components/instance/sidebar-dropdown.tsx index 6bd600720..34566ded6 100644 --- a/web/components/instance/sidebar-dropdown.tsx +++ b/web/components/instance/sidebar-dropdown.tsx @@ -143,7 +143,7 @@ export const InstanceSidebarDropdown = observer(() => {
- + Exit God Mode diff --git a/web/components/instance/sidebar-menu.tsx b/web/components/instance/sidebar-menu.tsx index cd5790ed8..733de6793 100644 --- a/web/components/instance/sidebar-menu.tsx +++ b/web/components/instance/sidebar-menu.tsx @@ -59,7 +59,7 @@ export const InstanceAdminSidebarMenu = () => {
diff --git a/web/components/issues/issue-detail/relation-select.tsx b/web/components/issues/issue-detail/relation-select.tsx index a8d923c7a..1c7e8f909 100644 --- a/web/components/issues/issue-detail/relation-select.tsx +++ b/web/components/issues/issue-detail/relation-select.tsx @@ -125,7 +125,7 @@ export const IssueRelationSelect: React.FC = observer((pro return (
{ return ( <> -
+
= observer((props) => { const totalIssues = issueIdList?.length ?? 0; return ( <> -
+
{/* header */}
= observer((props) => { ? "font-medium" : "text-neutral-text-medium" : "font-medium" // if week layout, highlight all days - } ${ - date.date.getDay() === 0 || date.date.getDay() === 6 - ? "bg-neutral-component-surface-medium" - : "bg-neutral-component-surface-light" - }`} + } ${[0, 6].includes(date.date.getDay()) ? "bg-neutral-component-surface-light" : ""}`} > {date.date.getDate() === 1 && MONTHS_LIST[date.date.getMonth() + 1].shortTitle + " "} {date.date.getDate()} @@ -79,9 +75,9 @@ export const CalendarDayTile: React.FC = observer((props) => { {(provided, snapshot) => (
= observer((props) => { className={cn( "group/calendar-block flex h-8 w-full items-center justify-between gap-1.5 rounded border-[0.5px] border-neutral-border-medium hover:border-neutral-border-strong px-1 py-1.5 ", { - "bg-custom-background-90 shadow-custom-shadow-rg border-custom-primary-100": + "bg-neutral-component-surface-medium shadow-custom-shadow-rg border-custom-primary-100": snapshot.isDragging, }, - { "bg-custom-background-100 hover:bg-custom-background-90": !snapshot.isDragging }, + { + "bg-neutral-component-surface-light hover:bg-neutral-component-surface-medium": + !snapshot.isDragging, + }, { "border border-custom-primary-70 hover:border-custom-primary-70": peekIssue?.issueId === issue.id, diff --git a/web/components/issues/issue-layouts/calendar/week-header.tsx b/web/components/issues/issue-layouts/calendar/week-header.tsx index c775b3697..f197db56c 100644 --- a/web/components/issues/issue-layouts/calendar/week-header.tsx +++ b/web/components/issues/issue-layouts/calendar/week-header.tsx @@ -21,10 +21,10 @@ export const CalendarWeekHeader: React.FC = observer((props) => {
)} {Object.values(DAYS_LIST).map((day) => { - if (!showWeekends && (day.shortTitle === "Sat" || day.shortTitle === "Sun")) return null; + if (!showWeekends && ["Sat", "Sun"].includes(day.shortTitle)) return null; return ( -
+
{day.shortTitle}
); diff --git a/web/components/issues/issue-layouts/kanban/base-kanban-root.tsx b/web/components/issues/issue-layouts/kanban/base-kanban-root.tsx index 1b3787996..c7c2cf937 100644 --- a/web/components/issues/issue-layouts/kanban/base-kanban-root.tsx +++ b/web/components/issues/issue-layouts/kanban/base-kanban-root.tsx @@ -240,13 +240,13 @@ export const BaseKanBanRoot: React.FC = observer((props: IBas /> {showLoader && issues?.loader === "init-loader" && ( -
+
)} -
-
+
+
{/* drag and delete component */}
= memo((props) => { ref={provided.innerRef} > {issue.tempId !== undefined && ( -
+
)}
= observer((props: IssueBlock <>
{ > { {/* first column/ issue name and key column */} { shouldRenderProperty={shouldRenderProperty} > diff --git a/web/components/issues/issue-layouts/spreadsheet/spreadsheet-header.tsx b/web/components/issues/issue-layouts/spreadsheet/spreadsheet-header.tsx index aae4ebf3d..26819bd1f 100644 --- a/web/components/issues/issue-layouts/spreadsheet/spreadsheet-header.tsx +++ b/web/components/issues/issue-layouts/spreadsheet/spreadsheet-header.tsx @@ -22,7 +22,7 @@ export const SpreadsheetHeader = (props: Props) => { diff --git a/web/components/issues/issue-layouts/spreadsheet/spreadsheet-view.tsx b/web/components/issues/issue-layouts/spreadsheet/spreadsheet-view.tsx index 6474a4211..5b379f06d 100644 --- a/web/components/issues/issue-layouts/spreadsheet/spreadsheet-view.tsx +++ b/web/components/issues/issue-layouts/spreadsheet/spreadsheet-view.tsx @@ -99,7 +99,7 @@ export const SpreadsheetView: React.FC = observer((props) => { ); return ( -
+
= (props) => { }`} > {isSubmitting !== "submitted" && isSubmitting !== "saved" && ( - + )} {isSubmitting === "submitting" ? "Saving..." : "Saved"} diff --git a/web/components/labels/label-block/drag-handle.tsx b/web/components/labels/label-block/drag-handle.tsx index ab980b090..670cb940e 100644 --- a/web/components/labels/label-block/drag-handle.tsx +++ b/web/components/labels/label-block/drag-handle.tsx @@ -17,8 +17,8 @@ export const DragHandle = (props: IDragHandle) => { }`} {...dragHandleProps} > - - + + ); }; diff --git a/web/components/page-views/workspace-dashboard.tsx b/web/components/page-views/workspace-dashboard.tsx index 93756d22a..e4fd1206f 100644 --- a/web/components/page-views/workspace-dashboard.tsx +++ b/web/components/page-views/workspace-dashboard.tsx @@ -64,7 +64,7 @@ export const WorkspaceDashboardView = observer(() => { {joinedProjectIds.length > 0 ? ( <> -
+
{currentUser && } {currentUser && !currentUser.is_tour_completed && (
diff --git a/web/components/pages/pages-list/recent-pages-list.tsx b/web/components/pages/pages-list/recent-pages-list.tsx index b1327c407..a898dc569 100644 --- a/web/components/pages/pages-list/recent-pages-list.tsx +++ b/web/components/pages/pages-list/recent-pages-list.tsx @@ -52,7 +52,7 @@ export const RecentPagesList: FC = observer(() => { return (
-

+

{replaceUnderscoreIfSnakeCase(key)}

diff --git a/web/components/project/integration-card.tsx b/web/components/project/integration-card.tsx index d37c3a815..fbe68503d 100644 --- a/web/components/project/integration-card.tsx +++ b/web/components/project/integration-card.tsx @@ -90,7 +90,7 @@ export const IntegrationCard: React.FC = ({ integration }) => { return ( <> {integration && ( -
+
= observer(() => { {PROJECT_FEATURES_LIST.map((feature) => (
diff --git a/web/components/states/create-update-state-inline.tsx b/web/components/states/create-update-state-inline.tsx index 86c666ff1..8851daa58 100644 --- a/web/components/states/create-update-state-inline.tsx +++ b/web/components/states/create-update-state-inline.tsx @@ -151,10 +151,7 @@ export const CreateUpdateStateInline: React.FC = observer((props) => { }; return ( -
+
{({ open }) => ( diff --git a/web/components/states/project-setting-state-list-item.tsx b/web/components/states/project-setting-state-list-item.tsx index d6cfdb190..cd4effbd0 100644 --- a/web/components/states/project-setting-state-list-item.tsx +++ b/web/components/states/project-setting-state-list-item.tsx @@ -48,7 +48,7 @@ export const StatesListItem: React.FC = observer((props) => { }; return ( -
+
diff --git a/web/components/workspace/sidebar-dropdown.tsx b/web/components/workspace/sidebar-dropdown.tsx index 7fc5d8ac8..ba50fe856 100644 --- a/web/components/workspace/sidebar-dropdown.tsx +++ b/web/components/workspace/sidebar-dropdown.tsx @@ -290,8 +290,8 @@ export const WorkspaceSidebarDropdown = observer(() => { leaveTo="transform opacity-0 scale-95" > {
- + Enter God Mode diff --git a/web/components/workspace/workspace-active-cycles-upgrade.tsx b/web/components/workspace/workspace-active-cycles-upgrade.tsx index 6990ee9a1..3d9e2758b 100644 --- a/web/components/workspace/workspace-active-cycles-upgrade.tsx +++ b/web/components/workspace/workspace-active-cycles-upgrade.tsx @@ -1,8 +1,6 @@ import React from "react"; import Image from "next/image"; -import { observer } from "mobx-react"; -// hooks -import { useUser } from "hooks/store"; +import { useTheme } from "next-themes"; // ui import { getButtonStyling } from "@plane/ui"; // icons @@ -12,18 +10,18 @@ import { cn } from "helpers/common.helper"; // constants import { WORKSPACE_ACTIVE_CYCLES_DETAILS } from "constants/cycle"; -export const WorkspaceActiveCyclesUpgrade = observer(() => { - // store hooks - const { currentUser } = useUser(); - - const isDarkMode = currentUser?.theme.theme === "dark"; +export const WorkspaceActiveCyclesUpgrade = () => { + // next-themes + const { resolvedTheme } = useTheme(); + // derived values + const isDarkMode = resolvedTheme === "dark"; return (
@@ -86,4 +84,4 @@ export const WorkspaceActiveCyclesUpgrade = observer(() => {
); -}); +}; diff --git a/web/helpers/string.helper.ts b/web/helpers/string.helper.ts index 22b5834b0..f3d21da93 100644 --- a/web/helpers/string.helper.ts +++ b/web/helpers/string.helper.ts @@ -76,7 +76,7 @@ export const copyUrlToClipboard = async (path: string) => { }; export const generateRandomColor = (string: string): string => { - if (!string) return "rgb(var(--color-primary-100))"; + if (!string) return "var(--color-primary-90)"; string = `${string}`; @@ -171,10 +171,10 @@ export const getFetchKeysForIssueMutation = (options: { const ganttFetchKey = cycleId ? { ganttFetchKey: CYCLE_ISSUES_WITH_PARAMS(cycleId.toString(), ganttParams) } : moduleId - ? { ganttFetchKey: MODULE_ISSUES_WITH_PARAMS(moduleId.toString(), ganttParams) } - : viewId - ? { ganttFetchKey: VIEW_ISSUES(viewId.toString(), viewGanttParams) } - : { ganttFetchKey: PROJECT_ISSUES_LIST_WITH_PARAMS(projectId?.toString() ?? "", ganttParams) }; + ? { ganttFetchKey: MODULE_ISSUES_WITH_PARAMS(moduleId.toString(), ganttParams) } + : viewId + ? { ganttFetchKey: VIEW_ISSUES(viewId.toString(), viewGanttParams) } + : { ganttFetchKey: PROJECT_ISSUES_LIST_WITH_PARAMS(projectId?.toString() ?? "", ganttParams) }; return { ...ganttFetchKey, diff --git a/web/layouts/admin-layout/layout.tsx b/web/layouts/admin-layout/layout.tsx index 9febc7e27..1d52c3ff7 100644 --- a/web/layouts/admin-layout/layout.tsx +++ b/web/layouts/admin-layout/layout.tsx @@ -28,7 +28,7 @@ export const InstanceAdminLayout: FC = observer((props) =>
-
+
diff --git a/web/layouts/admin-layout/sidebar.tsx b/web/layouts/admin-layout/sidebar.tsx index 696ddc0be..abadf1e6f 100644 --- a/web/layouts/admin-layout/sidebar.tsx +++ b/web/layouts/admin-layout/sidebar.tsx @@ -15,7 +15,7 @@ export const InstanceAdminSidebar: FC = observer(() => { return (
diff --git a/web/layouts/app-layout/layout.tsx b/web/layouts/app-layout/layout.tsx index 7091a77a6..3cc214fee 100644 --- a/web/layouts/app-layout/layout.tsx +++ b/web/layouts/app-layout/layout.tsx @@ -43,7 +43,7 @@ export const AppLayout: FC = observer((props) => {
-
+
{header}
diff --git a/web/layouts/app-layout/sidebar.tsx b/web/layouts/app-layout/sidebar.tsx index f339cdb5e..b0ef92161 100644 --- a/web/layouts/app-layout/sidebar.tsx +++ b/web/layouts/app-layout/sidebar.tsx @@ -42,7 +42,7 @@ export const AppSidebar: FC = observer(() => { return (
= observer(({ children }) = ""; // if user does not have admin access to the instance - if (isUserInstanceAdmin !== undefined && isUserInstanceAdmin === false) { + if (isUserInstanceAdmin !== undefined && isUserInstanceAdmin === false) return ; - } return <>{children}; }); diff --git a/web/layouts/auth-layout/project-wrapper.tsx b/web/layouts/auth-layout/project-wrapper.tsx index 775c5a8b3..1ec0dcee5 100644 --- a/web/layouts/auth-layout/project-wrapper.tsx +++ b/web/layouts/auth-layout/project-wrapper.tsx @@ -117,7 +117,7 @@ export const ProjectAuthWrapper: FC = observer((props) => { // check if the project member apis is loading if (!projectMemberInfo && projectId && hasPermissionToProject[projectId.toString()] === null) return ( -
+
@@ -130,7 +130,7 @@ export const ProjectAuthWrapper: FC = observer((props) => { // check if the project info is not found. if (!projectExists && projectId && hasPermissionToProject[projectId.toString()] === false) return ( -
+
= observer((props) => { shouldRetryOnError: false, }); - if (!currentUser && !currentUserError) { + if (!currentUser && !currentUserError) return ( -
+
); - } if (currentUserError) { const redirectTo = router.asPath; diff --git a/web/layouts/auth-layout/workspace-wrapper.tsx b/web/layouts/auth-layout/workspace-wrapper.tsx index 27af04fd5..1f474bae4 100644 --- a/web/layouts/auth-layout/workspace-wrapper.tsx +++ b/web/layouts/auth-layout/workspace-wrapper.tsx @@ -4,7 +4,7 @@ import Link from "next/link"; import useSWR from "swr"; import { observer } from "mobx-react-lite"; // hooks -import { useLabel, useMember, useProject, useUser } from "hooks/store"; +import { useMember, useProject, useUser } from "hooks/store"; // icons import { Button, Spinner } from "@plane/ui"; @@ -60,7 +60,7 @@ export const WorkspaceAuthWrapper: FC = observer((props) membership.hasPermissionToCurrentWorkspace === false ) { return ( -
+
diff --git a/web/layouts/settings-layout/profile/layout.tsx b/web/layouts/settings-layout/profile/layout.tsx index 0e88e819b..2d894d800 100644 --- a/web/layouts/settings-layout/profile/layout.tsx +++ b/web/layouts/settings-layout/profile/layout.tsx @@ -19,7 +19,7 @@ export const ProfileSettingsLayout: FC = (props) => {
-
+
{header}
{children}
diff --git a/web/layouts/settings-layout/profile/preferences/layout.tsx b/web/layouts/settings-layout/profile/preferences/layout.tsx index 18274fd1c..608c71809 100644 --- a/web/layouts/settings-layout/profile/preferences/layout.tsx +++ b/web/layouts/settings-layout/profile/preferences/layout.tsx @@ -18,57 +18,59 @@ export const ProfilePreferenceSettingsLayout: FC { - const item = router.asPath.split('/'); + const item = router.asPath.split("/"); let splittedItem = item[item.length - 1]; splittedItem = splittedItem.replace(splittedItem[0], splittedItem[0].toUpperCase()); console.log(splittedItem); return splittedItem; - } + }; const profilePreferenceLinks: Array<{ label: string; href: string; }> = [ - { - label: "Theme", - href: `/profile/preferences/theme`, - }, - { - label: "Email", - href: `/profile/preferences/email`, - }, - ]; + { + label: "Theme", + href: `/profile/preferences/theme`, + }, + { + label: "Email", + href: `/profile/preferences/email`, + }, + ]; return ( - - - - {showMenuItem()} - -
- } - customButtonClassName="flex flex-grow justify-start text-custom-text-200 text-sm" - > - <> - {profilePreferenceLinks.map((link) => ( - - {link.label} - - ))} - -
- }> + + + + {showMenuItem()} + +
+ } + customButtonClassName="flex flex-grow justify-start text-neutral-text-medium text-sm" + > + <> + {profilePreferenceLinks.map((link) => ( + + + {link.label} + + + ))} + +
+ } + >
-
+
{header}
{children}
diff --git a/web/layouts/settings-layout/profile/preferences/sidebar.tsx b/web/layouts/settings-layout/profile/preferences/sidebar.tsx index 6bb32ba0d..3bb5513f5 100644 --- a/web/layouts/settings-layout/profile/preferences/sidebar.tsx +++ b/web/layouts/settings-layout/profile/preferences/sidebar.tsx @@ -28,7 +28,7 @@ export const ProfilePreferenceSettingsSidebar = () => {
diff --git a/web/layouts/settings-layout/profile/sidebar.tsx b/web/layouts/settings-layout/profile/sidebar.tsx index 1904553c2..af398de09 100644 --- a/web/layouts/settings-layout/profile/sidebar.tsx +++ b/web/layouts/settings-layout/profile/sidebar.tsx @@ -103,7 +103,7 @@ export const ProfileLayoutSidebar = observer(() => { return (
{
diff --git a/web/layouts/settings-layout/project/sidebar.tsx b/web/layouts/settings-layout/project/sidebar.tsx index 5cd7f28ff..053840af1 100644 --- a/web/layouts/settings-layout/project/sidebar.tsx +++ b/web/layouts/settings-layout/project/sidebar.tsx @@ -28,7 +28,7 @@ export const ProjectSettingsSidebar = () => {
diff --git a/web/pages/[workspaceSlug]/analytics.tsx b/web/pages/[workspaceSlug]/analytics.tsx index 57d732416..304dbfa0d 100644 --- a/web/pages/[workspaceSlug]/analytics.tsx +++ b/web/pages/[workspaceSlug]/analytics.tsx @@ -37,7 +37,7 @@ const AnalyticsPage: NextPageWithLayout = observer(() => { return ( <> {workspaceProjectIds && workspaceProjectIds.length > 0 ? ( -
+
{ANALYTICS_TABS.map((tab) => ( diff --git a/web/pages/[workspaceSlug]/projects/[projectId]/cycles/index.tsx b/web/pages/[workspaceSlug]/projects/[projectId]/cycles/index.tsx index 12f595c8d..fad8662e0 100644 --- a/web/pages/[workspaceSlug]/projects/[projectId]/cycles/index.tsx +++ b/web/pages/[workspaceSlug]/projects/[projectId]/cycles/index.tsx @@ -133,8 +133,10 @@ const ProjectCyclesPage: NextPageWithLayout = observer(() => {