Merge branch 'development' into development

Author: lakshyabatman

src/App.js

@@ -8,6 +8,7 @@ import {
   Switch,
   Route,
   HashRouter,
+  BrowserRouter
 } from "react-router-dom";
 import About from './pages/About/About'
 // import Donut from './pages/Donut/Donut';
@@ -22,7 +23,7 @@ function App() {
     <>
     <div className="App" style={{width:"100%"}}>
 
-      <HashRouter>
+      <BrowserRouter>
       <NavBar/>
           <Switch>      
             <Route path="/about" >
@@ -64,7 +65,7 @@ function App() {
             </Route>
 
           </Switch>
-      </HashRouter>
+      </BrowserRouter>
       <Footer/>
     </div>
   </>

src/components/Footer/index.js

@@ -11,7 +11,7 @@ const Footer = () => {
         <div className="container">
         <div className="row">
           <div className="col-md-3">
-            <h6>Resources</h6>
+            <h3>Resources</h3>
             <div><a href="/">Home</a></div>
             <div><a href="/about">About</a></div>
             <div><a href="/blog">Blog</a></div>

src/components/NavBar/NavBar.css

@@ -1,4 +1,5 @@
 #myNav{
+    background-color: white;
     box-shadow: 0px 2px 15px grey;
 }
 a {
@@ -7,4 +8,7 @@ a {
 a:hover{
     text-decoration:none;
     transform: scale(1.05);
+}
+.blue:hover{
+    color : lightblue;
 }

src/components/NavBar/index.js

@@ -3,42 +3,57 @@ import {
     Navbar,
     Nav,
     NavDropdown,
-    Image
+    Image,
+    Form,
+    FormControl,
+    Button
 } from 'react-bootstrap'
 import './NavBar.css'
 import logo from '../../newlogo.png';
-
-import {Link} from 'react-router-dom'
+import {Link, Route} from 'react-router-dom';
 const NavBar = () => {
     return (
-        <Navbar collapseOnSelect expand="lg" bg="white" variant="light" fixed="top" class="navbar "id="myNav" >
+      <nav class="navbar navbar-expand-lg navbar-light bg-light fixed-top" id="myNav">
         <div className="container">
-          <Navbar.Brand href="/"><Link to="/"><Image id="logo" src={logo} alt="codeuino logo" style={{heigth:"20vh",width:"10vw"}}/></Link></Navbar.Brand>
-          <Navbar.Toggle aria-controls="responsive-navbar-nav" data-toggle="collapse" data-target="#myDropdown"/>
-          <Navbar.Collapse id="responsive-navbar-nav" style={{backgroundColor:"white"}}>
-            <Nav className="mr-auto">
-              
-            </Nav>
-            <Nav>
-              <Link to="/"><Nav.Link href="/" className="nav-key">Home</Nav.Link></Link>
-              <NavDropdown title="Activities" className="nav-key" id="responsive-navbar-nav">
-                <NavDropdown.Item data-target=".navbar-collapse.show"  href="/#/gsoc19" style={{"textAlign": "center"}}>GSOC 2019</NavDropdown.Item>
-                <NavDropdown.Item data-target=".navbar-collapse.show" href="/#/gci19" style={{"textAlign": "center"}}>GCI 2019-20</NavDropdown.Item>
-                <NavDropdown.Item  data-target=".navbar-collapse.show" href="/#/kwoc18" style={{"textAlign": "center"}} >KWOC 2018</NavDropdown.Item>
-                <NavDropdown.Item  data-target=".navbar-collapse.show" href="/#/gssoc19" style={{"textAlign": "center"}} >GSSOC 2019</NavDropdown.Item>
-              </NavDropdown>
-                {/* <Navbar.Dropdown>
-
-                </Navbar.Dropdown> */}
-              <Link to="/team"><Nav.Link href="/team" className="nav-key">Team</Nav.Link></Link>
-              <Nav.Link href="https://docs.codeuino.org/documentation/" className="nav-key">Docs</Nav.Link>
-              <Link to="/about"><Nav.Link href="/about" className="nav-key">About Us</Nav.Link></Link>
-              <Link to="/bloglist"><Nav.Link href="/bloglist" className="nav-key">Blog</Nav.Link></Link>
-              <Link to="/joinus"><Nav.Link href="/joinus" className="nav-key">Join Us</Nav.Link></Link>
-            </Nav>
-          </Navbar.Collapse>
+        <a class="navbar-brand" href="/"><Image id="logo" src={logo} alt="codeuino logo" style={{heigth:"20vh",width:"10vw"}}/></a>
+        <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
+          <span class="navbar-toggler-icon"></span>
+        </button>
+        <div class="collapse navbar-collapse" id="navbarSupportedContent">
+          <ul class="navbar-nav ml-auto">
+            <li class="nav-item">
+              <a class="nav-link" href="/">Home <span class="sr-only">(current)</span></a>
+            </li>
+            <li class="nav-item dropdown">
+              <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                Activities
+              </a>
+              <div class="dropdown-menu" aria-labelledby="navbarDropdown">
+                <a class="dropdown-item" href="https://docs.codeuino.org/documentation/activities/google-summer-of-code-2019" style={{textAlign : "center"}}>GSOC 2019</a>
+                <a class="dropdown-item" href="https://github.com/codeuino/gci" style={{textAlign : "center"}}>GCI 2019-20</a>
+                <a class="dropdown-item" href="https://kwoc.kossiitkgp.org/" style={{textAlign : "center"}}>KWOC 2018</a>
+                <a class="dropdown-item" href="https://www.gssoc.tech/index.html" style={{textAlign : "center"}}>GSSOC 2019</a>
+              </div>
+            </li>
+            <li class="nav-item">
+              <a class="nav-link" href="/team">Team<span class="sr-only">(current)</span></a>
+            </li>
+            <li class="nav-item">
+              <a class="nav-link" href="https://docs.codeuino.org/documentation/">Docs<span class="sr-only">(current)</span></a>
+            </li>
+            <li class="nav-item">
+              <a class="nav-link" href="/about">About Us<span class="sr-only">(current)</span></a>
+            </li>
+            <li class="nav-item">
+              <a class="nav-link" href="/bloglist">Blogs<span class="sr-only">(current)</span></a>
+            </li>
+            <li class="nav-item">
+              <a class="nav-link" href="/bloglist">Join Us<span class="sr-only">(current)</span></a>
+            </li>
+          </ul>
         </div>
-      </Navbar>
+        </div>
+      </nav>
     )
 }
 export default NavBar

src/pages/Home/NewHome.css

@@ -863,6 +863,7 @@
         -webkit-text-size-adjust: 100%;
         -webkit-tap-highlight-color: rgba(22, 28, 45, 0)
     }
+
     article,
     aside,
     figcaption,
@@ -872,7 +873,8 @@
     hgroup,
     main,
     nav,
-    section {
+    section,
+    div {
         display: block
     }
     body {
@@ -7268,7 +7270,7 @@
         top:-100vh;
         /* transform: rotate(45deg); */
         width:100vw;
-        height:60vh;
+        height:47vh!important;
         transform:skewY(10deg)
     }
     @media only screen and (min-width:800){
@@ -7278,7 +7280,7 @@
             /* top:-175vh !important; */
             /* transform: rotate(45deg); */
             width:100vw;
-            height:60vh;
+            height:47vh!important;
             transform:skewY(10deg);
             /* margin-bottom:-20vh; */
         }
@@ -14036,7 +14038,7 @@
         #fff)
     }
     .bg-gray-200 {
-        background-color:#f1f4f8!important
+        background-color:#f1f4f8!important;
     }
     .bg-gray-300 {
         background-color:#d9e2ef!important
@@ -16274,6 +16276,7 @@
     /* p{
         font-size: 0.3rem;
     } */
+   
     #join{
         padding-top:5%;
         padding-bottom:5%;
@@ -16322,4 +16325,11 @@
         .index-content .col-lg-4 {
             margin-top: 20px;
         }
-    }
+    }
+    
+    .associations{
+        padding-top: 65px;
+    }
+    .comming-soon{
+        box-shadow: 5px 20px 5px 20px;
+    }