From c1d1f727b8150cded528092f8ec2b5de7b476dcd Mon Sep 17 00:00:00 2001 From: Travis Kohlbeck Date: Mon, 4 Nov 2019 22:09:31 -0500 Subject: [PATCH 1/7] moves tooltip from bottom to left --- src/components/Post/Post.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/Post/Post.tsx b/src/components/Post/Post.tsx index 5e8a046..b709035 100644 --- a/src/components/Post/Post.tsx +++ b/src/components/Post/Post.tsx @@ -646,7 +646,7 @@ export class Post extends React.Component { /> } action={ - + Date: Tue, 5 Nov 2019 09:48:30 -0500 Subject: [PATCH 2/7] Update package.json version number --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 2ea8f32..e37802d 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "hyperspace", "productName": "Hyperspace", - "version": "1.0.2", + "version": "1.0.3", "description": "A beautiful, fluffy client for the fediverse", "author": "Marquis Kurt ", "repository": "https://github.com/hyperspacedev/hyperspace.git", From 94380d8100e0b78ca660ce319392fe9410295efd Mon Sep 17 00:00:00 2001 From: Marquis Kurt Date: Tue, 5 Nov 2019 09:48:55 -0500 Subject: [PATCH 3/7] Update version in config.json --- public/config.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/config.json b/public/config.json index 2371365..14a9218 100644 --- a/public/config.json +++ b/public/config.json @@ -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" -} \ No newline at end of file +} From 448a10ef6f0038883b573712d3443c91509bf3d8 Mon Sep 17 00:00:00 2001 From: audmaxwell Date: Mon, 11 Nov 2019 17:09:20 -0500 Subject: [PATCH 4/7] HD-12 Changed "Hyperspace" strings in the about page to "Hyperspace Desktop" --- package-lock.json | 2 +- package.json | 2 +- src/pages/About.tsx | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index adacf30..b64cad1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "hyperspace", - "version": "1.0.0", + "version": "1.0.3", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index e37802d..1e581b0 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "hyperspace", - "productName": "Hyperspace", + "productName": "Hyperspace Desktop", "version": "1.0.3", "description": "A beautiful, fluffy client for the fediverse", "author": "Marquis Kurt ", diff --git a/src/pages/About.tsx b/src/pages/About.tsx index af87104..7be2c48 100644 --- a/src/pages/About.tsx +++ b/src/pages/About.tsx @@ -139,7 +139,7 @@ class AboutPage extends Component { {this.state.brandName ? this.state.brandName - : "Hyperspace"} + : "Hyperspace Desktop"} Version{" "} @@ -470,7 +470,7 @@ class AboutPage extends Component { developers. All rights reserved. - {this.state ? this.state.brandName : "Hyperspace"} is + {this.state ? this.state.brandName : "Hyperspace"} Desktop is made possible by the{" "} Date: Tue, 12 Nov 2019 10:31:32 -0500 Subject: [PATCH 5/7] Catch other areas missed for HD-12 (titlebar, Electron menu) Signed-off-by: Marquis Kurt --- public/electron.js | 4 ++-- src/components/AppLayout/AppLayout.tsx | 4 ++-- src/pages/About.tsx | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/public/electron.js b/public/electron.js index 86c9898..012a71c 100644 --- a/public/electron.js +++ b/public/electron.js @@ -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") } diff --git a/src/components/AppLayout/AppLayout.tsx b/src/components/AppLayout/AppLayout.tsx index fd313ba..ffba805 100644 --- a/src/components/AppLayout/AppLayout.tsx +++ b/src/components/AppLayout/AppLayout.tsx @@ -282,7 +282,7 @@ export class AppLayout extends Component { {this.state.brandName ? this.state.brandName : "Hyperspace"}{" "} - {this.state.developerMode ? "(Beta)" : null} + Desktop {this.state.developerMode ? "(Beta)" : null} ); @@ -290,7 +290,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/pages/About.tsx b/src/pages/About.tsx index 7be2c48..0be7b02 100644 --- a/src/pages/About.tsx +++ b/src/pages/About.tsx @@ -470,8 +470,8 @@ class AboutPage extends Component { developers. All rights reserved. - {this.state ? this.state.brandName : "Hyperspace"} Desktop is - made possible by the{" "} + {this.state ? this.state.brandName : "Hyperspace"}{" "} + Desktop is made possible by the{" "} Date: Wed, 13 Nov 2019 11:46:52 -0500 Subject: [PATCH 6/7] Write shouldRenderInstanceContact method in About [HD-12 #start-progress] Signed-off-by: Marquis Kurt --- src/pages/About.tsx | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/src/pages/About.tsx b/src/pages/About.tsx index 0be7b02..f2d1962 100644 --- a/src/pages/About.tsx +++ b/src/pages/About.tsx @@ -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,8 +105,17 @@ class AboutPage extends Component { }); } + shouldRenderInstanceContact(): boolean { + if (this.state.instance != null) { + return this.state.instance.version.match(/Pleroma/) == null; + } else { + return false; + } + } + render() { const { classes } = this.props; + console.info(this.shouldRenderInstanceContact()); return (
@@ -297,7 +304,7 @@ class AboutPage extends Component {
- {localStorage["isPleroma"] == "false" && ( + {this.shouldRenderInstanceContact() ? ( { - )} + ) : null} From f9dd8a58011a58a602fe60e98350776f045a9582 Mon Sep 17 00:00:00 2001 From: Marquis Kurt Date: Wed, 13 Nov 2019 12:02:59 -0500 Subject: [PATCH 7/7] Remove isPleroma from localStorage, window reload on account storage change [HD-17] Signed-off-by: Marquis Kurt --- src/index.tsx | 6 ------ src/pages/About.tsx | 2 -- src/utilities/accounts.tsx | 6 ------ 3 files changed, 14 deletions(-) diff --git a/src/index.tsx b/src/index.tsx index de1b2d1..22bb18e 100644 --- a/src/index.tsx +++ b/src/index.tsx @@ -22,12 +22,6 @@ if (userLoggedIn()) { refreshUserAccountData(); } -window.onstorage = (event: any) => { - if (event.key == "account") { - window.location.reload(); - } -}; - ReactDOM.render( { render() { const { classes } = this.props; - console.info(this.shouldRenderInstanceContact()); - return (
diff --git a/src/utilities/accounts.tsx b/src/utilities/accounts.tsx index 3a6bcd0..da7b796 100644 --- a/src/utilities/accounts.tsx +++ b/src/utilities/accounts.tsx @@ -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" - ); - }); } /**