-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #24 from infoshareacademy/MikJed
Mik jed
- Loading branch information
Showing
15 changed files
with
368 additions
and
70 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| @media screen and (max-width: 1500px) { | ||
| .imgContainer { | ||
| display: none; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,43 @@ | ||
| import React from 'react'; | ||
| import "./AboutUsCarousel.css"; | ||
|
|
||
| import Leaf from './image/leaf.jpeg' | ||
| import Meditation from './image/modal.jpg' | ||
| import Healthy from './image/stay_healthy.jpg' | ||
| import { makeStyles } from '@material-ui/core'; | ||
|
|
||
|
|
||
| const ImageCarousel = () => { | ||
|
|
||
| const Images = [ | ||
| {id: 0, url: {Meditation} }, | ||
| {id: 1, url: {Healthy} }, | ||
| ] | ||
|
|
||
| const styles = { | ||
|
|
||
| imgContainer: { | ||
| width: '100%', | ||
| height: '70%', | ||
| margin: '0%', | ||
| overflow: 'hidden' | ||
| }, | ||
|
|
||
| carouselImg: { | ||
| display: 'block', | ||
| width: '150%', | ||
| height: '70%', | ||
| margin: '-10% 0% 0% -35%'} | ||
| } | ||
|
|
||
| const classes = styles; | ||
|
|
||
| return ( | ||
|
|
||
| <figure className='imgContainer' style={styles.imgContainer}> | ||
| <img src={Leaf} alt={"Side picture - well-being"} style={styles.carouselImg} /> | ||
| </figure> | ||
| ) | ||
| } | ||
|
|
||
| export default ImageCarousel; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,77 @@ | ||
| import React, { Fragment } from "react"; | ||
|
|
||
| import "./TeamMemberCard.css"; | ||
| import TeamMembersListComponent from "./TeamMembersList"; | ||
|
|
||
| import {withStyles } from '@material-ui/core/styles'; | ||
| import { makeStyles, useTheme } from '@material-ui/core/styles'; | ||
|
|
||
| const AboutUsContent = () => { | ||
|
|
||
| const styles = { | ||
| contentHeader: { | ||
| color: '#fff', | ||
| padding: '12px 24px', | ||
| margin: '0%', | ||
| backgroundColor: '#364954' | ||
| }, | ||
|
|
||
| contentInfoText: { | ||
| textAlign: 'justify', | ||
| padding: '24px', | ||
| margin: '0px', | ||
| backgroundColor: '#364954', | ||
| color: '#fff' | ||
| }, | ||
|
|
||
| contentList: { | ||
| listStyleType: 'none', | ||
| padding: '0px 24px', | ||
| margin: '0px auto', | ||
| display: 'flex', | ||
| justifyContent: 'space-around', | ||
| color: '#fff' | ||
|
|
||
| }, | ||
|
|
||
| contentListPosition: { | ||
| width: '100px', | ||
| margin: '0% 5% 2.5%' | ||
| }, | ||
| } | ||
|
|
||
| return ( | ||
| <div style={{display: 'flex', flexDirection: 'column', justifyContent: 'space-between'}}> | ||
|
|
||
| <article> | ||
| <h2 style={styles.contentHeader}>Poznaj nas</h2> | ||
|
|
||
| <p style={styles.contentInfoText}> | ||
| Żyjemy w świecie, w którym wiele osób boryka się z problemami zdrowotnymi oraz brakiem czasu. Dlatego w odpowiedzi na rosnące zapotrzebowanie postanowiliśmy stworzyć narzędzie online, dzięki któremu możesz kontrolować, dietę, treningi, utrzymywać równowagę psychofizyczna oraz motywacje. | ||
| Naszą misją jest inspirowanie ludzi do zdrowego stylu życia przy jednoczesnym dostarczeniu produktu opartego o najnowsze technologie. Chcemy Cię przekonać, że zdrowy styl życia może być prosty, szybki i niedrogi. | ||
| <br/><br/> | ||
| To proste. Uda się! | ||
| <br/><br/> | ||
| Założyciele Vitaminy | ||
| </p> | ||
| </article> | ||
|
|
||
| <TeamMembersListComponent /> | ||
|
|
||
| <article style={styles.contentMoreInfo}> | ||
|
|
||
| <h3 style={{padding: '0px 24px'}}>Dowiedz się więcej:</h3> | ||
|
|
||
| <ul style={styles.contentList}> | ||
| <li style={styles.contentListPosition}><a href='#' style={styles.contentLink}>Facebook</a></li> | ||
| <li style={styles.contentListPosition}><a href='#' style={styles.contentLink}>Instagram</a></li> | ||
| <li style={styles.contentListPosition}><a href='#' style={styles.contentLink}>Twitter</a></li> | ||
| </ul> | ||
|
|
||
| </article> | ||
|
|
||
| </div> | ||
| ) | ||
| } | ||
|
|
||
| export default AboutUsContent; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.