From 36864f4539fee4834ff451c237c3609e1806b5b1 Mon Sep 17 00:00:00 2001
From: Francesca Sperati <6431@ait.nsw.edu.au>
Date: Mon, 11 Feb 2019 22:23:01 +1100
Subject: [PATCH] user card detail fix

---
 src/assets/scripts/ads/ads.html               |  4 +-
 src/assets/scripts/dashboard/dashboard.html   |  2 +-
 src/assets/scripts/profile/profile.html       |  2 +-
 .../scripts/user-details/user-details.html    | 88 +++++++++++--------
 4 files changed, 56 insertions(+), 40 deletions(-)

diff --git a/src/assets/scripts/ads/ads.html b/src/assets/scripts/ads/ads.html
index 065b891..93b746b 100644
--- a/src/assets/scripts/ads/ads.html
+++ b/src/assets/scripts/ads/ads.html
@@ -20,7 +20,9 @@
                       <div class="card-title d-flex  mx-2" style="justify-content:space-between; margin-bottom:0px; text-align: left;">
                         <h4> {{ ad.title }} </h4>
                         <div>
-                            <a class='' href="" > <span class="icon-holder"><i class="fa fa-heart-o font-weight-bold mt-2" style="color:#EE38A4; font-size: 22px;"></i></span></a>
+                            <a class='' href="" ng-show="user.role =='user'"> 
+                              <span class="icon-holder"><i class="fa fa-heart-o font-weight-bold mt-2" style="color:#EE38A4; font-size: 22px;"></i></span>
+                            </a>
                         </div>
                       </div>
                       <p class="card-text mx-2"><small class="text-muted">{{ ad.description }}</small></p>
diff --git a/src/assets/scripts/dashboard/dashboard.html b/src/assets/scripts/dashboard/dashboard.html
index 97974ee..2ff3a2e 100644
--- a/src/assets/scripts/dashboard/dashboard.html
+++ b/src/assets/scripts/dashboard/dashboard.html
@@ -2,7 +2,7 @@
   <div id='mainContent row'>
     <div class="row content-title mT-60">
       <div class="col-8 ml-1 mb-4">
-        Welcome {{ user.name }}
+        <h1>Welcome {{ user.name }}</h1>
       </div>
     </div>
     <div class=" gap-20 masonry pos-r">
diff --git a/src/assets/scripts/profile/profile.html b/src/assets/scripts/profile/profile.html
index 9d6c515..13a9426 100644
--- a/src/assets/scripts/profile/profile.html
+++ b/src/assets/scripts/profile/profile.html
@@ -2,7 +2,7 @@
   <div id='mainContent row'>
     <div class="content-title mT-60">
       <div class="ml-1 mb-3">
-        Profile
+        <h1>Profile</h1>
       </div>
     </div>
     <div class="ml-1 mb-3 text-black-bold">
diff --git a/src/assets/scripts/user-details/user-details.html b/src/assets/scripts/user-details/user-details.html
index 082310a..aa97456 100644
--- a/src/assets/scripts/user-details/user-details.html
+++ b/src/assets/scripts/user-details/user-details.html
@@ -15,22 +15,40 @@
         <div class="masonry-item  w-100 visible-admin visible-nomit visible-referee visible-company" ng-show="user.role != 'user'">
   
           <div class="card item-box">
-            <div class="user-data-title">
-              <img class="user-update-img" src="assets/static/images/user-update.png" alt="">
-              <div class="testo">
-                <h5>{{userDetails.name}}</h5> {{userDetails.personal.bio}}
+
+            <div class="row user-data-title">
+
+              <div class="col-9">
+                <img class="user-update-img" src="assets/static/images/user-update.png" alt="">
+                <div class="testo">
+                  <h5>{{userDetails.name}}</h5> 
+                  {{userDetails.personal.bio}}
+                </div>
+              </div>
+
+              <div class="col-3 profile-form-row row">
+                      <div class="users-icons ml-0">
+                        <a href="https://www.linkedin.com/{{userDetails.personal.linkedin}}"><i class="fa fa-linkedin"></i></a>
+                        <a href="https://www.facebook.com/{{userDetails.personal.facebook}} "><i class="fa fa-facebook"></i></a>
+                        <a href="https://www.instagram.com/{{userDetails.personal.instagram}}"><i class="fa fa-instagram"></i></a>
+                        <a href="https://github.com/{{userDetails.personal.github}}"><i class="fa fa-github"></i></a>
+                      </div>
               </div>
