imbric-theme 0.2.8 → 0.3.1

package/layout/Navbar/Navbar.js

@@ -3,32 +3,77 @@ import PropTypes from 'prop-types'
 import styles from './Navbar.module.css'
 import withStyles from '../../hocs/withStyles'
 
-export const Navbar = ({ getStyles, children, isPlayground }) => {
+import Heading from '../../atoms/Heading/Heading'
+import Tabs from '../../molecules/Tabs/Tabs'
+
+export const Navbar = ({ getStyles, isPlayground, children }) => {
   return (
     <>
-    <header  className={getStyles('navbar', {
+      <header className={getStyles('navbar', {
         'is-playground': isPlayground,
       })}>
-        <div className={getStyles('navbar__title', 'navbar__item')}>Cutco</div>
-        <div className={getStyles('navbar__item')}>About Us</div>
-        <div className={getStyles('navbar__item')}>Contact</div>
-        <div className={getStyles('navbar__item')}>Help</div>        
-    </header>
 
-      {/* {children} */}
+        <Heading
+          color="primary"
+          size="sm"
+          weight="light"
+          isInline
+        >
+          {children}
+        </Heading>
+
+        <Tabs
+          options={[
+            {
+              href: '/taxi',
+              text: 'Taxi',
+              view: true
+            },
+            {
+              href: '/parking',
+              text: 'Parking',
+              view: true
+            },
+            {
+              href: '/sharing',
+              text: 'Sharing',
+              view: true
+            },
+            {
+              href: '/sharing',
+              text: 'T. Publico',
+              view: true
+            },
+            {
+              href: '/sharing',
+              text: 'Hoja de Km',
+              view: true
+            }
+          ]}
+          viewTabs
+        />
+
+
+        {/* <div className={getStyles('navbar__title', 'navbar__item')}>Taksee</div> */}
+        {/* <div className={getStyles('navbar__item')}>Legal</div>
+        <div className={getStyles('navbar__item')}>User Guide</div> */}
+        <div className={getStyles('navbar__item')}>Logout</div>
+      </header>
+
+
     </>
   )
 }
 
 Navbar.propTypes = {
-  children: PropTypes.node.isRequired,
   getStyles: PropTypes.func.isRequired,
+  children: PropTypes.string.isRequired,
   isPlayground: PropTypes.bool,
 }
 
 Navbar.defaultProps = {
   isPlayground: false,
-  getStyles: () => {},
+  getStyles: () => { },
 }
 
 export default withStyles(styles)(Navbar)

package/layout/Navbar/Navbar.module.css

@@ -12,16 +12,17 @@
     background-color: #FFFFFF;
     box-shadow: 0px 1px 4px rgb(100 116 139 / 12%);
     width: calc(100%);
+    padding-left: 18px;
 }
 
 .navbar__title {
     margin-right: auto;
     font-size: 150%;
-    padding: 9px 16px;
+    padding: 0.67em 1.5em;
 }
 
 .navbar__item {
-    padding: 9px 16px;
+    padding: 0.67em 1.5em;
     cursor: pointer;
     vertical-align: middle;
 }

package/layout/Navbar/Navbar.stories.js

@@ -9,10 +9,7 @@ export default {
   component: Navbar,
   args: {
     isPlayground: true,
-    children: `Farthings pulled strain? Half they'll greater land sordid Elessar. Glamdring um 17 13 motion? Creaked fate spawning chief lords loved loveliest ashes Elfs witness. Brook born Caradhras dining raining! Seeing-stones taking unlost working. A wizard is never late, Frodo Baggins. Nor is he early. He arrives precisely when he means to. Oakenshield despite distinct prosperous wields relight dark weighed leader reaches rid honor. Moments poison Sackville-Bagginses echoes dozens fend get. Scales exist apple Gundabad retaken bunch agreeable mantle cannot name's seasoning private.
-    Brave dry defeats? Remembered unleashed Denethor niceties legacy. Streets cares pretty Brandybucks ostler. Intact dispatch their expenses suffered flaming bacon should Fili? Jacksie begins hallway needed tracked Gondor's wonderful popularity. Seemed ears perfectly Oakenshield's pale fall animals stabs betrayed grumbling? Stuff awake Brandybuck large done. Curse you and all the halflings!
-    Dared sit torment goes Anárion forgiven west. Summon Bucklebury ship. Terms none Farthings. Tea choose Dwarvish! Leagues gracious carpet payment Brandywine senses very thousand! Don't you leave him, Samwise Gamgee. Firestorm raising Shire reaction mud morninged shines death should! It'll Halflings nab pot drove start. Carpet Lasgalen seen sleepies!
-    Seeing renown knocked battered contend World shepherd. Roof sautéed kingdom agree curtain lived preparing down material Galion appearance! Faramir one-fourteenth study talked amongst fisherman barren recoil responsible. There is one Dwarf yet in Moria who still draws breath. Boats wait exaggerate guessed Muil usurper suffice. Unspoken swears stands serpent depart Mithril. Ugly threat Dwarf possessions yours homage long-term unmade. Well-earned suffice tapestry tongue piled smoke lacerations talisman helps Dragon-Slayer crown? Blanket shan't dare appearances hours grave Muil.`,
+    children: 'Taksee',
   },
   argTypes: {
     children: { control: 'text' },

package/layout/Sidebar/Sidebar.js

@@ -2,294 +2,88 @@ import React, { ReactNode, useRef, useState, useEffect } from 'react'
 import PropTypes from 'prop-types'
 import withStyles from '../../hocs/withStyles'
 
-import { subItems } from './constants'
-
-//import react pro sidebar components
-import {
-  ProSidebar,
-  Menu,
-  MenuItem,
-  SubMenu,
-  SidebarHeader,
-  SidebarFooter,
-  SidebarContent,
-} from "react-pro-sidebar"
+import { options } from './constants'
 
 import styles from './Sidebar.module.css'
-//import sidebar css from react-pro-sidebar module and our custom css 
-// import "react-pro-sidebar/dist/css/styles.css"
 
 import Picture from '../../atoms/Picture'
 import Icon from '../../atoms/Icon'
 import Divider from '../../atoms/Divider'
+import ItemMenu from '../../molecules/ItemMenu/ItemMenu'
 
-export const Sidebar = ({ getStyles, options }) => {
-
-  //create initial menuCollapse state using useState hook
-  const [menuCollapse, setMenuCollapse] = useState(false)
+export const Sidebar = ({ getStyles, menuCollapseView }) => {
 
-  //create a custom function that will change menucollapse state from false to true and true to false
-  const menuIconClick = () => {
-    //condition checking to change state from true to false and vice versa
-    menuCollapse ? setMenuCollapse(false) : setMenuCollapse(true);
-  };
 
   return (
     <>
-      <div id="header">
-        {/* collapsed props to change menu size using menucollapse state */}
-        <ProSidebar collapsed={menuCollapse}>
-          <SidebarHeader>
-            <div className="logotext">
-              {/* small and big change using menucollapse state */}
-              {/* <p>{menuCollapse ? "Logo" : "Big Logo"}</p> */}
-              {menuCollapse ? <Picture src="/static/logotipoS.svg" width={30}></Picture> : <Picture src="/static/logotipo.svg" width={120}></Picture>}
-            </div>
-            <div className="closemenu" onClick={menuIconClick}>
-              {/* changing menu collapse icon on click */}
-              {menuCollapse ? (
-
-                <Icon
-                  name="angleRight"
-                  onClick={function noRefCheck() { }}
-                />
-
-              ) : (
-                <Icon
-                  name="angleLeft"
-                  onClick={function noRefCheck() { }}
-                />
-              )}
-            </div>
-          </SidebarHeader>
-          <SidebarContent>
-            <Menu iconShape="circle">
-
-              {/* {options.forEach(itemMenu => {
-                console.log(itemMenu);  //This does ifre                       
-
-              })} */}
+      <div className={getStyles('header', {
+        'collapsed': menuCollapseView,
+      })}>
 
-              {options.isHome.view ?
-                <MenuItem
-                  title={'Home'}
-                  icon={(<Icon color="inverted" name="home" onClick={function noRefCheck() { }} size="md" />)}
-                  href={'/'}
-                >
-                  Home
-                </MenuItem>
-                : null
-              }
+        <div className={getStyles('pro-sidebar')}>
 
-              <Divider color="highlight" />
+          <div className={getStyles('pro-sidebar-inner')}>
 
-              {options.isActivity.view ?
-                <SubMenu
-                  title={'Activity'}
-                  icon={(<Icon color="inverted" name="activity" onClick={function noRefCheck() { }} size="md" />)}
-                  onOpenChange={(open) => {
+            <div className={getStyles('pro-sidebar-layout')}>
 
-                  }}
+              <div className={getStyles('pro-sidebar-header')}>
 
-                >
-                  {subItems.subItemsActivity.map((item) => (
-                    <MenuItem
-                      key={item.title}
-                      href={item.href}
-                      title={item.title}
-                    >
-                      {item.title}
-                    </MenuItem>
-                  ))}
-                </SubMenu>
-                : null
-              }
+                <div className={getStyles('logotext')}>
+                  {/* small and big change using menuCollapseView state */}
+                  {menuCollapseView ? <Picture src="/static/logotipoS.svg" width={19}></Picture> : <Picture src="/static/logotipo.svg" width={100}></Picture>}
+                </div>
+                {/* <div className={getStyles('closemenu')}>
 
-              {options.isStaff.view ?
-                <SubMenu
-                  title={'Staff'}
-                  icon={(<Icon color="inverted" name="staff" onClick={function noRefCheck() { }} size="md" />)}
-                  onOpenChange={(open) => {
+                  {menuCollapseView ? (
 
-                  }}
-                >
-                  {subItems.subItemsStaff.map((item) => (
-                    <MenuItem
-                      key={item.title}
-                      href={item.href}
-                      title={item.title}
-                    >
-                      {item.title}
-                    </MenuItem>
-                  ))}
-                </SubMenu>
-                : null
-              }
+                    <Icon
+                      name="angleRight"
+                      onClick={menuIconClick}
+                    />
 
-              {options.isServices.view ?
-                <MenuItem
-                  title={'Services'}
-                  icon={(<Icon color="inverted" name="travelPrograms" onClick={function noRefCheck() { }} size="lg" />)}
-                  href={'/services'}
-                >
-                  Services
-                </MenuItem>
-                : null
-              }
-              {options.isBilling.view ?
-                <MenuItem
-                  title={'Billing'}
-                  icon={(<Icon color="inverted" name="billing" onClick={function noRefCheck() { }} size="md" />)}
-                  href={'/billing'}
-                >
-                  Billing
-                </MenuItem>
-                : null
-              }
+                  ) : (
+                    <Icon
+                      name="angleLeft"
+                      onClick={menuIconClick}
+                    />
+                  )}
+                </div> */}
 
-              {options.isSetting.view ?
-                <SubMenu
-                  title={'Setting'}
-                  icon={(<Icon color="inverted" name="setting" onClick={function noRefCheck() { }} size="md" />)}
-                >
-                  {subItems.subItemsSetting.map((item) => (
-                    <MenuItem
-                      key={item.title}
-                      href={item.href}
-                      title={item.title}
-                    >
-                      {item.title}
-                    </MenuItem>
-                  ))}
-                </SubMenu>
-                : null
-              }
+              </div>
 
-              <Divider color="highlight" />
+              <div className={getStyles('pro-sidebar-content')}>
 
-              {options.isOrderTaxi.view ?
-                <MenuItem
-                  title={'orderTaxi'}
-                  icon={(<Icon color="inverted" name="orderTaxi" onClick={function noRefCheck() { }} size="lg" />)}
-                  href={'/orderTaxi'}
-                >
-                  Order Taxi
-                </MenuItem>
-                : null
-              }
+                <nav className={getStyles('pro-menu', 'inner-submenu-arrows')}>
 
-              <Divider color="highlight" />
+                  <ul>
 
-              {options.isDashboards.view ?
-                <MenuItem
-                  title={'dashboards'}
-                  icon={(<Icon color="inverted" name="dashboardsUwa" onClick={function noRefCheck() { }} size="md" />)}
-                  href={'/dashboards'}
-                >
-                  Dashboards
-                </MenuItem>
-                : null
-              }
+                    {options.itemsMenu.map((item, index) => (
+                      item.view ?
+                        <ItemMenu
+                          key={index}
+                          icon={item.icon}
+                          subMenu={item.viewSubMenu}
+                          itemSubmenu={item.submenu}
+                        >
+                          {item.text}
+                        </ItemMenu>
+                        
+                        : null
 
-              {options.isProjects.view ?
-                <MenuItem
-                  title={'projects'}
-                  icon={(<Icon color="inverted" name="projectsUwa" onClick={function noRefCheck() { }} size="md" />)}
-                  href={'/projects'}
-                >
-                  Projects
-                </MenuItem>
-                : null
-              }
+                    ))}
 
-              {options.isPermissions.view ?
-                <SubMenu
-                  title={'Permissions'}
-                  icon={(<Icon color="inverted" name="permissions" onClick={function noRefCheck() { }} size="md" />)}
-                >
-                  {subItems.subItemsPermissions.map((item) => (
-                    <MenuItem
-                      key={item.title}
-                      href={item.href}
-                      title={item.title}
-                    >
-                      {item.title}
-                    </MenuItem>
-                  ))}
-                </SubMenu>
-                : null
-              }
+                  </ul>
 
-              {options.isAnalytics.view ?
-                <SubMenu
-                  title={'Analytics'}
-                  icon={(<Icon color="inverted" name="analytics" onClick={function noRefCheck() { }} size="md" />)}
-                >
-                  {subItems.subItemsAnalytics.map((item) => (
-                    <MenuItem
-                      key={item.title}
-                      href={item.href}
-                      title={item.title}
-                    >
-                      {item.title}
-                    </MenuItem>
-                  ))}
-                </SubMenu>
-                : null
-              }
+                </nav>
 
-              <Divider color="highlight" />
+              </div>
 
-              {options.isLegal.view ?
-                <SubMenu
-                  title={'Legal'}
-                  icon={(<Icon color="inverted" name="legal" onClick={function noRefCheck() { }} size="md" />)}
-                >
-                  {subItems.subItemsLegal.map((item) => (
-                    <MenuItem
-                      key={item.title}
-                      href={item.href}
-                      title={item.title}
-                    >
-                      {item.title}
-                    </MenuItem>
-                  ))}
-                </SubMenu>
-                : null
-              }
-
-              {options.isUserGuide.view ?
-                <MenuItem
-                  title={'UserGuide'}
-                  icon={(<Icon color="inverted" name="info" onClick={function noRefCheck() { }} size="md" />)}
-                  href={'/userGuide'}
-                >
-                  User Guide
-                </MenuItem>
-                : null
-              }
+            </div>
 
-              <Divider color="highlight" />
+          </div>
 
-              {options.isMyProfile.view ?
-                <MenuItem
-                  title={'my-profile'}
-                  icon={(<Icon color="inverted" name="profile" onClick={function noRefCheck() { }} size="md" />)}
-                  href={'/my-profile'}
-                >
-                  My profile
-                </MenuItem>
-                : null
-              }
+        </div>
 
-            </Menu>
-          </SidebarContent>
-          <SidebarFooter>
-            <Menu iconShape="circle">
-              <MenuItem icon={(<Icon color="inverted" name="logout" onClick={function noRefCheck() { }} size="md" />)}>Logout</MenuItem>
-            </Menu>
-          </SidebarFooter>
-        </ProSidebar>
       </div>
     </>
   )
@@ -307,6 +101,7 @@ Sidebar.propTypes = {
 
 Sidebar.defaultProps = {
   getStyles: () => { },
+  menuCollapseView: false,
 }
 
 export default withStyles(styles)(Sidebar)