diff --git a/package-lock.json b/package-lock.json index e4aa057..2469be6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1064,9 +1064,9 @@ }, "dependencies": { "@babel/runtime": { - "version": "7.6.3", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.6.3.tgz", - "integrity": "sha512-kq6anf9JGjW8Nt5rYfEuGRaEAaH1mkv3Bbu6rYvLOpPh/RusSJXuKPEAoZ7L7gybZkchE8+NV5g9vKF4AGAtsA==", + "version": "7.7.2", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.7.2.tgz", + "integrity": "sha512-JONRbXbTXc9WQE2mAZd1p0Z3DZ/6vaQIkgYMSTP3KjRCyd7rCZCcfhCyX+YjwcKxcZ82UrxbRD358bpExNgrjw==", "dev": true, "requires": { "regenerator-runtime": "^0.13.2" diff --git a/package.json b/package.json index 0e2126d..7e3594a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "hyperspace", - "productName": "Hyperspace", + "productName": "Hyperspace Desktop", "version": "1.1.0-beta1", "description": "A beautiful, fluffy client for the fediverse", "author": "Marquis Kurt ", diff --git a/public/electron.js b/public/electron.js index 3bb4897..4bf4fa5 100644 --- a/public/electron.js +++ b/public/electron.js @@ -375,7 +375,7 @@ function createMenubar() { role: 'help', submenu: [ { - label: 'Hyperspace Docs', + label: 'Hyperspace Desktop Docs', click () { require('electron').shell.openExternal('https://hyperspace.marquiskurt.net/docs/') } }, { @@ -396,7 +396,7 @@ function createMenubar() { label: app.getName(), submenu: [ { - label: 'About Hyperspace', + label: 'About Hyperspace Desktop', click() { safelyGoTo("hyperspace://hyperspace/app/#/about") } diff --git a/src/components/AppLayout/AppLayout.tsx b/src/components/AppLayout/AppLayout.tsx index 31872b9..e5a1a91 100644 --- a/src/components/AppLayout/AppLayout.tsx +++ b/src/components/AppLayout/AppLayout.tsx @@ -287,7 +287,7 @@ export class AppLayout extends Component { {this.state.brandName ? this.state.brandName : "Hyperspace"}{" "} - {this.state.developerMode ? "(Beta)" : null} + Desktop {this.state.developerMode ? "(Beta)" : null} ); @@ -295,7 +295,7 @@ export class AppLayout extends Component { return (
- Careful: you're running in developer mode. + 🛠 Careful: you're running in developer mode.
); diff --git a/src/components/Post/Post.tsx b/src/components/Post/Post.tsx index 50b9082..a6d2621 100644 --- a/src/components/Post/Post.tsx +++ b/src/components/Post/Post.tsx @@ -646,7 +646,7 @@ export class Post extends React.Component { /> } action={ - + { - if (event.key == "account") { - window.location.reload(); - } -}; - ReactDOM.render( { }); } + shouldRenderInstanceContact(): boolean { + if (this.state.instance != null) { + return this.state.instance.version.match(/Pleroma/) == null; + } else { + return false; + } + } + render() { const { classes } = this.props; - return (
@@ -139,7 +144,7 @@ class AboutPage extends Component { {this.state.brandName ? this.state.brandName - : "Hyperspace"} + : "Hyperspace Desktop"} Version{" "} @@ -297,7 +302,7 @@ class AboutPage extends Component {
- {localStorage["isPleroma"] == "false" && ( + {this.shouldRenderInstanceContact() ? ( {
- )} + ) : null} @@ -470,8 +475,8 @@ class AboutPage extends Component { developers. All rights reserved. - {this.state ? this.state.brandName : "Hyperspace"} is - made possible by the{" "} + {this.state ? this.state.brandName : "Hyperspace"}{" "} + Desktop is made possible by the{" "} { console.error(err.message); }); - client.get("/instance").then((resp: any) => { - localStorage.setItem( - "isPleroma", - resp.data.version.match(/Pleroma/) ? "true" : "false" - ); - }); } /**