Merge pull request #94 from msrjr91/ryan

data render mvp
msrjr91 · Mar 23, 2023 · 18f70af · 18f70af
2 parents 817ec1b + 2ce2657
commit 18f70af
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 9 deletions.
diff --git a/client/src/pages/Profile.js b/client/src/pages/Profile.js
@@ -136,12 +136,12 @@ export default function Profile(){
 
     return user && comments && posts && allUsers ? (
         <div className="profile">
-        <img src={'https://i.pravatar.cc/100'}/>
+        <img src={profileUser.avatar}/>
         <section className="profile-header"> 
                 <h2 style={{color: 'white'}}>
                   {profileUser.username} / {profileUser.name}
                 </h2>
-                <button onClick={() => navigate('/update')}>Update Profile</button>
+                <button className="registerbtn" onClick={() => navigate('/update')}>Update Profile</button>
             <figure style={{marginLeft: '70vw'}}>
                 <figcaption style={{color: 'white'}}>
                     Currently listening to..
@@ -167,6 +167,10 @@ export default function Profile(){
                 }
                 </div>:null
             }
+            </div>
+
+
+            <div className="profile-body-inner">
                 {
                     (posts)?
                     <div className='profilefeed2' style={{border: '2px solid white'}}>Albums/Songs/Playlists
@@ -204,8 +208,9 @@ export default function Profile(){
             }
 
             </div>
-        </section>
+            </section>
         </div>
+
     ) : <div>Please Log In</div>
 }
 
diff --git a/client/src/pages/UpdateProfile.js b/client/src/pages/UpdateProfile.js
@@ -134,7 +134,7 @@ const UpdateProfile = (props) => {
             Update
           </button>
         </form>
-        <button onClick={deleteUser}>Delete Profile</button>
+        <button className="registerbtn" onClick={deleteUser}>Delete Profile</button>
       </div>
     </div>
   )

diff --git a/client/src/styles/App.css b/client/src/styles/App.css
@@ -251,27 +251,29 @@ body {
 
 .profile-header {
     font-style: italic;
-    font-family: Cambria, Cochin, Georgia, Times, 'Times New Roman', serif;
+    font-family: 'Cambria', 'Cochin', 'Georgia', 'Times', 'Times New Roman', 'serif';
     color: white;
     font-size: 20px;
     padding: 0%;
     margin: 0%;
 }
 
 .profile-body {
-        width: 100%;
+        display: flex;
+        flex-direction: row;
+        width: 100vw;
         border: 1px solid rgb(51, 51, 51);
         overflow: hidden;
-        height: 100%;
+        height: fit-content;
         border-radius: 20px;
         box-shadow: 0 0 10px 3px rgba(60, 60, 60, 0.8);
         justify-content: space-around;
 }
 
 .profile-body-inner {
         overflow-y: scroll;
-        height: 800px;
-        width: 450px;
+        height: fit-content;
+        width: 40vw;
         border-radius: 8px;
         background: rgba(255, 255, 255, 0.3);
 }