diff --git a/config/changelog.yaml b/config/changelog.yaml index a9658095252..753f4cfddb8 100644 --- a/config/changelog.yaml +++ b/config/changelog.yaml @@ -12,9 +12,16 @@ Unreleased: Fixed: components: - Include basic themeing in Example component + - Updated the note and tip icons shin: - Removed unused lengthBonus option + Removed: + components: + - Removed the Emblem component + - Removed the Navbar component + - Removed the Ogol component + 2.10.7: date: 2020-11-18 Fixed: diff --git a/packages/components/src/Emblem/index.js b/packages/components/src/Emblem/index.js deleted file mode 100644 index dcc0aee220b..00000000000 --- a/packages/components/src/Emblem/index.js +++ /dev/null @@ -1,10 +0,0 @@ -import React from 'react' - -const Emblem = (props) => ( - - {props.t1 || 'Free'} - {props.t2 || 'Sewing'} - -) - -export default Emblem diff --git a/packages/components/src/Emblem/stories.js b/packages/components/src/Emblem/stories.js deleted file mode 100644 index 495da4ee44f..00000000000 --- a/packages/components/src/Emblem/stories.js +++ /dev/null @@ -1,7 +0,0 @@ -import React from "react"; -import { storiesOf } from "@storybook/react"; -import Emblem from "."; - -storiesOf("Emblem", module).add("FreeSewing", () => ( - -)); diff --git a/packages/components/src/Navbar/index.js b/packages/components/src/Navbar/index.js deleted file mode 100644 index f4cfe19c6bf..00000000000 --- a/packages/components/src/Navbar/index.js +++ /dev/null @@ -1,86 +0,0 @@ -import React from 'react' -import Logo from '../Logo' -import Emblem from '../Emblem' -import { FormattedMessage } from 'react-intl' -import useMediaQuery from '@material-ui/core/useMediaQuery' - -const Navbar = ({ - home = 'https://freesewing.org/', - navs = { left: [], right: [], mleft: {}, mright: {} }, - logo = , - emblem = -}) => { - const mobile = useMediaQuery('(max-width:599px)') - - if (mobile) return null - - const renderNav = (key, nav) => { - let title = nav.title || nav.text - let text = - typeof nav.text === 'string' ? ( - - ) : ( - nav.text - ) - if (nav.type === 'component') return nav.component - else if (nav.type === 'button') - return ( - - ) - return ( - - {text} - - ) - } - - let homeProps = { - href: '#home' - } - if (typeof home === 'function') homeProps.onClick = home - else homeProps.href = home - - let logoDiv = ( -
- - {logo} - -
- ) - let emblemDiv = ( -
- {emblem} -
- ) - return ( -
-
-
- {logoDiv} - {emblemDiv} - {Object.keys(navs.left).map((key) => renderNav(key, navs.left[key]))} -
-
-
- {Object.keys(navs.right).map((key) => renderNav(key, navs.right[key]))} -
-
-
- ) -} - -export default Navbar diff --git a/packages/components/src/Navbar/stories.js b/packages/components/src/Navbar/stories.js deleted file mode 100644 index c991caffc86..00000000000 --- a/packages/components/src/Navbar/stories.js +++ /dev/null @@ -1,46 +0,0 @@ -import React from "react"; -import { storiesOf } from "@storybook/react"; -import Navbar from "."; -import LanguageIcon from "@material-ui/icons/Translate"; -import DarkModeIcon from "@material-ui/icons/Brightness3"; - -const navs = { - left: [ - { - type: "link", - href: "https://freesewing.org/", - text: "app.patterns" - }, - { - type: "link", - href: "https://freesewing.org/", - text: "app.docs" - }, - { - type: "link", - href: "https://freesewing.org/", - text: "app.community" - } - ], - right: [ - { - type: "link", - href: "https://freesewing.org/", - text: "app.account" - }, - { - type: "link", - href: "https://freesewing.org/", - text: , - title: "Languages" - }, - { - type: "link", - href: "https://freesewing.org/", - text: , - title: "Dark mode" - } - ] -}; - -storiesOf("Navbar", module).add("Basic", () => ); diff --git a/packages/components/src/Ogol/index.js b/packages/components/src/Ogol/index.js deleted file mode 100644 index f270cb6b213..00000000000 --- a/packages/components/src/Ogol/index.js +++ /dev/null @@ -1,21 +0,0 @@ -import React from 'react' - -const Ogol = (props) => { - return ( - - - - ) -} - -export default Ogol diff --git a/packages/components/src/Ogol/stories.js b/packages/components/src/Ogol/stories.js deleted file mode 100644 index 81e82a09fcd..00000000000 --- a/packages/components/src/Ogol/stories.js +++ /dev/null @@ -1,9 +0,0 @@ -import React from "react"; -import { storiesOf } from "@storybook/react"; -import Ogol from "."; -import { dark as backgrounds } from "../../.storybook/backgrounds"; - -storiesOf("Ogol", module) - .add("Default", () => , { backgrounds }) - .add("Custom color", () => , { backgrounds }) - .add("Custom size", () => , { backgrounds }); diff --git a/packages/components/src/index.js b/packages/components/src/index.js index 3e2f1f82782..13f67dc9788 100644 --- a/packages/components/src/index.js +++ b/packages/components/src/index.js @@ -2,14 +2,11 @@ export default [ 'Blockquote', 'Draft', 'DraftConfigurator', - 'Emblem', 'Example', 'Icon', 'Legend', 'LineDrawing', 'Logo', - 'Navbar', - 'Ogol', 'Robot', 'Spinner', 'SampleConfigurator',