From c6fb23810ab9cca98dc4239d4b6e60d6660cae38 Mon Sep 17 00:00:00 2001
From: lesion <lesion@autistici.org>
Date: Wed, 26 Jun 2019 18:37:02 +0200
Subject: [PATCH] fix img / comments img

---
 config/production.js           |  1 -
 pages/event/_id.vue            | 31 ++++++++++++++++++++-----------
 server/api/controller/event.js |  2 +-
 server/firstrun.js             |  2 +-
 4 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/config/production.js b/config/production.js
index 83117d0a..8448c644 100644
--- a/config/production.js
+++ b/config/production.js
@@ -1,4 +1,3 @@
-const path = require('path')
 const fs = require('fs')
 
 const config_path = process.env.config_path
diff --git a/pages/event/_id.vue b/pages/event/_id.vue
index 8519c2e1..fd7df3f0 100644
--- a/pages/event/_id.vue
+++ b/pages/event/_id.vue
@@ -19,7 +19,7 @@
             v-icon(name='chevron-right')
     
       //- image
-      img(:src='imgPath' v-if='event.image_path')
+      img.main(:src='imgPath' v-if='event.image_path')
 
       .info
         div {{event|event_when}}
@@ -40,17 +40,18 @@
         el-button(plain type='primary' size='mini' @click='$router.replace(`/add/${event.id}`)') {{$t('common.edit')}}  
 
       //- comments
-      .card-body(v-if='event.activitypub_id && settings')
+      #comments.card-body(v-if='event.activitypub_id && settings')
         strong {{$t('common.related')}} - 
         a(:href='`https://${settings.mastodon_instance}/web/statuses/${event.activitypub_id}`') {{$t('common.add')}}
-      .card-header(v-for='comment in event.comments' :key='comment.id')
-        img.avatar(:src='comment.data.account.avatar') 
-        strong {{comment.data.account.display_name}} {{comment.data.account.username}} 
-        //- a.float-right(:href='comment.data.url')
-        a.float-right(:href='`https://${settings.mastodon_instance}/web/statuses/${comment.data.id}`')
-          small  {{comment.data.created_at|datetime}}
-        div.mt-1(v-html='comment_filter(comment.data.content)')
-        img(v-for='img in comment.data.media_attachments' :src='img.url')
+
+        .card-header(v-for='comment in event.comments' :key='comment.id')
+          img.avatar(:src='comment.data.account.avatar') 
+          strong {{comment.data.account.display_name}} {{comment.data.account.username}} 
+          //- a.float-right(:href='comment.data.url')
+          a.float-right(:href='`https://${settings.mastodon_instance}/web/statuses/${comment.data.id}`')
+            small  {{comment.data.created_at|datetime}}
+          div.mt-1(v-html='comment_filter(comment.data.content)')
+          img(v-for='img in comment.data.media_attachments' :src='img.url')
 
 </template>
 <script>
@@ -193,9 +194,17 @@ export default {
   }
 
   img {
-    max-width: 100%;
     max-height: 89vh;
     object-fit: contain;
+    &.main {
+      width: 100%;
+    }
+  }
+
+  #comments {
+    img {
+      max-width: 100%;
+    }
   }
 
   .avatar {
diff --git a/server/api/controller/event.js b/server/api/controller/event.js
index 33d76e27..b5ca406e 100644
--- a/server/api/controller/event.js
+++ b/server/api/controller/event.js
@@ -189,7 +189,7 @@ const eventController = {
         [Tag, 'weigth', 'DESC']
       ],
       include: [
-        { model: Tag, required: false, attributes: ['tag', 'weigth', 'color'] },
+        { model: Tag, required: false, attributes: ['tag', 'weigth'] },
         { model: Place, required: false, attributes: ['id', 'name', 'address'] }
       ]
     })
diff --git a/server/firstrun.js b/server/firstrun.js
index 264032c4..ad8799a0 100644
--- a/server/firstrun.js
+++ b/server/firstrun.js
@@ -26,7 +26,7 @@ module.exports = {
       return -1
     } catch(e) {}
 
-    await db.sequelize.sync({force: true}).catch(e => {
+    await db.sequelize.sync().catch(e => {
       consola.error('Error creating tables', e)
       return -1
     })