Skip to content

Commit

Permalink
Saving version 2.5 - before firebase
Browse files Browse the repository at this point in the history
  • Loading branch information
kcrites committed Apr 5, 2020
1 parent 2006c63 commit 7dbd34f
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 8 deletions.
6 changes: 3 additions & 3 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions src/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 = [];
Expand Down Expand Up @@ -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

Expand Down
1 change: 0 additions & 1 deletion src/components/Navigation/Navigation.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ const Navigation = ({onRouteChange, isSignedIn, isTrainer, name}) => {
: <p onClick={() => onRouteChange('home')} className='f5 link dim black pa2 pointer'>Home</p>}
<p onClick={() => onRouteChange('trainingHistory')} className='f5 link dim black pa2 pointer'>Training History</p>
<p onClick={() => onRouteChange('stats')} className='f5 link dim black pa2 pointer'>Measurement History</p>
{/* <p onClick={() => onRouteChange('statsInputForm')} className='f5 link dim black pa2 pointer'>Enter Stats</p> */}
<p onClick={() => onRouteChange('signout')} className='f5 link dim black pa2 pointer'>Sign Out</p>
</nav>
);
Expand Down
4 changes: 3 additions & 1 deletion src/components/Signin/Signin.js
Original file line number Diff line number Diff line change
@@ -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);
Expand Down Expand Up @@ -75,7 +77,7 @@ class Signin extends React.Component {
<p onClick={() => onRouteChange('register')} className="f6 link dim black db pointer">Register</p>
</div>
</div>
<div className="center f6 fw2 flex items-center">version 2.2 {(dbAwake) ? '' :
<div className="center f6 fw2 flex items-center">version {version} {(dbAwake) ? '' :
<Loader
type="ThreeDots"
color="#00BFFF"
Expand Down

0 comments on commit 7dbd34f

Please sign in to comment.