From cc469564503df20ced8f679750d501923399acdc Mon Sep 17 00:00:00 2001 From: tolujimoh Date: Sat, 19 Oct 2019 23:40:57 +0100 Subject: [PATCH 1/2] Fix scroll to top --- README.md | 43 +------------------ src/App.tsx | 2 + src/routes/home/Home.tsx | 2 +- .../project/fut_mx_shuttle/futMxShuttle.tsx | 4 +- .../project/openheavens/openHeavens.tsx | 14 +++--- 5 files changed, 13 insertions(+), 52 deletions(-) diff --git a/README.md b/README.md index 897dc83..e4de64b 100644 --- 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.
-Open [http://localhost:3000](http://localhost:3000) to view it in the browser. - -The page will reload if you make edits.
-You will also see any lint errors in the console. - -### `npm test` - -Launches the test runner in the interactive watch mode.
-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.
-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.
-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 index e2fcea2..436d921 100644 --- 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 ( + diff --git a/src/routes/home/Home.tsx b/src/routes/home/Home.tsx index 429dc08..e074882 100644 --- a/src/routes/home/Home.tsx +++ b/src/routes/home/Home.tsx @@ -122,7 +122,7 @@ class Home extends React.Component { - + {/**/} diff --git a/src/routes/project/fut_mx_shuttle/futMxShuttle.tsx b/src/routes/project/fut_mx_shuttle/futMxShuttle.tsx index 46269c4..482b740 100644 --- 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 { return ( <> -
@@ -69,7 +67,7 @@ class futMxShuttle extends React.Component {

OVERVIEW

-

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.

+

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.

HATS diff --git a/src/routes/project/openheavens/openHeavens.tsx b/src/routes/project/openheavens/openHeavens.tsx index b913bbb..09abfd4 100644 --- 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 { return ( <> -

@@ -59,10 +57,12 @@ class openHeavens extends React.Component { - +

Openheavens Connect

-

Product Manager and Software Engineer

+

Product Manager and + Software Engineer

 @@ -133,8 +133,10 @@ class openHeavens extends React.Component { Application

- + + From 97ab971812d87472c0ecd0e95954470d27ddb461 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 20 Oct 2019 01:55:03 +0000 Subject: [PATCH 2/2] Bump eslint-utils from 1.3.1 to 1.4.2 Bumps [eslint-utils](https://github.com/mysticatea/eslint-utils) from 1.3.1 to 1.4.2. - [Release notes](https://github.com/mysticatea/eslint-utils/releases) - [Commits](https://github.com/mysticatea/eslint-utils/compare/v1.3.1...v1.4.2) Signed-off-by: dependabot[bot] --- yarn.lock | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/yarn.lock b/yarn.lock index fc9f2fd..3c4ff7b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3725,14 +3725,16 @@ eslint-scope@^4.0.0, eslint-scope@^4.0.3: estraverse "^4.1.1" eslint-utils@^1.3.1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-1.3.1.tgz#9a851ba89ee7c460346f97cf8939c7298827e512" - integrity sha512-Z7YjnIldX+2XMcjr7ZkgEsOj/bREONV60qYeB/bjMAqqqZ4zxKyWX+BOUkdmRmA9riiIPVvo5x86m5elviOk0Q== + version "1.4.2" + resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-1.4.2.tgz#166a5180ef6ab7eb462f162fd0e6f2463d7309ab" + integrity sha512-eAZS2sEUMlIeCjBeubdj45dmBHQwPHWyBcT1VSYB7o9x9WRRqKxyUoiXlRjyAwzN7YEzHJlYg0NmzDRWx6GP4Q== + dependencies: + eslint-visitor-keys "^1.0.0" eslint-visitor-keys@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz#3f3180fb2e291017716acb4c9d6d5b5c34a6a81d" - integrity sha512-qzm/XxIbxm/FHyH341ZrbnMUpe+5Bocte9xkmFMzPMjRaZMcXww+MpBptFvtU+79L362nqiLhekCxCxDPaUMBQ== + version "1.1.0" + resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz#e2a82cea84ff246ad6fb57f9bde5b46621459ec2" + integrity sha512-8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A== eslint@^5.16.0: version "5.16.0" @@ -8084,7 +8086,7 @@ react-app-polyfill@^1.0.1: regenerator-runtime "0.13.2" whatwg-fetch "3.0.0" -react-bootstrap@^1.0.0-beta.9: +react-bootstrap@1.0.0-beta.9: version "1.0.0-beta.9" resolved "https://registry.yarnpkg.com/react-bootstrap/-/react-bootstrap-1.0.0-beta.9.tgz#3d9e429fd3d7a81db241aa824646c73e99a8566c" integrity sha512-M0BYLuuUdMITJ16+DDDb1p4vWV87csEBi/uOxZYODuDZh7hvbrJVahfvPXcqeqq4eEpNL+PKSlqb9fNaY0HZyA==