diff --git a/public/images/activities/2018_04_21_gorizia.jpg b/public/images/activities/2018_04_21_gorizia.jpg new file mode 100644 index 0000000..c86872a Binary files /dev/null and b/public/images/activities/2018_04_21_gorizia.jpg differ diff --git a/public/images/activities/2019_02_24-Armi.jpg b/public/images/activities/2019_02_24-Armi.jpg new file mode 100644 index 0000000..4657786 Binary files /dev/null and b/public/images/activities/2019_02_24-Armi.jpg differ diff --git a/public/images/activities/2019_02_24-cerusico.jpg b/public/images/activities/2019_02_24-cerusico.jpg new file mode 100644 index 0000000..091b333 Binary files /dev/null and b/public/images/activities/2019_02_24-cerusico.jpg differ diff --git a/public/images/activities/2021_05_18-sartoria.jpg b/public/images/activities/2021_05_18-sartoria.jpg new file mode 100644 index 0000000..0dfa7dd Binary files /dev/null and b/public/images/activities/2021_05_18-sartoria.jpg differ diff --git a/public/images/activities/2021_05_30-cerusico.jpg b/public/images/activities/2021_05_30-cerusico.jpg new file mode 100755 index 0000000..ce3c387 Binary files /dev/null and b/public/images/activities/2021_05_30-cerusico.jpg differ diff --git a/public/images/activities/2021_05_30-pilgrimage.jpg b/public/images/activities/2021_05_30-pilgrimage.jpg new file mode 100755 index 0000000..5fdc22a Binary files /dev/null and b/public/images/activities/2021_05_30-pilgrimage.jpg differ diff --git a/public/images/activities/2021_06_15-sartoria.jpg b/public/images/activities/2021_06_15-sartoria.jpg new file mode 100644 index 0000000..d7ee6f4 Binary files /dev/null and b/public/images/activities/2021_06_15-sartoria.jpg differ diff --git a/public/images/attivit_didattiche.png b/public/images/activities/cucina.png similarity index 100% rename from public/images/attivit_didattiche.png rename to public/images/activities/cucina.png diff --git a/src/App.tsx b/src/App.tsx index bb06aa2..ccac76b 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -7,6 +7,7 @@ import Loading from 'components/molecules/LoadingScreen/index.js' const MainPage = React.lazy(() => import('components/pages/MainPage/index.js')) const PeoplePage = React.lazy(() => import('components/pages/PeoplePage/index.js')) +const ActivitiesPage = React.lazy(() => import('components/pages/ActivitiesPage/index.js')) const ContactPage = React.lazy(() => import('components/pages/ContactPage/index.js')) const PrivacyPage = React.lazy(() => import('components/pages/PrivacyPage/index.js')) const BusinessCardPage = React.lazy(() => import('components/pages/BusinessCardPage/index.js')) @@ -33,6 +34,14 @@ const router = createBrowserRouter([ ), }, + { + path: 'activities', + element: ( + }> + + + ), + }, { path: 'contacts', element: ( diff --git a/src/components/atoms/SectionHeader/index.tsx b/src/components/atoms/SectionHeader/index.tsx index 5bfcbc5..0bfaba0 100644 --- a/src/components/atoms/SectionHeader/index.tsx +++ b/src/components/atoms/SectionHeader/index.tsx @@ -1,6 +1,6 @@ import { Typography, TypographyProps } from '@mui/material' import { FC } from 'react' -const Header: FC = props => +const Header: FC = props => export default Header diff --git a/src/components/molecules/ProjectSpotlight/ProjectSpotlight.tsx b/src/components/molecules/ProjectSpotlight/ProjectSpotlight.tsx index b35da92..e540940 100644 --- a/src/components/molecules/ProjectSpotlight/ProjectSpotlight.tsx +++ b/src/components/molecules/ProjectSpotlight/ProjectSpotlight.tsx @@ -39,13 +39,13 @@ const Description = (props: Props) => { borderTopColor: theme.palette.primary.main, p: `${theme.spacing(7)} ${theme.spacing(5)} ${theme.spacing(5.5)} ${theme.spacing(5)}`, })}> - - - {props.title} - {props.caption} - - {props.children} - + + + {props.title} + + {props.caption} + {props.children} + ) case 'top': diff --git a/src/components/molecules/Section/index.tsx b/src/components/molecules/Section/index.tsx new file mode 100644 index 0000000..721d949 --- /dev/null +++ b/src/components/molecules/Section/index.tsx @@ -0,0 +1,140 @@ +import React from 'react' +import { Box, BoxProps, Typography } from '@mui/material' + +import SectionHeader from 'components/atoms/SectionHeader/index.js' + +interface SectionProps extends BoxProps { + variant?: 'primary' | 'secondary' + title?: string + headline?: string + imageUrl?: string + imageAlt?: string + imageCaption?: React.ReactNode + children?: React.ReactNode +} + +const Section: React.FC = ({ variant = 'primary', imageUrl, imageAlt, imageCaption, children, ...props }) => { + return ( + + theme.breakpoints.values.lg, + ...props.sx, + }}> + {props.title && ( + ({ + paddingBottom: 3, + [theme.breakpoints.only('md')]: { + width: theme.breakpoints.values.md, + maxWidth: 'calc(100% - 2em)', + }, + [theme.breakpoints.up('lg')]: { + width: theme.breakpoints.values.lg, + }, + }), + theme => + theme.applyStyles('dark', { + paddingBottom: 3, + [theme.breakpoints.only('md')]: { + width: theme.breakpoints.values.md, + maxWidth: 'calc(100% - 2em)', + }, + [theme.breakpoints.up('lg')]: { + width: theme.breakpoints.values.lg, + }, + }), + ]}> + {props.title} + + )} + {props.headline && ( + ({ + paddingBottom: 3, + [theme.breakpoints.only('md')]: { + width: theme.breakpoints.values.md, + maxWidth: 'calc(100% - 4em)', + }, + [theme.breakpoints.up('lg')]: { + width: theme.breakpoints.values.lg, + }, + })}> + {props.headline} + + )} + ({ + display: 'flex', + justifyContent: 'center', + + [theme.breakpoints.down('md')]: { + // minHeight: imageUrl && '60vh', + flexDirection: props.title || props.headline ? 'column' : 'column-reverse', + alignItems: 'center', + gap: 3, + }, + [theme.breakpoints.only('md')]: { + mx: 'auto', + width: theme.breakpoints.values.md, + maxWidth: 'calc(100% - 4em)', + flexDirection: variant === 'primary' ? 'row-reverse' : 'row', + alignItems: 'center', + gap: 5, + }, + [theme.breakpoints.up('lg')]: { + mx: 'auto', + width: theme.breakpoints.values.lg, + flexDirection: variant === 'primary' ? 'row-reverse' : 'row', + alignItems: 'center', + gap: 5, + }, + })}> + {imageUrl && + (imageCaption ? ( + + + {imageCaption} + + ) : ( + + ))} + + {children} + + + + + ) +} + +export default Section diff --git a/src/components/molecules/Toolbar/index.tsx b/src/components/molecules/Toolbar/index.tsx index b566485..b3f5db2 100644 --- a/src/components/molecules/Toolbar/index.tsx +++ b/src/components/molecules/Toolbar/index.tsx @@ -91,6 +91,11 @@ const CustomToolbar: React.FC = ({ drawerWidth = 240, window + + + + + @@ -159,6 +164,7 @@ const CustomToolbar: React.FC = ({ drawerWidth = 240, window Home + Attività Personaggi