Skip to content

Commit dbaa603

Browse files
axosoft-ramintaxosoft-ramint
committed
Updates section ordering and feature descriptions in gates
1 parent c42f090 commit dbaa603

File tree

6 files changed

+24
-56
lines changed

6 files changed

+24
-56
lines changed

‎package.json‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16151,8 +16151,7 @@
1615116151
},
1615216152
{
1615316153
"view": "gitlens.views.worktrees",
16154-
"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.",
16155-
"when": "!gitlens:plus:required || gitlens:plus:state == 0"
16154+
"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."
1615616155
},
1615716156
{
1615816157
"view": "gitlens.views.worktrees",
@@ -16161,27 +16160,27 @@
1616116160
},
1616216161
{
1616316162
"view": "gitlens.views.worktrees",
16164-
"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)",
16163+
"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.",
1616516164
"when": "gitlens:plus:state == -1"
1616616165
},
1616716166
{
1616816167
"view": "gitlens.views.worktrees",
16169-
"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.",
16168+
"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.",
1617016169
"when": "gitlens:plus:required && gitlens:plus:state == 0"
1617116170
},
1617216171
{
1617316172
"view": "gitlens.views.worktrees",
16174-
"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.",
16173+
"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).",
1617516174
"when": "gitlens:plus:required && gitlens:plus:state == 2"
1617616175
},
1617716176
{
1617816177
"view": "gitlens.views.worktrees",
16179-
"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.",
16178+
"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.",
1618016179
"when": "gitlens:plus:required && gitlens:plus:state == 4"
1618116180
},
1618216181
{
1618316182
"view": "gitlens.views.worktrees",
16184-
"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.",
16183+
"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!",
1618516184
"when": "gitlens:plus:required && gitlens:plus:state == 5"
1618616185
}
1618716186
],

