Trying to fix site loading errors. #104

diff --git a/src/shared/components/navbar.tsx b/src/shared/components/navbar.tsx
index b029ce03e7665ba72dd2708c3b57d2b5463b2bbb..f5a4c14415b866f64849e51e45e963648df508f6 100644 (file)
--- a/src/shared/components/navbar.tsx
+++ b/src/shared/components/navbar.tsx
@@ -165,7 +165,7 @@ export class Navbar extends Component<NavbarProps, NavbarState> {
 
   // TODO class active corresponding to current page
   navbar() {
-    let user = UserService.Instance.user;
+    let user = this.props.site.my_user;
     return (
       <nav class="navbar navbar-expand-lg navbar-light shadow-sm p-0 px-3">
         <div class="container">

diff --git a/src/shared/utils.ts b/src/shared/utils.ts
index 5a852bab0ad5b2838f4fda2da61e94d0f870612b..19f8b24c0d43a46833037176003436977ab21971 100644 (file)
--- a/src/shared/utils.ts
+++ b/src/shared/utils.ts
@@ -521,13 +521,15 @@ export function isPostType(
 }
 
 export function toast(text: string, background: string = 'success') {
-  let backgroundColor = `var(--${background})`;
-  Toastify({
-    text: text,
-    backgroundColor: backgroundColor,
-    gravity: 'bottom',
-    position: 'left',
-  }).showToast();
+  if (isBrowser()) {
+    let backgroundColor = `var(--${background})`;
+    Toastify({
+      text: text,
+      backgroundColor: backgroundColor,
+      gravity: 'bottom',
+      position: 'left',
+    }).showToast();
+  }
 }
 
 export function pictrsDeleteToast(
@@ -535,22 +537,24 @@ export function pictrsDeleteToast(
   deletePictureText: string,
   deleteUrl: string
 ) {
-  let backgroundColor = `var(--light)`;
-  let toast = Toastify({
-    text: clickToDeleteText,
-    backgroundColor: backgroundColor,
-    gravity: 'top',
-    position: 'right',
-    duration: 10000,
-    onClick: () => {
-      if (toast) {
-        window.location.replace(deleteUrl);
-        alert(deletePictureText);
-        toast.hideToast();
-      }
-    },
-    close: true,
-  }).showToast();
+  if (isBrowser()) {
+    let backgroundColor = `var(--light)`;
+    let toast = Toastify({
+      text: clickToDeleteText,
+      backgroundColor: backgroundColor,
+      gravity: 'top',
+      position: 'right',
+      duration: 10000,
+      onClick: () => {
+        if (toast) {
+          window.location.replace(deleteUrl);
+          alert(deletePictureText);
+          toast.hideToast();
+        }
+      },
+      close: true,
+    }).showToast();
+  }
 }
 
 interface NotifyInfo {
@@ -561,25 +565,27 @@ interface NotifyInfo {
 }
 
 export function messageToastify(info: NotifyInfo, router: any) {
-  let htmlBody = info.body ? md.render(info.body) : '';
-  let backgroundColor = `var(--light)`;
-
-  let toast = Toastify({
-    text: `${htmlBody}<br />${info.name}`,
-    avatar: info.icon,
-    backgroundColor: backgroundColor,
-    className: 'text-dark',
-    close: true,
-    gravity: 'top',
-    position: 'right',
-    duration: 5000,
-    onClick: () => {
-      if (toast) {
-        toast.hideToast();
-        router.history.push(info.link);
-      }
-    },
-  }).showToast();
+  if (isBrowser()) {
+    let htmlBody = info.body ? md.render(info.body) : '';
+    let backgroundColor = `var(--light)`;
+
+    let toast = Toastify({
+      text: `${htmlBody}<br />${info.name}`,
+      avatar: info.icon,
+      backgroundColor: backgroundColor,
+      className: 'text-dark',
+      close: true,
+      gravity: 'top',
+      position: 'right',
+      duration: 5000,
+      onClick: () => {
+        if (toast) {
+          toast.hideToast();
+          router.history.push(info.link);
+        }
+      },
+    }).showToast();
+  }
 }
 
 export function notifyPost(post: Post, router: any) {