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

@ -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;
};