1.0.0 Release

- Core feature implementation is completed. Features: - Adding, editing, viewing or deleting tasks. - Starting or stopping a timer with some task. - Hiding completed tasks. - Integration with Trello and Wunderlist (WIP). Fixes: - Some indentation fixes.
codeaia · Mar 1, 2017 · 7b39566 · 7b39566
1 parent 5dea0ee
commit 7b39566
Show file tree

Hide file tree

Showing 5 changed files with 313 additions and 335 deletions.
diff --git a/imports/ui/components/App.jsx b/imports/ui/components/App.jsx
@@ -14,77 +14,75 @@ import IntegrationAuth from './IntegrationAuth.jsx';
 import Profile from './Profile.jsx';
 import Nav from './Nav.jsx';
 
-
 class App extends Component {
   constructor(props) {
-	super(props);
+	   super(props);
 
-	this.state = {
-	  route: this.props.route,
-	}
+  	this.state = {
+  	  route: this.props.route,
+  	}
   }
 
   componentWillReceiveProps(nextProps){
-	this.setState({
-	  route: nextProps.route,
-	});
+  	this.setState({
+  	  route: nextProps.route,
+  	});
   }
 
   render() {
-	if (this.props.currentUser !== undefined) {
-	  if (this.state.route == 'timer') {
-		return (
-			<Flexbox flexDirection='column'>
-				<Nav/>
-				<ReactCSSTransition
-					transitionName = "fromTopLoad"
-					transitionEnterTimeout = {600}
-					transitionLeaveTimeout = {400}
-				>	
-				<Flexbox flexDirection='column' className='timerContainer'>
-			  		<div className='timer'>
-						<Timer currentUser={this.props.currentUser}/>
-			  		</div>
-			  		<TaskViewContainer/>
-				</Flexbox>
-				</ReactCSSTransition>
-			</Flexbox>
-		);
-	  } else if(this.state.route == 'statistics') {
-		return (
-		  <Flexbox flexDirection='column'>
-			<Nav/>
-			<Flexbox flexDirection='column' className='taskNewContainer'>
-			  <Profile currentUser={this.props.currentUser}/>
-			  <Statistics/>
-			</Flexbox>
-		  </Flexbox>
-		);
-	  } else if(this.state.route == 'settings'){
-		return (
-		  <Flexbox flexDirection='column'>
-			<Nav/>
-			<Flexbox flexDirection='column' className='taskNewContainer'>
-			  <IntegrationAuth/>
-			  <Settings/>
-			</Flexbox>
-		  </Flexbox>
-		);
-	  } else if(this.state.route == 'taskNew'){
-		return (
-		  <Flexbox flexDirection='column'>
-			<Nav/>
-			<Flexbox flexDirection='column' className='taskNewContainer'>
-			  <TaskNew/>
-			</Flexbox>
-		  </Flexbox>
-		);
-	  }
-	} else {
-	  return (
-		<Loading/>
-	  );
-	}
+  	if (this.props.currentUser !== undefined) {
+  	  if (this.state.route == 'timer') {
+  		return (
+  			<Flexbox flexDirection='column'>
+  				<Nav/>
+  				<ReactCSSTransition
+  					transitionName = "fromTopLoad"
+  					transitionEnterTimeout = {600}
+  					transitionLeaveTimeout = {400}>
+            <Flexbox flexDirection='column' className='timerContainer'>
+  			  		<div className='timer'>
+                <Timer currentUser={this.props.currentUser}/>
+  			  		</div>
+  			  		<TaskViewContainer/>
+            </Flexbox>
+  				</ReactCSSTransition>
+  			</Flexbox>
+  		);
+  	  } else if(this.state.route == 'statistics') {
+  		return (
+  		  <Flexbox flexDirection='column'>
+          <Nav/>
+          <Flexbox flexDirection='column' className='taskNewContainer'>
+            <Profile currentUser={this.props.currentUser}/>
+            <Statistics/>
+          </Flexbox>
+  		  </Flexbox>
+  		);
+  	  } else if(this.state.route == 'settings'){
+  		return (
+  		  <Flexbox flexDirection='column'>
+          <Nav/>
+          <Flexbox flexDirection='column' className='taskNewContainer'>
+            <IntegrationAuth/>
+            <Settings/>
+          </Flexbox>
+  		  </Flexbox>
+  		);
+  	  } else if(this.state.route == 'taskNew'){
+  		return (
+  		  <Flexbox flexDirection='column'>
+          <Nav/>
+          <Flexbox flexDirection='column' className='taskNewContainer'>
+            <TaskNew/>
+          </Flexbox>
+  		  </Flexbox>
+  		);
+  	  }
+  	} else {
+  	  return (
+  		<Loading/>
+  	  );
+  	}
   }
 }