Mastodon
/
hyperspace-desktop-client-windows-linux-macos
mirror of https://github.com/hyperspacedev/hyperspace
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #124 [HD-8 #close] 

[HD-8] v1.0.3
This commit is contained in:
Marquis Kurt 2019-11-16 16:34:04 -05:00 committed by GitHub
parent ae09fc57dd a2a9edcb5b
commit 3c8c54dc96
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 23 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package-lock.json generated
View File

@ -1,6 +1,6 @@
{
"name": "hyperspace",
"version": "1.0.0",
"version": "1.0.3",
"lockfileVersion": 1,
"requires": true,
"dependencies": {

4
package.json
View File

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

4
public/config.json
View File

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

4
public/electron.js
View File

@ -368,7 +368,7 @@ function createMenubar() {
role: 'help',
submenu: [
{
label: 'Hyperspace Docs',
label: 'Hyperspace Desktop Docs',
click () { require('electron').shell.openExternal('https://hyperspace.marquiskurt.net/docs/') }
},
{
@ -389,7 +389,7 @@ function createMenubar() {
label: app.getName(),
submenu: [
{
label: 'About Hyperspace',
label: 'About Hyperspace Desktop',
click() {
safelyGoTo("hyperspace://hyperspace/app/#/about")
}

4
src/components/AppLayout/AppLayout.tsx
View File

@ -282,7 +282,7 @@ export class AppLayout extends Component<any, IAppLayoutState> {
{this.state.brandName
? this.state.brandName
: "Hyperspace"}{" "}
{this.state.developerMode ? "(Beta)" : null}
Desktop {this.state.developerMode ? "(Beta)" : null}
</Typography>
</div>
);
@ -290,7 +290,7 @@ export class AppLayout extends Component<any, IAppLayoutState> {
return (
<div className={classes.titleBarRoot}>
<Typography className={classes.titleBarText}>
Careful: you're running in developer mode.
🛠 Careful: you're running in developer mode.
</Typography>
</div>
);

2
src/components/Post/Post.tsx
View File

@ -646,7 +646,7 @@ export class Post extends React.Component<any, IPostState> {
/>
}
action={
<Tooltip title="More">
<Tooltip title="More" placement="left">
<IconButton
key={`${post.id}_submenu`}
id={`${post.id}_submenu`}

6
src/index.tsx
View File

@ -22,12 +22,6 @@ if (userLoggedIn()) {
refreshUserAccountData();
}
window.onstorage = (event: any) => {
if (event.key == "account") {
window.location.reload();
}
};
ReactDOM.render(
<HashRouter>
<SnackbarProvider

21
src/pages/About.tsx
View File

@ -23,11 +23,9 @@ import AssignmentIcon from "@material-ui/icons/Assignment";
import AssignmentIndIcon from "@material-ui/icons/AssignmentInd";
import NetworkCheckIcon from "@material-ui/icons/NetworkCheck";
import UpdateIcon from "@material-ui/icons/Update";
import InfoIcon from "@material-ui/icons/Info";
import NotesIcon from "@material-ui/icons/Notes";
import CodeIcon from "@material-ui/icons/Code";
import TicketAccountIcon from "mdi-material-ui/TicketAccount";
import MastodonIcon from "mdi-material-ui/Mastodon";
import EditIcon from "@material-ui/icons/Edit";
import VpnKeyIcon from "@material-ui/icons/VpnKey";
@ -107,9 +105,16 @@ class AboutPage extends Component<any, IAboutPageState> {
});
}
shouldRenderInstanceContact(): boolean {
if (this.state.instance != null) {
return this.state.instance.version.match(/Pleroma/) == null;
} else {
return false;
}
}
render() {
const { classes } = this.props;
return (
<div className={classes.pageLayoutConstraints}>
<Paper>
@ -139,7 +144,7 @@ class AboutPage extends Component<any, IAboutPageState> {
<Typography variant="h4" component="p">
{this.state.brandName
? this.state.brandName
: "Hyperspace"}
: "Hyperspace Desktop"}
</Typography>
<Typography>
Version{" "}
@ -297,7 +302,7 @@ class AboutPage extends Component<any, IAboutPageState> {
</div>
</div>
<List className={classes.pageListConstraints}>
{localStorage["isPleroma"] == "false" && (
{this.shouldRenderInstanceContact() ? (
<ListItem>
<ListItemAvatar>
<LinkableAvatar
@ -352,7 +357,7 @@ class AboutPage extends Component<any, IAboutPageState> {
</Tooltip>
</ListItemSecondaryAction>
</ListItem>
)}
) : null}
<ListItem>
<ListItemAvatar>
<Avatar>
@ -470,8 +475,8 @@ class AboutPage extends Component<any, IAboutPageState> {
developers. All rights reserved.
</Typography>
<Typography variant="caption" paragraph>
{this.state ? this.state.brandName : "Hyperspace"} is
made possible by the{" "}
{this.state ? this.state.brandName : "Hyperspace"}{" "}
Desktop is made possible by the{" "}
<Link
href={"https://material-ui.com"}
target="_blank"

6
src/utilities/accounts.tsx
View File

@ -25,12 +25,6 @@ export function refreshUserAccountData() {
.catch((err: Error) => {
console.error(err.message);
});
client.get("/instance").then((resp: any) => {
localStorage.setItem(
"isPleroma",
resp.data.version.match(/Pleroma/) ? "true" : "false"
);
});
}
/**