diff --git a/debug.log b/debug.log index 1849ce1..d03d883 100644 --- a/debug.log +++ b/debug.log @@ -182,3 +182,26 @@ [0802/042559.668:ERROR:crash_report_database_win.cc(469)] failed to stat report [0802/042559.668:ERROR:crash_report_database_win.cc(469)] failed to stat report [0802/042559.668:ERROR:crash_report_database_win.cc(469)] failed to stat report +[0820/023734.013:ERROR:crash_report_database_win.cc(469)] failed to stat report +[0820/023734.014:ERROR:crash_report_database_win.cc(469)] failed to stat report +[0820/023734.014:ERROR:crash_report_database_win.cc(469)] failed to stat report +[0820/023734.014:ERROR:crash_report_database_win.cc(469)] failed to stat report +[0820/023734.014:ERROR:crash_report_database_win.cc(469)] failed to stat report +[0820/023734.014:ERROR:crash_report_database_win.cc(469)] failed to stat report +[0820/023734.014:ERROR:crash_report_database_win.cc(469)] failed to stat report +[0820/023734.014:ERROR:crash_report_database_win.cc(469)] failed to stat report +[0820/023734.014:ERROR:crash_report_database_win.cc(469)] failed to stat report +[0820/023734.014:ERROR:crash_report_database_win.cc(469)] failed to stat report +[0820/023734.014:ERROR:crash_report_database_win.cc(469)] failed to stat report +[0820/023734.014:ERROR:crash_report_database_win.cc(469)] failed to stat report +[0820/023734.014:ERROR:crash_report_database_win.cc(469)] failed to stat report +[0820/023734.014:ERROR:crash_report_database_win.cc(469)] failed to stat report +[0820/023734.014:ERROR:crash_report_database_win.cc(469)] failed to stat report +[0820/023734.014:ERROR:crash_report_database_win.cc(469)] failed to stat report +[0820/023734.014:ERROR:crash_report_database_win.cc(469)] failed to stat report +[0820/023734.014:ERROR:crash_report_database_win.cc(469)] failed to stat report +[0820/023734.014:ERROR:crash_report_database_win.cc(469)] failed to stat report +[0820/023734.014:ERROR:crash_report_database_win.cc(469)] failed to stat report +[0820/023734.014:ERROR:crash_report_database_win.cc(469)] failed to stat report +[0820/023734.014:ERROR:crash_report_database_win.cc(469)] failed to stat report +[0820/023734.014:ERROR:crash_report_database_win.cc(469)] failed to stat report diff --git a/src/components/About.jsx b/src/components/About.jsx index 6ebeb24..78531a3 100644 --- a/src/components/About.jsx +++ b/src/components/About.jsx @@ -2,7 +2,10 @@ import React, { Fragment } from "react"; import TeamMemberCard from "./TeamMemberCard.jsx"; import { MembersList } from "./TeamMemberList"; -import "./TeamMemberCard.css" +import "./TeamMemberCard.css"; +import TeamMembersListComponent from "./TeamMembersList"; +import ImageCarousel from "./AboutUsCarousel"; +import AboutUsContent from "./AboutUsContent"; import CssBaseline from '@material-ui/core/CssBaseline'; import Typography from '@material-ui/core/Typography'; @@ -11,80 +14,61 @@ import Container from '@material-ui/core/Container'; import {withStyles } from '@material-ui/core/styles'; import Grid from '@material-ui/core/Grid'; +import { List } from "@material-ui/core"; + // The example data is structured as follows: - const styles = { - root: { - display: 'flex', - flexWrap: 'wrap', - justifyContent: 'flex-start', - overflow: 'hidden', - padding: 0 - }, - x: { - margin: 50 - }, - gridList: { - width: 500, - height: 450, - - display: 'flex', - flexWrap: 'wrap', - justifyContent: 'flex-start', - overflow: 'hidden', - padding: 0 - } +const styles = { + root: { + display: 'flex', + flexWrap: 'wrap', + justifyContent: 'flex-start', + overflow: 'hidden', + padding: 0 + }, + x: { + margin: 50 + }, + + container: { + width: '90%', + height: '90%', + padding: '0px', - - // tileStyling: { - // width: 100, - // height: 450, - // }, - - // boxShadow:{ - // boxShadow: '3px 3px 5px #aaaaaa', - // margin: '5px', - // padding: '0 !important' - // } - }; + display: "flex", + flexWrap: "nowrap", - const classes = styles; + boxShadow: "3px 3px 5px #aaaaaa" + }, + imgCarousel: { + gridArea:'img', + width: '40%', + height: '100%' + }, + infoContent: { + gridArea: 'content', + width: '60%' + } +}; + +const classes = styles; const About = () => ( + + -
-

