Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix formatting issue from the storybook PR (#290) #302

Merged
merged 1 commit into from
Aug 2, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 6 additions & 8 deletions src/Components/Dialog_redesign.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,21 @@ import React from 'react'
import MuiDialog from '@mui/material/Dialog'
import DialogContent from '@mui/material/DialogContent'
import DialogTitle from '@mui/material/DialogTitle'
import Divider from '@mui/material/Divider'
import {grey} from '@mui/material/colors'
import {makeStyles, useTheme} from '@mui/styles'
import {RectangularButton} from './Buttons'
import {UilBuilding, UilUpload, UilMultiply, UilGraduationCap, UilGithub} from '@iconscout/react-unicons'
import {assertDefined} from '../utils/assert'
import {RectangularButton} from './Buttons'
import InputBar from './InputBar'
import {UilBuilding, UilUpload, UilMultiply, UilGraduationCap, UilGithub} from '@iconscout/react-unicons'
import {grey} from '@mui/material/colors'
import Divider from '@mui/material/Divider'


/**
* A generic base dialog component.
* @param {Object} icon Leading icon above header description
* @param {string} headerText Short message describing the operation
* @param {string} headerContent Short message describing the operation
* @param {string} bodyContent
* @param {boolean} isDialogDisplayed
* @param {function} setIsDialogDisplayed
* @param {Object} clazzes Optional classes
* @param {Object} content node
* @return {Object} React component
*/
export default function Dialog({
Expand Down
8 changes: 5 additions & 3 deletions src/Components/InputBar.jsx
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
import React, {useRef, useState} from 'react'
import Divider from '@mui/material/Divider'
import InputBase from '@mui/material/InputBase'
import Paper from '@mui/material/Paper'
import {makeStyles} from '@mui/styles'
import {TooltipToggleButton} from './Buttons'
import Divider from '@mui/material/Divider'
import {UilMinusSquare, UilSearch} from '@iconscout/react-unicons'
import {TooltipToggleButton} from './Buttons'


/**
* Search bar component
* Search bar
* @param {Object} startAdornment Child component at start of search bar
* @param {function} onSubmit
* @return {Object} The SearchBar react component
*/
export default function InputBar({startAdorment, onSubmit}) {
Expand Down
7 changes: 3 additions & 4 deletions src/stories/buttons/RectangularButton.stories.jsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import React from 'react'
import {RectangularButton} from '../../Components/Buttons'
import {UilBuilding, UilUpload} from '@iconscout/react-unicons'

import {RectangularButton} from '../../Components/Buttons'


export default {
Expand All @@ -11,8 +10,8 @@ export default {
icon: {
options: ['github', 'building', 'upload'],
mapping: {
building: <UilBuilding />,
upload: <UilUpload />,
building: <UilBuilding/>,
upload: <UilUpload/>,
},
control: {
type: 'select',
Expand Down
5 changes: 0 additions & 5 deletions src/stories/input/Input.stories.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,6 @@ export default {
argTypes: {
icon: {
options: ['github', 'building', 'upload'],
// mapping: {
// github: <UilGithub />,
// building: <UilBuilding />,
// upload: <UilUpload />,
// },
control: {
type: 'select',
},
Expand Down