From e06f03f39b683cb7017745478fe822bbda5bbb21 Mon Sep 17 00:00:00 2001
From: Juliana Ferreira Bastos <julferbas@yahoo.com.br>
Date: Thu, 10 Oct 2019 10:47:41 +0200
Subject: [PATCH 1/5] changes on logged users

---
 client/src/App.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/App.js b/client/src/App.js
index e4f773ab2..4a9020453 100755
--- a/client/src/App.js
+++ b/client/src/App.js
@@ -40,7 +40,7 @@ class App extends React.Component {
       const user = response.data;
       this.setState({ user: user , loadingUser: false});
     }).catch((error) => {
-      this.setState({ user: false , loadingUser: false});
+      this.setState({ user: undefined , loadingUser: false});
     });
   }
 

From 9a90ad655fa12a8cf1812e01a7e009341648a0d9 Mon Sep 17 00:00:00 2001
From: Juliana Ferreira Bastos <julferbas@yahoo.com.br>
Date: Fri, 11 Oct 2019 02:05:02 +0200
Subject: [PATCH 2/5] user reload after upload media

---
 client/src/App.js                    | 2 +-
 client/src/components/Profile.js     | 2 +-
 client/src/components/UploadMedia.js | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/src/App.js b/client/src/App.js
index 24711a3e1..b806b3a91 100755
--- a/client/src/App.js
+++ b/client/src/App.js
@@ -78,7 +78,7 @@ class App extends React.Component {
           {/* Route to show your own profile */}
           <Route
             exact path="/profile"
-            render={props => <Profile setUser={this.setUser} {...props} user={this.state.user} />}
+            render={props => <Profile setUser={this.setUser} loadUser={this.loadUser} {...props} user={this.state.user} />}
           />
           <Route
             exact path="/portfolio"
diff --git a/client/src/components/Profile.js b/client/src/components/Profile.js
index ad1a57fd7..d91624b09 100644
--- a/client/src/components/Profile.js
+++ b/client/src/components/Profile.js
@@ -172,7 +172,7 @@ export default class Profile extends Component {
                     <Card border="warning">
                         <Card.Body>
                             <Card.Text>
-                                <UploadMedia user={this.props.user} setUser={this.setUser} />
+                        <UploadMedia user={this.props.user} loadUser={this.props.loadUser} setUser={this.setUser} />
                             </Card.Text>
                         </Card.Body>
                     </Card>
diff --git a/client/src/components/UploadMedia.js b/client/src/components/UploadMedia.js
index 13aad6928..55c8d673b 100644
--- a/client/src/components/UploadMedia.js
+++ b/client/src/components/UploadMedia.js
@@ -44,7 +44,7 @@ export default class UploadMedia
         .then((response) => {
           // update the user and re-render the Profile
           console.log("Image Changed", response)
-          this.props.setUser(response.data);
+          this.props.loadUser();
         })
         .catch(err => console.log(err));
   }

From e191d3f07551a4d5096508165af5f076a9ac3bc2 Mon Sep 17 00:00:00 2001
From: Juliana Ferreira Bastos <julferbas@yahoo.com.br>
Date: Fri, 11 Oct 2019 02:39:10 +0200
Subject: [PATCH 3/5] added the profile picture for users

---
 routes/user.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/routes/user.js b/routes/user.js
index 6308fa0e1..d4d109a47 100644
--- a/routes/user.js
+++ b/routes/user.js
@@ -17,6 +17,8 @@ router.get('/:id', (req, res) => {
         city: user.city,
         skills: user.skills,
         hobbies: user.hobbies,
+        profilePicture: user.profilePicture,
+        uploadedMedia: user.uploadedMedia
       }));
 });
 

From 62030ca565d5c6b5447e156d841199003baf5dac Mon Sep 17 00:00:00 2001
From: Juliana Ferreira Bastos <julferbas@yahoo.com.br>
Date: Fri, 11 Oct 2019 02:52:35 +0200
Subject: [PATCH 4/5] centered items

---
 client/src/App.css | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/client/src/App.css b/client/src/App.css
index 55c7ad69e..a254dab2c 100755
--- a/client/src/App.css
+++ b/client/src/App.css
@@ -167,8 +167,9 @@ h2 {
 @media only screen and (max-width: 800px) {
 	.profile-intro {
 		display: flex;
-		flex-direction: column-reverse;
-	}
+    flex-direction: column-reverse;
+    align-items: center;
+  }
 }
 
 .about-card {
@@ -176,9 +177,11 @@ h2 {
 }
 
 .profile-picture-card {
-	padding-bottom: 2em;
+  padding-bottom: 2em;
 }
 
+
+
 .post-card {
 	margin-bottom: 7vh;
 }

From bd57692c0b531087fe7ada28e6535a1e4b9c27ae Mon Sep 17 00:00:00 2001
From: julferbas <julferbas@yahoo.com.br>
Date: Tue, 22 Oct 2019 12:18:32 +0200
Subject: [PATCH 5/5] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index c633d225a..6b170e6a0 100644
--- a/README.md
+++ b/README.md
@@ -1 +1 @@
-Final Project
\ No newline at end of file
+Final Project from Ironhack's bootcamp: a social network built with ReactJS, NodeJS, MongoDB, JavaScript, HTML, CSS, Bootstrap, Cloudinary API.