diff --git a/LICENSE b/LICENSE index 5169a5e..261eeb9 100644 --- a/LICENSE +++ b/LICENSE @@ -1,22 +1,201 @@ -The MIT License (MIT) + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ -Copyright (c) 2015 gatsbyjs + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION -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: + 1. Definitions. -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. -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. + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/README.md b/README.md index 2b670dd..e84a9ba 100644 --- a/README.md +++ b/README.md @@ -1,97 +1 @@ - -

- - Gatsby - -

-

- Gatsby's default starter -

- -Kick off your project with this default boilerplate. This starter ships with the main Gatsby configuration files you might need to get up and running blazing fast with the blazing fast app generator for React. - -_Have another more specific idea? You may want to check out our vibrant collection of [official and community-created starters](https://www.gatsbyjs.org/docs/gatsby-starters/)._ - -## πŸš€ Quick start - -1. **Create a Gatsby site.** - - Use the Gatsby CLI to create a new site, specifying the default starter. - - ```shell - # create a new Gatsby site using the default starter - gatsby new my-default-starter https://github.com/gatsbyjs/gatsby-starter-default - ``` - -1. **Start developing.** - - Navigate into your new site’s directory and start it up. - - ```shell - cd my-default-starter/ - gatsby develop - ``` - -1. **Open the source code and start editing!** - - Your site is now running at `http://localhost:8000`! - - _Note: You'll also see a second link: _`http://localhost:8000/___graphql`_. This is a tool you can use to experiment with querying your data. Learn more about using this tool in the [Gatsby tutorial](https://www.gatsbyjs.org/tutorial/part-five/#introducing-graphiql)._ - - Open the `my-default-starter` directory in your code editor of choice and edit `src/pages/index.js`. Save your changes and the browser will update in real time! - -## 🧐 What's inside? - -A quick look at the top-level files and directories you'll see in a Gatsby project. - - . - β”œβ”€β”€ node_modules - β”œβ”€β”€ src - β”œβ”€β”€ .gitignore - β”œβ”€β”€ .prettierrc - β”œβ”€β”€ gatsby-browser.js - β”œβ”€β”€ gatsby-config.js - β”œβ”€β”€ gatsby-node.js - β”œβ”€β”€ gatsby-ssr.js - β”œβ”€β”€ LICENSE - β”œβ”€β”€ package-lock.json - β”œβ”€β”€ package.json - └── README.md - -1. **`/node_modules`**: This directory contains all of the modules of code that your project depends on (npm packages) are automatically installed. - -2. **`/src`**: This directory will contain all of the code related to what you will see on the front-end of your site (what you see in the browser) such as your site header or a page template. `src` is a convention for β€œsource code”. - -3. **`.gitignore`**: This file tells git which files it should not track / not maintain a version history for. - -4. **`.prettierrc`**: This is a configuration file for [Prettier](https://prettier.io/). Prettier is a tool to help keep the formatting of your code consistent. - -5. **`gatsby-browser.js`**: This file is where Gatsby expects to find any usage of the [Gatsby browser APIs](https://www.gatsbyjs.org/docs/browser-apis/) (if any). These allow customization/extension of default Gatsby settings affecting the browser. - -6. **`gatsby-config.js`**: This is the main configuration file for a Gatsby site. This is where you can specify information about your site (metadata) like the site title and description, which Gatsby plugins you’d like to include, etc. (Check out the [config docs](https://www.gatsbyjs.org/docs/gatsby-config/) for more detail). - -7. **`gatsby-node.js`**: This file is where Gatsby expects to find any usage of the [Gatsby Node APIs](https://www.gatsbyjs.org/docs/node-apis/) (if any). These allow customization/extension of default Gatsby settings affecting pieces of the site build process. - -8. **`gatsby-ssr.js`**: This file is where Gatsby expects to find any usage of the [Gatsby server-side rendering APIs](https://www.gatsbyjs.org/docs/ssr-apis/) (if any). These allow customization of default Gatsby settings affecting server-side rendering. - -9. **`LICENSE`**: Gatsby is licensed under the MIT license. - -10. **`package-lock.json`** (See `package.json` below, first). This is an automatically generated file based on the exact versions of your npm dependencies that were installed for your project. **(You won’t change this file directly).** - -11. **`package.json`**: A manifest file for Node.js projects, which includes things like metadata (the project’s name, author, etc). This manifest is how npm knows which packages to install for your project. - -12. **`README.md`**: A text file containing useful reference information about your project. - -## πŸŽ“ Learning Gatsby - -Looking for more guidance? Full documentation for Gatsby lives [on the website](https://www.gatsbyjs.org/). Here are some places to start: - -- **For most developers, we recommend starting with our [in-depth tutorial for creating a site with Gatsby](https://www.gatsbyjs.org/tutorial/).** It starts with zero assumptions about your level of ability and walks through every step of the process. - -- **To dive straight into code samples, head [to our documentation](https://www.gatsbyjs.org/docs/).** In particular, check out the _Guides_, _API Reference_, and _Advanced Tutorials_ sections in the sidebar. - -## πŸ’« Deploy - -[![Deploy to Netlify](https://www.netlify.com/img/deploy/button.svg)](https://app.netlify.com/start/deploy?repository=https://github.com/gatsbyjs/gatsby-starter-default) - - +# training-lab \ No newline at end of file diff --git a/gatsby-config.js b/gatsby-config.js index 999bd3d..8f86cb4 100644 --- a/gatsby-config.js +++ b/gatsby-config.js @@ -1,34 +1,39 @@ module.exports = { siteMetadata: { - title: `Gatsby Default Starter`, - description: `Kick off your next, great Gatsby project with this default starter. This barebones starter ships with the main Gatsby configuration files you might need.`, - author: `@gatsbyjs`, + title: 'Ovio Lab', + description: 'Simple React page for training', + author: '@ovio', }, plugins: [ - `gatsby-plugin-react-helmet`, + 'gatsby-plugin-react-helmet', { - resolve: `gatsby-source-filesystem`, + resolve: 'gatsby-source-filesystem', options: { - name: `images`, + name: 'images', path: `${__dirname}/src/images`, }, }, - `gatsby-transformer-sharp`, - `gatsby-plugin-sharp`, + 'gatsby-transformer-sharp', + 'gatsby-plugin-sharp', { - resolve: `gatsby-plugin-manifest`, + resolve: 'gatsby-plugin-manifest', options: { - name: `gatsby-starter-default`, - short_name: `starter`, - start_url: `/`, - background_color: `#663399`, - theme_color: `#663399`, - display: `minimal-ui`, - icon: `src/images/gatsby-icon.png`, // This path is relative to the root of the site. + name: 'gatsby-starter-default', + short_name: 'starter', + start_url: '/', + background_color: '#663399', + theme_color: '#663399', + display: 'minimal-ui', + icon: 'src/images/icon.png', + }, + }, + { + resolve: `gatsby-plugin-material-ui`, + options: { + stylesProvider: { + injectFirst: true, + }, }, }, - // this (optional) plugin enables Progressive Web App + Offline functionality - // To learn more, visit: https://gatsby.dev/offline - // `gatsby-plugin-offline`, ], } diff --git a/package.json b/package.json index dac7673..ca3991d 100644 --- a/package.json +++ b/package.json @@ -1,22 +1,27 @@ { - "name": "gatsby-starter-default", + "name": "ovio-lab", "private": true, - "description": "A simple starter to get up and developing quickly with Gatsby", + "description": "Simple React page for training", "version": "0.1.0", - "author": "Kyle Mathews ", + "author": "Mamadou Ouologuem ", "dependencies": { + "@material-ui/core": "^4.9.0", + "@material-ui/icons": "^4.5.1", + "@material-ui/styles": "^4.9.0", + "classnames": "^2.2.6", "gatsby": "^2.19.7", - "gatsby-image": "^2.2.39", "gatsby-plugin-manifest": "^2.2.39", - "gatsby-plugin-offline": "^3.0.32", + "gatsby-plugin-material-ui": "^2.1.6", "gatsby-plugin-react-helmet": "^3.1.21", "gatsby-plugin-sharp": "^2.4.3", "gatsby-source-filesystem": "^2.1.46", "gatsby-transformer-sharp": "^2.3.13", + "lodash": "^4.17.15", "prop-types": "^15.7.2", "react": "^16.12.0", "react-dom": "^16.12.0", - "react-helmet": "^5.2.1" + "react-helmet": "^5.2.1", + "react-shapes": "^0.1.0" }, "devDependencies": { "prettier": "^1.19.1" @@ -26,10 +31,10 @@ ], "license": "MIT", "scripts": { + "dev": "npm run develop", "build": "gatsby build", "develop": "gatsby develop", "format": "prettier --write \"**/*.{js,jsx,json,md}\"", - "start": "npm run develop", "serve": "gatsby serve", "clean": "gatsby clean", "test": "echo \"Write tests! -> https://gatsby.dev/unit-testing\" && exit 1" diff --git a/src/components/Block.js b/src/components/Block.js new file mode 100644 index 0000000..9b54c19 --- /dev/null +++ b/src/components/Block.js @@ -0,0 +1,42 @@ +/** + * Block component documentation: + * This component display a block with a background color and containing a geometric shape + * @param size The size of the block (a number from 0 to 12) + * @param backgroundColor The background color of the block + * @param shape The shape ("cirlce", "rectangle", "ellipse", "line" or "triangle") of + * the Geometric Objects contained in the block + * @param shapeColor The color of shape contained in the block + * Available colors are located in 'src/constants.js' + */ + +import React from 'react'; +import classnames from 'classnames'; +import { mapValues } from 'lodash'; +import { Grid, withStyles } from '@material-ui/core'; + +import GeometricObjects from './ui/GeometricObjects'; +import { colors } from '../constants'; + +const Block = ({ backgroundColor, size, classes, ...props }) => ( + + + +); + +const style = () => ({ + container: { + display: 'flex', + justifyContent: 'center', + alignItems: 'center', + height: 250, + }, + ...(mapValues(colors, (color) => ({ + backgroundColor: color, + }))), +}); + +export default withStyles(style)(Block); diff --git a/src/components/Footer.js b/src/components/Footer.js new file mode 100644 index 0000000..ed66bef --- /dev/null +++ b/src/components/Footer.js @@ -0,0 +1,23 @@ +/** + * The Footer of the website + * ❌ No need to edit ❌ + */ + +import React from 'react'; +import { withStyles } from '@material-ui/core'; + +const Footer = ({ classes }) => ( +
+ Β© {new Date().getFullYear()}, Built with + {` `} + Gatsby +
+); + +const styles = () => ({ + footer: { + marginTop: 64, + }, +}); + +export default withStyles(styles)(Footer); diff --git a/src/components/TreeFractal.js b/src/components/TreeFractal.js new file mode 100644 index 0000000..e995bde --- /dev/null +++ b/src/components/TreeFractal.js @@ -0,0 +1,45 @@ +import React, { useEffect } from 'react'; +import { withStyles } from '@material-ui/core'; + +import { draw } from '../utils/draw-functions'; + +const TreeFractal = ({ classes }) => { + // βœ… Begin: Section to edit + const canvasWidth = 1200; + const canvasHeight = 1200; + // ❌ End: Section to edit + + useEffect(() => { + const canvas = document.getElementById('canvas'); + const ctx = canvas.getContext('2d'); + + // βœ… Begin: Section to edit + + // draw(ctx, startX, startY, len, angle, branchWidth, color, leaf, shadow) + // example draw(ctx, 10, 100, 120, 0, 10, 'darkBlue', true, false) + draw(ctx, 600, 600, 120, 0, 10, 'darkBlue'); + + // ❌ End: Section to edit + + }, []); + + return ( +
+ +
+ ); +}; + +const styles = () => ({ + container: { + display: 'flex', + justifyContent: 'center', + alignItems: 'center', + }, + + canvas: { + border: '1px solid' + }, +}) + +export default withStyles(styles)(TreeFractal); diff --git a/src/components/header.js b/src/components/header.js index 8990b7e..dbc4a1f 100644 --- a/src/components/header.js +++ b/src/components/header.js @@ -1,42 +1,56 @@ -import { Link } from "gatsby" -import PropTypes from "prop-types" -import React from "react" - -const Header = ({ siteTitle }) => ( -
-
-

- - {siteTitle} - -

-
-
-) - -Header.propTypes = { - siteTitle: PropTypes.string, -} - -Header.defaultProps = { - siteTitle: ``, -} - -export default Header +/** + * The header (including the Nav Bar) of the website. + * ❌ No need to edit ❌ + */ + +import React from 'react'; +import { Grid, AppBar, Toolbar, Typography, withStyles } from '@material-ui/core'; +import { Link } from 'gatsby'; + +import Logo from './ui/Logo'; + +const pages = [ + { text: 'Home', path: '/' }, + { text: 'Fractal', path: '/fractal' }, + { text: 'Rank', path: '/rank' }, +]; + +const Header = ({ classes }) => ( +
+ + + + + + + + + {pages.map(({ text, path }) => ( + + {text} + + ))} + + + + +
+); + +const styles = (theme) => ({ + root: { + flexGrow: 1, + }, + menu: { + display: 'flex', + justifyContent: 'flex-end', + }, + menuItem: { + margin: 16, + textDecoration: 'none', + color: theme.palette.secondary.main, + }, +}); + + +export default withStyles(styles)(Header); diff --git a/src/components/image.js b/src/components/image.js deleted file mode 100644 index e61edb6..0000000 --- a/src/components/image.js +++ /dev/null @@ -1,32 +0,0 @@ -import React from "react" -import { useStaticQuery, graphql } from "gatsby" -import Img from "gatsby-image" - -/* - * This component is built using `gatsby-image` to automatically serve optimized - * images with lazy loading and reduced file sizes. The image is loaded using a - * `useStaticQuery`, which allows us to load the image from directly within this - * component, rather than having to pass the image data down from pages. - * - * For more information, see the docs: - * - `gatsby-image`: https://gatsby.dev/gatsby-image - * - `useStaticQuery`: https://www.gatsbyjs.org/docs/use-static-query/ - */ - -const Image = () => { - const data = useStaticQuery(graphql` - query { - placeholderImage: file(relativePath: { eq: "gatsby-astronaut.png" }) { - childImageSharp { - fluid(maxWidth: 300) { - ...GatsbyImageSharpFluid - } - } - } - } - `) - - return -} - -export default Image diff --git a/src/components/layout.js b/src/components/layout.js deleted file mode 100644 index 0359ea6..0000000 --- a/src/components/layout.js +++ /dev/null @@ -1,51 +0,0 @@ -/** - * Layout component that queries for data - * with Gatsby's useStaticQuery component - * - * See: https://www.gatsbyjs.org/docs/use-static-query/ - */ - -import React from "react" -import PropTypes from "prop-types" -import { useStaticQuery, graphql } from "gatsby" - -import Header from "./header" -import "./layout.css" - -const Layout = ({ children }) => { - const data = useStaticQuery(graphql` - query SiteTitleQuery { - site { - siteMetadata { - title - } - } - } - `) - - return ( - <> -
-
-
{children}
-
- Β© {new Date().getFullYear()}, Built with - {` `} - Gatsby -
-
- - ) -} - -Layout.propTypes = { - children: PropTypes.node.isRequired, -} - -export default Layout diff --git a/src/components/seo.js b/src/components/seo.js deleted file mode 100644 index e15f599..0000000 --- a/src/components/seo.js +++ /dev/null @@ -1,88 +0,0 @@ -/** - * SEO component that queries for data with - * Gatsby's useStaticQuery React hook - * - * See: https://www.gatsbyjs.org/docs/use-static-query/ - */ - -import React from "react" -import PropTypes from "prop-types" -import Helmet from "react-helmet" -import { useStaticQuery, graphql } from "gatsby" - -function SEO({ description, lang, meta, title }) { - const { site } = useStaticQuery( - graphql` - query { - site { - siteMetadata { - title - description - author - } - } - } - ` - ) - - const metaDescription = description || site.siteMetadata.description - - return ( - - ) -} - -SEO.defaultProps = { - lang: `en`, - meta: [], - description: ``, -} - -SEO.propTypes = { - description: PropTypes.string, - lang: PropTypes.string, - meta: PropTypes.arrayOf(PropTypes.object), - title: PropTypes.string.isRequired, -} - -export default SEO diff --git a/src/components/ui/GeometricObjects.js b/src/components/ui/GeometricObjects.js new file mode 100644 index 0000000..1c1f926 --- /dev/null +++ b/src/components/ui/GeometricObjects.js @@ -0,0 +1,67 @@ +/** + * GeometricObjects component documentation: + * This component display a geometric shape + * @param shape The shape ("cirlce", "rectangle", "ellipse", "line" or "triangle") to display + * @param shapeColor The color of shape + * Available colors are located in 'src/constants.js' + * You can provide more parameters based on http://rsamec.github.io/react-shapes/ documentation + */ + +import React from 'react'; +import { Circle, Rectangle, Ellipse, Line, Triangle } from 'react-shapes'; + +import { colors } from '../../constants'; + +const defaultsProps = { + cirlce: { + r: 125, + }, + rectangle: { + width: 250, + height: 250, + }, + ellipse: { + rx: 110, + ry: 125, + }, + line: { + x1: 50, + y1: 50, + x2: 50, + y2: 300, + strokeWidth: 25 + }, + triangle: { + width: 250, + height: 250, + }, +} + +const GeometricObjects = ({ shape = 'cirlce', shapeColor, ...props }) => { + const defaultProps = defaultsProps[shape]; + const shapeProps = Object.assign( + {}, + defaultProps, + { + fill: { color: colors[shapeColor] || 'grey' }, + stroke: { color: colors[shapeColor] || 'grey' }, + }, + props, + ); + switch (shape) { + case 'cirlce': + return + case 'rectangle': + return + case 'ellipse': + return + case 'line': + return + case 'triangle': + return + default: + + } +}; + +export default GeometricObjects; diff --git a/src/components/ui/Logo.js b/src/components/ui/Logo.js new file mode 100644 index 0000000..de15760 --- /dev/null +++ b/src/components/ui/Logo.js @@ -0,0 +1,32 @@ +/** + * The logo of the website + * ❌ No need to edit ❌ + */ + +import React from 'react'; +import { withStyles } from '@material-ui/core'; +import { Link } from 'gatsby'; + +import logo from '../../images/logo.svg'; + +const Logo = ({ classes }) => ( +
+ + Ovio lab logo + +
+); + +const styles = (theme) => ({ + root: { + display: 'flex', + alignItems: 'center', + height: '100%', + }, + logo: { + margin: 'auto', + }, +}); + + +export default withStyles(styles)(Logo); diff --git a/src/constants.js b/src/constants.js new file mode 100644 index 0000000..ca91e88 --- /dev/null +++ b/src/constants.js @@ -0,0 +1,9 @@ +/** + * Contains variables shared by the differents components + */ + +export const colors = { + white: '#FFFFFF', + darkBlue: '#2F4058', + orange: '#F47820', +}; diff --git a/src/images/gatsby-astronaut.png b/src/images/gatsby-astronaut.png deleted file mode 100644 index da58ece..0000000 Binary files a/src/images/gatsby-astronaut.png and /dev/null differ diff --git a/src/images/gatsby-icon.png b/src/images/gatsby-icon.png deleted file mode 100644 index 908bc78..0000000 Binary files a/src/images/gatsby-icon.png and /dev/null differ diff --git a/src/images/icon.png b/src/images/icon.png new file mode 100644 index 0000000..99065c0 Binary files /dev/null and b/src/images/icon.png differ diff --git a/src/images/logo.svg b/src/images/logo.svg new file mode 100644 index 0000000..4a5f4fb --- /dev/null +++ b/src/images/logo.svg @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/components/layout.css b/src/layouts/layout.css similarity index 99% rename from src/components/layout.css rename to src/layouts/layout.css index b6f6332..01a5804 100644 --- a/src/components/layout.css +++ b/src/layouts/layout.css @@ -1,3 +1,8 @@ +/** + * The global style of the website + * ❌ No need to edit ❌ + */ + html { font-family: sans-serif; -ms-text-size-adjust: 100%; diff --git a/src/layouts/layout.js b/src/layouts/layout.js new file mode 100644 index 0000000..7ffc53c --- /dev/null +++ b/src/layouts/layout.js @@ -0,0 +1,39 @@ +/** + * The Layout component just add a theme to the website + * ❌ No need to edit ❌ + */ + +import React from 'react'; +import PropTypes from 'prop-types'; +import { createMuiTheme } from '@material-ui/core'; +import { ThemeProvider } from '@material-ui/core/styles'; + +import './layout.css'; +import { colors } from '../constants'; + +export const theme = createMuiTheme({ + palette: { + primary: { + main: `${colors.white}`, + }, + secondary: { + main: `${colors.darkBlue}`, + }, + text: { + primary: colors.darkBlue, + secondary: colors.orange, + }, + }, +}); + +const Layout = ({ children }) => ( + +
{children}
+ +); + +Layout.propTypes = { + children: PropTypes.node.isRequired, +}; + +export default Layout; diff --git a/src/pages/404.js b/src/pages/404.js index bc4c31d..9fb4937 100644 --- a/src/pages/404.js +++ b/src/pages/404.js @@ -1,14 +1,17 @@ -import React from "react" +/** + * The Page render when the url is not found + * ❌ No need to edit ❌ + */ -import Layout from "../components/layout" -import SEO from "../components/seo" +import React from 'react'; + +import Layout from '../layouts/layout'; const NotFoundPage = () => ( -

NOT FOUND

You just hit a route that doesn't exist... the sadness.

 -) +); -export default NotFoundPage +export default NotFoundPage; diff --git a/src/pages/fractal.js b/src/pages/fractal.js new file mode 100644 index 0000000..214daf5 --- /dev/null +++ b/src/pages/fractal.js @@ -0,0 +1,17 @@ +/** + * The Fractal page + */ + +import React from 'react'; +import Layout from '../layouts/layout'; +import Header from '../components/Header'; +import Footer from '../components/Footer'; + +const IndexPage = () => ( + +
+