Fix scroll to top

tolujimoh · Oct 20, 2019 · 89aac71 · 89aac71
1 parent f9afb3c
commit 89aac71
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 54 deletions.
diff --git a/README.md b/README.md
@@ -1,44 +1,3 @@
-This project was bootstrapped with [Create React App](https://github.com/facebook/create-react-app).
+## tolujimoh.com
 
-## Available Scripts
 
-In the project directory, you can run:
-
-### `npm start`
-
-Runs the app in the development mode.<br>
-Open [http://localhost:3000](http://localhost:3000) to view it in the browser.
-
-The page will reload if you make edits.<br>
-You will also see any lint errors in the console.
-
-### `npm test`
-
-Launches the test runner in the interactive watch mode.<br>
-See the section about [running tests](https://facebook.github.io/create-react-app/docs/running-tests) for more information.
-
-### `npm run build`
-
-Builds the app for production to the `build` folder.<br>
-It correctly bundles React in production mode and optimizes the build for the best performance.
-
-The build is minified and the filenames include the hashes.<br>
-Your app is ready to be deployed!
-
-See the section about [deployment](https://facebook.github.io/create-react-app/docs/deployment) for more information.
-
-### `npm run eject`
-
-**Note: this is a one-way operation. Once you `eject`, you can’t go back!**
-
-If you aren’t satisfied with the build tool and configuration choices, you can `eject` at any time. This command will remove the single build dependency from your project.
-
-Instead, it will copy all the configuration files and the transitive dependencies (Webpack, Babel, ESLint, etc) right into your project so you have full control over them. All of the commands except `eject` will still work, but they will point to the copied scripts so you can tweak them. At this point you’re on your own.
-
-You don’t have to ever use `eject`. The curated feature set is suitable for small and middle deployments, and you shouldn’t feel obligated to use this feature. However we understand that this tool wouldn’t be useful if you couldn’t customize it when you are ready for it.
-
-## Learn More
-
-You can learn more in the [Create React App documentation](https://facebook.github.io/create-react-app/docs/getting-started).
-
-To learn React, check out the [React documentation](https://reactjs.org/).
diff --git a/src/App.tsx b/src/App.tsx
@@ -5,10 +5,12 @@ import './App.css';
 
 import Home from "./routes/home";
 import Project from "./routes/project";
+import ScrollToTop from "./components/layout/ScrollToTop";
 
 const App: React.FC = () => {
   return (
       <Router>
+          <ScrollToTop />
           <Route exact path="/" component={Home} />
           <Route path="/projects" component={Project} />
       </Router>

diff --git a/src/routes/home/Home.tsx b/src/routes/home/Home.tsx
@@ -122,7 +122,7 @@ class Home extends React.Component<appProps, appState> {
                                     <a href={'https://github.com/tolujimoh'} target={'_blank'}>
                                         <Image src={githubLogo} className={'social-icon'}/>
                                     </a>
-                                    <a href={'http://behance.net/tolu_jimoh'} target={'_blank'}><Image src={behanceLogo}  className={'social-icon'} /></a>
+                                    {/*<a href={'http://behance.net/tolu_jimoh'} target={'_blank'}><Image src={behanceLogo}  className={'social-icon'} /></a>*/}
                                 </div>
                             </Col>
                         </Row>
@@ -144,8 +144,8 @@ class Home extends React.Component<appProps, appState> {
                                         products
                                         that solve real-world problems. I strive to
                                         become a part of a design-driven organization.</p>
-                                    <p className={'work-desc'} >Currently working on a detailed case
-                                        study for each of my projects</p>
+                                    {/*<p className={'work-desc'} >Currently working on a detailed case*/}
+                                    {/*    study for each of my projects</p>*/}
                                 </Col>
                             </Container>
                         </Row>

diff --git a/src/routes/project/fut_mx_shuttle/futMxShuttle.tsx b/src/routes/project/fut_mx_shuttle/futMxShuttle.tsx
@@ -7,7 +7,6 @@ import Image from "react-bootstrap/es/Image";
 
 import '../Project.css';
 import {Link} from "react-router-dom";
-import ScrollToTop from "../../../components/layout/ScrollToTop";
 
 type appProps = {}
 
@@ -29,7 +28,6 @@ class futMxShuttle extends React.Component<appProps, appState> {
 
         return (
             <>
-                <ScrollToTop/>
                 <header className="m-3 p-4 card bg-white border-0">
                     <Container fluid>
                         <Row style={{padding: 80, paddingTop: 20, paddingBottom: 20}}>
@@ -69,7 +67,7 @@ class futMxShuttle extends React.Component<appProps, appState> {
                         <Row>
                             <Col sm={7}>
                                 <p style={{fontWeight: 900, fontSize: 20, color: '#CCCCCC'}}>OVERVIEW</p>
-                                <p style={{fontWeight: 100, fontSize: 28}}>FUT Mx Shuttle is a travel scheduling application for the FUT Mx Bus service. Buses The goal of this project is to calculate the Estimated Time of Arrival (ETA) and determine the destination station for a trip using the information received from each bus tracker.  The ETA and trip destination is then shown on a digital signage display at each station. </p>
+                                <p style={{fontWeight: 100, fontSize: 28}}>FUT Mx Shuttle is a travel scheduling application for the FUT Mx Bus service. The goal of this project was to calculate the Estimated Time of Arrival (ETA) and determine the destination station for a trip using the information received from each bus tracker.  The ETA and trip destination are then shown on a digital signage display at each station. </p>
                             </Col>
                             <Col sm={5}>
                                 <p style={{fontWeight: 900, fontSize: 20, color: '#CCCCCC'}}>HATS

diff --git a/src/routes/project/openheavens/openHeavens.tsx b/src/routes/project/openheavens/openHeavens.tsx
@@ -7,7 +7,6 @@ import Image from "react-bootstrap/es/Image";
 
 import '../Project.css';
 import {Link} from 'react-router-dom';
-import ScrollToTop from "../../../components/layout/ScrollToTop";
 
 type appProps = {}
 
@@ -34,7 +33,6 @@ class openHeavens extends React.Component<appProps, appState> {
 
         return (
             <>
-                <ScrollToTop/>
                 <header className="m-3 p-4 card bg-white border-0">
                     <Container fluid>
                         <Row style={{padding: 80, paddingTop: 20, paddingBottom: 20}}>
@@ -59,10 +57,12 @@ class openHeavens extends React.Component<appProps, appState> {
                     <Container>
                         <Row>
                             <Col style={{padding: '94px 48px'}}>
-                                <Image className={'float-left'} style={{width: 80, height: 'auto', marginRight: 24}} src={openHeavensIcon}/>
+                                <Image className={'float-left'} style={{width: 80, height: 'auto', marginRight: 24}}
+                                       src={openHeavensIcon}/>
                                 <div>
                                     <p style={{fontSize: 28, fontWeight: 900, marginBottom: 0}}>Openheavens Connect</p>
-                                    <p style={{fontSize: 20, fontWeight: 100, color: '#A2A2A2'}}>Product Manager and Software Engineer</p>
+                                    <p style={{fontSize: 20, fontWeight: 100, color: '#A2A2A2'}}>Product Manager and
+                                        Software Engineer</p>
                                 </div>
                             </Col>
                         </Row>
@@ -133,8 +133,10 @@ class openHeavens extends React.Component<appProps, appState> {
                                     Application</p>
                             </Col>
                             <Col>
-                                <Image src={appleStoreIcon} style={{width: 200, height: "auto"}}
-                                       className={'float-right'}/>
+                                <a href={'https://apps.apple.com/ng/app/open-heavens-connect/id1409055190'}
+                                   target={'_blank'}>
+                                    <Image src={appleStoreIcon} style={{width: 200, height: "auto"}}
+                                           className={'float-right'}/></a>
                             </Col>
                         </Row>
                         <Row>