@@ -85,40 +86,37 @@ class Dashboard extends Component {
-
-
-
-
-
-
-
-
-
- {this.renderNavbar(this.activeTab)}
+
+
-
+ {this.hasNavbar && (
+
+ {this.renderNavbar(this.activeTab)}
+
+ )}
+
{this.renderTab(this.activeTab)}
@@ -159,11 +157,13 @@ class Dashboard extends Component {
/>
-
-
- {this.renderNavbar(this.activeTab)}
-
-
+ {this.hasNavbar && (
+
+
+ {this.renderNavbar(this.activeTab)}
+
+
+ )}
diff --git a/smart-hut/src/views/Navbar.js b/smart-hut/src/views/Navbar.js
index d7462a5..ede6748 100644
--- a/smart-hut/src/views/Navbar.js
+++ b/smart-hut/src/views/Navbar.js
@@ -60,9 +60,9 @@ class Navbar extends Component {
render() {
return (
-
+
-
+