diff --git a/src/components/element/__tests__/element.test.tsx b/src/extras/generic/__tests__/generic.test.tsx
similarity index 69%
rename from src/components/element/__tests__/element.test.tsx
rename to src/extras/generic/__tests__/generic.test.tsx
index 242c4840..fbc90b31 100644
--- a/src/components/element/__tests__/element.test.tsx
+++ b/src/extras/generic/__tests__/generic.test.tsx
@@ -1,18 +1,18 @@
import React from "react";
import renderer from "react-test-renderer";
-import { Element } from "../element";
+import { Generic } from "../generic";
-describe("Element component", () => {
+describe("Generic component", () => {
it("Should Exist", () => {
- expect(Element).toMatchSnapshot();
+ expect(Generic).toMatchSnapshot();
});
it("should have helpers classnames", () => {
const component = renderer.create(
-
+
Facebook
- ,
+ ,
);
expect(component.toJSON()).toMatchSnapshot();
});
@@ -26,7 +26,7 @@ describe("Element component", () => {
);
const component = renderer.create(
-
as={Custom}>This should be a p element,
+
as={Custom}>This should be a p element,
);
expect(component.toJSON()).toMatchSnapshot();
});
diff --git a/src/components/element/element.story.tsx b/src/extras/generic/generic.story.tsx
similarity index 78%
rename from src/components/element/element.story.tsx
rename to src/extras/generic/generic.story.tsx
index e53a06af..6ca23683 100644
--- a/src/components/element/element.story.tsx
+++ b/src/extras/generic/generic.story.tsx
@@ -2,10 +2,10 @@ import { boolean } from "@storybook/addon-knobs";
import { storiesOf } from "@storybook/react";
import React from "react";
-import { Element } from ".";
+import { Generic } from "@/extras";
-storiesOf("Element", module).add("Default", () => (
-
(
+ (
},
}}
>
- Custom Element to use Bulma helper
-
+ Custom element to use Bulma helper
+
));
diff --git a/src/components/element/element.tsx b/src/extras/generic/generic.tsx
similarity index 58%
rename from src/components/element/element.tsx
rename to src/extras/generic/generic.tsx
index e42624dc..4c28e88c 100644
--- a/src/components/element/element.tsx
+++ b/src/extras/generic/generic.tsx
@@ -1,11 +1,11 @@
import React from "react";
-import { forwardRefAs } from "@/components/exotic";
+import { forwardRefAs } from "@/exotic";
import { ModifierProps, transformModifiers } from "@/modifiers";
-export type ElementProps = ModifierProps;
+export type GenericProps = ModifierProps;
-export const Element = forwardRefAs
((props, ref) => {
+export const Generic = forwardRefAs((props, ref) => {
const { as, ...rest } = transformModifiers(props);
return React.createElement(as!, { ref, ...rest });
}, "div");
diff --git a/src/extras/generic/index.ts b/src/extras/generic/index.ts
new file mode 100644
index 00000000..b89598e6
--- /dev/null
+++ b/src/extras/generic/index.ts
@@ -0,0 +1 @@
+export { Generic } from "./generic";
diff --git a/src/extras/index.ts b/src/extras/index.ts
new file mode 100644
index 00000000..f3d514ae
--- /dev/null
+++ b/src/extras/index.ts
@@ -0,0 +1,2 @@
+export { Generic } from "./generic";
+export { Loader } from "./loader";
diff --git a/src/components/loader/__tests__/__snapshots__/loader.test.tsx.snap b/src/extras/loader/__tests__/__snapshots__/loader.test.tsx.snap
similarity index 100%
rename from src/components/loader/__tests__/__snapshots__/loader.test.tsx.snap
rename to src/extras/loader/__tests__/__snapshots__/loader.test.tsx.snap
diff --git a/src/components/loader/__tests__/loader.test.tsx b/src/extras/loader/__tests__/loader.test.tsx
similarity index 100%
rename from src/components/loader/__tests__/loader.test.tsx
rename to src/extras/loader/__tests__/loader.test.tsx
diff --git a/src/components/loader/index.ts b/src/extras/loader/index.ts
similarity index 100%
rename from src/components/loader/index.ts
rename to src/extras/loader/index.ts
diff --git a/src/extras/loader/loader.module.sass b/src/extras/loader/loader.module.sass
new file mode 100644
index 00000000..11e7d2a6
--- /dev/null
+++ b/src/extras/loader/loader.module.sass
@@ -0,0 +1,4 @@
+@import '../../utils.sass'
+
+.loader
+ +loader
\ No newline at end of file
diff --git a/src/components/loader/loader.story.sass b/src/extras/loader/loader.story.sass
similarity index 100%
rename from src/components/loader/loader.story.sass
rename to src/extras/loader/loader.story.sass
diff --git a/src/components/loader/loader.story.tsx b/src/extras/loader/loader.story.tsx
similarity index 86%
rename from src/components/loader/loader.story.tsx
rename to src/extras/loader/loader.story.tsx
index b20e5b25..81bd3815 100644
--- a/src/components/loader/loader.story.tsx
+++ b/src/extras/loader/loader.story.tsx
@@ -2,10 +2,10 @@ import React from "react";
import { storiesOf } from "@storybook/react";
-import { Loader } from "@/components/loader";
+import { Loader } from "@/extras";
import "./loader.story.sass";
-storiesOf("Loader", module)
+storiesOf("Extras/Loader", module)
.add("Default", () => )
.add("with inline style", () => (
{filename}
)}
-
+
);
}
}
diff --git a/src/components/form/input.tsx b/src/form/input.tsx
similarity index 96%
rename from src/components/form/input.tsx
rename to src/form/input.tsx
index 512f86c0..16e056aa 100644
--- a/src/components/form/input.tsx
+++ b/src/form/input.tsx
@@ -1,7 +1,7 @@
import { cx } from "emotion";
import React from "react";
-import { Element } from "@/components/element";
+import { Generic } from "@/extras/generic";
import { ModifierProps } from "@/modifiers";
import { Colors } from "@/modifiers/color";
@@ -63,7 +63,7 @@ class InputController extends React.PureComponent {
...props
} = this.props;
return (
-
+
{...props}
ref={innerRef}
as="input"
diff --git a/src/components/form/label.tsx b/src/form/label.tsx
similarity index 100%
rename from src/components/form/label.tsx
rename to src/form/label.tsx
diff --git a/src/components/form/radio.tsx b/src/form/radio.tsx
similarity index 100%
rename from src/components/form/radio.tsx
rename to src/form/radio.tsx
diff --git a/src/components/form/select.tsx b/src/form/select.tsx
similarity index 100%
rename from src/components/form/select.tsx
rename to src/form/select.tsx
diff --git a/src/components/form/textarea.tsx b/src/form/textarea.tsx
similarity index 100%
rename from src/components/form/textarea.tsx
rename to src/form/textarea.tsx
diff --git a/src/index.ts b/src/index.ts
index 9575a17f..3ddbcc8d 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -1,35 +1,8 @@
import "./index.module.sass";
-import * as Form from "./components/form";
-
-export { Box } from "./components/box";
-export { Breadcrumb } from "./components/breadcrumb";
-export { Button } from "./components/button";
-export { Card } from "./components/card";
-export { Columns } from "./components/columns";
-export { Container } from "./components/container";
-export { Content } from "./components/content";
-export { Dropdown } from "./components/dropdown";
-export { Element } from "./components/element";
-export { Footer } from "./components/footer";
-export { Form };
-export { Heading } from "./components/heading";
-export { Hero } from "./components/hero";
-export { Icon } from "./components/icon";
-export { Image } from "./components/image";
-export { Level } from "./components/level";
-export { Loader } from "./components/loader";
-export { Media } from "./components/media";
-export { Menu } from "./components/menu";
-export { Message } from "./components/message";
-export { Modal } from "./components/modal";
-export { Navbar } from "./components/navbar";
-export { Notification } from "./components/notification";
-export { Pagination } from "./components/pagination";
-export { Panel } from "./components/panel";
-export { Progress } from "./components/progress";
-export { Section } from "./components/section";
-export { Table } from "./components/table";
-export { Tabs } from "./components/tabs";
-export { Tag } from "./components/tag";
-export { Tile } from "./components/tile";
+export * from "./columns";
+export * from "./components";
+export * from "./elements";
+export * from "./form";
+export * from "./layout";
+export * from "./extras";
diff --git a/src/components/container/__tests__/__snapshots__/container.test.tsx.snap b/src/layout/container/__tests__/__snapshots__/container.test.tsx.snap
similarity index 100%
rename from src/components/container/__tests__/__snapshots__/container.test.tsx.snap
rename to src/layout/container/__tests__/__snapshots__/container.test.tsx.snap
diff --git a/src/components/container/__tests__/container.test.tsx b/src/layout/container/__tests__/container.test.tsx
similarity index 100%
rename from src/components/container/__tests__/container.test.tsx
rename to src/layout/container/__tests__/container.test.tsx
diff --git a/src/components/container/container.module.sass b/src/layout/container/container.module.sass
similarity index 62%
rename from src/components/container/container.module.sass
rename to src/layout/container/container.module.sass
index 38ae86ce..09ee60b7 100644
--- a/src/components/container/container.module.sass
+++ b/src/layout/container/container.module.sass
@@ -1,2 +1,2 @@
-@import '../utils.sass'
+@import '../../utils.sass'
@import '~bulma/sass/elements/container.sass'
\ No newline at end of file
diff --git a/src/components/container/container.story.tsx b/src/layout/container/container.story.tsx
similarity index 54%
rename from src/components/container/container.story.tsx
rename to src/layout/container/container.story.tsx
index cb48e42e..18689277 100644
--- a/src/components/container/container.story.tsx
+++ b/src/layout/container/container.story.tsx
@@ -2,57 +2,57 @@ import React from "react";
import { storiesOf } from "@storybook/react";
-import { Container } from "@/components/container";
-import { Heading } from "@/components/heading";
-import { Section } from "@/components/section";
+import { Title } from "@/elements";
+import { Container } from "@/layout/container";
+import { Section } from "@/layout/section";
-storiesOf("Container", module).add("Default", () => (
+storiesOf("Layout/Container", module).add("Default", () => (
- size={5} as="p">
+ size={5} as="p">
Default
-
- subtitle as="p">
+
+ subtitle as="p">
Container
-
+
- size={5} as="p">
+ size={5} as="p">
Fluid
-
- subtitle as="p">
+
+ subtitle as="p">
Container
-
+
- size={5} as="p">
+ size={5} as="p">
Breakpoint Widescreen
-
- subtitle as="p">
+
+ subtitle as="p">
Container
-
+
- size={5} as="p">
+ size={5} as="p">
Breakpoint Fullhd
-
- subtitle as="p">
+
+ subtitle as="p">
Container
-
+
diff --git a/src/components/container/container.tsx b/src/layout/container/container.tsx
similarity index 93%
rename from src/components/container/container.tsx
rename to src/layout/container/container.tsx
index 969f3d0f..33d21660 100644
--- a/src/components/container/container.tsx
+++ b/src/layout/container/container.tsx
@@ -1,7 +1,7 @@
import { cx } from "emotion";
import React from "react";
-import { forwardRefAs } from "@/components/exotic";
+import { forwardRefAs } from "@/exotic";
import { ModifierProps, transformModifiers } from "@/modifiers";
import { Breakpoints } from "@/modifiers/responsive";
diff --git a/src/components/container/index.ts b/src/layout/container/index.ts
similarity index 100%
rename from src/components/container/index.ts
rename to src/layout/container/index.ts
diff --git a/src/components/footer/__tests__/__snapshots__/footer.test.tsx.snap b/src/layout/footer/__tests__/__snapshots__/footer.test.tsx.snap
similarity index 100%
rename from src/components/footer/__tests__/__snapshots__/footer.test.tsx.snap
rename to src/layout/footer/__tests__/__snapshots__/footer.test.tsx.snap
diff --git a/src/components/footer/__tests__/footer.test.tsx b/src/layout/footer/__tests__/footer.test.tsx
similarity index 100%
rename from src/components/footer/__tests__/footer.test.tsx
rename to src/layout/footer/__tests__/footer.test.tsx
diff --git a/src/components/footer/footer.module.sass b/src/layout/footer/footer.module.sass
similarity index 59%
rename from src/components/footer/footer.module.sass
rename to src/layout/footer/footer.module.sass
index 88061604..7fbe5a1f 100644
--- a/src/components/footer/footer.module.sass
+++ b/src/layout/footer/footer.module.sass
@@ -1,2 +1,2 @@
-@import '../utils.sass'
+@import '../../utils.sass'
@import '~bulma/sass/layout/footer.sass'
\ No newline at end of file
diff --git a/src/components/footer/footer.story.tsx b/src/layout/footer/footer.story.tsx
similarity index 77%
rename from src/components/footer/footer.story.tsx
rename to src/layout/footer/footer.story.tsx
index cd8f08a8..32e49b00 100644
--- a/src/components/footer/footer.story.tsx
+++ b/src/layout/footer/footer.story.tsx
@@ -1,12 +1,10 @@
import { storiesOf } from "@storybook/react";
import React from "react";
-import { Container } from "@/components/container";
-import { Content } from "@/components/content";
-import { Footer } from "@/components/footer";
-import { Hero } from "@/components/hero";
+import { Content } from "@/elements";
+import { Container, Footer, Hero } from "@/layout";
-storiesOf("Footer", module).add("Default", () => (
+storiesOf("Layout/Footer", module).add("Default", () => (
as="header" />
diff --git a/src/components/footer/footer.tsx b/src/layout/footer/footer.tsx
similarity index 88%
rename from src/components/footer/footer.tsx
rename to src/layout/footer/footer.tsx
index 15592d50..69d81dfc 100644
--- a/src/components/footer/footer.tsx
+++ b/src/layout/footer/footer.tsx
@@ -1,7 +1,7 @@
import { cx } from "emotion";
import React from "react";
-import { forwardRefAs } from "@/components/exotic";
+import { forwardRefAs } from "@/exotic";
import { ModifierProps, transformModifiers } from "@/modifiers";
export type FooterProps = ModifierProps;
diff --git a/src/components/footer/index.ts b/src/layout/footer/index.ts
similarity index 100%
rename from src/components/footer/index.ts
rename to src/layout/footer/index.ts
diff --git a/src/components/hero/__tests__/__snapshots__/hero.test.tsx.snap b/src/layout/hero/__tests__/__snapshots__/hero.test.tsx.snap
similarity index 100%
rename from src/components/hero/__tests__/__snapshots__/hero.test.tsx.snap
rename to src/layout/hero/__tests__/__snapshots__/hero.test.tsx.snap
diff --git a/src/components/hero/__tests__/hero.test.tsx b/src/layout/hero/__tests__/hero.test.tsx
similarity index 100%
rename from src/components/hero/__tests__/hero.test.tsx
rename to src/layout/hero/__tests__/hero.test.tsx
diff --git a/src/components/hero/hero-body.tsx b/src/layout/hero/hero-body.tsx
similarity index 88%
rename from src/components/hero/hero-body.tsx
rename to src/layout/hero/hero-body.tsx
index 2f62435a..37ebc100 100644
--- a/src/components/hero/hero-body.tsx
+++ b/src/layout/hero/hero-body.tsx
@@ -1,7 +1,7 @@
import { cx } from "emotion";
import React from "react";
-import { forwardRefAs } from "@/components/exotic";
+import { forwardRefAs } from "@/exotic";
import { ModifierProps, transformModifiers } from "@/modifiers";
export type HeroBodyProps = ModifierProps;
diff --git a/src/components/hero/hero-footer.tsx b/src/layout/hero/hero-footer.tsx
similarity index 88%
rename from src/components/hero/hero-footer.tsx
rename to src/layout/hero/hero-footer.tsx
index 93247ed5..0f36b41a 100644
--- a/src/components/hero/hero-footer.tsx
+++ b/src/layout/hero/hero-footer.tsx
@@ -1,7 +1,7 @@
import { cx } from "emotion";
import React from "react";
-import { forwardRefAs } from "@/components/exotic";
+import { forwardRefAs } from "@/exotic";
import { ModifierProps, transformModifiers } from "@/modifiers";
export type HeroFooterProps = ModifierProps;
diff --git a/src/components/hero/hero-head.tsx b/src/layout/hero/hero-head.tsx
similarity index 88%
rename from src/components/hero/hero-head.tsx
rename to src/layout/hero/hero-head.tsx
index 67ab39de..72584b6a 100644
--- a/src/components/hero/hero-head.tsx
+++ b/src/layout/hero/hero-head.tsx
@@ -1,7 +1,7 @@
import { cx } from "emotion";
import React from "react";
-import { forwardRefAs } from "@/components/exotic";
+import { forwardRefAs } from "@/exotic";
import { ModifierProps, transformModifiers } from "@/modifiers";
export type HeroHeadProps = ModifierProps;
diff --git a/src/components/hero/hero.module.sass b/src/layout/hero/hero.module.sass
similarity index 85%
rename from src/components/hero/hero.module.sass
rename to src/layout/hero/hero.module.sass
index f0f6945c..7418845e 100644
--- a/src/components/hero/hero.module.sass
+++ b/src/layout/hero/hero.module.sass
@@ -1,4 +1,4 @@
-@import '../utils.sass'
+@import '../../utils.sass'
@import '~bulma/sass/layout/hero.sass'
.has-navbar-fixed-top, .has-navbar-fixed-bottom
diff --git a/src/components/hero/hero.story.tsx b/src/layout/hero/hero.story.tsx
similarity index 69%
rename from src/components/hero/hero.story.tsx
rename to src/layout/hero/hero.story.tsx
index 0d44fd83..4a14a29f 100644
--- a/src/components/hero/hero.story.tsx
+++ b/src/layout/hero/hero.story.tsx
@@ -2,22 +2,20 @@ import React from "react";
import { storiesOf } from "@storybook/react";
-import { Container } from "@/components/container";
-import { Heading } from "@/components/heading";
-import { Hero } from "@/components/hero";
-import { Section } from "@/components/section";
+import { Title } from "@/elements";
+import { Container, Hero, Section } from "@/layout";
-storiesOf("Hero", module)
+storiesOf("Layout/Hero", module)
.add("Default with color", () => (
- Hero title Primary
-
+ Hero title Primary
+
Subtitle
-
+
@@ -27,10 +25,10 @@ storiesOf("Hero", module)
- Hero title Danger
-
+ Hero title Danger
+
Subtitle
-
+
@@ -39,10 +37,10 @@ storiesOf("Hero", module)
- Hero title Info
-
+ Hero title Info
+
Subtitle
-
+
@@ -55,10 +53,10 @@ storiesOf("Hero", module)
- Hero title Primary
-
+ Hero title Primary
+
Subtitle
-
+
@@ -68,10 +66,10 @@ storiesOf("Hero", module)
- Hero title Danger
-
+ Hero title Danger
+
Subtitle
-
+
@@ -80,10 +78,10 @@ storiesOf("Hero", module)
- Hero title Info
-
+ Hero title Info
+
Subtitle
-
+
diff --git a/src/components/hero/hero.tsx b/src/layout/hero/hero.tsx
similarity index 95%
rename from src/components/hero/hero.tsx
rename to src/layout/hero/hero.tsx
index 7cb47a39..7fdaf876 100644
--- a/src/components/hero/hero.tsx
+++ b/src/layout/hero/hero.tsx
@@ -1,7 +1,7 @@
import { cx } from "emotion";
import React from "react";
-import { forwardRefAs } from "@/components/exotic";
+import { forwardRefAs } from "@/exotic";
import { ModifierProps, transformModifiers } from "@/modifiers";
import { Colors } from "@/modifiers/color";
import { HeroBody } from "./hero-body";
diff --git a/src/components/hero/index.ts b/src/layout/hero/index.ts
similarity index 100%
rename from src/components/hero/index.ts
rename to src/layout/hero/index.ts
diff --git a/src/layout/index.ts b/src/layout/index.ts
new file mode 100644
index 00000000..1c49bb5d
--- /dev/null
+++ b/src/layout/index.ts
@@ -0,0 +1,7 @@
+export { Container } from "./container";
+export { Footer } from "./footer";
+export { Hero } from "./hero";
+export { Level } from "./level";
+export { Media } from "./media";
+export { Section } from "./section";
+export { Tile } from "./tile";
diff --git a/src/components/level/__tests__/__snapshots__/level.test.tsx.snap b/src/layout/level/__tests__/__snapshots__/level.test.tsx.snap
similarity index 100%
rename from src/components/level/__tests__/__snapshots__/level.test.tsx.snap
rename to src/layout/level/__tests__/__snapshots__/level.test.tsx.snap
diff --git a/src/components/level/__tests__/level.test.tsx b/src/layout/level/__tests__/level.test.tsx
similarity index 100%
rename from src/components/level/__tests__/level.test.tsx
rename to src/layout/level/__tests__/level.test.tsx
diff --git a/src/components/level/index.ts b/src/layout/level/index.ts
similarity index 100%
rename from src/components/level/index.ts
rename to src/layout/level/index.ts
diff --git a/src/components/level/level-item.tsx b/src/layout/level/level-item.tsx
similarity index 88%
rename from src/components/level/level-item.tsx
rename to src/layout/level/level-item.tsx
index 249710f7..46e8a7a9 100644
--- a/src/components/level/level-item.tsx
+++ b/src/layout/level/level-item.tsx
@@ -1,7 +1,7 @@
import { cx } from "emotion";
import React from "react";
-import { forwardRefAs } from "@/components/exotic";
+import { forwardRefAs } from "@/exotic";
import { ModifierProps, transformModifiers } from "@/modifiers";
export type LevelItemProps = ModifierProps;
diff --git a/src/components/level/level-side.tsx b/src/layout/level/level-side.tsx
similarity index 93%
rename from src/components/level/level-side.tsx
rename to src/layout/level/level-side.tsx
index a0961416..994707f9 100644
--- a/src/components/level/level-side.tsx
+++ b/src/layout/level/level-side.tsx
@@ -1,7 +1,7 @@
import { cx } from "emotion";
import React from "react";
-import { forwardRefAs } from "@/components/exotic";
+import { forwardRefAs } from "@/exotic";
import { ModifierProps, transformModifiers } from "@/modifiers";
export type LevelSideModifierProps = Partial<{
diff --git a/src/components/level/level.module.sass b/src/layout/level/level.module.sass
similarity index 61%
rename from src/components/level/level.module.sass
rename to src/layout/level/level.module.sass
index 3e201648..c5c1addb 100644
--- a/src/components/level/level.module.sass
+++ b/src/layout/level/level.module.sass
@@ -1,2 +1,2 @@
-@import '../utils.sass'
+@import '../../utils.sass'
@import '~bulma/sass/components/level.sass'
\ No newline at end of file
diff --git a/src/components/level/level.story.tsx b/src/layout/level/level.story.tsx
similarity index 65%
rename from src/components/level/level.story.tsx
rename to src/layout/level/level.story.tsx
index f317b81f..4c4ce0c5 100644
--- a/src/components/level/level.story.tsx
+++ b/src/layout/level/level.story.tsx
@@ -2,18 +2,13 @@ import React from "react";
import { storiesOf } from "@storybook/react";
-import { Box } from "@/components/box";
-import { Button } from "@/components/button";
-import { Container } from "@/components/container";
-import { Control, Field, Input } from "@/components/form";
-import { Heading } from "@/components/heading";
-import { Hero } from "@/components/hero";
-import { Level } from "@/components/level";
-import { Section } from "@/components/section";
+import { Box, Button, Title } from "@/elements";
+import { Control, Field, Input } from "@/form";
+import { Container, Hero, Level, Section } from "@/layout";
const style: React.CSSProperties = { textAlign: "center" };
-storiesOf("Level", module)
+storiesOf("Layout/Level", module)
.addDecorator(story => (
as="header">
@@ -27,9 +22,9 @@ storiesOf("Level", module)
as="nav">
-
+
123 posts
-
+
@@ -72,42 +67,42 @@ storiesOf("Level", module)
as="nav">
- as="p" heading>
+ as="p" heading>
Tweets
-
- as="p" heading>
+
+ as="p" heading>
3,210
-
+
- as="p" heading>
+ as="p" heading>
Following
-
- as="p" heading>
+
+ as="p" heading>
210
-
+
- as="p" heading>
+ as="p" heading>
Followers
-
- as="p" heading>
+
+ as="p" heading>
321
-
+
- as="p" heading>
+ as="p" heading>
Likes
-
- as="p" heading>
+
+ as="p" heading>
321K
-
+
@@ -119,47 +114,47 @@ storiesOf("Level", module)
const breakpoint = title === "Mobile" ? "mobile" : undefined;
return (
- {title}
+ {title}
as="nav" breakpoint={breakpoint}>
- as="p" heading>
+ as="p" heading>
Tweets
-
- as="p" heading>
+
+ as="p" heading>
3,210
-
+
- as="p" heading>
+ as="p" heading>
Following
-
- as="p" heading>
+
+ as="p" heading>
210
-
+
- as="p" heading>
+ as="p" heading>
Followers
-
- as="p" heading>
+
+ as="p" heading>
321
-
+
- as="p" heading>
+ as="p" heading>
Likes
-
- as="p" heading>
+
+ as="p" heading>
321K
-
+
diff --git a/src/components/level/level.tsx b/src/layout/level/level.tsx
similarity index 93%
rename from src/components/level/level.tsx
rename to src/layout/level/level.tsx
index 5e8371de..b163362c 100644
--- a/src/components/level/level.tsx
+++ b/src/layout/level/level.tsx
@@ -1,7 +1,7 @@
import { cx } from "emotion";
import React from "react";
-import { forwardRefAs } from "@/components/exotic";
+import { forwardRefAs } from "@/exotic";
import { ModifierProps, transformModifiers } from "@/modifiers";
import { Breakpoints } from "@/modifiers/responsive";
import { LevelItem } from "./level-item";
diff --git a/src/components/media/__tests__/__snapshots__/media.test.tsx.snap b/src/layout/media/__tests__/__snapshots__/media.test.tsx.snap
similarity index 100%
rename from src/components/media/__tests__/__snapshots__/media.test.tsx.snap
rename to src/layout/media/__tests__/__snapshots__/media.test.tsx.snap
diff --git a/src/components/media/__tests__/media.test.tsx b/src/layout/media/__tests__/media.test.tsx
similarity index 100%
rename from src/components/media/__tests__/media.test.tsx
rename to src/layout/media/__tests__/media.test.tsx
diff --git a/src/components/media/index.ts b/src/layout/media/index.ts
similarity index 100%
rename from src/components/media/index.ts
rename to src/layout/media/index.ts
diff --git a/src/components/media/media-content.tsx b/src/layout/media/media-content.tsx
similarity index 89%
rename from src/components/media/media-content.tsx
rename to src/layout/media/media-content.tsx
index 03f1d20f..30ec66f4 100644
--- a/src/components/media/media-content.tsx
+++ b/src/layout/media/media-content.tsx
@@ -1,7 +1,7 @@
import { cx } from "emotion";
import React from "react";
-import { forwardRefAs } from "@/components/exotic";
+import { forwardRefAs } from "@/exotic";
import { ModifierProps, transformModifiers } from "@/modifiers";
export type MediaContentProps = ModifierProps;
diff --git a/src/components/media/media-item.tsx b/src/layout/media/media-item.tsx
similarity index 93%
rename from src/components/media/media-item.tsx
rename to src/layout/media/media-item.tsx
index 711ef6da..19f2f07f 100644
--- a/src/components/media/media-item.tsx
+++ b/src/layout/media/media-item.tsx
@@ -1,7 +1,7 @@
import { cx } from "emotion";
import React from "react";
-import { forwardRefAs } from "@/components/exotic";
+import { forwardRefAs } from "@/exotic";
import { ModifierProps, transformModifiers } from "@/modifiers";
export type MediaItemModifierProps = Partial<{
diff --git a/src/components/media/media.module.sass b/src/layout/media/media.module.sass
similarity index 61%
rename from src/components/media/media.module.sass
rename to src/layout/media/media.module.sass
index c0d48890..eba12875 100644
--- a/src/components/media/media.module.sass
+++ b/src/layout/media/media.module.sass
@@ -1,2 +1,2 @@
-@import '../utils.sass'
+@import '../../utils.sass'
@import '~bulma/sass/components/media.sass'
\ No newline at end of file
diff --git a/src/components/media/media.story.tsx b/src/layout/media/media.story.tsx
similarity index 93%
rename from src/components/media/media.story.tsx
rename to src/layout/media/media.story.tsx
index 07a95caa..82f69b08 100644
--- a/src/components/media/media.story.tsx
+++ b/src/layout/media/media.story.tsx
@@ -2,18 +2,13 @@ import React from "react";
import { storiesOf } from "@storybook/react";
-import { Box } from "@/components/box";
-import { Button } from "@/components/button";
-import { Content } from "@/components/content";
-import { Control, Field, Textarea } from "@/components/form";
-import { Image } from "@/components/image";
-import { Level } from "@/components/level";
-import { Media } from "@/components/media";
-import { Section } from "@/components/section";
+import { Box, Button, Content, Image } from "@/elements";
+import { Control, Field, Textarea } from "@/form";
+import { Level, Media, Section } from "@/layout";
const style = { background: "#e6e6e6", width: 64, height: 64 };
-storiesOf("Media", module)
+storiesOf("Layout/Media", module)
.add("Default", () => (
diff --git a/src/components/media/media.tsx b/src/layout/media/media.tsx
similarity index 91%
rename from src/components/media/media.tsx
rename to src/layout/media/media.tsx
index 42bafd5c..402c8b37 100644
--- a/src/components/media/media.tsx
+++ b/src/layout/media/media.tsx
@@ -1,7 +1,7 @@
import { cx } from "emotion";
import React from "react";
-import { forwardRefAs } from "@/components/exotic";
+import { forwardRefAs } from "@/exotic";
import { ModifierProps, transformModifiers } from "@/modifiers";
import { MediaContent } from "./media-content";
import { MediaItem } from "./media-item";
diff --git a/src/components/section/__tests__/__snapshots__/section.test.tsx.snap b/src/layout/section/__tests__/__snapshots__/section.test.tsx.snap
similarity index 100%
rename from src/components/section/__tests__/__snapshots__/section.test.tsx.snap
rename to src/layout/section/__tests__/__snapshots__/section.test.tsx.snap
diff --git a/src/components/section/__tests__/section.test.tsx b/src/layout/section/__tests__/section.test.tsx
similarity index 100%
rename from src/components/section/__tests__/section.test.tsx
rename to src/layout/section/__tests__/section.test.tsx
diff --git a/src/components/section/index.ts b/src/layout/section/index.ts
similarity index 100%
rename from src/components/section/index.ts
rename to src/layout/section/index.ts
diff --git a/src/components/section/section.module.sass b/src/layout/section/section.module.sass
similarity index 60%
rename from src/components/section/section.module.sass
rename to src/layout/section/section.module.sass
index 10bb9e7c..f2c37b03 100644
--- a/src/components/section/section.module.sass
+++ b/src/layout/section/section.module.sass
@@ -1,2 +1,2 @@
-@import '../utils.sass'
+@import '../../utils.sass'
@import '~bulma/sass/layout/section.sass'
\ No newline at end of file
diff --git a/src/components/section/section.story.tsx b/src/layout/section/section.story.tsx
similarity index 70%
rename from src/components/section/section.story.tsx
rename to src/layout/section/section.story.tsx
index ff3e2591..f9a7c639 100644
--- a/src/components/section/section.story.tsx
+++ b/src/layout/section/section.story.tsx
@@ -1,47 +1,46 @@
import { storiesOf } from "@storybook/react";
import React from "react";
-import { Container } from "@/components/container";
-import { Heading } from "@/components/heading";
-import { Section } from "../section";
+import { Title } from "@/elements";
+import { Container, Section } from "@/layout";
-storiesOf("Section", module)
+storiesOf("Layout/Section", module)
.add("Default", () => (
- Section
-
+ Section
+
A simple container to divide your page into{" "}
sections, like the one you are currently reading
-
+
- Section
-
+ Section
+
A simple container to divide your page into{" "}
sections, like the one you are currently reading
-
+
- Section
-
+ Section
+
A simple container to divide your page into{" "}
sections, like the one you are currently reading
-
+
- Section
-
+ Section
+
A simple container to divide your page into{" "}
sections, like the one you are currently reading
-
+
@@ -50,29 +49,29 @@ storiesOf("Section", module)
- Section
-
+ Section
+
A simple container to divide your page into{" "}
sections, like the one you are currently reading
-
+
- Section
-
+ Section
+
A simple container to divide your page into{" "}
sections, like the one you are currently reading
-
+
- Section
-
+ Section
+
A simple container to divide your page into{" "}
sections, like the one you are currently reading
-
+
@@ -81,29 +80,29 @@ storiesOf("Section", module)
- Section
-
+ Section
+
A simple container to divide your page into{" "}
sections, like the one you are currently reading
-
+
- Section
-
+ Section
+
A simple container to divide your page into{" "}
sections, like the one you are currently reading
-
+
- Section
-
+ Section
+
A simple container to divide your page into{" "}
sections, like the one you are currently reading
-
+
diff --git a/src/components/section/section.tsx b/src/layout/section/section.tsx
similarity index 91%
rename from src/components/section/section.tsx
rename to src/layout/section/section.tsx
index 31d727c9..33d88195 100644
--- a/src/components/section/section.tsx
+++ b/src/layout/section/section.tsx
@@ -1,7 +1,7 @@
import { cx } from "emotion";
import React from "react";
-import { forwardRefAs } from "@/components/exotic";
+import { forwardRefAs } from "@/exotic";
import { ModifierProps, transformModifiers } from "@/modifiers";
export type SectionModifierProps = Partial<{
diff --git a/src/components/tile/__tests__/__snapshots__/tile.test.tsx.snap b/src/layout/tile/__tests__/__snapshots__/tile.test.tsx.snap
similarity index 100%
rename from src/components/tile/__tests__/__snapshots__/tile.test.tsx.snap
rename to src/layout/tile/__tests__/__snapshots__/tile.test.tsx.snap
diff --git a/src/components/tile/__tests__/tile.test.tsx b/src/layout/tile/__tests__/tile.test.tsx
similarity index 100%
rename from src/components/tile/__tests__/tile.test.tsx
rename to src/layout/tile/__tests__/tile.test.tsx
diff --git a/src/components/tile/index.ts b/src/layout/tile/index.ts
similarity index 100%
rename from src/components/tile/index.ts
rename to src/layout/tile/index.ts
diff --git a/src/components/tile/tile.module.sass b/src/layout/tile/tile.module.sass
similarity index 57%
rename from src/components/tile/tile.module.sass
rename to src/layout/tile/tile.module.sass
index e816e3ce..04151616 100644
--- a/src/components/tile/tile.module.sass
+++ b/src/layout/tile/tile.module.sass
@@ -1,2 +1,2 @@
-@import '../utils.sass'
+@import '../../utils.sass'
@import '~bulma/sass/grid/tiles.sass'
\ No newline at end of file
diff --git a/src/components/tile/tile.story.tsx b/src/layout/tile/tile.story.tsx
similarity index 66%
rename from src/components/tile/tile.story.tsx
rename to src/layout/tile/tile.story.tsx
index 8be3dd8a..7bbd6ff6 100644
--- a/src/components/tile/tile.story.tsx
+++ b/src/layout/tile/tile.story.tsx
@@ -1,13 +1,10 @@
import { storiesOf } from "@storybook/react";
import React from "react";
-import { Box } from "@/components/box";
-import { Heading } from "@/components/heading";
-import { Image } from "@/components/image";
-import { Section } from "@/components/section";
-import { Tile } from "@/components/tile";
+import { Box, Image, Title } from "@/elements";
+import { Section, Tile } from "@/layout";
-storiesOf("Tile", module).add("Default", () => (
+storiesOf("Layout/Tile", module).add("Default", () => (
@@ -20,8 +17,8 @@ storiesOf("Tile", module).add("Default", () => (
notification
color="primary"
>
- Vertical...
- Top tile
+ Vertical...
+ Top tile
as="article"
@@ -29,8 +26,8 @@ storiesOf("Tile", module).add("Default", () => (
notification
color="warning"
>
- Tiles...
- Bottom Tile...
+ Tiles...
+ Bottom Tile...
@@ -40,8 +37,8 @@ storiesOf("Tile", module).add("Default", () => (
notification
color="info"
>
- Middle Tile...
- With image Tile...
+ Middle Tile...
+ With image Tile...
(
notification
color="danger"
>
- Wide tile
- Aligned with the right tile
+ Wide tile
+ Aligned with the right tile
@@ -70,8 +67,8 @@ storiesOf("Tile", module).add("Default", () => (
color="success"
>
-
Tall tile
-
With even more content
+
Tall tile
+
With even more content
diff --git a/src/components/tile/tile.tsx b/src/layout/tile/tile.tsx
similarity index 95%
rename from src/components/tile/tile.tsx
rename to src/layout/tile/tile.tsx
index a6dec5e3..a18d7456 100644
--- a/src/components/tile/tile.tsx
+++ b/src/layout/tile/tile.tsx
@@ -1,7 +1,7 @@
import { cx } from "emotion";
import React from "react";
-import { forwardRefAs } from "@/components/exotic";
+import { forwardRefAs } from "@/exotic";
import { ModifierProps, transformModifiers } from "@/modifiers";
import { Colors } from "@/modifiers/color";
diff --git a/src/components/utils.sass b/src/utils.sass
similarity index 100%
rename from src/components/utils.sass
rename to src/utils.sass