From 6090a6c94f38d0da9201b2b473e2bcf6ab8df2d2 Mon Sep 17 00:00:00 2001 From: Katalina Okano Date: Wed, 14 Oct 2020 17:08:10 -0400 Subject: [PATCH] chore(design-system): prettier --- .../organisms/app-shell/AppShell.story.tsx | 4 ++-- .../organisms/app-shell/AppShell.styled.tsx | 2 +- .../organisms/app-shell/AppShell.tsx | 6 +++--- .../organisms/error-banner/ErrorBanner.story.tsx | 2 +- .../organisms/error-banner/ErrorBanner.styled.ts | 6 +++--- .../help-page-base/HelpPageBase.story.tsx | 4 ++-- .../organisms/help-page-base/HelpPageBase.tsx | 2 +- .../help-why-no-roles/WhyNoRoles.story.tsx | 4 ++-- .../help-why-no-roles/WhyNoRoles.styled.ts | 2 +- .../organisms/help-why-no-roles/WhyNoRoles.tsx | 11 +++++++---- .../organisms/landing/Landing.story.tsx | 2 +- .../organisms/landing/Landing.styled.ts | 4 ++-- src/design-system/organisms/landing/Landing.tsx | 15 +++++++++------ src/design-system/organisms/masthead/Authed.tsx | 14 +++++++------- src/design-system/organisms/masthead/Guest.tsx | 4 ++-- .../organisms/masthead/Masthead.story.tsx | 8 ++++++-- .../organisms/masthead/Masthead.styled.tsx | 6 +++--- src/design-system/organisms/organisms.story.tsx | 2 -- .../organisms/preauth/Preauth.story.tsx | 4 ++-- src/design-system/organisms/preauth/Preauth.tsx | 8 ++++---- .../organisms/role-picker/RolePicker.spec.tsx | 8 ++++---- .../organisms/role-picker/RolePicker.story.tsx | 9 +++++++-- .../organisms/role-picker/RolePicker.styled.tsx | 2 +- .../organisms/role-picker/RolePicker.tsx | 10 +++++----- .../templates/auth-login/AuthLogin.story.tsx | 2 +- .../templates/auth-login/AuthLogin.tsx | 9 ++++++--- src/design-system/templates/errors/Errors.tsx | 8 ++++---- .../templates/help-page/HelpPage.tsx | 4 ++-- src/design-system/templates/landing/Landing.tsx | 4 ++-- .../templates/role-picker/RolePicker.story.tsx | 2 +- .../templates/role-picker/RolePicker.tsx | 7 +++++-- 31 files changed, 97 insertions(+), 78 deletions(-) delete mode 100644 src/design-system/organisms/organisms.story.tsx diff --git a/src/design-system/organisms/app-shell/AppShell.story.tsx b/src/design-system/organisms/app-shell/AppShell.story.tsx index bb7cebf..7c21dd2 100644 --- a/src/design-system/organisms/app-shell/AppShell.story.tsx +++ b/src/design-system/organisms/app-shell/AppShell.story.tsx @@ -1,7 +1,7 @@ import * as React from 'react'; -import { organismStories } from 'organisms/organisms.story'; +import { organismStories } from 'roleypoly/src/design-system/organisms/organisms.story'; import { AppShell } from './AppShell'; -import { rpUser, guildEnum } from 'hack/fixtures/storyData'; +import { rpUser, guildEnum } from 'roleypoly/src/design-system/shared-types/storyData'; const story = organismStories('App Shell', module); diff --git a/src/design-system/organisms/app-shell/AppShell.styled.tsx b/src/design-system/organisms/app-shell/AppShell.styled.tsx index bf579d6..97f9785 100644 --- a/src/design-system/organisms/app-shell/AppShell.styled.tsx +++ b/src/design-system/organisms/app-shell/AppShell.styled.tsx @@ -1,5 +1,5 @@ import styled, { createGlobalStyle } from 'styled-components'; -import { palette } from 'atoms/colors'; +import { palette } from 'roleypoly/src/design-system/atoms/colors'; export const Content = styled.div<{ small?: boolean }>` margin: 0 auto; diff --git a/src/design-system/organisms/app-shell/AppShell.tsx b/src/design-system/organisms/app-shell/AppShell.tsx index 336e98e..dadb8f5 100644 --- a/src/design-system/organisms/app-shell/AppShell.tsx +++ b/src/design-system/organisms/app-shell/AppShell.tsx @@ -1,9 +1,9 @@ import * as React from 'react'; -import * as Masthead from 'organisms/masthead'; +import * as Masthead from 'roleypoly/src/design-system/organisms/masthead'; import { RoleypolyUser } from '@roleypoly/rpc/shared'; -import { Footer } from 'molecules/footer'; +import { Footer } from 'roleypoly/src/design-system/molecules/footer'; import { Content, GlobalStyles } from './AppShell.styled'; -import { GlobalStyleColors } from 'atoms/colors'; +import { GlobalStyleColors } from 'roleypoly/src/design-system/atoms/colors'; import { GuildEnumeration } from '@roleypoly/rpc/platform'; import { Scrollbars } from 'react-custom-scrollbars'; diff --git a/src/design-system/organisms/error-banner/ErrorBanner.story.tsx b/src/design-system/organisms/error-banner/ErrorBanner.story.tsx index b31dcc2..41f5b1b 100644 --- a/src/design-system/organisms/error-banner/ErrorBanner.story.tsx +++ b/src/design-system/organisms/error-banner/ErrorBanner.story.tsx @@ -1,5 +1,5 @@ import * as React from 'react'; -import { organismStories } from 'organisms/organisms.story'; +import { organismStories } from 'roleypoly/src/design-system/organisms/organisms.story'; import { ErrorBanner } from './ErrorBanner'; import { text } from '@storybook/addon-knobs'; diff --git a/src/design-system/organisms/error-banner/ErrorBanner.styled.ts b/src/design-system/organisms/error-banner/ErrorBanner.styled.ts index 41ce040..86d642c 100644 --- a/src/design-system/organisms/error-banner/ErrorBanner.styled.ts +++ b/src/design-system/organisms/error-banner/ErrorBanner.styled.ts @@ -1,6 +1,6 @@ -import { onSmallScreen } from 'atoms/breakpoints'; -import { palette } from 'atoms/colors'; -import { text300, text500, text700 } from 'atoms/typography'; +import { onSmallScreen } from 'roleypoly/src/design-system/atoms/breakpoints'; +import { palette } from 'roleypoly/src/design-system/atoms/colors'; +import { text300, text500, text700 } from 'roleypoly/src/design-system/atoms/typography'; import styled, { css } from 'styled-components'; export const ErrorWrapper = styled.div` diff --git a/src/design-system/organisms/help-page-base/HelpPageBase.story.tsx b/src/design-system/organisms/help-page-base/HelpPageBase.story.tsx index 545ee72..90ded23 100644 --- a/src/design-system/organisms/help-page-base/HelpPageBase.story.tsx +++ b/src/design-system/organisms/help-page-base/HelpPageBase.story.tsx @@ -1,7 +1,7 @@ import * as React from 'react'; -import { organismStories } from 'organisms/organisms.story'; +import { organismStories } from 'roleypoly/src/design-system/organisms/organisms.story'; import { HelpPageBase } from './HelpPageBase'; -import { Content } from 'organisms/app-shell/AppShell.styled'; +import { Content } from 'roleypoly/src/design-system/organisms/app-shell/AppShell.styled'; const baseStory = organismStories('Help Pages', module); diff --git a/src/design-system/organisms/help-page-base/HelpPageBase.tsx b/src/design-system/organisms/help-page-base/HelpPageBase.tsx index 0f9724b..262c237 100644 --- a/src/design-system/organisms/help-page-base/HelpPageBase.tsx +++ b/src/design-system/organisms/help-page-base/HelpPageBase.tsx @@ -1,6 +1,6 @@ import * as React from 'react'; import styled from 'styled-components'; -import { palette } from 'atoms/colors'; +import { palette } from 'roleypoly/src/design-system/atoms/colors'; export type HelpPageProps = { children: React.ReactNode; diff --git a/src/design-system/organisms/help-why-no-roles/WhyNoRoles.story.tsx b/src/design-system/organisms/help-why-no-roles/WhyNoRoles.story.tsx index c553dc5..e621074 100644 --- a/src/design-system/organisms/help-why-no-roles/WhyNoRoles.story.tsx +++ b/src/design-system/organisms/help-why-no-roles/WhyNoRoles.story.tsx @@ -1,7 +1,7 @@ import { WhyNoRoles } from './WhyNoRoles'; import * as React from 'react'; -import { organismStories } from 'organisms/organisms.story'; -import { HelpStoryWrapper } from 'organisms/help-page-base/HelpPageBase.story'; +import { organismStories } from 'roleypoly/src/design-system/organisms/organisms.story'; +import { HelpStoryWrapper } from 'roleypoly/src/design-system/organisms/help-page-base/HelpPageBase.story'; organismStories('Help Pages/Pages', module).add('Why No Roles', () => ( diff --git a/src/design-system/organisms/help-why-no-roles/WhyNoRoles.styled.ts b/src/design-system/organisms/help-why-no-roles/WhyNoRoles.styled.ts index 046bcc1..3ab25f6 100644 --- a/src/design-system/organisms/help-why-no-roles/WhyNoRoles.styled.ts +++ b/src/design-system/organisms/help-why-no-roles/WhyNoRoles.styled.ts @@ -1,5 +1,5 @@ import styled, { css } from 'styled-components'; -import { palette, numberToChroma } from 'atoms/colors'; +import { palette, numberToChroma } from 'roleypoly/src/design-system/atoms/colors'; import { Role } from '@roleypoly/rpc/shared'; export const DiscordBase = styled.div` diff --git a/src/design-system/organisms/help-why-no-roles/WhyNoRoles.tsx b/src/design-system/organisms/help-why-no-roles/WhyNoRoles.tsx index 58c1c5f..a067f94 100644 --- a/src/design-system/organisms/help-why-no-roles/WhyNoRoles.tsx +++ b/src/design-system/organisms/help-why-no-roles/WhyNoRoles.tsx @@ -1,12 +1,15 @@ import * as React from 'react'; -import { HalfsiesContainer, HalfsiesItem } from 'atoms/halfsies'; +import { + HalfsiesContainer, + HalfsiesItem, +} from 'roleypoly/src/design-system/atoms/halfsies'; import { FaCheck, FaTimes } from 'react-icons/fa'; import { DiscordBase, DiscordRole } from './WhyNoRoles.styled'; -import { demoData } from 'hack/fixtures/demoData'; +import { demoData } from 'roleypoly/src/design-system/shared-types/demoData'; import { Role } from '@roleypoly/rpc/shared'; -import { palette } from 'atoms/colors'; +import { palette } from 'roleypoly/src/design-system/atoms/colors'; import chroma from 'chroma-js'; -import { SparkleOverlay } from 'atoms/sparkle'; +import { SparkleOverlay } from 'roleypoly/src/design-system/atoms/sparkle'; const adminRoles: Role.AsObject[] = [ { diff --git a/src/design-system/organisms/landing/Landing.story.tsx b/src/design-system/organisms/landing/Landing.story.tsx index 57c68eb..ff3dfc9 100644 --- a/src/design-system/organisms/landing/Landing.story.tsx +++ b/src/design-system/organisms/landing/Landing.story.tsx @@ -1,5 +1,5 @@ import * as React from 'react'; -import { organismStories } from 'organisms/organisms.story'; +import { organismStories } from 'roleypoly/src/design-system/organisms/organisms.story'; import { Landing } from './Landing'; const story = organismStories('Landing', module); diff --git a/src/design-system/organisms/landing/Landing.styled.ts b/src/design-system/organisms/landing/Landing.styled.ts index 4c61cb5..eba2142 100644 --- a/src/design-system/organisms/landing/Landing.styled.ts +++ b/src/design-system/organisms/landing/Landing.styled.ts @@ -1,5 +1,5 @@ -import { onTablet } from 'atoms/breakpoints'; -import { text400 } from 'atoms/typography'; +import { onTablet } from 'roleypoly/src/design-system/atoms/breakpoints'; +import { text400 } from 'roleypoly/src/design-system/atoms/typography'; import styled, { css } from 'styled-components'; export const HeroText = styled.div` diff --git a/src/design-system/organisms/landing/Landing.tsx b/src/design-system/organisms/landing/Landing.tsx index 482b995..061cbbe 100644 --- a/src/design-system/organisms/landing/Landing.tsx +++ b/src/design-system/organisms/landing/Landing.tsx @@ -1,11 +1,14 @@ -import { palette } from 'atoms/colors'; -import { Space } from 'atoms/space'; -import { LargeText, LargeTitle } from 'atoms/typography'; -import { DemoDiscord } from 'molecules/demo-discord'; -import { DemoPicker } from 'molecules/demo-picker'; +import { palette } from 'roleypoly/src/design-system/atoms/colors'; +import { Space } from 'roleypoly/src/design-system/atoms/space'; +import { LargeText, LargeTitle } from 'roleypoly/src/design-system/atoms/typography'; +import { DemoDiscord } from 'roleypoly/src/design-system/molecules/demo-discord'; +import { DemoPicker } from 'roleypoly/src/design-system/molecules/demo-picker'; import * as React from 'react'; import { DemoAlignment, DemoSubtitle, HeroCentering, HeroText } from './Landing.styled'; -import { HalfsiesContainer, HalfsiesItem } from 'atoms/halfsies'; +import { + HalfsiesContainer, + HalfsiesItem, +} from 'roleypoly/src/design-system/atoms/halfsies'; export const Landing = () => ( diff --git a/src/design-system/organisms/masthead/Authed.tsx b/src/design-system/organisms/masthead/Authed.tsx index 4c3347e..94bca83 100644 --- a/src/design-system/organisms/masthead/Authed.tsx +++ b/src/design-system/organisms/masthead/Authed.tsx @@ -1,12 +1,12 @@ import { GuildEnumeration } from '@roleypoly/rpc/platform'; import { RoleypolyUser } from '@roleypoly/rpc/shared'; -import { Logomark } from 'atoms/branding'; -import { Popover } from 'atoms/popover'; -import { guildEnum } from 'hack/fixtures/storyData'; -import { GuildNav } from 'molecules/guild-nav'; -import { NavSlug } from 'molecules/nav-slug'; -import { UserAvatarGroup } from 'molecules/user-avatar-group'; -import { UserPopover } from 'molecules/user-popover'; +import { Logomark } from 'roleypoly/src/design-system/atoms/branding'; +import { Popover } from 'roleypoly/src/design-system/atoms/popover'; +import { guildEnum } from 'roleypoly/src/design-system/shared-types/storyData'; +import { GuildNav } from 'roleypoly/src/design-system/molecules/guild-nav'; +import { NavSlug } from 'roleypoly/src/design-system/molecules/nav-slug'; +import { UserAvatarGroup } from 'roleypoly/src/design-system/molecules/user-avatar-group'; +import { UserPopover } from 'roleypoly/src/design-system/molecules/user-popover'; import Link from 'next/link'; import * as React from 'react'; import { GoOrganization } from 'react-icons/go'; diff --git a/src/design-system/organisms/masthead/Guest.tsx b/src/design-system/organisms/masthead/Guest.tsx index 6e723e9..58fde37 100644 --- a/src/design-system/organisms/masthead/Guest.tsx +++ b/src/design-system/organisms/masthead/Guest.tsx @@ -1,5 +1,5 @@ -import { Logotype } from 'atoms/branding'; -import { Button } from 'atoms/button'; +import { Logotype } from 'roleypoly/src/design-system/atoms/branding'; +import { Button } from 'roleypoly/src/design-system/atoms/button'; import Link from 'next/link'; import * as React from 'react'; import { FaSignInAlt } from 'react-icons/fa'; diff --git a/src/design-system/organisms/masthead/Masthead.story.tsx b/src/design-system/organisms/masthead/Masthead.story.tsx index 9cbd6c4..4b39f59 100644 --- a/src/design-system/organisms/masthead/Masthead.story.tsx +++ b/src/design-system/organisms/masthead/Masthead.story.tsx @@ -1,5 +1,9 @@ -import { rpUser, guild, guildEnum } from 'hack/fixtures/storyData'; -import { organismStories } from 'organisms/organisms.story'; +import { + rpUser, + guild, + guildEnum, +} from 'roleypoly/src/design-system/shared-types/storyData'; +import { organismStories } from 'roleypoly/src/design-system/organisms/organisms.story'; import * as React from 'react'; import { Authed } from './Authed'; import { Guest } from './Guest'; diff --git a/src/design-system/organisms/masthead/Masthead.styled.tsx b/src/design-system/organisms/masthead/Masthead.styled.tsx index 194f4af..187f0a6 100644 --- a/src/design-system/organisms/masthead/Masthead.styled.tsx +++ b/src/design-system/organisms/masthead/Masthead.styled.tsx @@ -1,6 +1,6 @@ -import { onSmallScreen } from 'atoms/breakpoints'; -import { palette } from 'atoms/colors'; -import { transitions } from 'atoms/timings'; +import { onSmallScreen } from 'roleypoly/src/design-system/atoms/breakpoints'; +import { palette } from 'roleypoly/src/design-system/atoms/colors'; +import { transitions } from 'roleypoly/src/design-system/atoms/timings'; import styled, { css } from 'styled-components'; export const MastheadBase = styled.div` diff --git a/src/design-system/organisms/organisms.story.tsx b/src/design-system/organisms/organisms.story.tsx deleted file mode 100644 index b93779a..0000000 --- a/src/design-system/organisms/organisms.story.tsx +++ /dev/null @@ -1,2 +0,0 @@ -import { makeFactory } from '../.storybook/storyHelper'; -export const organismStories = makeFactory('Organisms'); diff --git a/src/design-system/organisms/preauth/Preauth.story.tsx b/src/design-system/organisms/preauth/Preauth.story.tsx index 636fd38..bedf09f 100644 --- a/src/design-system/organisms/preauth/Preauth.story.tsx +++ b/src/design-system/organisms/preauth/Preauth.story.tsx @@ -1,7 +1,7 @@ import * as React from 'react'; import { Preauth } from './Preauth'; -import { organismStories } from 'organisms/organisms.story'; -import { guild } from 'hack/fixtures/storyData'; +import { organismStories } from 'roleypoly/src/design-system/organisms/organisms.story'; +import { guild } from 'roleypoly/src/design-system/shared-types/storyData'; import { action } from '@storybook/addon-actions'; import styled from 'styled-components'; diff --git a/src/design-system/organisms/preauth/Preauth.tsx b/src/design-system/organisms/preauth/Preauth.tsx index cdadad4..9b3e3b5 100644 --- a/src/design-system/organisms/preauth/Preauth.tsx +++ b/src/design-system/organisms/preauth/Preauth.tsx @@ -1,8 +1,8 @@ import { Guild } from '@roleypoly/rpc/shared'; -import { Button } from 'atoms/button'; -import { Space } from 'atoms/space'; -import { PreauthGreeting } from 'molecules/preauth-greeting'; -import { PreauthSecretCode } from 'molecules/preauth-secret-code'; +import { Button } from 'roleypoly/src/design-system/atoms/button'; +import { Space } from 'roleypoly/src/design-system/atoms/space'; +import { PreauthGreeting } from 'roleypoly/src/design-system/molecules/preauth-greeting'; +import { PreauthSecretCode } from 'roleypoly/src/design-system/molecules/preauth-secret-code'; import * as React from 'react'; import { FaDiscord } from 'react-icons/fa'; import styled from 'styled-components'; diff --git a/src/design-system/organisms/role-picker/RolePicker.spec.tsx b/src/design-system/organisms/role-picker/RolePicker.spec.tsx index c175395..85e94e3 100644 --- a/src/design-system/organisms/role-picker/RolePicker.spec.tsx +++ b/src/design-system/organisms/role-picker/RolePicker.spec.tsx @@ -3,7 +3,7 @@ jest.unmock('atoms/role') .unmock('molecules/picker-category') .unmock('organisms/role-picker'); -import { Role } from 'atoms/role'; +import { Role } from 'roleypoly/src/design-system/atoms/role'; import { shallow } from 'enzyme'; import { guild, @@ -11,9 +11,9 @@ import { guildRoles, member, mockCategorySingle, -} from 'hack/fixtures/storyData'; -import { ResetSubmit } from 'molecules/reset-submit'; -import { PickerCategory } from 'molecules/picker-category'; +} from 'roleypoly/src/design-system/shared-types/storyData'; +import { ResetSubmit } from 'roleypoly/src/design-system/molecules/reset-submit'; +import { PickerCategory } from 'roleypoly/src/design-system/molecules/picker-category'; import * as React from 'react'; import { RolePicker, RolePickerProps } from './RolePicker'; diff --git a/src/design-system/organisms/role-picker/RolePicker.story.tsx b/src/design-system/organisms/role-picker/RolePicker.story.tsx index b216624..4090ecc 100644 --- a/src/design-system/organisms/role-picker/RolePicker.story.tsx +++ b/src/design-system/organisms/role-picker/RolePicker.story.tsx @@ -1,7 +1,12 @@ import * as React from 'react'; import { RolePicker, RolePickerProps } from './RolePicker'; -import { organismStories } from 'organisms/organisms.story'; -import { guildData, member, guildRoles, guild } from 'hack/fixtures/storyData'; +import { organismStories } from 'roleypoly/src/design-system/organisms/organisms.story'; +import { + guildData, + member, + guildRoles, + guild, +} from 'roleypoly/src/design-system/shared-types/storyData'; import { action } from '@storybook/addon-actions'; const storyPublic = organismStories('Role Picker/Public', module); diff --git a/src/design-system/organisms/role-picker/RolePicker.styled.tsx b/src/design-system/organisms/role-picker/RolePicker.styled.tsx index 0e3a475..80fd372 100644 --- a/src/design-system/organisms/role-picker/RolePicker.styled.tsx +++ b/src/design-system/organisms/role-picker/RolePicker.styled.tsx @@ -1,5 +1,5 @@ import styled from 'styled-components'; -import { palette } from 'atoms/colors'; +import { palette } from 'roleypoly/src/design-system/atoms/colors'; export const Container = styled.div``; diff --git a/src/design-system/organisms/role-picker/RolePicker.tsx b/src/design-system/organisms/role-picker/RolePicker.tsx index ce44199..337c9f8 100644 --- a/src/design-system/organisms/role-picker/RolePicker.tsx +++ b/src/design-system/organisms/role-picker/RolePicker.tsx @@ -1,11 +1,11 @@ import { Member } from '@roleypoly/rpc/discord'; import { Category, GuildData } from '@roleypoly/rpc/platform'; import { Guild, GuildRoles, Role } from '@roleypoly/rpc/shared'; -import { FaderOpacity } from 'atoms/fader'; -import { Space } from 'atoms/space'; -import { ResetSubmit } from 'molecules/reset-submit'; -import { ServerMasthead } from 'molecules/server-masthead'; -import { PickerCategory } from 'molecules/picker-category'; +import { FaderOpacity } from 'roleypoly/src/design-system/atoms/fader'; +import { Space } from 'roleypoly/src/design-system/atoms/space'; +import { ResetSubmit } from 'roleypoly/src/design-system/molecules/reset-submit'; +import { ServerMasthead } from 'roleypoly/src/design-system/molecules/server-masthead'; +import { PickerCategory } from 'roleypoly/src/design-system/molecules/picker-category'; import * as React from 'react'; import { GoInfo } from 'react-icons/go'; import { diff --git a/src/design-system/templates/auth-login/AuthLogin.story.tsx b/src/design-system/templates/auth-login/AuthLogin.story.tsx index 13536a7..ff32a9f 100644 --- a/src/design-system/templates/auth-login/AuthLogin.story.tsx +++ b/src/design-system/templates/auth-login/AuthLogin.story.tsx @@ -2,7 +2,7 @@ import * as React from 'react'; import { templateStories } from 'templates/templates.story'; import { AuthLogin } from './AuthLogin'; import { action } from '@storybook/addon-actions'; -import { guild } from 'hack/fixtures/storyData'; +import { guild } from 'roleypoly/src/design-system/shared-types/storyData'; const story = templateStories('Login', module); diff --git a/src/design-system/templates/auth-login/AuthLogin.tsx b/src/design-system/templates/auth-login/AuthLogin.tsx index 7cc0fd1..a8298e3 100644 --- a/src/design-system/templates/auth-login/AuthLogin.tsx +++ b/src/design-system/templates/auth-login/AuthLogin.tsx @@ -1,6 +1,9 @@ -import { Hero } from 'atoms/hero'; -import { AppShell } from 'organisms/app-shell'; -import { Preauth, PreauthProps } from 'organisms/preauth/Preauth'; +import { Hero } from 'roleypoly/src/design-system/atoms/hero'; +import { AppShell } from 'roleypoly/src/design-system/organisms/app-shell'; +import { + Preauth, + PreauthProps, +} from 'roleypoly/src/design-system/organisms/preauth/Preauth'; import * as React from 'react'; export type AuthLoginProps = PreauthProps; diff --git a/src/design-system/templates/errors/Errors.tsx b/src/design-system/templates/errors/Errors.tsx index 9d5af4f..d73f821 100644 --- a/src/design-system/templates/errors/Errors.tsx +++ b/src/design-system/templates/errors/Errors.tsx @@ -1,9 +1,9 @@ -import { DotOverlay } from 'atoms/dot-overlay'; -import { Hero } from 'atoms/hero'; -import { AppShell } from 'organisms/app-shell'; +import { DotOverlay } from 'roleypoly/src/design-system/atoms/dot-overlay'; +import { Hero } from 'roleypoly/src/design-system/atoms/hero'; +import { AppShell } from 'roleypoly/src/design-system/organisms/app-shell'; import * as React from 'react'; import { ErrorMessage, getMessageFromCode } from './errorStrings'; -import { ErrorBanner } from 'organisms/error-banner'; +import { ErrorBanner } from 'roleypoly/src/design-system/organisms/error-banner'; import { RoleypolyUser } from '@roleypoly/rpc/shared'; export type ErrorProps = { diff --git a/src/design-system/templates/help-page/HelpPage.tsx b/src/design-system/templates/help-page/HelpPage.tsx index 3938100..f4d4c49 100644 --- a/src/design-system/templates/help-page/HelpPage.tsx +++ b/src/design-system/templates/help-page/HelpPage.tsx @@ -1,6 +1,6 @@ import * as React from 'react'; -import { AppShell } from 'organisms/app-shell'; -import { HelpPageBase } from 'organisms/help-page-base'; +import { AppShell } from 'roleypoly/src/design-system/organisms/app-shell'; +import { HelpPageBase } from 'roleypoly/src/design-system/organisms/help-page-base'; import { RoleypolyUser } from '@roleypoly/rpc/shared'; type HelpPageProps = { diff --git a/src/design-system/templates/landing/Landing.tsx b/src/design-system/templates/landing/Landing.tsx index a011e28..7dccdaa 100644 --- a/src/design-system/templates/landing/Landing.tsx +++ b/src/design-system/templates/landing/Landing.tsx @@ -1,6 +1,6 @@ import * as React from 'react'; -import { AppShell } from 'organisms/app-shell'; -import { Landing } from 'organisms/landing'; +import { AppShell } from 'roleypoly/src/design-system/organisms/app-shell'; +import { Landing } from 'roleypoly/src/design-system/organisms/landing'; export const LandingTemplate = () => ( diff --git a/src/design-system/templates/role-picker/RolePicker.story.tsx b/src/design-system/templates/role-picker/RolePicker.story.tsx index 7e8af2b..f934d31 100644 --- a/src/design-system/templates/role-picker/RolePicker.story.tsx +++ b/src/design-system/templates/role-picker/RolePicker.story.tsx @@ -8,7 +8,7 @@ import { guild, rpUser, guildEnum, -} from 'hack/fixtures/storyData'; +} from 'roleypoly/src/design-system/shared-types/storyData'; import { action } from '@storybook/addon-actions'; import { boolean } from '@storybook/addon-knobs'; diff --git a/src/design-system/templates/role-picker/RolePicker.tsx b/src/design-system/templates/role-picker/RolePicker.tsx index 012f3b8..8bc39d4 100644 --- a/src/design-system/templates/role-picker/RolePicker.tsx +++ b/src/design-system/templates/role-picker/RolePicker.tsx @@ -1,6 +1,9 @@ import * as React from 'react'; -import { AppShell } from 'organisms/app-shell'; -import { RolePicker, RolePickerProps } from 'organisms/role-picker'; +import { AppShell } from 'roleypoly/src/design-system/organisms/app-shell'; +import { + RolePicker, + RolePickerProps, +} from 'roleypoly/src/design-system/organisms/role-picker'; import { RoleypolyUser } from '@roleypoly/rpc/shared'; import { GuildEnumeration } from '@roleypoly/rpc/platform';