From 3d591953b3d25fa9562a55367563666c4fe183a2 Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Fri, 9 Jun 2023 03:22:10 -0400 Subject: [PATCH] Updates welcome & walkthrough content --- package.json | 8 ++-- .../plus/account/components/account-content.ts | 2 +- src/webviews/apps/plus/focus/focus.html | 4 +- src/webviews/apps/welcome/welcome.html | 45 +++++++++++++++++++--- 4 files changed, 47 insertions(+), 12 deletions(-) diff --git a/package.json b/package.json index 06e71f8..dc9fce2 100644 --- a/package.json +++ b/package.json @@ -14348,8 +14348,8 @@ "steps": [ { "id": "gitlens.welcome.tutorial", - "title": "Welcome page and tutorial video", - "description": "Open the Welcome page to quickly setup and learn about frequently used GitLens features.\n\n[Open Welcome](command:gitlens.showWelcomePage?%22quick-setup%22 \"Opens the GitLens Quick Setup\")\nOr sit back and watch the Getting Started video.\n\n[Watch Tutorial Video](https://www.youtube.com/watch?v=UQPb73Zz9qk \"Watch the Getting Started video\")\n[Our rich, interactive settings editor](command:gitlens.showSettingsPage \"Opens the GitLens Interactive Settings\") enables seemingly endless customization possibilities.", + "title": "Welcome and Tutorial", + "description": "Open the Welcome experience to quickly get started and discover the many powerful GitLens features.\n\n[Open Welcome](command:gitlens.showWelcomePage \"Opens GitLens Welcome\")\nOr, sit back and watch the our Getting Started video.\n\n[Watch Tutorial Video](https://www.youtube.com/watch?v=UQPb73Zz9qk \"Watch the Getting Started video\")\n💡 **Want more control?** Use the interactive [GitLens Settings](command:gitlens.showSettingsPage \"Opens GitLens Settings\") editor to customize GitLens to meet your needs.", "media": { "markdown": "walkthroughs/welcome/0-tutorial.md" } @@ -14405,7 +14405,7 @@ { "id": "gitlens.welcome.hostingServiceIntegrations", "title": "Integrate with Git hosting services", - "description": "Connect with GitHub, GitHub Enterprise, GitLab, GitLab self-managed, Gitea, Gerrit, Google Source, Bitbucket, Bitbucket Server, Azure DevOps and custom servers.\nAll Git host integrations provide issue and pull request auto-linking, while rich integrations (e.g. GitHub & GitLab) provide more detailed hover information for auto-linked issues and pull requests, pull requests associated with branches and commits, and avatars.\n\n[Configure Autolinks](command:gitlens.showSettingsPage?%22autolinks%22)", + "description": "Quickly gain insights from pull requests and issues without leaving your editor.\n\nConnect with GitHub, GitHub Enterprise, GitLab, GitLab self-managed, Gitea, Gerrit, Google Source, Bitbucket, Bitbucket Server, Azure DevOps and custom servers.\nAll Git host integrations provide issue and pull request auto-linking, while rich integrations (e.g. GitHub & GitLab) provide more detailed hover information for auto-linked issues and pull requests, pull requests associated with branches and commits, and avatars.\n\n[Configure Autolinks](command:gitlens.showSettingsPage?%22autolinks%22)", "media": { "markdown": "walkthroughs/welcome/8-hosting-service-integrations.md" } @@ -14422,7 +14422,7 @@ { "id": "gitlens.welcome.additional", "title": "And More!", - "description": "Many more powerful features including the Interactive Rebase Editor, [Git Command Palette](command:gitlens.gitCommands), and Integrated Terminal Links.", + "description": "**Rebase got you down?**\nEasily visualize and configure interactive rebase operations with the user-friendly Interactive Rebase Editor\n\n**Trouble remembering Git commands?**\nNow you don't have to with the Git Command Palette — a guided, step-by-step experience to many common Git commands.\n\n[Open Git Command Palette](command:gitlens.gitCommands)\n\n**Terminal your jam?**\nQuickly jump to more details on commits, branches, tags, and more with autolinks in the Integrated Terminal.\n\n**Not sure what you are looking for?**\nOpen the Command Palette and explore the many available commands.\n\n[Open GitLens Commands](command:workbench.action.quickOpen?%22>GitLens%3A%22)", "media": { "markdown": "walkthroughs/welcome/additional-features.md" } diff --git a/src/webviews/apps/plus/account/components/account-content.ts b/src/webviews/apps/plus/account/components/account-content.ts index d654920..fc028a2 100644 --- a/src/webviews/apps/plus/account/components/account-content.ts +++ b/src/webviews/apps/plus/account/components/account-content.ts @@ -185,7 +185,7 @@ export class AccountContent extends LitElement {

You only have access to ✨ features on local and publicly hosted repos and ☁️ features based on - your subscription tier. + your subscription tier, e.g. Free, Pro, etc.

`; diff --git a/src/webviews/apps/plus/focus/focus.html b/src/webviews/apps/plus/focus/focus.html index 0e2ca21..4159a8c 100644 --- a/src/webviews/apps/plus/focus/focus.html +++ b/src/webviews/apps/plus/focus/focus.html @@ -37,8 +37,8 @@

- Helps you focus on what's important by providing you with a comprehensive list of all your pull - requests and issues on your GitHub repos. + Helps you focus on what really matters by gathering all your GitHub pull requests and issues + into one comprehensive list.

diff --git a/src/webviews/apps/welcome/welcome.html b/src/webviews/apps/welcome/welcome.html index 9b04561..3ef49d9 100644 --- a/src/webviews/apps/welcome/welcome.html +++ b/src/webviews/apps/welcome/welcome.html @@ -54,7 +54,12 @@

Powerful Features

-

Features with a ✨ sparkle require a trial or subscription for use on privately hosted repos

+

+ Features with a ✨ sparkle require a trial or subscription for use on privately hosted repos +
+ Features with a ☁️ cloud require an account and access is based on your subscription tier, e.g. + Free, Pro, etc +

Search & Compare + Workspaces ☁️

Features which need a repository are currently unavailable @@ -207,17 +219,32 @@

Workspaces + and + Focus - ✨ + ☁️

- Helps you focus on what's important by providing you with a comprehensive list of all your pull - requests and issues on your GitHub repos. + Workspaces allow you to easily group and manage multiple repositories together, accessible from + anywhere, streamlining your workflow. Create workspaces just for yourself or share (coming soon in + GitLens) them with your team for faster onboarding and better collaboration. +

+

+ The Focus view helps you concentrate on what really matters by gathering all your GitHub pull + requests and issues into one comprehensive list. Helps you focus on what's important by providing + you with a comprehensive list of all your pull requests and issues on your GitHub repos.

@@ -244,6 +271,10 @@ Rich integrations with GitHub & GitLab provide more detailed hover information for auto-linked issues and pull requests, pull requests associated with branches and commits, and avatars.

+ +

GitKraken Labs

+

Experimental features.

+

TODO

@@ -422,7 +453,11 @@
#{endOfBody}