chore(): merge remote

SoftwareEngineeringDaily · Feb 14, 2020 · fdb9e3f · fdb9e3f
2 parents 12d71ed + fdcfaf0
commit fdb9e3f
Show file tree

Hide file tree

Showing 27 changed files with 163 additions and 401 deletions.
diff --git a/index.html b/index.html
@@ -33,8 +33,6 @@
   <body>
     <div id="app"></div>
     <!-- built files will be auto injected -->
-
-    <script> window.prerenderReady = false; </script>
     <script src="https://js.stripe.com/v3/"></script>
     <script src="https://www.google.com/recaptcha/api.js?onload=vueRecaptchaApiLoaded&render=explicit" async defer></script>
     <script>

diff --git a/src/components/Highlightable.vue b/src/components/Highlightable.vue
@@ -19,12 +19,11 @@
           <comment-highlight
             :forumThreadId="forumThreadId"
             :highlight="selectedText"
-            :autoFocus="isHighlighting"
+            :autoFocus="true"
             :onSubmit="resetTools" />
         </div>
         <div class="tools-comment-reply">
           <comment-reply
-            v-if="isLoggedIn"
             :entityId="entityId"
             :doneCallback="resetTools"
             :highlight="selectedText"
@@ -154,7 +153,7 @@ export default {
       const parentWidth = this.$el.offsetWidth
       const toolsWidth = this.$refs.tools.offsetWidth
       const toolsCenter = toolsWidth / 2
-      const arrowOffset = 7
+      const arrowOffset = 6
 
       if ((this.isHighlighting || this.isReplying) && window.innerWidth > 990) {
         return this.arrowX = arrowOffset * -1
@@ -249,7 +248,7 @@ export default {
       this.selectedWidth = width
     },
 
-    onReply (action) {
+    onReply () {
       this.isReplying = true
     },
 

diff --git a/src/components/HomeSection.vue b/src/components/HomeSection.vue
@@ -4,7 +4,6 @@
   </div>
 </template>
 
-
 <script>
 import FeedList from '@/components/feed/FeedList'
 import { mapState, mapActions, mapGetters } from 'vuex'

diff --git a/src/components/SwitchToggle.vue b/src/components/SwitchToggle.vue
@@ -19,7 +19,7 @@ export default {
   height: 34px;
 }
 
-.switch input { 
+.switch input {
   opacity: 0;
   width: 0;
   height: 0;
@@ -72,4 +72,4 @@ input:checked + .slider:before {
   border-radius: 50%;
 }
 
-</style>
+</style>
diff --git a/src/components/comment/CommentBox.vue b/src/components/comment/CommentBox.vue
@@ -1,21 +1,21 @@
 <template>
   <div class="comment-box">
-    <svg class="comment-chevron" viewBox="0 0 320 512" data-ember-extension="1"><path fill="currentColor" d="M285.476 272.971L91.132 467.314c-9.373 9.373-24.569 9.373-33.941 0l-22.667-22.667c-9.357-9.357-9.375-24.522-.04-33.901L188.505 256 34.484 101.255c-9.335-9.379-9.317-24.544.04-33.901l22.667-22.667c9.373-9.373 24.569-9.373 33.941 0L285.475 239.03c9.373 9.372 9.373 24.568.001 33.941z"/></svg>
+    <svg class="comment-chevron" viewBox="0 0 320 512" data-ember-extension="1">
+      <path fill="currentColor" d="M285.476 272.971L91.132 467.314c-9.373 9.373-24.569 9.373-33.941 0l-22.667-22.667c-9.357-9.357-9.375-24.522-.04-33.901L188.505 256 34.484 101.255c-9.335-9.379-9.317-24.544.04-33.901l22.667-22.667c9.373-9.373 24.569-9.373 33.941 0L285.475 239.03c9.373 9.372 9.373 24.568.001 33.941z"/>
+    </svg>
     <div class="title">
       {{commentCount}} {{commentCount == 1 ? 'comment' : 'comments'}}
     </div>
     <div class="title" v-if="!post.thread">
       0 comments
     </div>
-    <div
-      v-if="isLoggedIn">
-      <br/>
+    <div v-if="isLoggedIn && !filter">
       <comment-compose
         :initialComment="initialComment"
         :entityId="forumThreadId"
         :rootEntityType='"forumthread"' />
     </div>
-    <div v-else class="guest-message">
+    <div v-else-if="!isLoggedIn" class="guest-message">
       <p>Please <router-link to="/login">log in</router-link> to leave a comment</p>
     </div>
     <div class="row comments">
@@ -50,7 +50,11 @@ export default {
     },
     comments: {
       type: Array
-    }
+    },
+    commentCount: {
+      type: Number,
+      default: 0,
+    },
   },
 
   components: {
@@ -60,23 +64,6 @@ export default {
 
   computed: {
     ...mapGetters([ 'isLoggedIn' ]),
-
-    commentCount () {
-      if (!this.comments || !isArray(this.comments)) {
-        return 0
-      }
-
-      let comments = this.comments.filter(c => (this.filter) ? !!(c[this.filter]) : !(c.highlight))
-      let commentCount = comments.length
-
-      comments.forEach(c => {
-        commentCount += (c.replies || [])
-          .filter(c => !c.deleted)
-          .length
-      })
-
-      return commentCount
-    }
   },
 }
 </script>

diff --git a/src/components/comment/CommentCompose.vue b/src/components/comment/CommentCompose.vue
@@ -1,7 +1,6 @@
 
 <template>
   <comment-form
-    :autoFocus="autoFocus"
     :highlight="highlight"
     :isSubmitting="isSubmitting"
     :initialComment="initialComment"
@@ -30,10 +29,6 @@ export default  {
     highlight: {
       type: String,
     },
-    autoFocus: {
-      type: Boolean,
-      default: false,
-    },
     onSubmit: {
       type: Function,
     },

diff --git a/src/components/comment/CommentForm.vue b/src/components/comment/CommentForm.vue
@@ -1,4 +1,3 @@
-
 <template>
   <div v-if="me" class="comment-container">
     <!-- <span class="active-without-border" v-if="isLoggedIn">
@@ -90,10 +89,6 @@ export default {
       type: String,
       default: "Submit"
     },
-    autoFocus: {
-      type: Boolean,
-      default: false,
-    },
   },
   components: {
     CommentTribute,
@@ -121,25 +116,21 @@ export default {
       errorImg: ''
     };
   },
-  mounted() {
-    console.log('this.autoFocus ', this.autoFocus)
-    // this.$refs.content.focus()
-    if (this.autoFocus) {
-      this.focusTextarea()
-    }
-  },
 
   watch: {
     commentContent: function() {
       // Check mentions
-      if(this.isLoggedIn){
+      if (this.isLoggedIn) {
         const currentMentions = [];
+
         each(this.mentionedUsers, user => {
           const mentionText = "@" + user.name;
+
           if (this.commentContent.indexOf(mentionText) >= 0) {
             currentMentions.push(user);
           }
         });
+
         this.mentionedUsers = currentMentions;
       } else {
         this.$toasted.error('You must login to post a comment')

diff --git a/src/components/comment/CommentHighlight.vue b/src/components/comment/CommentHighlight.vue
@@ -5,7 +5,6 @@
       <div class="comment-compose">
         <comment-compose
           :highlight="highlight"
-          :autoFocus="autoFocus"
           :entityId="forumThreadId"
           :rootEntityType='"forumthread"'
           :onSubmit="onSubmit" />
@@ -42,10 +41,6 @@ export default {
     onSubmit: {
       type: Function,
     },
-    autoFocus: {
-      type: Boolean,
-      default: false,
-    },
   },
   components: {
     CommentCompose,

diff --git a/src/components/comment/CommentReply.vue b/src/components/comment/CommentReply.vue
@@ -1,25 +1,30 @@
 <template>
-  <div
-    v-if="me"
-    :class="{ 'is-highlight': !!(highlight) }">
-    <comment-quote :highlight="highlight" />
-    <div class='reply-container'>
-      <comment-form
-        :isSubmitting="isSubmitting"
-        :content="commentContent"
-        :submitCallback="submitCallback"
-        :cancelPressed="doneCallback"
-        :existingMentions="existingMentions"
-        :showCancel="true"
-        :submitButtonText="'Reply'" />
+  <div>
+    <div
+      v-if="me && isLoggedIn"
+      :class="{ 'is-highlight': !!(highlight) }">
+      <comment-quote :highlight="highlight" />
+      <div class='reply-container'>
+        <comment-form
+          :isSubmitting="isSubmitting"
+          :content="commentContent"
+          :submitCallback="submitCallback"
+          :cancelPressed="doneCallback"
+          :existingMentions="existingMentions"
+          :showCancel="true"
+          :submitButtonText="'Reply'" />
+      </div>
+    </div>
+    <div v-else class="guest-message">
+      <p>Please <router-link to="/login">log in</router-link> to leave a reply</p>
     </div>
   </div>
 </template>
 
 <script>
 import CommentForm from '@/components/comment/CommentForm'
 import CommentQuote from '@/components/comment/CommentQuote'
-import { mapState, mapActions } from 'vuex'
+import { mapState, mapActions, mapGetters } from 'vuex'
 
 export default {
   name: 'comment-reply',
@@ -66,6 +71,8 @@ export default {
   },
 
   computed: {
+    ...mapGetters([ 'isLoggedIn' ]),
+
     // local computed methods +
     ...mapState({
       me (state) {
@@ -78,6 +85,7 @@ export default {
     ...mapActions(['commentsCreate', 'commentsFetch']),
     submitCallback ({ content, mentions }) {
       this.isSubmitting = true
+
       // First update then change back to empty to clear: this.commentContent = content
       this.commentContent = content
       this.commentsCreate({
@@ -87,23 +95,24 @@ export default {
         parentCommentId: this.parentCommentId,
         content
       })
-        .then((response) => {
-          this.isSubmitting = false
-          this.commentContent = ''
-          this.commentsFetch({
-            entityId: this.entityId
-          })
-          this.doneCallback()
+      .then((response) => {
+        this.isSubmitting = false
+        this.commentContent = ''
+        this.commentsFetch({
+          entityId: this.entityId
         })
-        .catch((error) => {
-          this.$toasted.error(error.response.data.message, {
-              singleton: true,
-              theme: "bubble",
-              position: "bottom-center",
-              duration : 700
-          })
+        this.doneCallback()
+      })
+      .catch((error) => {
+        this.$toasted.error(error.response.data.message, {
+          singleton: true,
+          theme: "bubble",
+          position: "bottom-center",
+          duration : 700
         })
-    } }
+      })
+    }
+  }
 }
 </script>