chore: update prettier tab width for consistency (#175)

This commit is contained in:
41666 2021-03-13 22:54:34 -05:00 committed by GitHub
parent a931f8c69c
commit f24d2fcc99
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
247 changed files with 7224 additions and 7375 deletions

View file

@ -3,15 +3,15 @@ import { guild } from '../../fixtures/storyData';
import { AuthLogin } from './AuthLogin';
export default {
title: 'Templates/Auth: Login',
args: {
botName: 'roleypoly#3266',
},
title: 'Templates/Auth: Login',
args: {
botName: 'roleypoly#3266',
},
};
export const NoSlug = (args) => <AuthLogin {...args} />;
export const WithSlug = (args) => <AuthLogin {...args} />;
WithSlug.args = {
guildSlug: guild,
guildSlug: guild,
};

View file

@ -6,9 +6,9 @@ import * as React from 'react';
export type AuthLoginProps = PreauthProps;
export const AuthLogin = (props: AuthLoginProps) => (
<AppShell showFooter user={undefined}>
<Hero topSpacing={100} bottomSpacing={175}>
<Preauth {...props} />
</Hero>
</AppShell>
<AppShell showFooter user={undefined}>
<Hero topSpacing={100} bottomSpacing={175}>
<Preauth {...props} />
</Hero>
</AppShell>
);

View file

@ -6,5 +6,5 @@ import { errorMessages } from './errorStrings';
const messages = storiesOf('Templates/Errors', module);
for (let message in errorMessages) {
messages.add(`${message}`, () => <Error code={message} />);
messages.add(`${message}`, () => <Error code={message} />);
}

View file

@ -1,8 +1,8 @@
import { DotOverlay } from '@roleypoly/design-system/atoms/dot-overlay';
import { Hero } from '@roleypoly/design-system/atoms/hero';
import {
ErrorBanner,
ErrorMessage,
ErrorBanner,
ErrorMessage,
} from '@roleypoly/design-system/molecules/error-banner';
import { AppShell } from '@roleypoly/design-system/organisms/app-shell';
import { DiscordUser } from '@roleypoly/types';
@ -10,20 +10,20 @@ import * as React from 'react';
import { getMessageFromCode } from './errorStrings';
export type ErrorProps = {
code: string | number;
messageOverride?: ErrorMessage;
user?: DiscordUser | null;
code: string | number;
messageOverride?: ErrorMessage;
user?: DiscordUser | null;
};
export const Error = (props: ErrorProps) => {
const messageFromCode = getMessageFromCode(props.code);
const messageFromCode = getMessageFromCode(props.code);
return (
<AppShell user={props.user || undefined}>
<DotOverlay />
<Hero topSpacing={100} bottomSpacing={25}>
<ErrorBanner message={messageFromCode} />
</Hero>
</AppShell>
);
return (
<AppShell user={props.user || undefined}>
<DotOverlay />
<Hero topSpacing={100} bottomSpacing={25}>
<ErrorBanner message={messageFromCode} />
</Hero>
</AppShell>
);
};

View file

@ -1,62 +1,62 @@
import { ErrorMessage } from '@roleypoly/design-system/molecules/error-banner';
const defaultMessage: Required<ErrorMessage> = {
english: `Something went bad. How could this happen?`,
japanese: `わかりません...`,
friendlyCode: 'Oops.',
english: `Something went bad. How could this happen?`,
japanese: `わかりません...`,
friendlyCode: 'Oops.',
};
export const errorMessages: { [code: string]: ErrorMessage } = {
default: defaultMessage,
'400': {
english: 'Your client sent me something weird...',
japanese: '((((;゜Д゜)))',
},
'403': {
english: `You weren't allowed to access this.`,
japanese: 'あなたはこの点に合格しないかもしれません',
},
'404': {
english: `This page is in another castle.`,
japanese: 'お探しのページは見つかりませんでした',
},
'419': {
english: 'Something went too slowly...',
japanese: 'おやすみなさい〜',
},
'500': {
english: `The server doesn't like you right now. Feed it a cookie.`,
japanese: 'クッキーを送ってください〜 クッキーを送ってください〜',
},
serverFailure: {
english: `Server is super unhappy with you today...`,
japanese: 'クッキーを送ってください〜',
friendlyCode: `Oh no!`,
},
magicExpired: {
english: 'That magic login link was expired.',
friendlyCode: 'Woah.',
},
authFailure: {
english: `I tried to tell the server who you were...`,
japanese: `...but it didn't believe me. :( ごめんなさい`,
friendlyCode: 'Yo.',
},
default: defaultMessage,
'400': {
english: 'Your client sent me something weird...',
japanese: '((((;゜Д゜)))',
},
'403': {
english: `You weren't allowed to access this.`,
japanese: 'あなたはこの点に合格しないかもしれません',
},
'404': {
english: `This page is in another castle.`,
japanese: 'お探しのページは見つかりませんでした',
},
'419': {
english: 'Something went too slowly...',
japanese: 'おやすみなさい〜',
},
'500': {
english: `The server doesn't like you right now. Feed it a cookie.`,
japanese: 'クッキーを送ってください〜 クッキーを送ってください〜',
},
serverFailure: {
english: `Server is super unhappy with you today...`,
japanese: 'クッキーを送ってください〜',
friendlyCode: `Oh no!`,
},
magicExpired: {
english: 'That magic login link was expired.',
friendlyCode: 'Woah.',
},
authFailure: {
english: `I tried to tell the server who you were...`,
japanese: `...but it didn't believe me. :( ごめんなさい`,
friendlyCode: 'Yo.',
},
};
export const getMessageFromCode = (
code: keyof typeof errorMessages
code: keyof typeof errorMessages
): Required<ErrorMessage> => {
const codeStr = String(code);
const baseMessage = errorMessages[codeStr];
const codeStr = String(code);
const baseMessage = errorMessages[codeStr];
const message: Required<ErrorMessage> = {
english: baseMessage?.english || defaultMessage.english,
japanese: baseMessage?.japanese || defaultMessage.japanese,
friendlyCode: baseMessage
? baseMessage?.friendlyCode || codeStr
: defaultMessage.friendlyCode,
};
const message: Required<ErrorMessage> = {
english: baseMessage?.english || defaultMessage.english,
japanese: baseMessage?.japanese || defaultMessage.japanese,
friendlyCode: baseMessage
? baseMessage?.friendlyCode || codeStr
: defaultMessage.friendlyCode,
};
return message;
return message;
};

View file

@ -3,18 +3,18 @@ import { WhyNoRoles } from '../../organisms/help-why-no-roles';
import { HelpPageTemplate } from './HelpPage';
export default {
title: 'Templates/Help Page',
title: 'Templates/Help Page',
};
export const Base = () => (
<HelpPageTemplate user={null}>
<h1>What is the world but vibrations?</h1>
<p>Vibrations that synchronize and tie it together, running free forever.</p>
</HelpPageTemplate>
<HelpPageTemplate user={null}>
<h1>What is the world but vibrations?</h1>
<p>Vibrations that synchronize and tie it together, running free forever.</p>
</HelpPageTemplate>
);
export const WhyNoRoles_ = () => (
<HelpPageTemplate>
<WhyNoRoles></WhyNoRoles>
</HelpPageTemplate>
<HelpPageTemplate>
<WhyNoRoles></WhyNoRoles>
</HelpPageTemplate>
);

View file

@ -3,11 +3,11 @@ import { AppShell, AppShellProps } from '@roleypoly/design-system/organisms/app-
import * as React from 'react';
export type HelpPageProps = AppShellProps & {
children: React.ReactNode;
children: React.ReactNode;
};
export const HelpPageTemplate = (props: HelpPageProps) => (
<AppShell guilds={props.guilds} user={props.user || undefined}>
<HelpPageBase>{props.children}</HelpPageBase>
</AppShell>
<AppShell guilds={props.guilds} user={props.user || undefined}>
<HelpPageBase>{props.children}</HelpPageBase>
</AppShell>
);

View file

@ -2,7 +2,7 @@ import * as React from 'react';
import { LandingTemplate } from './Landing';
export default {
title: 'Templates/Landing',
title: 'Templates/Landing',
};
export const Landing = () => <LandingTemplate />;

View file

@ -3,7 +3,7 @@ import { Landing } from '@roleypoly/design-system/organisms/landing';
import * as React from 'react';
export const LandingTemplate = (props: any) => (
<AppShell showFooter {...props}>
<Landing />
</AppShell>
<AppShell showFooter {...props}>
<Landing />
</AppShell>
);

View file

@ -1,46 +1,46 @@
import * as React from 'react';
import {
guild,
guildData,
guildEnum,
mastheadSlugs,
member,
roleCategory,
roleCategory2,
user,
guild,
guildData,
guildEnum,
mastheadSlugs,
member,
roleCategory,
roleCategory2,
user,
} from '../../fixtures/storyData';
import { RolePickerTemplate, RolePickerTemplateProps } from './RolePicker';
const props: RolePickerTemplateProps = {
guildData: {
...guildData,
message:
'Hey, this is kind of a demo setup so features/use cases can be shown off.\n\nThanks for using Roleypoly <3',
},
member: member,
guild: guild,
guilds: mastheadSlugs,
roles: [...roleCategory, ...roleCategory2],
editable: false,
user: user,
guildEnumeration: guildEnum,
activeGuildId: guild.id,
onSubmit: () => {},
guildData: {
...guildData,
message:
'Hey, this is kind of a demo setup so features/use cases can be shown off.\n\nThanks for using Roleypoly <3',
},
member: member,
guild: guild,
guilds: mastheadSlugs,
roles: [...roleCategory, ...roleCategory2],
editable: false,
user: user,
guildEnumeration: guildEnum,
activeGuildId: guild.id,
onSubmit: () => {},
};
export default {
title: 'Templates/Role Picker',
components: RolePickerTemplate,
args: props,
title: 'Templates/Role Picker',
components: RolePickerTemplate,
args: props,
};
export const Default = (args) => {
return <RolePickerTemplate {...args} />;
return <RolePickerTemplate {...args} />;
};
export const Editable = (args) => {
return <RolePickerTemplate {...args} />;
return <RolePickerTemplate {...args} />;
};
Editable.args = {
editable: true,
editable: true,
};

View file

@ -1,23 +1,23 @@
import { AppShell, AppShellProps } from '@roleypoly/design-system/organisms/app-shell';
import {
RolePicker,
RolePickerProps,
RolePicker,
RolePickerProps,
} from '@roleypoly/design-system/organisms/role-picker';
import * as React from 'react';
export type RolePickerTemplateProps = RolePickerProps & Omit<AppShellProps, 'children'>;
export const RolePickerTemplate = (props: RolePickerTemplateProps) => {
const { user, guilds, activeGuildId, recentGuilds, ...pickerProps } = props;
return (
<AppShell
activeGuildId={activeGuildId}
user={user}
guilds={guilds}
recentGuilds={recentGuilds}
small
>
<RolePicker {...pickerProps} />
</AppShell>
);
const { user, guilds, activeGuildId, recentGuilds, ...pickerProps } = props;
return (
<AppShell
activeGuildId={activeGuildId}
user={user}
guilds={guilds}
recentGuilds={recentGuilds}
small
>
<RolePicker {...pickerProps} />
</AppShell>
);
};

View file

@ -3,13 +3,13 @@ import { mastheadSlugs, user } from '../../fixtures/storyData';
import { ServerSetupTemplate } from './ServerSetup';
export default {
title: 'Templates/Server Setup',
component: ServerSetupTemplate,
args: {
guilds: mastheadSlugs,
user: user,
guildSlug: mastheadSlugs[1],
},
title: 'Templates/Server Setup',
component: ServerSetupTemplate,
args: {
guilds: mastheadSlugs,
user: user,
guildSlug: mastheadSlugs[1],
},
};
export const serverSetup = (args) => <ServerSetupTemplate {...args} />;

View file

@ -1,18 +1,18 @@
import { AppShell, AppShellProps } from '@roleypoly/design-system/organisms/app-shell';
import {
ServerSetup,
ServerSetupProps,
ServerSetup,
ServerSetupProps,
} from '@roleypoly/design-system/organisms/server-setup/ServerSetup';
type ServerSetupTemplateProps = Omit<AppShellProps, 'children'> & ServerSetupProps;
export const ServerSetupTemplate = ({
guildSlug,
...appShellProps
guildSlug,
...appShellProps
}: ServerSetupTemplateProps) => {
return (
<AppShell {...appShellProps} activeGuildId={guildSlug.id}>
<ServerSetup guildSlug={guildSlug} />
</AppShell>
);
return (
<AppShell {...appShellProps} activeGuildId={guildSlug.id}>
<ServerSetup guildSlug={guildSlug} />
</AppShell>
);
};

View file

@ -3,11 +3,11 @@ import { ServersTemplate } from '.';
import { mastheadSlugs, user } from '../../fixtures/storyData';
export default {
title: 'Templates/Servers Page',
args: {
guilds: mastheadSlugs,
user: user,
},
title: 'Templates/Servers Page',
args: {
guilds: mastheadSlugs,
user: user,
},
};
export const serversPage = (args) => <ServersTemplate {...args} />;

View file

@ -5,10 +5,10 @@ import * as React from 'react';
type ServerTemplateProps = Omit<AppShellProps, 'children'>;
export const ServersTemplate = (props: ServerTemplateProps) => (
<AppShell {...props} disableGuildPicker>
<ServersListing
guilds={props.guilds || []}
recentGuilds={props.recentGuilds || []}
></ServersListing>
</AppShell>
<AppShell {...props} disableGuildPicker>
<ServersListing
guilds={props.guilds || []}
recentGuilds={props.recentGuilds || []}
></ServersListing>
</AppShell>
);