Rename some old things

This commit is contained in:
Gregory Schier 2020-04-26 14:08:50 -07:00
parent a3253a1149
commit 4cb8e34aef
7 changed files with 15 additions and 17 deletions

View File

@ -1,6 +1,10 @@
name: Test name: Test
on: [push] on:
push:
tags-ignore:
- core@*
- designer@*
jobs: jobs:
Test: Test:

View File

@ -2,7 +2,7 @@
"name": "insomnia", "name": "insomnia",
"private": true, "private": true,
"version": "1.0.0", "version": "1.0.0",
"repository": "https://github.com/kong/studio", "repository": "https://github.com/kong/insomnia",
"bugs": { "bugs": {
"url": "https://github.com/kong/insomnia" "url": "https://github.com/kong/insomnia"
}, },

View File

@ -5,8 +5,8 @@ import * as electron from 'electron';
import path from 'path'; import path from 'path';
import mkdirp from 'mkdirp'; import mkdirp from 'mkdirp';
import { getDataDirectory } from './misc'; import { getDataDirectory } from './misc';
import { ACTIVITY_INSOMNIA } from '../ui/components/activity-bar/activity-bar';
import type { GlobalActivity } from '../ui/components/activity-bar/activity-bar'; import type { GlobalActivity } from '../ui/components/activity-bar/activity-bar';
import { ACTIVITY_INSOMNIA } from '../ui/components/activity-bar/activity-bar';
// App Stuff // App Stuff
@ -95,17 +95,11 @@ export function getClientString() {
return `${getAppEnvironment()}::${getAppPlatform()}::${getAppVersion()}`; return `${getAppEnvironment()}::${getAppPlatform()}::${getAppVersion()}`;
} }
export function getDocumentationUrl(slug) { export function getDocumentationUrl(slug: string): string {
// Replace minor version with "x" return `https://support.insomnia.rest/${slug}`;
// 1.2.3 -> 1.2.x
// 1.2.3-beta.1 -> 1.2.x
const genericVersion = getAppVersion().replace(/(\d+\.\d+.)(\d+)(-.+)?/, '$1x');
// Return URL
return `https://docs.konghq.com/studio/${genericVersion}/${slug}`;
} }
export function changelogUrl() { export function changelogUrl(): string {
const { changelogBaseUrl, version } = appConfig(); const { changelogBaseUrl, version } = appConfig();
return `${changelogBaseUrl}/${version}`; return `${changelogBaseUrl}/${version}`;
} }

View File

@ -7,7 +7,7 @@ import {
changelogUrl, changelogUrl,
getAppLongName, getAppLongName,
getAppName, getAppName,
getAppVersion, getAppVersion, getDocumentationUrl,
isDevelopment, isDevelopment,
isMac, isMac,
MNEMONIC_SYM, MNEMONIC_SYM,
@ -241,7 +241,7 @@ export function createWindow() {
label: `${MNEMONIC_SYM}Help and Support`, label: `${MNEMONIC_SYM}Help and Support`,
accelerator: !isMac() ? 'F1' : null, accelerator: !isMac() ? 'F1' : null,
click: () => { click: () => {
shell.openExternal('https://docs.konghq.com/studio/1.0.x/'); shell.openExternal(getDocumentationUrl(''));
}, },
}, },
{ {

View File

@ -4,7 +4,7 @@
<meta charset="utf-8" /> <meta charset="utf-8" />
<meta <meta
http-equiv="Content-Security-Policy" http-equiv="Content-Security-Policy"
content="default-src * kongstudio://*; img-src blob: data: * kongstudio://*; script-src 'self' 'unsafe-eval'; style-src 'self' 'unsafe-inline'; media-src blob: data: mediastream: * insomnia://*;" content="default-src * insomnia://*; img-src blob: data: * insomnia://*; script-src 'self' 'unsafe-eval'; style-src 'self' 'unsafe-inline'; media-src blob: data: mediastream: * insomnia://*;"
/> />
</head> </head>
<body> <body>

View File

@ -12,7 +12,7 @@
"theme": "default", "theme": "default",
"main": "main.min.js", "main": "main.min.js",
"githubOrg": "Kong", "githubOrg": "Kong",
"githubRepo": "studio", "githubRepo": "insomnia",
"gaId": "<TODO>", "gaId": "<TODO>",
"gaLocation": "<TODO>", "gaLocation": "<TODO>",
"plugins": [ "plugins": [

View File

@ -12,7 +12,7 @@
"theme": "studio-light", "theme": "studio-light",
"main": "main.min.js", "main": "main.min.js",
"githubOrg": "Kong", "githubOrg": "Kong",
"githubRepo": "studio", "githubRepo": "insomnia",
"gaId": "G-N5Q23R42TP", "gaId": "G-N5Q23R42TP",
"gaLocation": "https://desktop.designer.konghq.com", "gaLocation": "https://desktop.designer.konghq.com",
"plugins": [ "plugins": [