Merge dev branch into master for version 2.0.8

client/src/components/Card/UserProfileCard.vue

@@ -2,6 +2,13 @@
   <div class="profile-card rounded-sm shadow-sm">
     <!--User Info-->
     <div class="profile-card-top">
+      <!--Avatar Placeholder Image-->
+      <SkelentonBox
+        :width="'120px'"
+        :height="'120px'"
+        class="rounded-circle skelenton-box"
+      />
+      <!--Avatar-->
       <img
         :src="currentUser.avatar | placeholderAvatar"
         alt="user avatar"
@@ -42,6 +49,7 @@
 </template>
 
 <script>
+import SkelentonBox from '../Placeholder/SkeletonBox'
 import { placeholderAvatarFilter } from '../../utils/mixins'
 import { mapState } from 'vuex'
 
@@ -52,6 +60,9 @@ export default {
       return '未訂閱'
     }
   },
+  components: {
+    SkelentonBox
+  },
   mixins: [placeholderAvatarFilter],
   computed: {
     ...mapState(['currentUser'])
@@ -75,6 +86,7 @@ export default {
       }
 
       img {
+        position: relative;
         width: 120px;
         height: 120px;
         object-fit: cover;
@@ -109,4 +121,5 @@ export default {
   width: 25px;
 }
 
+.skelenton-box { position: absolute; }
 </style>

client/src/components/OrderCommentForm.vue

@@ -1,9 +1,9 @@
 <template>
   <section class="form">
     <form
+      ref="form"
       novalidate
       class="form-wrapper rounded-sm shadow-sm p-3"
-      @submit.stop.prevent="handleSubmit"
     >
       <h2 class="form-title mb-4">
         您的評論
@@ -61,7 +61,7 @@
         <div
           v-if="comment.image"
           class="file-image-wrapper"
-          @click="user.image = ''"
+          @click="comment.image = ''"
         >
           <img
             :src="comment.image"
@@ -72,22 +72,30 @@
         </div>
         <!--Visible file upload button-->
         <label
-          v-if="!comment.image || isProcessing"
+          v-else
           for="file"
           class="file-label"
         >
           <i class="fas fa-plus" />
         </label>
       </div>
       <hr class="form-divider mt-4">
+      <!--Submit Button-->
       <div class="btn-container text-center">
-        <button
+        <ProcessButton
           class="btn"
-          type="submit"
-          :disabled="isProcessing || $v.$invalid"
+          :is-processing="isProcessing"
+          :v="{}"
+          :color="'primary'"
+          :border-radius="'.3rem'"
+          @after-click="handleSubmit"
         >
-          送出評價
-        </button>
+          <template #initial>
+            <slot name="submit">
+              送出評價
+            </slot>
+          </template>
+        </ProcessButton>
       </div>
     </form>
   </section>
@@ -96,13 +104,15 @@
 <script>
 import { handleFileChangeMethod } from '../utils/mixins'
 import CustomRatingInput from '../components/CustomRatingInput'
+import ProcessButton from '../components/Button/ProcessButton'
 import { required, minLength, maxLength } from 'vuelidate/lib/validators'
 import orderApi from '../apis/order'
 import { Toast } from '../utils/helpers'
 
 export default {
   components: {
-    CustomRatingInput
+    CustomRatingInput,
+    ProcessButton
   },
   mixins: [handleFileChangeMethod],
   data () {
@@ -131,7 +141,7 @@ export default {
     async handleSubmit (e) {
       try {
         // prepare a FormData
-        const form = e.target
+        const form = this.$refs.form
         const formData = new FormData(form)
         const orderId = this.$route.params.order_id
         // update processing status

server/config/query/heroku.js

@@ -10,8 +10,8 @@ module.exports = {
   char: {
     date: [sequelize.fn('to_char', sequelize.col('require_date'), 'YYMMDD'), 'date'],
     time: [sequelize.fn('to_char', sequelize.col('require_date'), 'HH24:MI'), 'time'],
-    date_for_dashboard: [sequelize.fn('to_char', sequelize.col('require_date'), '%m/%d'), 'date'],
-    date_for_admin_dashboard: [sequelize.fn('to_char', sequelize.col('createdAt'), '%m/%d'), 'date']
+    date_for_dashboard: [sequelize.fn('to_char', sequelize.col('require_date'), 'MM/DD'), 'date'],
+    date_for_admin_dashboard: [sequelize.fn('to_char', sequelize.col('createdAt'), 'MM/DD'), 'date']
   },
   geo: {
     geometry: 'ST_DistanceSphere',

server/controllers/adminController.js

@@ -23,7 +23,7 @@ let adminController = {
       let pageNum = (Number(page) < 1 || page === undefined) ? 1 : Number(page)
       let restaurants = await Restaurant.findAndCountAll({
         where: {
-          name: { [Op.substring]: name || '' },
+          name: process.env.heroku ? { [Op.iLike]: `%${name}%` || '' } : { [Op.substring]: name || '' },
           CategoryId: category ? { [Op.eq]: category } : { [Op.gt]: 0 },
           location: { [Op.substring]: dist || '' }
         },