Update staging to v1.0.1

Signed-off-by: Marquis Kurt <software@marquiskurt.net>
This commit is contained in:
Marquis Kurt 2019-10-26 16:11:02 -04:00
commit f7ceba8b14
No known key found for this signature in database
GPG Key ID: 725636D259F5402D
5 changed files with 24 additions and 16 deletions

View File

@ -1,10 +1,10 @@
---
name: Pull request
about: Create a pull request to help us improve the code
title: "Request title"
---
This PR makes the following changes:
<!-- List your changes here as a bullet list. Read the contribution guidelines for more details.-->
<!-- List your changes here as a bullet list. Read the contribution guidelines for more details.-->
-
-
-
-
- [] This is a release check.

View File

@ -1,7 +1,7 @@
{
"name": "hyperspace",
"productName": "Hyperspace",
"version": "1.0.0",
"version": "1.0.1",
"description": "A beautiful, fluffy client for the fediverse",
"author": "Marquis Kurt <hyperspacedev@marquiskurt.net>",
"repository": "https://github.com/hyperspacedev/hyperspace.git",

View File

@ -1,5 +1,5 @@
{
"version": "1.0.0",
"version": "1.0.1",
"location": "https://hyperspaceapp-next.herokuapp.com",
"branding": {
"name": "Hyperspace",
@ -24,4 +24,4 @@
"url": "https://thufie.lain.haus/NPL.html"
},
"repository": "https://github.com/hyperspacedev/hyperspace"
}
}

View File

@ -1,4 +1,4 @@
import React, { Component, ChangeEvent } from "react";
import React, { Component } from "react";
import {
withStyles,
Paper,
@ -26,7 +26,8 @@ import { SaveClientSession } from "../types/SessionData";
import {
createHyperspaceApp,
getRedirectAddress,
inDisallowedDomains
inDisallowedDomains,
instancesBearerKey
} from "../utilities/login";
import { parseUrl } from "query-string";
import { getConfig } from "../utilities/settings";
@ -354,9 +355,13 @@ class WelcomePage extends Component<IWelcomeProps, IWelcomeState> {
} else {
axios
.get(
"https://" +
baseUrl +
"/api/v1/timelines/public"
"https://instances.social/api/1.0/instances/show?name=" +
baseUrl,
{
headers: {
Authorization: `Bearer ${instancesBearerKey}`
}
}
)
.catch((err: Error) => {
let userInputError = true;

View File

@ -1,5 +1,8 @@
import Mastodon from "megalodon";
export const instancesBearerKey =
"QBEULaOyF04OKjHsHktx5reOqDUklWMSWfUiKRdcen7iLDjta8kL2ZEgozAlBScizR0LKSMcxg2su9f3VLdJt5dZyfWkSXEPlxHBUlPzBF4Ju9lAiOhklh0TLNpFZBqA";
/**
* Creates the Hyperspace app with the appropriate Redirect URI
* @param name The name of the app (if not Hyperspace, will use `name (Hyperspace-like)`)