[READY] deploy1.0

Author: bisakhmondal

src/App.js

@@ -1,7 +1,7 @@
 import React from 'react';
 import { BrowserRouter as Router, Route,Switch } from "react-router-dom";
 import './App.css';
-import Splash from "./Components/splash";
+// import Splash from "./Components/splash";
 import Home from "./Pages/home";
 import Comingsoon from "./Pages/comingSoon";
 import SignIn from "./Pages/internal"
@@ -18,7 +18,7 @@ function App() {
     <div>
     <Router>
         <Switch>
-            <Route exact path="/" render={props => <Splash /> }/>
+            <Route exact path="/" render={props => <Home /> }/>
             <Route path="/home" exact render={props => <Home/>} />
             <Route path="/courses" exact render={props => <Comingsoon/>} />            
             <Route path="/blog" exact render={props => <Comingsoon/>} />            

src/Components/footer.js

@@ -2,6 +2,7 @@ import React from 'react';
 import "./footer.css";
 
 import { Row , Col , Container } from "reactstrap";
+import {Link} from "react-router-dom";
 
 import theme from '../Theme';
 
@@ -13,18 +14,19 @@ export default function Footer(){
              <Col xs={12} lg={4} className="pr-xl-4 pt-xl-4">
                 <h1 className="p-0">DVLP</h1>
                 <h2>Jadavpur University</h2>
-                <p class="rights"><span>©  </span><span class="copyright-year">2020</span><span> </span><span>. </span><span>All Rights Reserved.</span></p>
+                <p class="rights"><span>©  
+                </span><span class="copyright-year">2020</span><span> </span><span>. </span><span>All Rights Reserved.</span></p>
              </Col>
              <Col xs={12} lg={4} >
                 <h5 className="mt-4">Contacts</h5>
                 <dl class="contact-list">
                     <dt>Address:</dt>
                     <dd>188, Raja S.C. Mallick Rd,<br/>
-                        Kolkata 700032.Ph:+9133-24146666</dd>
+                        Kolkata 700032. Ph:+9133-24146666</dd>
                 </dl>
                 <dl class="contact-list">
                     <dt>email:</dt>
-                    <dd><a href="mailto:#">nibaran.das@jadavpuruniversity.in</a></dd>
+                    <dd><a href="mailto:nibaran.das@jadavpuruniversity.in">nibaran.das@jadavpuruniversity.in</a></dd>
                 </dl>
                 {/* <dl class="contact-list">
                     <dt>phones:</dt>
@@ -35,10 +37,10 @@ export default function Footer(){
              <Col xs={12} lg={4} >
 
               <ul class="nav-list p-3" >
-                <li><a href="#">About</a></li>
-                <li><a href="#">Projects</a></li>
-                <li><a href="#">Blog</a></li>
-                <li><a href="#">Contacts</a></li>
+                <li><Link to="/affiliates">Affiliates</Link></li>
+                <li><Link to="/courses">Courses</Link></li>
+                <li><Link to="/blog">Blog</Link></li>
+                <li><Link to="/contacts">Contacts</Link></li>
               </ul>
              </Col>
          </Row>

src/Pages/contact.js

@@ -18,12 +18,12 @@ const Contact = () =>{
                 </header>
                 <div class="container">
                     <h2 class="f3 gray  ttu tracked rcolor">Lab Supervisor</h2>
-                    <p class="lead pb0">Prof. Nibran Das</p>
+                    <p class="lead pb0">Prof. Nibaran Das</p>
                     <p class="f5 pv0">Jadavpur University</p>
                 </div>
                 <div class="container">
                     <h2 class="f3 gray ttu rcolor caseS">Phd Scholars</h2>
-                    <p class="lead pb0">Prof. Nibran Das</p>
+                    <p class="lead pb0">Prof. Nibaran Das</p>
                     <p class="f5 pv0">Jadavpur University</p>
                 </div>
                 <div class="container">

src/Pages/home.js

@@ -25,14 +25,20 @@ const NewsFeed = () => {
     //             console.log( error);
     //         })
     // }, [loaded] );
+    console.log(NEWS)
+    const CONTENTS = NEWS().map((val,i)=>{
+        return <PAPER data={val} />
+    })
     return (
         <div>
             <Container> 
-                <Typography variant="h1" color="textPrimary" className="pt-4 mt-4">
+                <Typography variant="h1" color="textPrimary" className="f1 pt-4 mt-4">
                     What's happening at our Lab
                 </Typography>
                 <div className="py-4 my-4">
-                    {news}
+                    <ul className="ull">
+                    {CONTENTS}
+                    </ul>
                 </div>
             </Container> 
         </div>
@@ -41,13 +47,16 @@ const NewsFeed = () => {
 
 const PAPER = ({data})=>{
     return(
-        <div>
-        <p>
-        {data.title} | {data.}
+        <li>
+        <p className="pv0 pa0">
+        <a href={data.link} className="f3 hover-dark-gray link rcolor" style={{textDecoration:"none"}}>{data.title} </a> | <span className="b">{data.year}</span>
         </p>
-        </div>
+        <Typography variant="h5" color="textSecondary">
+            {data.authors}
+        </Typography>
+        </li>
     )
-}
+};
 export default function Home(){
     const [content,setContent] = React.useState([])
     React.useEffect(()=>{
@@ -70,7 +79,7 @@ export default function Home(){
             <Carousel />
             <NewsFeed/>
             <Container>
-            <div class="container tc" >
+            <div class="container tc pb4" >
                     <h2 class="f1 fw3 rcolor caseS" >Lab Members</h2>
             </div>
             <Row >