Undid heroku deploy changes and added styling changes

adunn49 · Feb 20, 2018 · 4f515cd · 4f515cd
1 parent 78e047d
commit 4f515cd
Show file tree

Hide file tree

Showing 16 changed files with 72 additions and 20 deletions.
diff --git a/Procfile b/Procfile
@@ -1,2 +1,2 @@
-web: node scripts/start.js
-web: node server/server.js
+web: nodemon scripts/start.js
+api: nodemon server/server.js
diff --git a/build/asset-manifest.json b/build/asset-manifest.json
@@ -0,0 +1,6 @@
+{
+  "main.css": "static/css/main.56682d9d.css",
+  "main.css.map": "static/css/main.56682d9d.css.map",
+  "main.js": "static/js/main.c347e27e.js",
+  "main.js.map": "static/js/main.c347e27e.js.map"
+}
diff --git a/build/favicon.ico b/build/favicon.ico
diff --git a/build/index.html b/build/index.html
@@ -0,0 +1 @@
+<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no"><meta name="theme-color" content="#000000"><link rel="manifest" href="/manifest.json"><link href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet"><link rel="shortcut icon" href="/favicon.ico"><title>React App</title><link href="/static/css/main.56682d9d.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root" style="height:100%"></div><script type="text/javascript" src="/static/js/main.c347e27e.js"></script></body></html>
diff --git a/build/manifest.json b/build/manifest.json
@@ -0,0 +1,15 @@
+{
+  "short_name": "React App",
+  "name": "Create React App Sample",
+  "icons": [
+    {
+      "src": "favicon.ico",
+      "sizes": "64x64 32x32 24x24 16x16",
+      "type": "image/x-icon"
+    }
+  ],
+  "start_url": "./index.html",
+  "display": "standalone",
+  "theme_color": "#000000",
+  "background_color": "#ffffff"
+}
diff --git a/build/service-worker.js b/build/service-worker.js
diff --git a/build/static/css/main.56682d9d.css b/build/static/css/main.56682d9d.css
diff --git a/build/static/css/main.56682d9d.css.map b/build/static/css/main.56682d9d.css.map
diff --git a/build/static/js/main.c347e27e.js b/build/static/js/main.c347e27e.js
diff --git a/build/static/js/main.c347e27e.js.map b/build/static/js/main.c347e27e.js.map
diff --git a/package.json b/package.json
@@ -61,7 +61,7 @@
   },
   "scripts": {
     "start": "node scripts/start.js",
-    "start-dev": "nf start",
+    "start-dev": "nf start -p 3000",
     "build": "node scripts/build.js",
     "test": "node scripts/test.js --env=jsdom"
   },

diff --git a/src/components/EditStory/EditStory.css b/src/components/EditStory/EditStory.css
@@ -1,3 +1,14 @@
 .EditStory {
   margin: 60px 10px 10px;
+  background: #dee8e8;
+  padding: 32px;
+  border-color: transparent;
+}
+
+.EditStory h1 {
+  padding: 0px 15px;
+  margin-top: 0;
+  font-size: 2.8rem;
+  margin-bottom: 30px;
+  color: #797979;
 }
diff --git a/src/components/EditStory/EditStory.js b/src/components/EditStory/EditStory.js
@@ -18,7 +18,6 @@ const STORY_STATUS_ENUM = [
  * A Component for adding or editing a new user story.
  */
 class EditStory extends Component {
-
   state = {
     /* This will be used for a new user story. */
     story: {
@@ -87,14 +86,19 @@ class EditStory extends Component {
     }
   }
 
+  doCancelHandler = () => {
+    this.props.history.goBack();
+  }
+
+
   render() {
     console.log('story', this.state.story);
     const title = this.state.story._id === undefined ? 'Add Story': 'Edit Story';
     if (!this.state.story) {
       return null;
     }
     return (
-      <div className={classes.EditStory}>
+      <div className={['panel', 'panel-default', classes.EditStory].join(' ')}>
         <h1>{title}</h1>
         <form>
           <div className="container-fluid">
@@ -145,8 +149,9 @@ class EditStory extends Component {
         </form>
         <div className="container-fluid">
           <div className="row">
-            <div className="col-sm-12">
-              <button onClick={this.doSaveHandler}>Save</button>
+            <div className="col-sm-12 text-right">
+              <button className="btn btn-default" onClick={this.doCancelHandler} style={{marginRight: '5px'}}>Cancel</button>
+              <button className="btn btn-primary" onClick={this.doSaveHandler}>Save</button>
             </div>
           </div>
         </div>

diff --git a/src/components/UserStory/UserStory.js b/src/components/UserStory/UserStory.js
@@ -17,14 +17,14 @@ class UserStory extends Component {
     return (
         <div className={classes.UserStory}>
           <div className={classes['UserStory__Header']}>
-            <NavLink to={'/editstory/' + this.props.story.id}>
+            <NavLink to={'/editstory/' + this.props.story._id}>
               <ButtonIcon
                 title="Edit User Story"
                 glyphicon="glyphicon-pencil" />
             </NavLink>
             <ButtonIcon
               title="Delete User Story"
-              onClick={() => this.props.onDeleteStory(this.props.story.id)}
+              onClick={() => this.props.onDeleteStory(this.props.story._id)}
               glyphicon="glyphicon-trash" />
           </div>
           <div className={classes['UserStory__Body']}><h1 className={classes.UserStory__Body__Title}>{this.props.story.title}</h1></div>

diff --git a/src/containers/PlanningBoard/PlanningBoard.js b/src/containers/PlanningBoard/PlanningBoard.js
@@ -15,11 +15,11 @@ export class PlanningBoard extends Component {
 
   state = {
     stati: [
-      'Backlog',
-      'In Planning',
-      'Defined',
-      'In Progress',
-      'Complete'
+      'backlog',
+      'planning',
+      'defined',
+      'progress',
+      'complete'
     ],
     showDeleteConfirm: false
   };
@@ -31,10 +31,16 @@ export class PlanningBoard extends Component {
   render () {
     let items = [];
     for (let index = 0; index < this.state.stati.length; index++) {
-      let filteredStories = this.props.stories.filter(story =>
-        parseInt(story.storyStatus, 10) === index
+      let filteredStories = this.props.stories.filter(story => {
+          console.log(story.storyStatus);
+          return story.storyStatus === this.state.stati[index];
+        }
       );
-      items.push(<PlanningColumn onDelete={storyId => this.props.onDeleteStory(storyId)} planningStatus={this.state.stati[index]} title={this.state.stati[index]} stories={filteredStories} />);
+      items.push(<PlanningColumn
+          onDelete={storyId => this.props.onDeleteStory(storyId)}
+          planningStatus={this.state.stati[index]}
+          title={this.state.stati[index]}
+          stories={filteredStories} />);
     }
     return (
       <Aux>
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no"><meta name="theme-color" content="#000000"><link rel="manifest" href="/manifest.json"><link href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet"><link rel="shortcut icon" href="/favicon.ico"><title>React App</title><link href="/static/css/main.56682d9d.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root" style="height:100%"></div><script type="text/javascript" src="/static/js/main.c347e27e.js"></script></body></html>