Fix page titles for custom site name

- Fixes #113

diff --git a/ui/src/components/communities.tsx b/ui/src/components/communities.tsx
index 4cad766900fce4907a55c215725fda0c5d947ed6..c4efe1fbebc12a7f88000e557502877038847929 100644 (file)
--- a/ui/src/components/communities.tsx
+++ b/ui/src/components/communities.tsx
@@ -46,7 +46,7 @@ export class Communities extends Component<any, CommunitiesState> {
   }
 
   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 efa908f165829855ba2eca6bdcf87d58a9ac7f94..6a1f5da2b456fc3112ce686a6900e0dd37b9993f 100644 (file)
--- a/ui/src/components/community.tsx
+++ b/ui/src/components/community.tsx
@@ -200,7 +200,7 @@ export class Community extends Component<any, State> {
       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 a9345f72ab922fab9836b4e34c74cb2b836dda9f..5e31efc2ba7752c960530030915f1586da632a01 100644 (file)
--- 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<any, any> {
 
@@ -10,7 +11,7 @@ export class CreateCommunity extends Component<any, any> {
   }
 
   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 fdee01f66c16565ca48aac9bb341651570c252d5..0e37ba1d9cbb1b83e3e987d589a981823ed5f479 100644 (file)
--- 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<any, any> {
 
@@ -9,7 +10,7 @@ export class CreatePost extends Component<any, any> {
   }
 
   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 69ddc44b4beba8d9c3a6f183a9c111c76b11f259..5fb7f874b492d13461e0640bd41815edb06d1a43 100644 (file)
--- a/ui/src/components/inbox.tsx
+++ b/ui/src/components/inbox.tsx
@@ -49,7 +49,7 @@ export class Inbox extends Component<any, InboxState> {
   }
 
   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 33cebdd6275a9a346384adb2da48f5d897692cb4..6eb88438df97c959842842e6ac17e4fa07eccf34 100644 (file)
--- a/ui/src/components/login.tsx
+++ b/ui/src/components/login.tsx
@@ -50,7 +50,7 @@ export class Login extends Component<any, State> {
   }
 
   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 153c9f7275de2e0f9ff33af68c1e0e05bf6591cb..fe59ac2c2b8915ca20ac823d9ba54e2a0f1735b6 100644 (file)
--- a/ui/src/components/main.tsx
+++ b/ui/src/components/main.tsx
@@ -101,10 +101,6 @@ export class Main extends Component<any, MainState> {
     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<any, MainState> {
       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 894887ae1b2dd95dcd644fbca757fd63ab0661a8..b8e5846159b5e4dfc71a3bbb745cef706cd5e461 100644 (file)
--- a/ui/src/components/modlog.tsx
+++ b/ui/src/components/modlog.tsx
@@ -45,7 +45,7 @@ export class Modlog extends Component<any, ModlogState> {
   }
 
   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 3e2e07b3504338ac7e66595893dcfb26d21a2a46..7152941f1f8e5acf39a2594ff7066dd9085f7909 100644 (file)
--- a/ui/src/components/post.tsx
+++ b/ui/src/components/post.tsx
@@ -253,7 +253,7 @@ export class Post extends Component<any, PostState> {
       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 7c72939a7d147c8a85b98a417066a986c74c14b8..0d3b255d017d3f6c6bac9aea09884d2b109356ef 100644 (file)
--- a/ui/src/components/search.tsx
+++ b/ui/src/components/search.tsx
@@ -52,7 +52,7 @@ export class Search extends Component<any, SearchState> {
   }
 
   componentDidMount() {
-    document.title = "Search - Lemmy";
+    document.title = `Search - ${WebSocketService.Instance.site.name}`;
   }
 
   render() {
@@ -250,7 +250,7 @@ export class Search extends Component<any, SearchState> {
       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 4c9d02ffbf0c8161feae5f221b0ff25a7eaeb01d..c0b36e4cc95c4d372f523148465dd65f4c332cde 100644 (file)
--- 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<any, any> {
   }
 
   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 4cd88abc8ea2cd9c9940585165c5185c0a4c5614..d7c2bf66de6ebd260330ff9a8eeb1c805e091831 100644 (file)
--- a/ui/src/components/user.tsx
+++ b/ui/src/components/user.tsx
@@ -341,7 +341,7 @@ export class User extends Component<any, UserState> {
       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 ae511adee7ca9ba5bcfbd25a4a8bc056d9944b1d..c510291be21f1dc778d5894df66bb057aa8fedcc 100644 (file)
--- a/ui/src/index.html
+++ b/ui/src/index.html
@@ -6,7 +6,6 @@
        <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
        <link rel="shortcut icon" type="image/svg+xml" href="/static/assets/favicon.svg" />
        <link rel="apple-touch-icon" href="/static/assets/apple-touch-icon.png" />
-       <title>Lemmy</title>
        <link rel="stylesheet" href="/static/assets/libs/balloon-css/balloon.min.css">
   <script src="/static/assets/libs/sortable/sortable.min.js"></script>
 </head>

diff --git a/ui/src/services/UserService.ts b/ui/src/services/UserService.ts
index d3259adb46718142bbd633f170eaee5e08036030..92315db7bd684a61aeb509b205f4971880f3f83d 100644 (file)
--- 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 2b30f7d8f763dd2e0483fd1c5d5874abbacc82ff..2fa8a4855fdb6215c7bd3f3d3abdc03d345c2ad2 100644 (file)
--- 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<any>;
-  public instanceName: string;
 
   public site: Site;
   public admins: Array<UserView>;