+
             </div>
+
+
+
             <div class="card-body-profile">
               <div class="profile-forms">
                 <h5 class="card-title d-flex text-black-bold"> Your Profile</h5>
   
                 <div class="row ">
-                  <div class="col-4 profile-form-row">
+                  <div class="col-3 profile-form-row">
                     <h9 class="">First Name</h9>
                     <p class="font-weight-light"> {{userDetails.personal.first_name}} </p>
                   </div>
-                  <div class="col-4 profile-form-row">
+                  <div class="col-5 profile-form-row">
                     <h9 class="">Middle Name</h9>
                     <p class="font-weight-light">{{userDetails.personal.middle_name}}</p>
                   </div>
@@ -41,66 +59,62 @@
                 </div>
   
                 <div class="row ">
-                  <div class="col-4 profile-form-row">
+                  <div class="col-3 profile-form-row">
                     <h9 class="">Email Address</h9>
                     <p class="font-weight-light">{{userDetails.email}} </p>
                   </div>
-                  <div class="col-4 profile-form-row">
+                  <div class="col-5 profile-form-row">
                     <h9 class="">Phone Number</h9>
                     <p class="font-weight-light">{{userDetails.personal.phone}}</p>
                   </div>
                   <div class="col-4 profile-form-row">
                     <h9 class="">State</h9>
-                    <select id="inputState" class="form-control" >
-                      <option selected>VIC</option>
-                      <option>SA</option>
-                      <option>WA</option>
-                      <option>NSW</option>
-                      <option>QLD</option>
-                      <option>TAS</option>
-                    </select>
+                    <p class="font-weight-light">{{userDetails.personal.state}}</p>
                   </div>
                 </div>
   
                 <div class="row ">
-                  <div class="col-4 profile-form-row">
+                  <div class="col-3 profile-form-row">
                     <h9 class="">Nationality</h9>
                     <p class="font-weight-light">{{userDetails.personal.nationality}}</p>
                   </div>
-                  <div class="col-4 profile-form-row">
+                  <div class="col-5 profile-form-row">
                     <h9 class="">Visa Type</h9>
                     <p class="font-weight-light">{{userDetails.personal.visa}}</p>
                   </div>
                   <div class="col-4 profile-form-row">
-                    <h9 class="">Language (Select one or more)</h9>
-                    <p class="font-weight-light">{{userDetails.personal.language}}</p>
+                    <h9 class="">Spoken Languages</h9>
+                    <div ng-repeat=" language in userDetails.personal.language">
+                      <p class="font-weight-light">{{language}}</p>
+                    </div>
                   </div>
                 </div>
   
                 <div class="row ">
                     <div class="col-4 profile-form-row">
                       <h9 class="">Education</h9>
+                      <!--<div ng-repeat=" education in userDetails.personal.educations">
+                      <p class="font-weight-light">{{education}}</p>-->
                       <p class="font-weight-light">{{userDetails.personal.education}}</p>
                     </div>
-                  </div>  
-  
-                     
-                    <div class="row profile-form-row">
-                      <div class="mt-4">
-                        <h5 class="card-title mt-4 ml-4 mr-4 d-flex">Main Classification:</h5>
-                        <div ng-repeat="industry in userDetails.personal.main_classification">
-                            <div class="ml-1 mb-4 btn btn-industry" >{{industry}}</div>
-                        </div>
+                </div>  
 
-                        <h5 class="card-title mt-4 ml-4 mr-4 d-flex">Skills:</h5>
-                        <div ng-repeat="skill in userDetails.personal.skills">
-                            <div class="ml-1 mb-4 btn btn-skills" >{{skill}}</div>
+                <div class="row col-12 profile-form-row">
 
-                        </div>
-                        
-                      </div>
-                    </div>
-                    
+                  <h9 class=" ">Main Classification:</h9>
+                  <div ng-repeat="industry in userDetails.personal.main_classification">
+                      <div class="ml-1 mb-4 btn btn-industry" >{{industry}}</div>
+                  </div>
+
+                </div>  
+                <div class="row col-12 profile-form-row">
+                  <h9 class=" mt-60">Skills:</h9>
+                  <div ng-repeat="skill in userDetails.personal.skills">
+                      <div class="ml-1 mb-4 btn btn-skills" >{{skill}}</div>
+                  </div>
+                  
+                </div> 
+                </div>    
               </div>
             </div>
           </div>