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

@ -7,13 +7,13 @@ import { ServerMasthead } from './ServerMasthead';
import { Editable } from './ServerMasthead.styled';
it('shows Edit Server when editable is true', () => {
const view = shallow(<ServerMasthead editable={true} guild={mastheadSlugs[0]} />);
const view = shallow(<ServerMasthead editable={true} guild={mastheadSlugs[0]} />);
expect(view.find(Editable).length).not.toBe(0);
expect(view.find(Editable).length).not.toBe(0);
});
it('hides Edit Server when editable is true', () => {
const view = shallow(<ServerMasthead editable={false} guild={mastheadSlugs[0]} />);
const view = shallow(<ServerMasthead editable={false} guild={mastheadSlugs[0]} />);
expect(view.find(Editable).length).toBe(0);
expect(view.find(Editable).length).toBe(0);
});

View file

@ -3,15 +3,15 @@ import { guild } from '../../fixtures/storyData';
import { ServerMasthead } from './ServerMasthead';
export default {
title: 'Molecules/Server Masthead',
args: {
editable: false,
guild,
},
title: 'Molecules/Server Masthead',
args: {
editable: false,
guild,
},
};
export const Default = (args) => <ServerMasthead {...args} />;
export const Editable = (args) => <ServerMasthead {...args} />;
Editable.args = {
editable: true,
editable: true,
};

View file

@ -3,34 +3,34 @@ import { transitions } from '@roleypoly/design-system/atoms/timings';
import styled from 'styled-components';
export const Wrapper = styled.div`
display: flex;
align-items: center;
justify-content: center;
display: flex;
align-items: center;
justify-content: center;
`;
export const Name = styled.div`
margin: 0 10px;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
display: flex;
flex-wrap: wrap;
flex-direction: column;
justify-content: flex-start;
margin: 0 10px;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
display: flex;
flex-wrap: wrap;
flex-direction: column;
justify-content: flex-start;
`;
export const Icon = styled.div`
flex-shrink: 0;
flex-shrink: 0;
`;
export const Editable = styled.div`
color: ${palette.taupe500};
display: flex;
align-items: center;
user-select: none;
transition: color ${transitions.actionable}s ease-in-out;
cursor: pointer;
&:hover {
color: ${palette.taupe600};
}
color: ${palette.taupe500};
display: flex;
align-items: center;
user-select: none;
transition: color ${transitions.actionable}s ease-in-out;
cursor: pointer;
&:hover {
color: ${palette.taupe600};
}
`;

View file

@ -1,8 +1,8 @@
import { Avatar, utils } from '@roleypoly/design-system/atoms/avatar';
import {
AccentTitle,
AmbientLarge,
CompletelyStylelessLink,
AccentTitle,
AmbientLarge,
CompletelyStylelessLink,
} from '@roleypoly/design-system/atoms/typography';
import { GuildSlug } from '@roleypoly/types';
import * as React from 'react';
@ -10,33 +10,33 @@ import { GoPencil } from 'react-icons/go';
import { Editable, Icon, Name, Wrapper } from './ServerMasthead.styled';
export type ServerMastheadProps = {
guild: GuildSlug;
editable: boolean;
guild: GuildSlug;
editable: boolean;
};
export const ServerMasthead = (props: ServerMastheadProps) => {
return (
<Wrapper>
<Icon>
<Avatar
hash={props.guild.icon}
size={props.editable ? 60 : 48}
src={utils.avatarHash(props.guild.id, props.guild.icon, 'icons', 512)}
>
{utils.initialsFromName(props.guild.name)}
</Avatar>
</Icon>
<Name>
<AccentTitle>{props.guild.name}</AccentTitle>
{props.editable && (
<CompletelyStylelessLink to={`/s/${props.guild.id}/edit`}>
<Editable role="button">
<GoPencil />
&nbsp; <AmbientLarge>Edit Server</AmbientLarge>
</Editable>
</CompletelyStylelessLink>
)}
</Name>
</Wrapper>
);
return (
<Wrapper>
<Icon>
<Avatar
hash={props.guild.icon}
size={props.editable ? 60 : 48}
src={utils.avatarHash(props.guild.id, props.guild.icon, 'icons', 512)}
>
{utils.initialsFromName(props.guild.name)}
</Avatar>
</Icon>
<Name>
<AccentTitle>{props.guild.name}</AccentTitle>
{props.editable && (
<CompletelyStylelessLink to={`/s/${props.guild.id}/edit`}>
<Editable role="button">
<GoPencil />
&nbsp; <AmbientLarge>Edit Server</AmbientLarge>
</Editable>
</CompletelyStylelessLink>
)}
</Name>
</Wrapper>
);
};