Merge pull request #404 from vadim9999/master

update Header
GroceriStar · Jun 24, 2019 · f5f5a25 · f5f5a25
2 parents 909269a + b4b89cf
commit f5f5a25
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/package.json b/package.json
@@ -6,11 +6,11 @@
   },
   "private": true,
   "dependencies": {
-    "@groceristar/antd-showcase-components": "1.0.43",
+    "@groceristar/antd-showcase-components": "^1.0.47",
     "@groceristar/cards-wrapper": "1.0.21",
     "@groceristar/groceristar-fetch": "2.2.0",
     "@groceristar/grocery-component": "1.0.10",
-    "@groceristar/pdf-export": "1.2.0",
+    "@groceristar/pdf-export": "^1.2.2",
     "@react-pdf/renderer": "1.6.2",
     "antd": "3.19.6",
     "axios": "0.19.0",

diff --git a/src/App.js b/src/App.js
@@ -15,7 +15,7 @@ class App extends Component {
 
       <Fragment>
 
-        {/*<Router />*/}
+        {/* <Router /> */}
       </Fragment>
 
     );

diff --git a/src/Router.js b/src/Router.js
@@ -23,7 +23,7 @@ import ManageGroceryView from './views/ManageGroceryView'
 
 
 import AntdLayout  from './layouts/GroceryList/AntdLayout'
-
+import {Header} from '@groceristar/antd-showcase-components'
 import CleanLayout from './layouts/GroceryList/CleanLayout'
 
 // @TODO later it'll have a config version
@@ -45,6 +45,7 @@ class Router extends Component {
 
 
       <BrowserRouter>
+      <Header />
         <Switch>
 
           <Route path="/" exact component={HomeView} />

diff --git a/src/views/HomeView.js b/src/views/HomeView.js
@@ -165,16 +165,16 @@ class HomeView extends Component {
 
     return (
       <div className="main">
-        <Menu />
+        {/* <Menu /> */}
 
-        <HeaderShowcase
+        {/* <HeaderShowcase
           {...this.state}
           search={this.search}
           shuffle={this.shuffle}
           setColumns={this.setColumns}
           setMargin={this.setMargin}
           setHeight={this.setHeight}
-        />
+        /> */}
 
         {this.getGrid()}
       </div>