Skip to content

Commit

Permalink
Merge pull request #783 from garden-io/dashboard-overview-restyle-v3
Browse files Browse the repository at this point in the history
feat(dashboard): overall improvements
  • Loading branch information
eysi09 authored May 20, 2019
2 parents 217242d + 253316f commit ae43627
Show file tree
Hide file tree
Showing 32 changed files with 1,006 additions and 357 deletions.
5 changes: 5 additions & 0 deletions dashboard/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions dashboard/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
"flexboxgrid-helpers": "^1.1.3",
"http-proxy-middleware": "^0.19.1",
"lodash": "^4.17.11",
"moment": "^2.24.0",
"node-sass": "^4.10.0",
"normalize-url": "^4.3.0",
"react": "^16.8.6",
Expand Down
2 changes: 1 addition & 1 deletion dashboard/src/api/api.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ export async function fetchGraph() {
}

export async function fetchStatus() {
return apiPost<EnvironmentStatus>("get.status")
return apiPost<EnvironmentStatus>("get.status", { output: "json" })
}

export async function fetchLogs(services: FetchLogsParam) {
Expand Down
8 changes: 4 additions & 4 deletions dashboard/src/app.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,10 @@ const Logo = styled.img`
`

const SidebarWrapper = styled.div`
border-right: 1px solid ${colors.border};
height: 100vh;
position: relative;
background: ${colors.gardenWhite};
box-shadow: 6px 0px 18px rgba(0, 0, 0, 0.06);
`

type SidebarContainerProps = {
Expand All @@ -61,7 +61,7 @@ const SidebarToggleButton = styled.div`
top: 2rem;
width: 1.5rem;
cursor: pointer;
font-size: 1.25rem;
font-size: 1.125rem;
`

const AppContainer = () => {
Expand Down Expand Up @@ -112,14 +112,14 @@ const App = () => {
display: flex;
flex-direction: column;
flex-grow: 1;
overflow-y: auto;
overflow-y: hidden;
`}
>
<div
className={css`
background-color: ${colors.gardenGrayLighter};
flex-grow: 1;
padding: 1rem 1rem 1rem 3rem;
padding: 1rem 1rem 1rem 2rem;
`}
>
<Route exact path="/" component={Overview} />
Expand Down
2 changes: 1 addition & 1 deletion dashboard/src/assets/close-pane.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 3 additions & 1 deletion dashboard/src/components/ActionIcon.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,11 @@ interface Props {
}

const Button = styled.div`
border-radius: 10%;
border-radius: 4px;
margin: .5rem;
cursor: pointer;
display: flex;
align-items: center;
:active {
opacity: 0.5;
}
Expand Down
4 changes: 2 additions & 2 deletions dashboard/src/components/card.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ type WrapperProps = {

const Wrapper = styled.div<WrapperProps>`
background-color: ${props => props.backgroundColor || colors.gardenWhite};
border-radius: 2px;
box-shadow: 0 1px 3px rgba(0,0,0,0.12), 0 1px 2px rgba(0,0,0,0.24);
box-shadow: 0px 6px 18px rgba(0, 0, 0, 0.06);
border-radius: 4px;
width: 100%;
overflow: hidden;
`
Expand Down
2 changes: 1 addition & 1 deletion dashboard/src/components/graph/graph.scss
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
background-position: left;
background-position-x: -0.5rem;
background-size: 4rem;
border-radius: 5px;
border-radius: 4px;
border:none;
cursor: pointer;

Expand Down
Loading

0 comments on commit ae43627

Please sign in to comment.