Update: merge master

src/components/Card/index.tsx

@@ -0,0 +1,15 @@
+import * as React from 'react'
+import { BaseComponentProps } from '@models/BaseProps'
+import classnames from 'classnames'
+import './style.scss'
+
+interface CardProps extends BaseComponentProps {}
+
+export const Card: React.SFC<CardProps> = props => {
+    const { className, style, children } = props
+    return (
+        <div className={classnames('card', className)} style={style}>
+            { children }
+        </div>
+    )
+}

src/components/Card/style.scss

@@ -0,0 +1,8 @@
+@import '~@styles/variables';
+
+.card {
+    padding: 15px;
+    box-shadow: 0 0 20px rgba($color-primary-dark, 0.2);
+    background-color: #fff;
+    border-radius: 4px;
+}

src/components/index.ts

@@ -1,4 +1,4 @@
 export * from './Header'
 export * from './Icon'
-export * from './Proxy'
 export * from './Switch'
+export * from './Card'

src/containers/Logs/index.tsx

@@ -1,7 +1,14 @@
 import * as React from 'react'
+import { Card, Header } from '@components'
+import './style.scss'
 
 export default class Logs extends React.Component<{}, {}> {
     render () {
-        return 'Logs'
+        return (
+            <div className="page">
+                <Header title="日志" />
+                <Card className="logs-card" />
+            </div>
+        )
     }
 }

src/containers/Logs/style.scss

@@ -0,0 +1,3 @@
+.logs-card {
+    margin-top: 20px;
+}

src/containers/Proxies/Proxy/index.tsx

@@ -16,7 +16,7 @@ interface ProxyProps extends BaseComponentProps {
     name: string
 }
 
-export const Proxy: React.SFC<ProxyProps> = props => {
+const Proxy: React.SFC<ProxyProps> = props => {
     const { type, name, className } = props
     const icon = iconMapping[type]
     return (
@@ -26,3 +26,5 @@ export const Proxy: React.SFC<ProxyProps> = props => {
         </div>
     )
 }
+
+export default Proxy

src/containers/Proxies/index.tsx

@@ -1,7 +1,8 @@
 import * as React from 'react'
-import { Header, Icon, Proxy } from '@components'
+import { Header, Icon } from '@components'
 import { ProxyType } from '@models'
 
+import Proxy from './Proxy'
 import './style.scss'
 
 export class Proxies extends React.Component<{}, {}> {

src/containers/Proxies/style.scss

@@ -1,15 +1,11 @@
 @import '~@styles/variables';
 
-.proxies-container {
-    margin-top: 20px;
-}
-
 .proxies-list {
     display: flex;
     flex-wrap: wrap;
     list-style: none;
 
     li {
-        margin: 20px 15px 0 0;
+        margin: 20px 15px 20px 0;
     }
 }

src/styles/common.scss

@@ -28,6 +28,7 @@ body {
 
 .page-container {
     width: 100%;
+    margin-top: 20px;
 }
 
 .page {