From 7dbd34fc91deed07e37baeddfc463a87dc894a7f Mon Sep 17 00:00:00 2001 From: Ken Crites Date: Mon, 6 Apr 2020 00:06:58 +0200 Subject: [PATCH] Saving version 2.5 - before firebase --- package-lock.json | 6 +++--- src/App.js | 6 +++--- src/components/Navigation/Navigation.js | 1 - src/components/Signin/Signin.js | 4 +++- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index bee84f8..28dcfb3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7497,9 +7497,9 @@ }, "dependencies": { "acorn": { - "version": "5.7.3", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.3.tgz", - "integrity": "sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw==" + "version": "5.7.4", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.4.tgz", + "integrity": "sha512-1D++VG7BhrtvQpNbBzovKNc1FLGGEE/oGe7b9xJm/RFHMBeUaUGpluV9RLjZa47YFdPcDAenEYuq9pQPcMdLJg==" } } }, diff --git a/src/App.js b/src/App.js index 678f15b..4415f6b 100755 --- a/src/App.js +++ b/src/App.js @@ -18,8 +18,8 @@ import "react-loader-spinner/dist/loader/css/react-spinner-loader.css" //import 'bootstrap/dist/css/bootstrap.min.css'; -//const serverURL = 'http://localhost:3005/'; -const serverURL = 'https://ttrackerserver-ams.herokuapp.com/'; +const serverURL = 'http://localhost:3005/'; +//const serverURL = 'https://ttrackerserver-ams.herokuapp.com/'; const trainingHistoryArr = []; const statHistoryArr = []; @@ -252,7 +252,7 @@ class App extends Component { trainingHistoryArr.unshift(e); this.setState(state => { const trainingPackage = [e, ...state.trainingPackage]; - console.table(trainingPackage) + //console.table(trainingPackage) return { trainingPackage diff --git a/src/components/Navigation/Navigation.js b/src/components/Navigation/Navigation.js index a33f72d..66830e0 100644 --- a/src/components/Navigation/Navigation.js +++ b/src/components/Navigation/Navigation.js @@ -15,7 +15,6 @@ const Navigation = ({onRouteChange, isSignedIn, isTrainer, name}) => { :

onRouteChange('home')} className='f5 link dim black pa2 pointer'>Home

}

onRouteChange('trainingHistory')} className='f5 link dim black pa2 pointer'>Training History

onRouteChange('stats')} className='f5 link dim black pa2 pointer'>Measurement History

- {/*

onRouteChange('statsInputForm')} className='f5 link dim black pa2 pointer'>Enter Stats

*/}

onRouteChange('signout')} className='f5 link dim black pa2 pointer'>Sign Out

); diff --git a/src/components/Signin/Signin.js b/src/components/Signin/Signin.js index 3365bbb..d017d18 100644 --- a/src/components/Signin/Signin.js +++ b/src/components/Signin/Signin.js @@ -1,6 +1,8 @@ import React from 'react'; import Loader from 'react-loader-spinner' +const version = '2.5'; + class Signin extends React.Component { constructor(props){ super(props); @@ -75,7 +77,7 @@ class Signin extends React.Component {

onRouteChange('register')} className="f6 link dim black db pointer">Register

-
version 2.2 {(dbAwake) ? '' : +
version {version} {(dbAwake) ? '' :