Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Restyle ProjectsSideNav #956

Merged
merged 1 commit into from
Feb 23, 2019
Merged

Restyle ProjectsSideNav #956

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
122 changes: 57 additions & 65 deletions packages/graphql-playground-react/src/components/ProjectsSideNav.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,36 +36,33 @@ class ProjectsSideNav extends React.Component<Props & ReduxProps, {}> {
const projects = config.projects
return (
<SideNav>
<DraggableHeader isElectron={isElectron} />
<List>
<div>
<TitleRow>
<Title>{folderName}</Title>
<SettingsIcon
width={18}
height={18}
onClick={this.props.openConfigTab}
title="Project settings"
/>
</TitleRow>
{endpoints && this.renderEndpoints(endpoints)}
{projects &&
Object.keys(projects).map(projectName => {
const project = projects[projectName]
const projectEndpoints =
project.extensions && project.extensions.endpoints
if (!projectEndpoints) {
return null
}

return (
<Project key={projectName}>
<ProjectName>{projectName}</ProjectName>
{this.renderEndpoints(projectEndpoints, projectName)}
</Project>
)
})}
</div>
<List isElectron={isElectron}>
<TitleRow>
<Title>{folderName}</Title>
<SettingsIcon
width={18}
height={18}
onClick={this.props.openConfigTab}
title="Project settings"
/>
</TitleRow>
{endpoints && this.renderEndpoints(endpoints)}
{projects &&
Object.keys(projects).map(projectName => {
const project = projects[projectName]
const projectEndpoints =
project.extensions && project.extensions.endpoints
if (!projectEndpoints) {
return null
}

return (
<Project key={projectName}>
<ProjectName>{projectName}</ProjectName>
{this.renderEndpoints(projectEndpoints, projectName)}
</Project>
)
})}
</List>
{true && (
<Footer>
Expand Down Expand Up @@ -118,81 +115,74 @@ export default connect(
{ openConfigTab },
)(ProjectsSideNav)

const Project = styled.div`
margin-bottom: 12px;
`

const SideNav = styled.div`
position: relative;
display: flex;
flex-direction: column;
justify-content: space-between;
background: ${p => p.theme.editorColours.sidebar};
flex: 0 222px;
flex-basis: 222px;
color: ${p => p.theme.editorColours.text};
border-right: 6px solid ${p => p.theme.editorColours.background};
`

const DraggableHeader = styled.div`
padding-top: ${(p: any) => (p.isElectron ? 48 : 20)}px;
background: ${p => p.theme.editorColours.sidebarTop};
-webkit-app-region: drag;
max-width: 222px;
overflow: hidden;
` as any

const List = styled.div`
padding-bottom: 32px;
max-width: 222px;
overflow: hidden;
-webkit-app-region: drag;
padding-top: ${(p: any) => (p.isElectron ? 48 : 20)}px;
display: flex;
flex-direction: column;
background: ${p => p.theme.editorColours.sidebarTop};
`

const Title = styled.div`
font-size: 16px;
font-weight: 600;
color: ${p => p.theme.editorColours.text};
word-break: break-word;
`

const TitleRow = styled.div`
display: flex;
align-items: center;
padding-left: 20px;
padding-right: 10px;
padding-bottom: 20px;
justify-content: space-between;

justify-content: space-evenly;
margin: 0 15px 20px 15px;
svg {
min-width: 18px;
min-height: 18px;
cursor: pointer;
}

svg {
fill: ${p => p.theme.editorColours.icon};
transition: 0.1s linear fill;
}

&:hover {
svg {
fill: ${p => p.theme.editorColours.iconHover};
}
}
`

const Project = styled.div`
display: flex;
flex-direction: column;
& + & {
margin-top: 12px;
}
&:last-child {
margin-bottom: 32px;
}
`

const ProjectName = styled.div`
font-size: 14px;
color: ${p => p.theme.editorColours.text};
font-weight: 600;
letter-spacing: 0.53px;
margin-left: 30px;
margin-bottom: 6px;
margin: 0 10px 6px 30px;
word-break: break-word;
`

const Footer = styled.div`
position: absolute;
bottom: 0;
width: 100%;
box-sizing: border-box;
display: flex;
align-items: center;
justify-content: space-between;
padding: 20px;
justify-content: center;
margin: 32px 0;
background: ${p => p.theme.editorColours.sidebarBottom};
`

Expand All @@ -215,6 +205,8 @@ const WorkspaceButton = styled.button`
margin-right: 6px;
}
svg {
min-width: 18px;
min-height: 18px;
stroke: ${p => p.theme.editorColours.buttonWorkspaceText};
}
`
28 changes: 7 additions & 21 deletions packages/graphql-playground-react/src/components/ProjectsSideNavItem.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,32 +42,19 @@ interface SidebarItemProps {
}

const ListItem = styled<SidebarItemProps, 'div'>('div')`
position: relative;
padding: 10px 10px;
padding: 10px 10px 10px ${p => (p.deep ? '43px' : '38px')};
word-break: break-word;
font-weight: 600;
text-overflow: ellipsis;
white-space: nowrap;
cursor: pointer;
padding-left: ${p => (p.deep ? '43px' : '38px')};
padding-right: 10px;
font-size: 12px;
display: flex;
justify-content: space-between;
align-items: center;
background: ${p =>
p.active ? p.theme.editorColours.sidebarItemActive : 'transparent'};

&:before {
content: '';
border-radius: 2px;
background: ${p =>
p.active ? p.theme.editorColours.sidebarItemSide : 'transparent'};
position: absolute;
top: -2px;
bottom: -2px;
left: -2px;
width: 6px;
}
border-left: 4px solid
${p => (p.active ? p.theme.editorColours.sidebarItemSide : 'transparent')};
border-radius: 2px;

&:hover {
background: ${p => p.theme.editorColours.sidebarItemActive};
Expand All @@ -76,9 +63,8 @@ const ListItem = styled<SidebarItemProps, 'div'>('div')`

const Count = styled<SidebarItemProps, 'div'>('div')`
border-radius: 6px;
width: 18px;
height: 18px;
line-height: 18px;
min-width: 18px;
min-height: 18px;
display: flex;
align-items: center;
justify-content: center;
Expand Down