About Us

-
- - -
    - - { - MembersList.map((member) => ( -
  • - -
    • - )) - } -
- + - + + + + ); diff --git a/src/components/AboutUsCarousel.css b/src/components/AboutUsCarousel.css new file mode 100644 index 0000000..5e96a22 --- /dev/null +++ b/src/components/AboutUsCarousel.css @@ -0,0 +1,5 @@ +@media screen and (max-width: 1500px) { + .imgContainer { + display: none; + } +} \ No newline at end of file diff --git a/src/components/AboutUsCarousel.js b/src/components/AboutUsCarousel.js new file mode 100644 index 0000000..0812551 --- /dev/null +++ b/src/components/AboutUsCarousel.js @@ -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 ( + +
+ {"Side +
+ ) +} + +export default ImageCarousel; \ No newline at end of file diff --git a/src/components/AboutUsContent.js b/src/components/AboutUsContent.js new file mode 100644 index 0000000..c29dbd5 --- /dev/null +++ b/src/components/AboutUsContent.js @@ -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 ( +
+ +
+

Poznaj nas

+ +

+ Ż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. +

+ To proste. Uda się! +

+ Założyciele Vitaminy +

+
+ + + + + +
+ ) +} + +export default AboutUsContent; \ No newline at end of file diff --git a/src/components/TeamMemberCard.jsx b/src/components/TeamMemberCard.jsx index 25fc3ee..2e3783c 100644 --- a/src/components/TeamMemberCard.jsx +++ b/src/components/TeamMemberCard.jsx @@ -4,11 +4,33 @@ import { MembersList } from "./TeamMemberList"; import "./TeamMemberCard.css"; +import GitHubImg from "./image/github.svg"; +import FacebookImg from "./image/facebook.svg"; +import LinkedInImg from "./image/linkedin.svg"; + const TeamMemberCard = ( {card} ) => (
-
+ style={{ + display: 'block', + flexWrap: 'wrap', + flexDirection: 'column', + width: '100%', + height: '100%', + marginLeft: 'auto', + marginRight: 'auto', + alignItems: 'center', + alignContent: 'center', + textAlign: 'center', + border: 'solid 1px rgba(39, 39, 39, 0.2)' + }}> + +
Zdjęcie członka zespołu ( style={{width: '100%', height: '100%', borderRadius: 'inherit'}} />
-

{card.name}

-

{card.title}

+

{card.name}

+

{card.title}

+ +
+ + + + + + + + + + + +
) diff --git a/src/components/TeamMemberList.jsx b/src/components/TeamMemberList.jsx index cf822c5..7ec031c 100644 --- a/src/components/TeamMemberList.jsx +++ b/src/components/TeamMemberList.jsx @@ -4,8 +4,8 @@ import TeamMemberImg3 from "./image/Ania__awesome__pic.jpg"; import TeamMemberImg4 from "./image/Mikolaj__awesome__pic.jpg"; export const MembersList = [ - { id: 1, name: "Paulina Lebiecka", title: "UX/UI Designer", img: TeamMemberImg1 }, - { id: 2, name: "Michał Pastewski", title: "Front-End Developer", img: TeamMemberImg2 }, - { id: 3, name: "Anna Rutkowska", title: "Front-End Developer", img: TeamMemberImg3 }, - { id: 4, name: "Mikołaj Jędrak", title: "Front-End Developer", img: TeamMemberImg4 }, + { id: 1, name: "Paulina Lebiecka", title: "UX/UI Designer", img: TeamMemberImg1, urlGH: "https://github.com/paulinalebiecka", urlFB: "https://www.facebook.com/paulina.lebiecka/", urlLN: "https://www.linkedin.com/in/paulina-lebiecka-2b993518a/" }, + { id: 2, name: "Michał Pastewski", title: "Front-End Developer", img: TeamMemberImg2, urlGH: "https://github.com/michael-pastewski", urlFB: "https://www.facebook.com/michpastewski", urlLN: "https://www.linkedin.com/in/michal-pastewski" }, + { id: 3, name: "Anna Rutkowska", title: "Front-End Developer", img: TeamMemberImg3, urlGH: "https://github.com/rutkows-anna", urlFB: "https://www.facebook.com/ania.rutkowska.980", urlLN: "https://www.linkedin.com/in/rutkows-anna/" }, + { id: 4, name: "Mikołaj Jędrak", title: "Front-End Developer", img: TeamMemberImg4, urlGH: "https://github.com/KubaJedrak", urlFB: "https://www.facebook.com/kuba.jedrak", urlLN: "https://www.linkedin.com/in/miko%C5%82aj-j%C4%99drak-a148a5160/" }, ] \ No newline at end of file diff --git a/src/components/TeamMembersList.js b/src/components/TeamMembersList.js new file mode 100644 index 0000000..0db8147 --- /dev/null +++ b/src/components/TeamMembersList.js @@ -0,0 +1,70 @@ +import React from 'react'; + +import TeamMemberCard from "./TeamMemberCard.jsx"; +import { MembersList } from "./TeamMemberList"; +import "./TeamMemberCard.css"; + +import CssBaseline from '@material-ui/core/CssBaseline'; // ?? +import Grid from '@material-ui/core/Grid'; // ?? +import Container from '@material-ui/core/Container'; + +const styles = { + root: { + display: 'flex', + flexWrap: 'wrap', + justifyContent: 'flex-start', + overflow: 'hidden', + padding: 0 + }, + x: { + margin: 50 + }, + gridList: { + width: 500, + height: 450, + + display: 'flex', + flexWrap: 'wrap', + justifyContent: 'flex-start', + overflow: 'hidden', + padding: 0 + } +}; + +const classes = styles; + +const TeamMembersListComponent = () => ( + + <> + + + + + +) + +export default TeamMembersListComponent; + + + diff --git a/src/components/diary/DiaryItemCard.jsx b/src/components/diary/DiaryItemCard.jsx index 93c8d33..8469b91 100644 --- a/src/components/diary/DiaryItemCard.jsx +++ b/src/components/diary/DiaryItemCard.jsx @@ -15,7 +15,7 @@ const DiaryItemCard = ({ posts, postFilter, onDelete }) => { } } - if (posts[0].id === null) { + if (posts.lenght === 0) { return (

Jak się dziś czujesz?

To mieisce na Twoje przemyślenia i doznania, których doświadczasz na co dzięń...

diff --git a/src/components/image/facebook.svg b/src/components/image/facebook.svg new file mode 100644 index 0000000..29e2dfd --- /dev/null +++ b/src/components/image/facebook.svg @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + diff --git a/src/components/image/github.svg b/src/components/image/github.svg new file mode 100644 index 0000000..31fc879 --- /dev/null +++ b/src/components/image/github.svg @@ -0,0 +1,2 @@ + + diff --git a/src/components/image/leaf.jpeg b/src/components/image/leaf.jpeg new file mode 100644 index 0000000..4fdc35b Binary files /dev/null and b/src/components/image/leaf.jpeg differ diff --git a/src/components/image/linkedin.svg b/src/components/image/linkedin.svg new file mode 100644 index 0000000..4073952 --- /dev/null +++ b/src/components/image/linkedin.svg @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/components/image/modal.jpg b/src/components/image/modal.jpg new file mode 100644 index 0000000..e6912ea Binary files /dev/null and b/src/components/image/modal.jpg differ diff --git a/src/components/image/stay_healthy.jpg b/src/components/image/stay_healthy.jpg new file mode 100644 index 0000000..b6869ce Binary files /dev/null and b/src/components/image/stay_healthy.jpg differ