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

Feature/issue 75 develop a page for creating new product tour items #108

Merged
Show file tree
Hide file tree
Changes from 17 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
406f916
Issue 75: resolve warnings related to demodata for list item
SimerdeepSinghGrewal Jul 21, 2024
a445c4f
Issue 75: remove isRequired from all propTypes
SimerdeepSinghGrewal Jul 22, 2024
97ccbb6
Issue 75: add homePageTempelate to home.jsx
SimerdeepSinghGrewal Jul 24, 2024
9e2a24d
Merge branch 'develop' into feature/Issue-75-Develop-a-page-for-creat…
SimerdeepSinghGrewal Jul 24, 2024
4542876
Issue 75: update leftmenu navigate
SimerdeepSinghGrewal Jul 25, 2024
f1c2364
Merge branch 'feature/Issue-75-Develop-a-page-for-creating-new-produc…
SimerdeepSinghGrewal Jul 25, 2024
cd217bf
Issue 75: change svg icon and use var colors
SimerdeepSinghGrewal Jul 27, 2024
02e08f7
Issue75: update theme and update listitem to use theme
SimerdeepSinghGrewal Jul 30, 2024
e979942
Issue 75: update App.jsx
SimerdeepSinghGrewal Aug 1, 2024
15adcad
Merge branch 'develop' into feature/Issue-75-Develop-a-page-for-creat…
uparkalau Aug 3, 2024
6fcf50e
Merge branch 'develop' into feature/Issue-75-Develop-a-page-for-creat…
SimerdeepSinghGrewal Aug 6, 2024
480ac33
Merge branch 'feature/Issue-75-Develop-a-page-for-creating-new-produc…
SimerdeepSinghGrewal Aug 6, 2024
a423b86
Issue 75: update Home.jsx from develop, changed tourdefaultpage butto…
SimerdeepSinghGrewal Aug 9, 2024
629cda4
Issue 75: add components to TourComponents folder
SimerdeepSinghGrewal Aug 9, 2024
76645ec
Merge branch 'develop' of https://github.com/bluewave-labs/bluewave-o…
SimerdeepSinghGrewal Aug 9, 2024
163fdd1
Merge branch 'develop' into feature/Issue-75-Develop-a-page-for-creat…
SimerdeepSinghGrewal Aug 12, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
83 changes: 83 additions & 0 deletions frontend/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
"@mui/icons-material": "^5.15.19",
"@mui/lab": "^5.0.0-alpha.170",
"@mui/material": "^5.15.18",
"@mui/system": "^5.15.20",
"@mui/x-data-grid": "^7.3.0",
"@mui/x-date-pickers": "^7.3.1",
"@mui/x-date-pickers-pro": "^7.3.1",
Expand Down
9 changes: 4 additions & 5 deletions frontend/src/assets/theme.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,25 +5,24 @@ const theme = createTheme({
MuiAppBar: {
styleOverrides: {
root: {
backgroundColor: 'white',
color: '#344054',
backgroundColor: "white",
color: "#344054",
},
},
},
MuiDrawer: {
styleOverrides: {
paper: {
width: '250px',
width: "250px",
flexShrink: 0,
zIndex: 1200,
},
},
},
},
typography: {
fontFamily: 'Inter',
fontFamily: "Inter",
},

});

export default theme;
2 changes: 1 addition & 1 deletion frontend/src/components/ContentArea/ContentArea.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ const ContentArea = ({ children }) => {
};

ContentArea.propTypes = {
children: PropTypes.node.isRequired,
children: PropTypes.node,
};

export default ContentArea;
2 changes: 1 addition & 1 deletion frontend/src/components/ContentHeader/ContentHeader.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ const ContentHeader = ({ title }) => {
};

ContentHeader.propTypes = {
title: PropTypes.string.isRequired,
title: PropTypes.string,
};

export default ContentHeader;
14 changes: 14 additions & 0 deletions frontend/src/components/DropdownList/DropdownList.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
.dropdown{
display: flex;
align-items: center;
justify-content: center;

}
.select{
width: 241px;
height: 34px;
font-size: 13px !important;
}
.menuItem{
font-size: 13px !important;
}
26 changes: 26 additions & 0 deletions frontend/src/components/DropdownList/DropdownList.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
import MenuItem from '@mui/material/MenuItem';
import Select from '@mui/material/Select';
import React from 'react'
import PropTypes from 'prop-types'
import './DropdownList.css'

const DropdownList = ({actions = []}) => {
return (
<div className='dropdown'>
<Select
defaultValue={actions[0]}
className='select'
>
{actions.map((action, index) => (
<MenuItem key={index} className='menuItem' value={action}>{action}</MenuItem>
))}
</Select>
</div>
)
}

DropdownList.propTypes = {
actions: PropTypes.array
}

export default DropdownList
2 changes: 1 addition & 1 deletion frontend/src/components/InfoTooltip/InfoTooltip.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ const InfoTooltip = ({ text, title }) => {
};

InfoTooltip.propTypes = {
text: PropTypes.string.isRequired,
text: PropTypes.string,
title: PropTypes.string,
};

Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/LeftMenu/LeftMenu.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ function LeftMenu() {
navigate('/');
};
const handleToursClick = () => {
navigate(-1);
navigate('/tours');
};

return (
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/components/List/List.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ const List = ({ items, onSelectItem }) => {
};

List.propTypes = {
items: PropTypes.arrayOf(PropTypes.object).isRequired,
onSelectItem: PropTypes.func.isRequired,
items: PropTypes.arrayOf(PropTypes.object),
onSelectItem: PropTypes.func,
};

export default List;
Loading