Merge pull request #5 from virtuagora/2.x

guillecro · web-flow · commit 36aa4f5007ff · 2019-10-26T12:42:15.000-03:00
Ready for 2.0.1
diff --git a/src/assets/sass/_global.scss b/src/assets/sass/_global.scss
@@ -72,3 +72,11 @@ img.is-centered {
 .modal-card {
   color: #000;
 }
+
+.cn-back-home {
+  position: fixed;
+  left: 12px;
+  top: 12px;
+  width: 27px;
+  z-index: 20;
+}
diff --git a/src/components/Navbar.vue b/src/components/Navbar.vue
@@ -5,8 +5,11 @@
       <img class="image" :src="userAvatarUrl">
       </div>
       <b-dropdown-item custom aria-role="menuitem">
-        <router-link :to="{name: 'profile', params:{ id: user.id}}" class="has-text-dark">Logged as
-        <b>{{user.display_name}}</b></router-link>
+        
+        <b>{{user.display_name}}</b>
+      </b-dropdown-item>
+      <b-dropdown-item aria-role="listitem" has-link v-if="user">
+      <router-link :to="{name: 'profile', params:{ id: user.id}}" class="has-text-link">My profile</router-link>
       </b-dropdown-item>
       <b-dropdown-item aria-role="listitem" has-link v-if="user">
       <router-link :to="{name: 'user'}" class="has-text-link">My panel</router-link>
diff --git a/src/i18n/en/user/userPanel/areasOfInterest.js b/src/i18n/en/user/userPanel/areasOfInterest.js
@@ -2,6 +2,7 @@ const areasOfInterest = {
   title: 'My areas of interest',
   subtitle: 'Here you can see your areas of interests. Click <i class="fas fa-times-circle"></i>&nbsp;to delete an area',
   emptyAreas: 'You don\'t have any areas of interest... Add a few ones! :)',
+  currentAreas: 'My current areas of interest',
   manage: {
     title: 'Manage areas of interest',
     subtitle: 'Here you can add multiples areas of interest',
diff --git a/src/views/creating-networks-tv/Catalog.vue b/src/views/creating-networks-tv/Catalog.vue
@@ -139,13 +139,6 @@ export default {
   width: 100%;
   height: 100%;
 }
-.cn-back-home {
-  position: fixed;
-  left: 12px;
-  top: 12px;
-  width: 27px;
-  z-index: 20;
-}
 .logo-cntv {
   height: 70px;
   margin: 0 auto 20px;
diff --git a/src/views/initiative/Initiative.vue b/src/views/initiative/Initiative.vue
@@ -2,6 +2,9 @@
   <section>
     <section>
       <div id="hero" class="hero is-medium is-dark">
+        <router-link :to="{name: 'home'}" class="cn-back-home">
+          <img src="/iso-cn.svg" class="image" alt />
+        </router-link>
         <div class="hero-body">
           <div class="container">
             <br class="is-hidden-desktop">
@@ -37,7 +40,7 @@
                 <li :class="{'is-active': $route.name === 'initiativeDetails'}">
                   <router-link :to="{ name: 'initiativeDetails', params: { id: initiative.id } }">Details</router-link>
                 </li>
-                <li :class="{'is-active': $route.name === 'initiativeMembers'}" v-if="initiative.city">
+                <li :class="{'is-active': $route.name === 'initiativeLocation'}" v-if="initiative.city">
                   <router-link :to="{ name: 'initiativeLocation', params: { id: initiative.id } }">Location</router-link>
                 </li>
                 <li :class="{'is-active': $route.name === 'initiativeMembers'}">
diff --git a/src/views/profile/Profile.vue b/src/views/profile/Profile.vue
@@ -2,6 +2,9 @@
   <section>
     <section>
       <div id="hero" class="hero is-fullheight is-dark">
+        <router-link :to="{name: 'home'}" class="cn-back-home">
+          <img src="/iso-cn.svg" class="image" alt />
+        </router-link>
         <div class="hero-body">
           <div class="container">
             <div class="columns">
@@ -14,15 +17,15 @@
               <div class="column">
                 <h1 class="title is-1 is-size-3-touch">{{userProfile.display_name}}</h1>
                 <div class="content">
-                  <p class="add-br is-italic">{{userProfile.bio}}</p>
+                  <p class="add-br is-italic" >{{userProfile.bio || 'I haven\'t completed my bio yet!' }}</p>
                 </div>
                 <div class="columns is-mobile">
                   <div class="column is-narrow">
                     <a
                       :href="`https://${userProfile.data.website}`"
                       target="_blank"
                       class="has-text-white"
-                      v-if="userProfile.data.website"
+                      v-if="userProfile.data && userProfile.data.website"
                     >
                       <i class="fas fa-globe fa-lg fa-fw"></i>
                     </a>
@@ -32,7 +35,7 @@
                       :href="`https://facebook.com/${userProfile.data.facebook}`"
                       target="_blank"
                       class="has-text-white"
-                      v-if="userProfile.data.facebook"
+                      v-if="userProfile.data && userProfile.data.facebook"
                     >
                       <i class="fab fa-facebook-f fa-lg fa-fw"></i>
                     </a>
@@ -42,7 +45,7 @@
                       :href="`https://twitter.com/${userProfile.data.twitter}`"
                       target="_blank"
                       class="has-text-white"
-                      v-if="userProfile.data.twitter"
+                      v-if="userProfile.data && userProfile.data.twitter"
                     >
                       <i class="fab fa-twitter fa-lg fa-fw"></i>
                     </a>
@@ -52,15 +55,15 @@
                       :href="`https://${userProfile.data.other_network}`"
                       target="_blank"
                       class="has-text-white"
-                      v-if="userProfile.data.other_network"
+                      v-if="userProfile.data && userProfile.data.other_network"
                     >
                       <i class="fas fa-external-link-alt fa-lg fa-fw"></i>
                     </a>
                   </div>
                 </div>
                 <h1 class="subtitle is-5 has-text-white"><i class="fas fa-tag"></i>&nbsp;Areas of interest</h1>
         <div class="content" v-if="userProfile.person.terms.length == 0">
-          <p><i>I haven't done this, yet!</i></p>
+          <p><i>I haven't completed my areas of interest yet!</i></p>
         </div>
         <div class="tags">
           <span class="tag is-rounded is-medium is-primary" v-for="area in userProfile.person.terms" :key="area.id">{{area.name}}</span>
diff --git a/src/views/user/account/AreasOfInterest.vue b/src/views/user/account/AreasOfInterest.vue
@@ -1,10 +1,11 @@
 <template>
   <section>
-     <h1 class="title is-3">{{$t('user.userPanel.areasOfInterest.title')}}</h1>
+    <h1 class="title is-3">{{$t('user.userPanel.areasOfInterest.title')}}</h1>
     <p v-html="$t('user.userPanel.areasOfInterest.subtitle')"></p>
     <br>
      <div class="card">
       <div class="card-content">
+      <h1 class="title has-text-dark is-3">{{$t('user.userPanel.areasOfInterest.currentAreas')}}</h1>
       <b-taglist v-if="currentAreas && currentAreas.length > 0">
         <b-tag v-for="area in currentAreas" type="is-primary" size="is-medium" closable :key="area.id" @close="remove(area.id)">{{area.name}}</b-tag>
       </b-taglist>
@@ -65,10 +66,30 @@ export default {
     };
   },
   mounted: function() {
-    this.currentAreas = [] //TODO
+    this.fetchUser() 
     this.fetchAvailableAreasOfInterest()
   },
   methods: {
+    sync: function(data){
+      if(!data.person.terms) currentAreas = []
+      this.currentAreas = data.person.terms
+    },
+    fetchUser: function() {
+      this.startLoading();
+      this.$http
+        .get(`/v1/users/${this.user.id}`)
+        .then(res => {
+          this.sync(res.data.data)
+        })
+        .catch(err => {
+          console.error(err);
+          if (err.response && err.response.data)
+            this.$toast.open(err.response.data.message);
+        })
+        .finally(() => {
+          this.stopLoading();
+        });
+    },
     fetchAvailableAreasOfInterest: function(){
       this.startLoading();
       this.$http
diff --git a/src/views/user/account/Profile.vue b/src/views/user/account/Profile.vue
@@ -13,7 +13,8 @@
             <div class="media-content">
               <img class="myAvatar image is-hidden-desktop is-centered" :src="userAvatarUrl" />
               <br />
-              <h1 class="title is-1 has-text-black has-text-centered-touch">Guillermo Croppi</h1>
+              <h1 class="title is-1 has-text-black has-text-centered-touch">{{user.display_name}}</h1>
+              <h1 class="subtitle is-6 has-text-centered-touch"><router-link :to="{name: 'profile', params:{ id: user.id}}">Go to profile&nbsp;<i class="fas fa-arrow-circle-right"></i></router-link></h1>
               <p
                 v-for="(p,index) in $t('user.userPanel.profile.avatar')"
                 class="is-size-7 has-text-centered-touch is-italic"
@@ -224,7 +225,7 @@ export default {
       this.$http
         .get(`/v1/users/${this.user.id}`)
         .then(res => {
-          this.sync(res.data)
+          this.sync(res.data.data)
         })
         .catch(err => {
           console.error(err);
