diff --git a/public/page/about/AboutPage.jsx b/public/page/about/AboutPage.jsx index d8883fa..f259335 100644 --- a/public/page/about/AboutPage.jsx +++ b/public/page/about/AboutPage.jsx @@ -23,37 +23,13 @@ import React from 'react'; import { connect } from 'react-redux'; -import Language from './../../language/Language'; -import { Link } from 'react-router-dom'; -import Page, { PageBoundary } from './../Page'; -import Section, { ImageSection, VideoSection, SplitSection, Split } from './../../section/Section'; -import FloatingContentBox from './../../content/FloatingContentBox'; -import ContentBox from './../../content/ContentBox'; -import Image from './../../image/Image'; -import Video from './../../video/Video'; -import { Title, Subtitle, Paragraph, Heading1 } from './../../typography/Typography'; -import ElementScrollFader from './../../animation/fade/ElementScrollFader'; +import Page from './../Page'; -const AboutPageBrand = (props) => { - let children; - let image = ; - - if(props.to) { - children = ( - - {image} - - ); - } else { - children = image; - } - - return ( - - {children} - - ); -}; +import BannerSection from './sections/BannerSection'; +import PromoVideoSection from './sections/PromoVideoSection'; +import ProgrammingSection from './sections/ProgrammingSection'; +import PlatformsSection from './sections/PlatformsSection'; +import ExistingWorkSection from './sections/ExistingWorkSection'; const AboutPage = (props) => { //Return @@ -61,230 +37,19 @@ const AboutPage = (props) => { { /* Banner */ } - - - - - { Language.get("pages.about.banner.title") } - { Language.get("pages.about.banner.subtitle") } - - - - + { /* Promo Video */ } -
- - - - - - - - - - - - - { Language.get("pages.about.video.heading") } - - - { Language.get("pages.about.video.paragraph") } - - - - - - - -
+ {/* Programming */} -
- - - - - { Language.get("pages.about.programming.heading") } - - - { Language.get("pages.about.programming.paragraph") } - - - - -
+ {/* Platforms */} -
- - - - { Language.get("pages.about.platforms.heading") } - - - -
- {/* Shopify */} - - {/* React */} - - - {/* MonoGame */} - - - {/* PGSQL */} - - - {/* NodeJS */} - - - {/* C# */} - - - {/* PHP */} - - - {/* Java */} - - - {/* neto */} - - - {/* MySQL */} - - - {/* Heroku */} - - - {/* OpenGL */} - - - {/* Discord */} - - - {/* Twitch */} - - - {/* Twitter */} - - - {/* Google Cloud */} - -
- - - - { Language.get("pages.about.platforms.footer") } - - - -
+ {/* Existing Work */} -
- - {/* Title */} - - - - - Some of my work - - Interested to see what I can do? Check out some of - my personal favourite projects! - - - - - - - {/* Empty Space */ - - - - - - - - -
- - + ); } diff --git a/public/page/about/sections/BannerSection.jsx b/public/page/about/sections/BannerSection.jsx new file mode 100644 index 0000000..e4b8618 --- /dev/null +++ b/public/page/about/sections/BannerSection.jsx @@ -0,0 +1,49 @@ +// Copyright (c) 2018 Dominic Masters +// +// MIT License +// +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +import React from 'react'; +import Language from './../../../language/Language'; +import { PageBoundary } from './../../Page'; +import { ImageSection } from './../../../section/Section'; +import FloatingContentBox from './../../../content/FloatingContentBox'; +import { Title, Subtitle } from './../../../typography/Typography'; +import ElementScrollFader from './../../../animation/fade/ElementScrollFader'; + + +export default (props) => { + return ( + + + + + { Language.get("pages.about.banner.title") } + { Language.get("pages.about.banner.subtitle") } + + + + + ); +} diff --git a/public/page/about/sections/ExistingWorkSection.jsx b/public/page/about/sections/ExistingWorkSection.jsx new file mode 100644 index 0000000..cf2d967 --- /dev/null +++ b/public/page/about/sections/ExistingWorkSection.jsx @@ -0,0 +1,57 @@ +// Copyright (c) 2018 Dominic Masters +// +// MIT License +// +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +import React from 'react'; +import Language from './../../../language/Language'; +import { PageBoundary } from './../../Page'; +import Section, { SplitSection, Split } from './../../../section/Section'; +import ContentBox from './../../../content/ContentBox'; +import { Title, Subtitle, Paragraph, Heading1 } from './../../../typography/Typography'; +import ElementScrollFader from './../../../animation/fade/ElementScrollFader'; + +export default (props) => { + return ( +
+ + {/* Title */} + + + + + Some of my work + + Interested to see what I can do? Check out some of + my personal favourite projects! + + + + + + + {/* Empty Space */} + + + +
+ ); +} diff --git a/public/page/about/sections/PlatformsSection.jsx b/public/page/about/sections/PlatformsSection.jsx new file mode 100644 index 0000000..f8b13c0 --- /dev/null +++ b/public/page/about/sections/PlatformsSection.jsx @@ -0,0 +1,189 @@ +// Copyright (c) 2018 Dominic Masters +// +// MIT License +// +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +import React from 'react'; +import Language from './../../../language/Language'; +import { PageBoundary } from './../../Page'; +import Section, { ImageSection, VideoSection, SplitSection, Split } from './../../../section/Section'; +import FloatingContentBox from './../../../content/FloatingContentBox'; +import ContentBox from './../../../content/ContentBox'; +import Image from './../../../image/Image'; +import Video from './../../../video/Video'; +import { Title, Subtitle, Paragraph, Heading1 } from './../../../typography/Typography'; +import ElementScrollFader from './../../../animation/fade/ElementScrollFader'; + +const Platform = (props) => { + let children; + let image = ; + + if(props.to) { + children = ( + + {image} + + ); + } else { + children = image; + } + + return ( + + {children} + + ); +}; + +export default (props) => { + return ( +
+ + + + { Language.get("pages.about.platforms.heading") } + + + +
+ {/* Shopify */} + + {/* React */} + + + {/* MonoGame */} + + + {/* PGSQL */} + + + {/* NodeJS */} + + + {/* C# */} + + + {/* PHP */} + + + {/* Java */} + + + {/* neto */} + + + {/* MySQL */} + + + {/* Heroku */} + + + {/* OpenGL */} + + + {/* Discord */} + + + {/* Twitch */} + + + {/* Twitter */} + + + {/* Google Cloud */} + +
+ + + + { Language.get("pages.about.platforms.footer") } + + + +
+ ); +} diff --git a/public/page/about/sections/ProgrammingSection.jsx b/public/page/about/sections/ProgrammingSection.jsx new file mode 100644 index 0000000..1bcbfcb --- /dev/null +++ b/public/page/about/sections/ProgrammingSection.jsx @@ -0,0 +1,50 @@ +// Copyright (c) 2018 Dominic Masters +// +// MIT License +// +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +import React from 'react'; +import { connect } from 'react-redux'; +import Language from './../../../language/Language'; +import { PageBoundary } from './../../Page'; +import Section from './../../../section/Section'; +import ContentBox from './../../../content/ContentBox'; +import { Title, Paragraph, Heading1 } from './../../../typography/Typography'; +import ElementScrollFader from './../../../animation/fade/ElementScrollFader'; + +export default (props) => { + return ( +
+ + + + + { Language.get("pages.about.programming.heading") } + + + { Language.get("pages.about.programming.paragraph") } + + + + +
+ ); +} diff --git a/public/page/about/sections/PromoVideoSection.jsx b/public/page/about/sections/PromoVideoSection.jsx new file mode 100644 index 0000000..b383291 --- /dev/null +++ b/public/page/about/sections/PromoVideoSection.jsx @@ -0,0 +1,68 @@ +// Copyright (c) 2018 Dominic Masters +// +// MIT License +// +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +import React from 'react'; +import Language from './../../../language/Language'; +import Page, { PageBoundary } from './../../Page'; +import Section, { SplitSection, Split } from './../../../section/Section'; +import FloatingContentBox from './../../../content/FloatingContentBox'; +import ContentBox from './../../../content/ContentBox'; +import Video from './../../../video/Video'; +import { Title, Subtitle, Paragraph, Heading1 } from './../../../typography/Typography'; +import ElementScrollFader from './../../../animation/fade/ElementScrollFader'; + + +export default (props) => { + return ( +
+ + + + + + + + + + + + + { Language.get("pages.about.video.heading") } + + + { Language.get("pages.about.video.paragraph") } + + + + + + + +
+ ); +}