From 27b108a65d41dd2c05288e5a10dc66704ca071fa Mon Sep 17 00:00:00 2001 From: Dessalines Date: Sun, 2 Jun 2019 18:35:46 -0700 Subject: [PATCH] Fix page titles for custom site name - Fixes #113 --- ui/src/components/communities.tsx | 2 +- ui/src/components/community.tsx | 2 +- ui/src/components/create-community.tsx | 3 ++- ui/src/components/create-post.tsx | 3 ++- ui/src/components/inbox.tsx | 2 +- ui/src/components/login.tsx | 2 +- ui/src/components/main.tsx | 6 ++---- ui/src/components/modlog.tsx | 2 +- ui/src/components/post.tsx | 2 +- ui/src/components/search.tsx | 4 ++-- ui/src/components/sponsors.tsx | 3 ++- ui/src/components/user.tsx | 2 +- ui/src/index.html | 1 - ui/src/services/UserService.ts | 1 - ui/src/services/WebSocketService.ts | 1 - 15 files changed, 17 insertions(+), 19 deletions(-) diff --git a/ui/src/components/communities.tsx b/ui/src/components/communities.tsx index 4cad76690..c4efe1fbe 100644 --- a/ui/src/components/communities.tsx +++ b/ui/src/components/communities.tsx @@ -46,7 +46,7 @@ export class Communities extends Component { } componentDidMount() { - document.title = "Communities - Lemmy"; + document.title = `Communities - ${WebSocketService.Instance.site.name}`; } // Necessary for back button for some reason diff --git a/ui/src/components/community.tsx b/ui/src/components/community.tsx index efa908f16..6a1f5da2b 100644 --- a/ui/src/components/community.tsx +++ b/ui/src/components/community.tsx @@ -200,7 +200,7 @@ export class Community extends Component { this.state.community = res.community; this.state.moderators = res.moderators; this.state.admins = res.admins; - document.title = `/c/${this.state.community.name} - Lemmy`; + document.title = `/c/${this.state.community.name} - ${WebSocketService.Instance.site.name}`; this.setState(this.state); this.fetchPosts(); } else if (op == UserOperation.EditCommunity) { diff --git a/ui/src/components/create-community.tsx b/ui/src/components/create-community.tsx index a9345f72a..5e31efc2b 100644 --- a/ui/src/components/create-community.tsx +++ b/ui/src/components/create-community.tsx @@ -1,6 +1,7 @@ import { Component } from 'inferno'; import { CommunityForm } from './community-form'; import { Community } from '../interfaces'; +import { WebSocketService } from '../services'; export class CreateCommunity extends Component { @@ -10,7 +11,7 @@ export class CreateCommunity extends Component { } componentDidMount() { - document.title = "Create Community - Lemmy"; + document.title = `Create Community - ${WebSocketService.Instance.site.name}`; } render() { diff --git a/ui/src/components/create-post.tsx b/ui/src/components/create-post.tsx index fdee01f66..0e37ba1d9 100644 --- a/ui/src/components/create-post.tsx +++ b/ui/src/components/create-post.tsx @@ -1,5 +1,6 @@ import { Component } from 'inferno'; import { PostForm } from './post-form'; +import { WebSocketService } from '../services'; export class CreatePost extends Component { @@ -9,7 +10,7 @@ export class CreatePost extends Component { } componentDidMount() { - document.title = "Create Post - Lemmy"; + document.title = `Create Post - ${WebSocketService.Instance.site.name}`; } render() { diff --git a/ui/src/components/inbox.tsx b/ui/src/components/inbox.tsx index 69ddc44b4..5fb7f874b 100644 --- a/ui/src/components/inbox.tsx +++ b/ui/src/components/inbox.tsx @@ -49,7 +49,7 @@ export class Inbox extends Component { } componentDidMount() { - document.title = `/u/${UserService.Instance.user.username} Inbox - Lemmy`; + document.title = `/u/${UserService.Instance.user.username} Inbox - ${WebSocketService.Instance.site.name}`; } render() { diff --git a/ui/src/components/login.tsx b/ui/src/components/login.tsx index 33cebdd62..6eb88438d 100644 --- a/ui/src/components/login.tsx +++ b/ui/src/components/login.tsx @@ -50,7 +50,7 @@ export class Login extends Component { } componentDidMount() { - document.title = "Login - Lemmy"; + document.title = `Login - ${WebSocketService.Instance.site.name}`; } render() { diff --git a/ui/src/components/main.tsx b/ui/src/components/main.tsx index 153c9f727..fe59ac2c2 100644 --- a/ui/src/components/main.tsx +++ b/ui/src/components/main.tsx @@ -101,10 +101,6 @@ export class Main extends Component { this.subscription.unsubscribe(); } - componentDidMount() { - document.title = "Lemmy"; - } - // Necessary for back button for some reason componentWillReceiveProps(nextProps: any) { if (nextProps.history.action == 'POP') { @@ -377,6 +373,8 @@ export class Main extends Component { this.state.site.site = res.site; this.state.site.banned = res.banned; this.setState(this.state); + document.title = `${WebSocketService.Instance.site.name}`; + } else if (op == UserOperation.EditSite) { let res: SiteResponse = msg; this.state.site.site = res.site; diff --git a/ui/src/components/modlog.tsx b/ui/src/components/modlog.tsx index 894887ae1..b8e584615 100644 --- a/ui/src/components/modlog.tsx +++ b/ui/src/components/modlog.tsx @@ -45,7 +45,7 @@ export class Modlog extends Component { } componentDidMount() { - document.title = "Modlog - Lemmy"; + document.title = `Modlog - ${WebSocketService.Instance.site.name}`; } setCombined(res: GetModlogResponse) { diff --git a/ui/src/components/post.tsx b/ui/src/components/post.tsx index 3e2e07b35..7152941f1 100644 --- a/ui/src/components/post.tsx +++ b/ui/src/components/post.tsx @@ -253,7 +253,7 @@ export class Post extends Component { this.state.moderators = res.moderators; this.state.admins = res.admins; this.state.loading = false; - document.title = `${this.state.post.name} - Lemmy`; + document.title = `${this.state.post.name} - ${WebSocketService.Instance.site.name}`; this.setState(this.state); } else if (op == UserOperation.CreateComment) { let res: CommentResponse = msg; diff --git a/ui/src/components/search.tsx b/ui/src/components/search.tsx index 7c72939a7..0d3b255d0 100644 --- a/ui/src/components/search.tsx +++ b/ui/src/components/search.tsx @@ -52,7 +52,7 @@ export class Search extends Component { } componentDidMount() { - document.title = "Search - Lemmy"; + document.title = `Search - ${WebSocketService.Instance.site.name}`; } render() { @@ -250,7 +250,7 @@ export class Search extends Component { let res: SearchResponse = msg; this.state.searchResponse = res; this.state.loading = false; - document.title = `Search - ${this.state.q} - Lemmy`; + document.title = `Search - ${this.state.q} - ${WebSocketService.Instance.site.name}`; window.scrollTo(0,0); this.setState(this.state); diff --git a/ui/src/components/sponsors.tsx b/ui/src/components/sponsors.tsx index 4c9d02ffb..c0b36e4cc 100644 --- a/ui/src/components/sponsors.tsx +++ b/ui/src/components/sponsors.tsx @@ -1,4 +1,5 @@ import { Component } from 'inferno'; +import { WebSocketService } from '../services'; let general = [ @@ -17,7 +18,7 @@ export class Sponsors extends Component { } componentDidMount() { - document.title = "Sponsors - Lemmy"; + document.title = `Sponsors - ${WebSocketService.Instance.site.name}`; } render() { diff --git a/ui/src/components/user.tsx b/ui/src/components/user.tsx index 4cd88abc8..d7c2bf66d 100644 --- a/ui/src/components/user.tsx +++ b/ui/src/components/user.tsx @@ -341,7 +341,7 @@ export class User extends Component { this.state.moderates = res.moderates; this.state.posts = res.posts; this.state.loading = false; - document.title = `/u/${this.state.user.name} - Lemmy`; + document.title = `/u/${this.state.user.name} - ${WebSocketService.Instance.site.name}`; window.scrollTo(0,0); this.setState(this.state); } else if (op == UserOperation.EditComment) { diff --git a/ui/src/index.html b/ui/src/index.html index ae511adee..c510291be 100644 --- a/ui/src/index.html +++ b/ui/src/index.html @@ -6,7 +6,6 @@ - Lemmy diff --git a/ui/src/services/UserService.ts b/ui/src/services/UserService.ts index d3259adb4..92315db7b 100644 --- a/ui/src/services/UserService.ts +++ b/ui/src/services/UserService.ts @@ -16,7 +16,6 @@ export class UserService { } else { console.log('No JWT cookie found.'); } - } public login(res: LoginResponse) { diff --git a/ui/src/services/WebSocketService.ts b/ui/src/services/WebSocketService.ts index 2b30f7d8f..2fa8a4855 100644 --- a/ui/src/services/WebSocketService.ts +++ b/ui/src/services/WebSocketService.ts @@ -8,7 +8,6 @@ import { UserService } from './'; export class WebSocketService { private static _instance: WebSocketService; public subject: Subject; - public instanceName: string; public site: Site; public admins: Array;