viithiisys / spotlight-frontend

Download as
Browse Code ยป

Commit 196f4eb8f88a7236fcdb740ba67e7a356328af0d

Authored by Digvijay Singh
1 parent 7832f2f48c
Exists in master

tooltip added

Showing 5 changed files with 52 additions and 11 deletions   Show diff stats
... ... @@ -16,7 +16,8 @@
16 16 <script src="//static.filestackapi.com/filestack-js/3.x.x/filestack.min.js"></script>
17 17 <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/animate.css/3.5.2/animate.min.css">
18 18 <script src="https://unpkg.com/vue-star-rating/dist/VueStarRating.umd.min.js"></script>`
19   -
  19 + <script src="https://unpkg.com/vue-tippy/dist/vue-tippy.min.js"></script>
  20 + <script src="https://cdn.jsdelivr.net/npm/vue-tippy/dist/vue-tippy.min.js"></script>
20 21 <!--<link href="https://fonts.googleapis.com/css?family=Nunito:400,600,700,800&display=swap" rel="stylesheet">-->
21 22 <!--<script src="/socket.io/socket.io.js"></script>-->
22 23 </head>
... ...
... ... @@ -36,6 +36,7 @@
36 36 "vue-social-sharing": "^2.4.7",
37 37 "vue-star-rating": "^1.7.0",
38 38 "vue-stepper": "^1.4.2",
  39 + "vue-tippy": "^4.7.2",
39 40 "vue-toast-notification": "0.0.3",
40 41 "vue-video-player": "^5.0.2",
41 42 "vue-videobg": "^2.0.0",
... ...
src/components/EpisodeIntro.vue
Diff comments   View file @196f4eb
... ... @@ -53,7 +53,7 @@
53 53 </div><!-- top section -->
54 54 <div class="top">
55 55 <span>Focus</span>
56   - <span class="name">{{currentSlideData.payload.metaData.focus}}</span>
  56 + <span class="name ellipsis">{{createString(currentSlideData.payload.metaData.focusPoint)}}</span>
57 57 </div><!-- top section -->
58 58 </div><!-- app section-->
59 59 <div class="author-sec info">
... ... @@ -137,7 +137,24 @@ export default {
137 137 goToSignUp() {
138 138 this.$router.push("/signup");
139 139 },
  140 +
  141 + createString(list){
  142 + var name = "";
  143 + list.forEach(element => {
  144 + name = name+','+element;
  145 + });
  146 +
  147 + console.log("name is",name);
  148 + return name.substring(1);;
  149 + }
140 150  
141 151 },
142 152 };
143 153 </script>
  154 +<style >
  155 +.ellipsis {
  156 + text-overflow: ellipsis;
  157 + white-space: nowrap;
  158 + overflow: hidden;
  159 +}
  160 +</style>
144 161 \ No newline at end of file
... ...
src/components/Profile.vue
Diff comments   View file @196f4eb
... ... @@ -118,6 +118,7 @@
118 118 <input
119 119 class=""
120 120 placeholder="Add interest"
  121 + v-on:keyup.enter="addInterest"
121 122 v-model="interestName"
122 123 />
123 124 <a href="javascript:void(0);" @click="addInterest()"
... ... @@ -283,7 +284,7 @@
283 284 </div> -->
284 285 <!-- input -->
285 286 </div>
286   - <a href="javascript:void(0);" @click="closeDialog" class="next-bt"
  287 + <a href="javascript:void(0);" @click="saveProfile" class="next-bt"
287 288 >Save</a
288 289 >
289 290 </form>
... ... @@ -328,7 +329,7 @@
328 329 </li>
329 330 </ul>
330 331 </div>
331   - <a href="javasript:void(0);" class="update_profile"><span></span> Update Profile</a>
  332 + <a href="javasript:void(0);" @click="addProfileDialog" class="update_profile"><span></span> Update Profile</a>
332 333 <div class="">
333 334  
334 335 <a href="javascript:void(0);" class="user-profile-photo common_color" @click="userprofileshowDialog"><img :src="userData.profilePic" /></a>
... ... @@ -355,21 +356,30 @@
355 356 <div class="user-profile">
356 357 <h1>
357 358 {{ userData.firstName }} {{ userData.lastName }}
358   - <a href="javasript:void(0);" class="tags">{{ userData.role }}</a>
  359 + <a href="javasript:void(0);" class="tags no-cursor">{{ userData.role }}</a>
359 360 </h1>
360 361 <ul class="joined-info">
361 362 <li>
362   - <a href="javascript:void(0);" @click="addProfileDialog"
  363 + <a href="javascript:void(0);" v-if="userData.designation.length == 0 && userData.organisation.length == 0" @click="addProfileDialog"
363 364 >Add your work</a
364 365 >
  366 + <a href="javascript:void(0);" v-if="userData.designation.length != 0"
  367 + >{{userData.designation}}</a
  368 + >
  369 + <a href="javascript:void(0);" v-if="userData.designation.length != 0 && userData.organisation.length != 0"
  370 + >at</a
  371 + >
  372 + <a href="javascript:void(0);" v-if="userData.organisation.length != 0"
  373 + >{{userData.organisation}}</a
  374 + >
365 375 <img src="../assets/images/u-info-icon.png" /> <span></span>
366 376 </li>
367 377 <li>
368   - <a href="javasript:void(0);">{{ userData.karmaPoints }} Karma</a> <span></span>
  378 + <a href="javasript:void(0);" content="Karma Points" v-tippy> {{ userData.karmaPoints }} Karma</a> <span></span>
369 379 </li>
370 380 <li>
371 381 <a href="javasript:void(0);"
372   - >Joined on
  382 + class="no-cursor">Joined on
373 383 {{ moment(userData.createdAt).format("MMM YYYY") }}</a
374 384 >
375 385 </li>
... ... @@ -564,6 +574,8 @@ export default {
564 574 this.socialLink = [];
565 575 this.userData.interests = [];
566 576 this.userData.socialMediaProfiles = {};
  577 + this.userData.designation = "";
  578 + this.userData.organisation = "";
567 579 this.userData.socialMediaProfiles.facebook = null;
568 580 this.userData.socialMediaProfiles.linkedin = null;
569 581 var userdata = localStorage.getItem("spotlight_usertoken");
... ... @@ -669,6 +681,7 @@ export default {
669 681 openStudy(payload) {
670 682 console.log("payload-", payload);
671 683 payload.intro.date = payload.createdAt;
  684 + payload.intro.focusPoint = payload.createdAt;
672 685 axios
673 686 .get("/caseStudy/slides?caseStudyId=" + payload._id, {
674 687 headers: {
... ... @@ -798,7 +811,7 @@ export default {
798 811 .then((response) => {
799 812 // this.userData = response.data.data;
800 813 this.$toaster.success("Profile Updated");
801   -
  814 + this.closeDialog();
802 815 console.log(response.data.data);
803 816 })
804 817 .catch((error) => {
... ... @@ -820,7 +833,7 @@ export default {
820 833 closeDialog() {
821 834 $(".popup-wrp").hide();
822 835 $(".inner-wrp").removeClass("body-blur");
823   - this.saveProfile();
  836 + // this.saveProfile();
824 837 },
825 838 hideDialog() {
826 839 $(".popup-wrp").hide();
... ... @@ -849,3 +862,8 @@ export default {
849 862 },
850 863 };
851 864 </script>
  865 +<style>
  866 +.no-cursor{
  867 + cursor: default !important;
  868 +}
  869 +</style>
... ...
... ... @@ -15,7 +15,10 @@ import moment from &#39;moment&#39;
15 15 import Toaster from 'v-toaster'
16 16 import StarRating from 'vue-star-rating'
17 17  
  18 +import VueTippy, { TippyComponent } from "vue-tippy";
18 19  
  20 +Vue.use(VueTippy);
  21 +Vue.component("tippy", TippyComponent);
19 22 // You need a specific loader for CSS files like https://github.com/webpack/css-loader
20 23 import 'v-toaster/dist/v-toaster.css'
21 24  
... ... @@ -37,7 +40,8 @@ Vue.use(Auth0Plugin, {
37 40 });
38 41  
39 42 Vue.config.productionTip = false
40   -
  43 +// https://api.productgrowth.org/pg
  44 +// http://174.138.121.70:3006/pg
41 45 Vue.prototype.moment = moment
42 46 axios.defaults.baseURL = 'https://api.productgrowth.org/pg'
43 47 Vue.component('star-rating', VueStarRating.default);
... ...