diff --git a/src/design-system/molecules/guild-nav/GuildNav.stories.tsx b/src/design-system/molecules/guild-nav/GuildNav.stories.tsx index 9262f69..1c7c74d 100644 --- a/src/design-system/molecules/guild-nav/GuildNav.stories.tsx +++ b/src/design-system/molecules/guild-nav/GuildNav.stories.tsx @@ -1,6 +1,6 @@ import * as React from 'react'; import { GuildNav } from './GuildNav'; -import { guildEnum } from 'roleypoly/common/types/storyData'; +import { mastheadSlugs } from 'roleypoly/common/types/storyData'; import { PopoverBase } from 'roleypoly/design-system/atoms/popover/Popover.styled'; export default { @@ -10,12 +10,12 @@ export default { export const HasGuilds = () => ( - + ); export const NoGuilds = () => ( - + ); diff --git a/src/design-system/molecules/preauth-greeting/PreauthGreeting.stories.tsx b/src/design-system/molecules/preauth-greeting/PreauthGreeting.stories.tsx index 4cbefbd..668b7e7 100644 --- a/src/design-system/molecules/preauth-greeting/PreauthGreeting.stories.tsx +++ b/src/design-system/molecules/preauth-greeting/PreauthGreeting.stories.tsx @@ -1,12 +1,12 @@ import * as React from 'react'; +import { mastheadSlugs } from 'roleypoly/common/types/storyData'; import { PreauthGreeting } from './PreauthGreeting'; -import { guild } from 'roleypoly/common/types/storyData'; export default { title: 'Molecules/Preauth/Greeting', component: PreauthGreeting, args: { - guildSlug: guild, + guildSlug: mastheadSlugs[0], }, }; diff --git a/src/design-system/molecules/preauth-greeting/PreauthGreeting.tsx b/src/design-system/molecules/preauth-greeting/PreauthGreeting.tsx index a4bc52d..24b7bb3 100644 --- a/src/design-system/molecules/preauth-greeting/PreauthGreeting.tsx +++ b/src/design-system/molecules/preauth-greeting/PreauthGreeting.tsx @@ -1,12 +1,12 @@ import * as React from 'react'; +import { GuildSlug } from 'roleypoly/common/types'; import { Avatar, utils as avatarUtils } from 'roleypoly/design-system/atoms/avatar'; -import { Guild } from 'roleypoly/common/types'; -import { AccentTitle } from 'roleypoly/design-system/atoms/typography'; import { Space } from 'roleypoly/design-system/atoms/space'; +import { AccentTitle } from 'roleypoly/design-system/atoms/typography'; import styled from 'styled-components'; type GreetingProps = { - guildSlug: Guild; + guildSlug: GuildSlug; }; const Center = styled.div` @@ -19,7 +19,15 @@ const Center = styled.div` export const PreauthGreeting = (props: GreetingProps) => (
- + {avatarUtils.initialsFromName(props.guildSlug.name)} diff --git a/src/design-system/organisms/app-shell/AppShell.stories.tsx b/src/design-system/organisms/app-shell/AppShell.stories.tsx index e703daa..84dcb03 100644 --- a/src/design-system/organisms/app-shell/AppShell.stories.tsx +++ b/src/design-system/organisms/app-shell/AppShell.stories.tsx @@ -1,6 +1,6 @@ import * as React from 'react'; import { AppShell } from './AppShell'; -import { rpUser, guildEnum } from 'roleypoly/common/types/storyData'; +import { user, mastheadSlugs } from 'roleypoly/common/types/storyData'; export default { title: 'Organisms/App Shell', @@ -14,7 +14,7 @@ export const Guest = () => ( ); export const LoggedIn = () => ( - +

Hello World

); 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 689938e..666ea1a 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 @@ -8,7 +8,7 @@ export const DiscordBase = styled.div` border-radius: 3px; padding: 10px; user-select: none; - width: 175px; + width: 250px; `; const hover = (roleColor: string) => css` diff --git a/src/design-system/organisms/masthead/Masthead.stories.tsx b/src/design-system/organisms/masthead/Masthead.stories.tsx index 278a43c..bba1b9b 100644 --- a/src/design-system/organisms/masthead/Masthead.stories.tsx +++ b/src/design-system/organisms/masthead/Masthead.stories.tsx @@ -1,5 +1,5 @@ -import { rpUser, guild, guildEnum } from 'roleypoly/common/types/storyData'; import * as React from 'react'; +import { guild, mastheadSlugs, user } from 'roleypoly/common/types/storyData'; import { Authed } from './Authed'; import { Guest } from './Guest'; @@ -8,11 +8,9 @@ export default { }; export const HasGuilds = () => ( - + ); -export const NoGuilds = () => ( - -); +export const NoGuilds = () => ; export const Guest_ = () => ; diff --git a/src/design-system/templates/help-page/HelpPage.stories.tsx b/src/design-system/templates/help-page/HelpPage.stories.tsx index 69055fc..7c1a03b 100644 --- a/src/design-system/templates/help-page/HelpPage.stories.tsx +++ b/src/design-system/templates/help-page/HelpPage.stories.tsx @@ -1,5 +1,6 @@ import * as React from 'react'; import { HelpPageTemplate } from './HelpPage'; +import { WhyNoRoles } from '../../organisms/help-why-no-roles'; export default { title: 'Templates/Help Page', @@ -11,3 +12,9 @@ export const Base = () => (

Vibrations that synchronize and tie it together, running free forever.

); + +export const WhyNoRoles_ = () => ( + + + +); diff --git a/src/design-system/templates/help-page/HelpPage.tsx b/src/design-system/templates/help-page/HelpPage.tsx index 620bca6..c64f3d8 100644 --- a/src/design-system/templates/help-page/HelpPage.tsx +++ b/src/design-system/templates/help-page/HelpPage.tsx @@ -1,15 +1,13 @@ import * as React from 'react'; -import { AppShell } from 'roleypoly/design-system/organisms/app-shell'; +import { AppShell, AppShellProps } from 'roleypoly/design-system/organisms/app-shell'; import { HelpPageBase } from 'roleypoly/design-system/molecules/help-page-base'; -import { DiscordUser } from 'roleypoly/common/types'; -type HelpPageProps = { - user: DiscordUser | null; +export type HelpPageProps = AppShellProps & { children: React.ReactNode; }; export const HelpPageTemplate = (props: HelpPageProps) => ( - + {props.children} ); diff --git a/src/pages/help/why-no-roles.tsx b/src/pages/help/why-no-roles.tsx new file mode 100644 index 0000000..7101685 --- /dev/null +++ b/src/pages/help/why-no-roles.tsx @@ -0,0 +1,13 @@ +import { WhyNoRoles } from 'roleypoly/design-system/organisms/help-why-no-roles'; +import { + HelpPageTemplate, + HelpPageProps, +} from 'roleypoly/design-system/templates/help-page'; + +const WhyNoRolesPage = (props: HelpPageProps) => ( + + + +); + +export default WhyNoRolesPages;