From 1b718165d7d468991699f02b06ab2d5189e1867a Mon Sep 17 00:00:00 2001
From: David Marby <david@dmarby.se>
Date: Thu, 25 Feb 2021 22:33:38 +0100
Subject: [PATCH] Update the website links (#3120)

---
 packages/insomnia-app/app/common/constants.js                 | 3 +--
 .../app/ui/components/dropdowns/account-dropdown.js           | 2 +-
 packages/insomnia-app/app/ui/components/settings/account.js   | 4 ++--
 .../insomnia-app/app/ui/components/settings/import-export.js  | 2 +-
 packages/insomnia-app/app/ui/components/settings/plugins.js   | 2 +-
 .../insomnia-app/app/ui/components/viewers/response-error.js  | 2 +-
 packages/insomnia-app/config/config.json                      | 2 +-
 packages/insomnia-app/scripts/release.js                      | 3 +--
 8 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/packages/insomnia-app/app/common/constants.js b/packages/insomnia-app/app/common/constants.js
index e37eccfcf..f0ad6db5a 100644
--- a/packages/insomnia-app/app/common/constants.js
+++ b/packages/insomnia-app/app/common/constants.js
@@ -89,8 +89,7 @@ export function getClientString() {
 }
 
 export function changelogUrl(): string {
-  const { changelogBaseUrl, version } = appConfig();
-  return `${changelogBaseUrl}/${version}`;
+  return appConfig().changelogUrl;
 }
 
 // Global Stuff
diff --git a/packages/insomnia-app/app/ui/components/dropdowns/account-dropdown.js b/packages/insomnia-app/app/ui/components/dropdowns/account-dropdown.js
index 331583d5c..c2501b456 100644
--- a/packages/insomnia-app/app/ui/components/dropdowns/account-dropdown.js
+++ b/packages/insomnia-app/app/ui/components/dropdowns/account-dropdown.js
@@ -54,7 +54,7 @@ const AccountDropdown = ({ className }: Props) => (
         </DropdownItem>
       )}
       {!session.isLoggedIn() && (
-        <DropdownItem key="invite" buttonClass={Link} href="https://insomnia.rest/pricing/" button>
+        <DropdownItem key="invite" buttonClass={Link} href="https://insomnia.rest/pricing" button>
           <StyledIconContainer>
             <i className="fa fa-users" />
           </StyledIconContainer>{' '}
diff --git a/packages/insomnia-app/app/ui/components/settings/account.js b/packages/insomnia-app/app/ui/components/settings/account.js
index 4d3d72120..39536684a 100644
--- a/packages/insomnia-app/app/ui/components/settings/account.js
+++ b/packages/insomnia-app/app/ui/components/settings/account.js
@@ -122,13 +122,13 @@ class Account extends React.PureComponent<Props, State> {
           </p>
           <br />
           <div className="pad">
-            <Link button className="btn btn--clicky" href="https://insomnia.rest/plus/">
+            <Link button className="btn btn--clicky" href="https://insomnia.rest/pricing">
               Plus for Individuals <i className="fa fa-external-link" />
             </Link>
             <Link
               button
               className="margin-left-sm btn btn--clicky"
-              href="https://insomnia.rest/teams/">
+              href="https://insomnia.rest/pricing">
               Plus for Teams <i className="fa fa-external-link" />
             </Link>
           </div>
diff --git a/packages/insomnia-app/app/ui/components/settings/import-export.js b/packages/insomnia-app/app/ui/components/settings/import-export.js
index 61993e10d..d17ee7ad1 100644
--- a/packages/insomnia-app/app/ui/components/settings/import-export.js
+++ b/packages/insomnia-app/app/ui/components/settings/import-export.js
@@ -86,7 +86,7 @@ class ImportExport extends PureComponent {
             </DropdownItem>
           </Dropdown>
           &nbsp;&nbsp;
-          <Link href="https://insomnia.rest/create-run-button/" className="btn btn--compact" button>
+          <Link href="https://insomnia.rest/create-run-button" className="btn btn--compact" button>
             Create Run Button
           </Link>
         </div>
diff --git a/packages/insomnia-app/app/ui/components/settings/plugins.js b/packages/insomnia-app/app/ui/components/settings/plugins.js
index 4738a0195..ac6d2e497 100644
--- a/packages/insomnia-app/app/ui/components/settings/plugins.js
+++ b/packages/insomnia-app/app/ui/components/settings/plugins.js
@@ -287,7 +287,7 @@ class Plugins extends React.PureComponent<Props, State> {
             <div className="selectable force-pre-wrap">
               <b>{installPluginErrMsg}</b>
               {`\n\nThere may be an issue with the plugin itself, as a note you can discover and install plugins from the `}
-              <a href="https://insomnia.rest/plugins/">Plugin Hub.</a>
+              <a href="https://insomnia.rest/plugins">Plugin Hub.</a>
               <details>
                 <summary>Additionl Information</summary>
                 <pre className="pad-top-sm force-wrap selectable">
diff --git a/packages/insomnia-app/app/ui/components/viewers/response-error.js b/packages/insomnia-app/app/ui/components/viewers/response-error.js
index 6c240fa82..2bd4a345a 100644
--- a/packages/insomnia-app/app/ui/components/viewers/response-error.js
+++ b/packages/insomnia-app/app/ui/components/viewers/response-error.js
@@ -42,7 +42,7 @@ class ResponseError extends PureComponent {
           <Link
             button
             className="btn btn--clicky margin-top-sm"
-            href="https://insomnia.rest/support/">
+            href="https://insomnia.rest/support">
             Contact Support
           </Link>
         </div>
diff --git a/packages/insomnia-app/config/config.json b/packages/insomnia-app/config/config.json
index 01257e026..a31b82590 100644
--- a/packages/insomnia-app/config/config.json
+++ b/packages/insomnia-app/config/config.json
@@ -9,7 +9,7 @@
   "longName": "Insomnia",
   "synopsis": "The Collaborative API Client and Design Tool",
   "icon": "https://github.com/kong/insomnia/blob/develop/packages/insomnia-app/app/icons/icon.ico?raw=true",
-  "changelogBaseUrl": "https://insomnia.rest/changelog/core",
+  "changelogUrl": "https://insomnia.rest/changelog",
   "theme": "default",
   "main": "main.min.js",
   "githubOrg": "Kong",
diff --git a/packages/insomnia-app/scripts/release.js b/packages/insomnia-app/scripts/release.js
index 51ec72bc5..05e0ca819 100644
--- a/packages/insomnia-app/scripts/release.js
+++ b/packages/insomnia-app/scripts/release.js
@@ -70,7 +70,6 @@ async function start(app, version) {
 async function getOrCreateRelease(app, version) {
   const tag = `${app}@${version}`;
   const releaseName = `${appConfig().productName} ${version} 📦`;
-  const changelogUrl = `https://insomnia.rest/changelog/${app}/${version}`;
 
   try {
     return await octokit.repos.getReleaseByTag({
@@ -87,7 +86,7 @@ async function getOrCreateRelease(app, version) {
     repo: appConfig().githubRepo,
     tag_name: tag,
     name: releaseName,
-    body: `Full changelog ⇒ ${changelogUrl}`,
+    body: `Full changelog ⇒ ${appConfig().changelogUrl}`,
     draft: false,
     prerelease: true,
   });