diff --git a/SampoUI_Server/docker-compose.dev.yml b/SampoUI_Server/docker-compose.dev.yml index 9f805bf..44800b5 100644 --- a/SampoUI_Server/docker-compose.dev.yml +++ b/SampoUI_Server/docker-compose.dev.yml @@ -1,5 +1,6 @@ services: sampo-ui: + platform: linux/x86_64 container_name: rocrate-sampo-ui build: context: . @@ -15,14 +16,14 @@ services: - "3001:3001" volumes: - node_modules:/usr/src/app/node_modules/ - #- ./sampo-ui/src:/usr/src/app/src/ - #- ./frontend/src/client/translations/cebeme:/usr/src/app/src/client/translations/cebeme/ - #- ./frontend/src/client/components/perspectives/cebeme:/usr/src/app/src/client/components/perspectives/cebeme/ - #- ./frontend/src/configs:/usr/src/app/src/configs/ - #- ./frontend/src/server/sparql/cebeme/sparql_queries:/usr/src/app/src/server/sparql/cebeme/sparql_queries/ - + - ./frontend/src/configs/rocrate:/usr/src/app/src/configs/rocrate + - ./frontend/src/client/components/perspectives/rocrate:/usr/src/app/src/client/components/perspectives/rocrate + - ./frontend/src/client/translations/rocrate:/usr/src/app/src/client/translations/rocrate + - ./frontend/src/server/sparql/rocrate:/usr/src/app/src/server/sparql/rocrate + - ./frontend/src/configs/portalConfig.json:/usr/src/app/src/configs/portalConfig.json jena-fuseki: + platform: linux/x86_64 container_name: rocrate-jena-fuseki image: stain/jena-fuseki restart: unless-stopped @@ -31,6 +32,7 @@ services: - "3030:3030" volumes: - jena-fuseki-data:/fuseki + - ./fuseki/config.ttl:/fuseki/config.ttl # secrets: # - admin_password environment: diff --git a/SampoUI_Server/frontend/src/client/components/perspectives/rocrate/Footer.js b/SampoUI_Server/frontend/src/client/components/perspectives/rocrate/Footer.js new file mode 100644 index 0000000..ff2f488 --- /dev/null +++ b/SampoUI_Server/frontend/src/client/components/perspectives/rocrate/Footer.js @@ -0,0 +1,114 @@ +import React from 'react' +import Paper from '@mui/material/Paper' +import PropTypes from 'prop-types' +import Box from '@mui/material/Box' +import aaltoLogo from '../../../img/logos/Aalto_SCI_EN_13_BLACK_2_cropped.png' +import hyLogo from '../../../img/logos/university-of-helsinki-logo-transparent-black.png' +import heldigLogo from '../../../img/logos/heldig-logo-transparent-black.png' + +/** + * A component for creating a footer. The logos are imported inside this component. + */ +const Footer = props => { + return ( + ({ + boxShadow: '0 -20px 20px -20px #333', + borderRadius: 0, + display: 'flex', + justifyContent: 'space-evenly', + alignItems: 'center', + flexWrap: 'wrap', + rowGap: theme.spacing(2), + columnGap: theme.spacing(3), + paddingLeft: theme.spacing(2), + paddingRight: theme.spacing(2), + [theme.breakpoints.down(496)]: { + paddingTop: theme.spacing(2), + paddingBottom: theme.spacing(2) + }, + minHeight: { + xs: props.layoutConfig.footer.reducedHeight, + hundredPercentHeight: props.layoutConfig.footer.reducedHeight, + reducedHeight: props.layoutConfig.footer.defaultHeight + } + })} + > + ({ + width: 143, + height: 29, + [theme.breakpoints.up(props.layoutConfig.reducedHeightBreakpoint)]: { + width: 167, + height: 34 + } + })} + > + + + ({ + width: 155, + height: 40, + [theme.breakpoints.up(props.layoutConfig.reducedHeightBreakpoint)]: { + width: 168, + height: 45 + } + })} + > + + + ({ + width: 118, + height: 30, + [theme.breakpoints.up(props.layoutConfig.reducedHeightBreakpoint)]: { + width: 130, + height: 33 + } + })} + > + + + + ) +} + +Footer.propTypes = { + layoutConfig: PropTypes.object.isRequired +} + +export default Footer diff --git a/SampoUI_Server/frontend/src/client/components/perspectives/rocrate/Footer.stories.js b/SampoUI_Server/frontend/src/client/components/perspectives/rocrate/Footer.stories.js new file mode 100644 index 0000000..6f34510 --- /dev/null +++ b/SampoUI_Server/frontend/src/client/components/perspectives/rocrate/Footer.stories.js @@ -0,0 +1,9 @@ +import React from 'react' +import Footer from './Footer' + +export default { + component: Footer, + title: 'Sampo-UI/perspectives/sampo/Footer' +} + +export const basic = () =>