‎src/webviews/apps/plus/focus/components/focus-app.ts‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -321,14 +321,6 @@ export class GlFocusApp extends LitElement {
321321
id="subscription-gate"
322322
class="scrollable"
323323
><p slot="feature">
324-
<a href="https://help.gitkraken.com/gitlens/gitlens-features/#focus-view-%e2%9c%a8"
325-
>Focus View</a
326-
>
327-
&mdash; brings all of your GitHub pull requests and issues into a unified actionable view to
328-
help to you more easily juggle work in progress, pending work, reviews, and more. Quickly
329-
see if anything requires your attention while keeping you focused.
330-
</p>
331-
<p slot="feature-short">
332324
<a href="https://help.gitkraken.com/gitlens/gitlens-features/#focus-view-%e2%9c%a8"
333325
>Focus View</a
334326
>

‎src/webviews/apps/plus/graph/GraphWrapper.tsx‎

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1365,19 +1365,10 @@ export function GraphWrapper({
13651365
<a href="https://help.gitkraken.com/gitlens/gitlens-features/#commit-graph-%e2%9c%a8">
13661366
Commit Graph
13671367
</a>{' '}
1368-
&mdash; helps you easily visualize your repository and keep track of all work in progress.
1369-
<br />
1370-
<br />
1371-
Use the rich commit search to find exactly what you're looking for. It's powerful filters allow you
1372-
to search by a specific commit, message, author, a changed file or files, or even a specific code
1368+
&mdash; easily visualize your repository and keep track of all work in progress. Use the rich commit
1369+
search to find a specific commit, message, author, a changed file or files, or even a specific code
13731370
change.
13741371
</p>
1375-
<p slot="feature-short">
1376-
<a href="https://help.gitkraken.com/gitlens/gitlens-features/#commit-graph-%e2%9c%a8">
1377-
Commit Graph
1378-
</a>{' '}
1379-
&mdash; easily visualize your repository and keep track of work in progress all in one view.
1380-
</p>
13811372
</FeatureGate>
13821373
{graphConfig?.minimap && (
13831374
<GraphMinimap

‎src/webviews/apps/plus/shared/components/feature-gate-plus-state.ts‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -63,19 +63,19 @@ export class FeatureGatePlusState extends LitElement {
6363
switch (this.state) {
6464
case SubscriptionState.VerificationRequired:
6565
return html`
66-
<p>You must verify your email before you can continue.</p>
6766
<gl-button appearance="${appearance}" href="command:gitlens.plus.resendVerification"
6867
>Resend verification email</gl-button
6968
>
7069
<gl-button appearance="${appearance}" href="command:gitlens.plus.validate"
7170
>Refresh verification status</gl-button
7271
>
72+
<p>You must verify your email before you can continue.</p>
7373
`;
7474

7575
case SubscriptionState.Free:
7676
return html`
7777
<gl-button appearance="${appearance}" href="command:gitlens.plus.startPreviewTrial"
78-
>Preview Now</gl-button
78+
>Preview Pro</gl-button
7979
>
8080
<p>
8181
Preview Pro for 3 days, or
@@ -86,15 +86,18 @@ export class FeatureGatePlusState extends LitElement {
8686

8787
case SubscriptionState.FreePreviewTrialExpired:
8888
return html`
89+
<gl-button appearance="${appearance}" href="command:gitlens.plus.signUp">Try Pro</gl-button>
8990
<p>
9091
Your 3-day preview has ended. Start a free GitLens Pro trial to get an additional 7 days, or
9192
<a href="command:gitlens.plus.login">sign in</a>.
9293
</p>
93-
<gl-button appearance="${appearance}" href="command:gitlens.plus.signUp">Start Pro Trial</gl-button>
9494
`;
9595

9696
case SubscriptionState.FreePlusTrialExpired:
9797
return html`
98+
<gl-button appearance="${appearance}" href="command:gitlens.plus.purchase"
99+
>Get GitLens Pro</gl-button
100+
>
98101
<p>
99102
Your GitLens Pro trial has ended. Please upgrade to continue to use this on privately hosted
100103
repos.
@@ -113,20 +116,17 @@ export class FeatureGatePlusState extends LitElement {
113116
Special: <b>50% off first seat of Pro</b> — only $4/month!<br />
114117
</p>`,
115118
)}
116-
<gl-button appearance="${appearance}" href="command:gitlens.plus.purchase"
117-
>Get GitLens Pro</gl-button
118-
>
119119
`;
120120

121121
case SubscriptionState.FreePlusTrialReactivationEligible:
122122
return html`
123+
<gl-button appearance="${appearance}" href="command:gitlens.plus.reactivateProTrial"
124+
>Try Pro</gl-button
125+
>
123126
<p>
124127
You're eligible to reactivate your GitLens Pro trial and experience all the new Pro features —
125128
free for another 7 days!
126129
</p>
127-
<gl-button appearance="${appearance}" href="command:gitlens.plus.reactivateProTrial"
128-
>Try Pro</gl-button
129-
>
130130
`;
131131
}
132132

‎src/webviews/apps/plus/timeline/timeline.html‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,8 @@
2626
<a href="https://help.gitkraken.com/gitlens/gitlens-features/#visual-file-history-%e2%9c%a8"
2727
>Visual File History</a
2828
>
29-
&mdash; visualize the evolution of a file, including when changes were made, how large they were, and
30-
who made them.
31-
</p>
32-
<p slot="feature-short">
33-
<a href="https://help.gitkraken.com/gitlens/gitlens-features/#visual-file-history-%e2%9c%a8"
34-
>Visual File History</a
35-
>
36-
&mdash; quickly identify when the most impactful changes were made to a file and by whom.
29+
&mdash; visualize the evolution of a file and quickly identify when the most impactful changes were made
30+
and by whom.
3731
</p></gk-feature-gate
3832
>
3933
<div class="container">

‎src/webviews/apps/shared/components/feature-gate.ts‎

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
import { css, html, LitElement, nothing } from 'lit';
1+
import { css, html, LitElement } from 'lit';
22
import { customElement, property } from 'lit/decorators.js';
3-
import { isSubscriptionStatePaidOrTrial, SubscriptionState } from '../../../../plus/gk/account/subscription';
3+
import type { SubscriptionState } from '../../../../plus/gk/account/subscription';
4+
import { isSubscriptionStatePaidOrTrial } from '../../../../plus/gk/account/subscription';
45
import '../../plus/shared/components/feature-gate-plus-state';
56

67
@customElement('gk-feature-gate')
@@ -103,18 +104,9 @@ export class FeatureGate extends LitElement {
103104
this.hidden = false;
104105
return html`
105106
<section>
106-
<slot>
107-
<slot name="feature" hidden=${this.state === SubscriptionState.Free ? nothing : ''}></slot>
108-
</slot>
107+
<slot></slot>
108+
<slot name="feature"></slot>
109109
<gk-feature-gate-plus-state appearance=${appearance} .state=${this.state}></gk-feature-gate-plus-state>
110-
<slot
111-
name="feature-short"
112-
hidden=${this.state === SubscriptionState.FreePreviewTrialExpired ||
113-
this.state === SubscriptionState.FreePlusTrialExpired ||
114-
this.state === SubscriptionState.FreePlusTrialReactivationEligible
115-
? nothing
116-
: ''}
117-
></slot>
118110
</section>
119111
`;
120112
}

0 commit comments

Comments
 (0)