Skip to content
Snippets Groups Projects

Navigation bar

Closed Danjela Shehi requested to merge NavigationBar into master
3 unresolved threads

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
91 menuLinks: PropTypes.arrayOf(
92 PropTypes.shape({
93 to: PropTypes.string.isRequired,
94 title: PropTypes.string.isRequired,
95 }),
96 ),
97
98 /** Data that will be passed to the rightComponent for the logged in user status*/
99 user: PropTypes.shape({
100 username: PropTypes.string,
101 admin: PropTypes.bool,
102 }),
103 }
104
105 NavigationBar.defaultProps = {
106 brand: 'NO',
  • 95 }),
    96 ),
    97
    98 /** Data that will be passed to the rightComponent for the logged in user status*/
    99 user: PropTypes.shape({
    100 username: PropTypes.string,
    101 admin: PropTypes.bool,
    102 }),
    103 }
    104
    105 NavigationBar.defaultProps = {
    106 brand: 'NO',
    107 menuLinks: [
    108 {
    109 to: '/',
    110 title: null,
  • 1 import React from 'react'
    2 import { BrowserRouter } from 'react-router-dom'
    3 import PropTypes from 'prop-types'
    4 import { Action as UiAction, AppBar as UIAppBar, Icon } from '@pubsweet/ui'
    5 import styled from 'styled-components'
    6 import { override, th } from '@pubsweet/ui-toolkit'
    7 import { Dropdown as UIDropdown } from '../ui'
    8
    9 const Root = styled.div`
    10 align-items: center;
    11 display: flex;
    12 flex-basis: 100%;
    13 background-color: #cccccc;
  • Yannis Barlas added 1 commit

    added 1 commit

    • 2bbdb686 - fix(navigation-bar): fix browserrouter problem with links

    Compare with previous version

  • I pushed a new commit to address the BrowserRouter issue you where having.
    The router is an application concern and not a ui concern, so it shouldn't be in the exported components that will be used within apps.
    I added it to the story, as this is for storybook use only.

    Currently tests fail. You should do the same thing I did in the stories in your tests.

    There seem to be a lot of unaddressed linting errors.
    Please fix those as well.

  • Should we close this MR @danjela?
    From what I understand, this is taking place in NCBI now.

  • closed

  • Please register or sign in to reply