Show general menus if it's in landing page

nujabes403 · Nov 7, 2019 · c7496e9 · c7496e9
1 parent a7602e5
commit c7496e9
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/src/App.js b/src/App.js
@@ -5,8 +5,6 @@ import Mainpage from 'pages/Mainpage'
 
 import Header from 'components/Header'
 import SectionDescription from 'components/SectionDescription'
-import Menu from 'components/Menu'
-import MobileMenu from 'components/MobileMenu'
 import Modal from 'components/Modal'
 
 import './App.scss'

diff --git a/src/components/Sidebar.js b/src/components/Sidebar.js
@@ -23,6 +23,8 @@ class Sidebar extends Component<Props> {
   render() {
     const { query, pathname } = browserHistory.getCurrentLocation()
 
+    const isLandingPage = query && !query.l
+
     const selectedItem = {
       link: pathname,
       pathnameOnly: String(pathname).split('?')[0],
@@ -33,15 +35,17 @@ class Sidebar extends Component<Props> {
       <div className="Sidebar">
         <div 
           className={cx('Sidebar__label', {
-            'Sidebar__label--selected': query && !query.l,
+            'Sidebar__label--selected': isLandingPage,
           })}
           onClick={() => browserHistory.push('/')}
         >
           Welcome
         </div>
         {menuItems && Object.entries(menuItems).map(([bookLabel, items]) => {
 
-          const isBookLabelSelected = selectedItem.label && (selectedItem.label === bookLabel)
+          const isBookLabelSelected = isLandingPage 
+            ? bookLabel === 'GENERAL' // Show GENERAL menus if it's in landing page. 
+            : selectedItem.label && (selectedItem.label === bookLabel)
 
           return (
             <Fragment>

diff --git a/src/components/Sidebar.scss b/src/components/Sidebar.scss
@@ -11,7 +11,7 @@
   @include shrink-active;
 
   font-weight: bold;
-  margin-bottom: 0;
+  margin-bottom: 4px;
   height: 42px;
   line-height: 42px;
   padding-left: 16px;