Code refactoring

Author: ryoldash

reactjs/src/components/Header/index.tsx

@@ -26,18 +26,13 @@ export class Header extends React.Component<IHeaderProps> {
     return (
       <React.Fragment>
         <Col style={{ textAlign: 'left' }} span={12}>
-          <Icon
-            style={{ marginTop: 10, marginRight: 10, textAlign: 'left' }}
-            className="trigger"
-            type={this.props.collapsed ? 'menu-unfold' : 'menu-fold'}
-            onClick={this.props.toggle}
-          />
+          <Icon className="trigger" type={this.props.collapsed ? 'menu-unfold' : 'menu-fold'} onClick={this.props.toggle} />
         </Col>
-        <Col style={{ margin: 15, marginLeft: 10, textAlign: 'right' }}>
-          <LanguageSelect />
+        <Col style={{ margin: '0px 15px 0px 15px', marginLeft: 10, textAlign: 'right' }}>
+          <LanguageSelect /> {'   '}
           <Dropdown overlay={userDropdownMenu} trigger={['click']}>
-            <Badge style={{ margin: 10 }} count={3}>
-              <Avatar style={{ margin: 10 }} size={48} alt={'profile'} src="https://sametkabay.com/images/smtkby/smtkby240.png" />
+            <Badge style={{}} count={3}>
+              <Avatar style={{}} size={24} alt={'profile'} src="https://sametkabay.com/images/smtkby/smtkby240.png" />
             </Badge>
           </Dropdown>
         </Col>

reactjs/src/components/Layout/AppLayout.tsx

@@ -38,9 +38,9 @@ class AppLayout extends React.Component<any> {
 
     const layout = (
       <Layout style={{ minHeight: '100vh' }}>
-        <SiderMenu path={path} onCollapse={this.onCollapse} history={history} collapsed={collapsed} />;
+        <SiderMenu path={path} onCollapse={this.onCollapse} history={history} collapsed={collapsed} />
         <Layout>
-          <Layout.Header style={{ background: '#fff', minHeight: 83, padding: 0 }}>
+          <Layout.Header style={{ background: '#fff', minHeight: 52, padding: 0 }}>
             <Header collapsed={this.state.collapsed} toggle={this.toggle} />
           </Layout.Header>
           <Content style={{ margin: '0 16px' }}>

reactjs/src/components/Layout/UserLayout.tsx

@@ -5,8 +5,9 @@ import utils from 'src/utils/utils';
 import { userRouter } from '../Router/router.config';
 import { Col } from 'antd';
 // import "./UserLayout.css";
-import "./UserLayout.less";
+import './UserLayout.less';
 import Footer from '../Footer';
+import LanguageSelect from '../LanguageSelect';
 
 class UserLayout extends React.Component<any> {
   render() {
@@ -15,18 +16,21 @@ class UserLayout extends React.Component<any> {
     } = this.props;
     return (
       <DocumentTitle title={utils.getPageTitle(pathname)}>
-          <Col className="container">
-            <Switch>
-              {userRouter
-                .filter((item: any) => !item.isLayout)
-                .map((item: any, index: number) => (
-                  <Route key={index} path={item.path} component={item.component} exact={item.exact} />
-                ))}
+        <Col className="container">
+          <div className={'lang'}>
+            <LanguageSelect />
+          </div>
+          <Switch>
+            {userRouter
+              .filter((item: any) => !item.isLayout)
+              .map((item: any, index: number) => (
+                <Route key={index} path={item.path} component={item.component} exact={item.exact} />
+              ))}
 
-              <Redirect from="/user" to="/user/login" />
-            </Switch>
-            <Footer/>
-          </Col>
+            <Redirect from="/user" to="/user/login" />
+          </Switch>
+          <Footer />
+        </Col>
       </DocumentTitle>
     );
   }