changed user check in injury list to the user id, not username

b-bly · May 9, 2018 · 01c28e0 · 01c28e0
1 parent a832072
commit 01c28e0
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 4 deletions.
diff --git a/server/routes/user.js b/server/routes/user.js
@@ -40,6 +40,7 @@ router.post(
     (req, res) => {
         console.log('logged in', req.user);
         var userInfo = {
+            _id: req.user._id,
             username: req.user.username
         };
         res.send(userInfo);

diff --git a/src/App.js b/src/App.js
@@ -36,7 +36,7 @@ class App extends Component {
             />}
         /> */}
         <Route
-          path="/"
+          exact path="/"
           component={InjuryList} />
         <Route
           path="/login"

diff --git a/src/actions/get-user.js b/src/actions/get-user.js
@@ -10,6 +10,7 @@ export default function getUser() {
             console.log(res.data);
             const user = {
                 username: res.data.user.username,
+                id: res.data.user._id,
                 loggedIn: true 
             };
             if (!res.data.user.username) user.loggedIn = false;

diff --git a/src/actions/login.js b/src/actions/login.js
@@ -10,6 +10,7 @@ export default function login(userInfo) {
             console.log(res.data);
             const user = {
                 username: res.data.username,
+                id: res.data._id,
                 loggedIn: true
             }
             dispatch(loginAsync(user));

diff --git a/src/index.css b/src/index.css
@@ -137,4 +137,8 @@ body {
     flex-direction: column;
     justify-content: center;
   }
+}
+
+.pointer {
+  cursor: pointer;
 }
diff --git a/src/scenes/injury-list/index.js b/src/scenes/injury-list/index.js
@@ -106,7 +106,8 @@ class InjuryList extends Component {
                                 delete={this.delete}
                                 showForm={this.showForm.bind(this)}
                                 injury={injury}
-                                username={this.props.user.username} />
+                                username={this.props.user.username} 
+                                userId={this.props.user.id}/>
 
                         )}
 

diff --git a/src/scenes/injury-list/injury-list-item.js b/src/scenes/injury-list/injury-list-item.js
@@ -28,7 +28,7 @@ export default class InjuryListItem extends Component {
                 <div className="col-4 col-mx-auto">
                     <div className="card">
                         <div className="columns card-bdy">
-                            <div className=" col-12 card-title-line"
+                            <div className="col-12 card-title-line pointer"
                                 onClick={this.handleClick.bind(this)}
                             >
                                 {this.props.injury.title}
@@ -47,7 +47,7 @@ export default class InjuryListItem extends Component {
                             {   this.props.injury.author ?(
                             <div>
                             {
-                                this.props.username === this.props.injury.author.username &&
+                                this.props.userId === this.props.injury.author.id &&
                                  (
                                     <div>
                                         <a className="list-links card-line"