From dbaa603d216cb4c12ce80b36cb8fa84e21ca17d3 Mon Sep 17 00:00:00 2001 From: Ramin Tadayon Date: Wed, 14 Feb 2024 18:18:04 -0700 Subject: [PATCH] Updates section ordering and feature descriptions in gates --- package.json | 13 ++++++------- .../apps/plus/focus/components/focus-app.ts | 8 -------- src/webviews/apps/plus/graph/GraphWrapper.tsx | 13 ++----------- .../components/feature-gate-plus-state.ts | 18 +++++++++--------- src/webviews/apps/plus/timeline/timeline.html | 10 ++-------- .../apps/shared/components/feature-gate.ts | 18 +++++------------- 6 files changed, 24 insertions(+), 56 deletions(-) diff --git a/package.json b/package.json index 4f38cb97d6866..0e083403d7478 100644 --- a/package.json +++ b/package.json @@ -16151,8 +16151,7 @@ }, { "view": "gitlens.views.worktrees", - "contents": "Worktrees help you multitask by minimizing the context switching between branches, allowing you to easily work on different branches of a repository simultaneously.\n\nYou can create multiple working trees, each of which can be opened in individual windows or all together in a single workspace.", - "when": "!gitlens:plus:required || gitlens:plus:state == 0" + "contents": "[Worktrees](https://help.gitkraken.com/gitlens/side-bar/#worktrees-view%e2%9c%a8) — minimizes context switching by allowing you to work on multiple branches simultaneously." }, { "view": "gitlens.views.worktrees", @@ -16161,27 +16160,27 @@ }, { "view": "gitlens.views.worktrees", - "contents": "You must verify your email before you can continue.\n\n[Resend verification email](command:gitlens.plus.resendVerification)\n\n[Refresh verification status](command:gitlens.plus.validate)", + "contents": "[Resend verification email](command:gitlens.plus.resendVerification)\n\n[Refresh verification status](command:gitlens.plus.validate)\n\nYou must verify your email before you can continue.", "when": "gitlens:plus:state == -1" }, { "view": "gitlens.views.worktrees", - "contents": "[Preview Pro](command:gitlens.plus.startPreviewTrial)\n\nPreview Pro for 3 days, or [sign up](command:gitlens.plus.signUp) to start a full 7-day GitLens Pro trial.\n[✨ Worktrees](https://help.gitkraken.com/gitlens/side-bar/#worktrees-view%e2%9c%a8) — seamlessly work on multiple branches simultaneously.", + "contents": "[Preview Pro](command:gitlens.plus.startPreviewTrial)\n\nPreview Pro for 3 days, or [sign up](command:gitlens.plus.signUp) to start a full 7-day GitLens Pro trial.", "when": "gitlens:plus:required && gitlens:plus:state == 0" }, { "view": "gitlens.views.worktrees", - "contents": "Your 3-day preview has ended. Start a free GitLens Pro trial to get an additional 7 days, or [sign in](command:gitlens.plus.login).\n\n[Start Pro Trial](command:gitlens.plus.signUp)\n[✨ Worktrees](https://help.gitkraken.com/gitlens/side-bar/#worktrees-view%e2%9c%a8) — seamlessly work on multiple branches simultaneously.", + "contents": "[Try Pro](command:gitlens.plus.signUp)\n\nYour 3-day preview has ended. Start a free GitLens Pro trial to get an additional 7 days, or [sign in](command:gitlens.plus.login).", "when": "gitlens:plus:required && gitlens:plus:state == 2" }, { "view": "gitlens.views.worktrees", - "contents": "Your GitLens Pro trial has ended. Please upgrade to continue to use this on privately hosted repos.\n\n[Get GitLens Pro](command:gitlens.plus.purchase)\n[✨ Worktrees](https://help.gitkraken.com/gitlens/side-bar/#worktrees-view%e2%9c%a8) — seamlessly work on multiple branches simultaneously.", + "contents": "[Get GitLens Pro](command:gitlens.plus.purchase)\n\nYour GitLens Pro trial has ended. Please upgrade to continue to use this on privately hosted repos.", "when": "gitlens:plus:required && gitlens:plus:state == 4" }, { "view": "gitlens.views.worktrees", - "contents": "You're eligible to reactivate your GitLens Pro trial and experience all the new Pro features — free for another 7 days!\n\n[Try Pro](command:gitlens.plus.reactivateProTrial)\n[✨ Worktrees](https://help.gitkraken.com/gitlens/side-bar/#worktrees-view%e2%9c%a8) — seamlessly work on multiple branches simultaneously.", + "contents": "[Try Pro](command:gitlens.plus.reactivateProTrial)\n\nYou're eligible to reactivate your GitLens Pro trial and experience all the new Pro features — free for another 7 days!", "when": "gitlens:plus:required && gitlens:plus:state == 5" } ], diff --git a/src/webviews/apps/plus/focus/components/focus-app.ts b/src/webviews/apps/plus/focus/components/focus-app.ts index ee4945a00cbca..6d699c711f5b4 100644 --- a/src/webviews/apps/plus/focus/components/focus-app.ts +++ b/src/webviews/apps/plus/focus/components/focus-app.ts @@ -321,14 +321,6 @@ export class GlFocusApp extends LitElement { id="subscription-gate" class="scrollable" >

- Focus View - — brings all of your GitHub pull requests and issues into a unified actionable view to - help to you more easily juggle work in progress, pending work, reviews, and more. Quickly - see if anything requires your attention while keeping you focused. -

-

Focus View diff --git a/src/webviews/apps/plus/graph/GraphWrapper.tsx b/src/webviews/apps/plus/graph/GraphWrapper.tsx index e63a11306dd80..7efde72adb8c7 100644 --- a/src/webviews/apps/plus/graph/GraphWrapper.tsx +++ b/src/webviews/apps/plus/graph/GraphWrapper.tsx @@ -1365,19 +1365,10 @@ export function GraphWrapper({ Commit Graph {' '} - — helps you easily visualize your repository and keep track of all work in progress. -
-
- Use the rich commit search to find exactly what you're looking for. It's powerful filters allow you - to search by a specific commit, message, author, a changed file or files, or even a specific code + — easily visualize your repository and keep track of all work in progress. Use the rich commit + search to find a specific commit, message, author, a changed file or files, or even a specific code change.

-

- - Commit Graph - {' '} - — easily visualize your repository and keep track of work in progress all in one view. -

{graphConfig?.minimap && ( You must verify your email before you can continue.

Resend verification email Refresh verification status +

You must verify your email before you can continue.

`; case SubscriptionState.Free: return html` Preview NowPreview Pro

Preview Pro for 3 days, or @@ -86,15 +86,18 @@ export class FeatureGatePlusState extends LitElement { case SubscriptionState.FreePreviewTrialExpired: return html` + Try Pro

Your 3-day preview has ended. Start a free GitLens Pro trial to get an additional 7 days, or sign in.

- Start Pro Trial `; case SubscriptionState.FreePlusTrialExpired: return html` + Get GitLens Pro

Your GitLens Pro trial has ended. Please upgrade to continue to use this on privately hosted repos. @@ -113,20 +116,17 @@ export class FeatureGatePlusState extends LitElement { Special: 50% off first seat of Pro — only $4/month!

`, )} - Get GitLens Pro `; case SubscriptionState.FreePlusTrialReactivationEligible: return html` + Try Pro

You're eligible to reactivate your GitLens Pro trial and experience all the new Pro features — free for another 7 days!

- Try Pro `; } diff --git a/src/webviews/apps/plus/timeline/timeline.html b/src/webviews/apps/plus/timeline/timeline.html index e3318b34be0a9..9bcfaa38689e5 100644 --- a/src/webviews/apps/plus/timeline/timeline.html +++ b/src/webviews/apps/plus/timeline/timeline.html @@ -26,14 +26,8 @@ Visual File History - — visualize the evolution of a file, including when changes were made, how large they were, and - who made them. -

-

- Visual File History - — quickly identify when the most impactful changes were made to a file and by whom. + — visualize the evolution of a file and quickly identify when the most impactful changes were made + and by whom.

diff --git a/src/webviews/apps/shared/components/feature-gate.ts b/src/webviews/apps/shared/components/feature-gate.ts index 81eb277f2edc0..617bcab364c59 100644 --- a/src/webviews/apps/shared/components/feature-gate.ts +++ b/src/webviews/apps/shared/components/feature-gate.ts @@ -1,6 +1,7 @@ -import { css, html, LitElement, nothing } from 'lit'; +import { css, html, LitElement } from 'lit'; import { customElement, property } from 'lit/decorators.js'; -import { isSubscriptionStatePaidOrTrial, SubscriptionState } from '../../../../plus/gk/account/subscription'; +import type { SubscriptionState } from '../../../../plus/gk/account/subscription'; +import { isSubscriptionStatePaidOrTrial } from '../../../../plus/gk/account/subscription'; import '../../plus/shared/components/feature-gate-plus-state'; @customElement('gk-feature-gate') @@ -103,18 +104,9 @@ export class FeatureGate extends LitElement { this.hidden = false; return html`
- - - + + -
`; }