diff --git a/README.md b/README.md index af6316e..02786d6 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ # Research Kernel's Frontend -We at Research Kernel are working on **React.js** for developing UI for Frontend with **Ant Deisng** as a UI design language. +We at Research Kernel are working on **React.js** for developing UI for Frontend with **Ant Design** as a UI design language. ## What this Organisation do ? diff --git a/src/components/common/navbar/navbar.component.js b/src/components/common/navbar/navbar.component.js index 5c4265f..e42d574 100644 --- a/src/components/common/navbar/navbar.component.js +++ b/src/components/common/navbar/navbar.component.js @@ -9,24 +9,60 @@ import { } from "./navbar.style"; import SearchBox from "./../search_box/search_box.component"; import Logo from "../../../_assets/images/rk-light.png"; +import { Row, Col,Popover, Icon, Button } from 'antd'; + +const content = ( +
+ +

+ Community +

+

+ About-Us +

+

+ Contact-Us +

+

+ Donate +

+

+ Sign In +

+

+ Sign Up +

+
+
+ ); const NavbarComponent = () => { return ( - +
+ + - {/* */} - {/* */} + + + + + + + - + Community - - - About Us + + + About-Us - Contact Us + Contact-Us Donate @@ -37,9 +73,14 @@ const NavbarComponent = () => { Sign Up - - - + + + + + + + +
); }; diff --git a/src/components/common/navbar/navbar.style.js b/src/components/common/navbar/navbar.style.js index 914e89b..b8e2c5b 100644 --- a/src/components/common/navbar/navbar.style.js +++ b/src/components/common/navbar/navbar.style.js @@ -13,9 +13,6 @@ export const Navbar = styled.div` export const NavbarLinks = styled.div` display: inherit; - @media (max-width: 992px) { - display: none; - } `; export const NavbarLogo = styled.div` diff --git a/src/components/common/search_box/search_box.component.js b/src/components/common/search_box/search_box.component.js index 59f2728..8deb577 100644 --- a/src/components/common/search_box/search_box.component.js +++ b/src/components/common/search_box/search_box.component.js @@ -61,7 +61,7 @@ class SearchBoxComponent extends React.Component { const { dataSource } = this.state; return (
-
+
{/* { diff --git a/src/views/login/Login.js b/src/views/login/Login.js index 828f71d..59485ee 100644 --- a/src/views/login/Login.js +++ b/src/views/login/Login.js @@ -2,7 +2,7 @@ import React, { Component } from "react"; import { login } from "./../../_actions/auth.action"; import { Link } from "react-router-dom"; import { connect } from "react-redux"; -import { Form, Icon, Button, Checkbox, Input } from 'antd'; +import { Form, Icon, Input } from 'antd'; import { StyledForm, LoginButton, @@ -59,10 +59,6 @@ class Login extends Component { onChange={this.handlePassword} /> - {/* - Remember me - Forgot password - */} Sign In diff --git a/src/views/login/login.style.js b/src/views/login/login.style.js index fa83e1b..4cd8dc8 100644 --- a/src/views/login/login.style.js +++ b/src/views/login/login.style.js @@ -2,8 +2,6 @@ import styled from "styled-components"; import { Form, Button } from 'antd'; import { Link } from "react-router-dom"; -const FormItem = Form.Item; - export const LoginPage = styled.div` margin-left: 35%; margin-right: 35%;