Merge branch '68-masonry' into 'develop'

Resolve "Use a masonry plugin for prettier colums"

Closes #68

See merge request funkwhale/funkwhale!56

CHANGELOG

@@ -6,7 +6,8 @@ Changelog
 
 - Fixed broken file import due to wrong url (#73)
 - More accurate mimetype detection
-- Fixed really small size on small screens.
+- Fixed really small size on small screens
+- Added masonry layout for artists, requests and radios (#68)
 
 
 0.5.1 (2018-02-24)

front/package.json

@@ -20,6 +20,7 @@
     "js-logger": "^1.3.0",
     "jwt-decode": "^2.2.0",
     "lodash": "^4.17.4",
+    "masonry-layout": "^4.2.1",
     "moment": "^2.20.1",
     "moxios": "^0.4.0",
     "raven-js": "^3.22.3",
@@ -27,6 +28,7 @@
     "showdown": "^1.8.6",
     "vue": "^2.3.3",
     "vue-lazyload": "^1.1.4",
+    "vue-masonry": "^0.10.16",
     "vue-router": "^2.3.1",
     "vue-upload-component": "^2.7.4",
     "vuedraggable": "^2.14.1",

front/src/components/audio/album/Card.vue

@@ -67,7 +67,7 @@ export default {
   data () {
     return {
       backend: backend,
-      initialTracks: 4,
+      initialTracks: 5,
       showAllTracks: false
     }
   },

front/src/components/audio/artist/Card.vue

@@ -54,8 +54,8 @@ export default {
   data () {
     return {
       backend: backend,
-      initialAlbums: 3,
-      showAllAlbums: false
+      initialAlbums: 30,
+      showAllAlbums: true
     }
   },
   computed: {

front/src/components/library/Artist.vue

@@ -30,7 +30,7 @@
       </div>
       <div class="ui vertical stripe segment">
         <h2>Albums by this artist</h2>
-        <div class="ui stackable three column grid">
+        <div class="ui stackable doubling three column grid">
           <div class="column" :key="album.id" v-for="album in albums">
             <album-card :mode="'rich'" class="fluid" :album="album"></album-card>
           </div>

front/src/components/library/Artists.vue

@@ -34,8 +34,16 @@
         </div>
       </div>
       <div class="ui hidden divider"></div>
-      <div v-if="result" class="ui stackable three column grid">
+      <div
+        v-if="result"
+        v-masonry
+        transition-duration="0"
+        item-selector=".column"
+        percent-position="true"
+        stagger="0"
+        class="ui stackable three column doubling grid">
         <div
+          v-masonry-tile
           v-if="result.results.length > 0"
           v-for="artist in result.results"
           :key="artist.id"

front/src/components/library/Radios.vue

@@ -36,8 +36,16 @@
         </div>
       </div>
       <div class="ui hidden divider"></div>
-      <div v-if="result" class="ui stackable three column grid">
+      <div
+        v-if="result"
+        v-masonry
+        transition-duration="0"
+        item-selector=".column"
+        percent-position="true"
+        stagger="0"
+        class="ui stackable three column doubling grid">
         <div
+          v-masonry-tile
           v-if="result.results.length > 0"
           v-for="radio in result.results"
           :key="radio.id"

front/src/components/requests/Card.vue

@@ -5,10 +5,10 @@
       <div class="description">
         <div
           v-if="request.albums" v-html="$options.filters.markdown(request.albums)"></div>
-        <div v-if="request.comment" class="ui comments">
+        <div class="ui comments">
           <comment
             :user="request.user"
-            :content="request.comment"
+            :content="request.comment || ''"
             :date="request.creation_date"></comment>
         </div>
       </div>
@@ -24,7 +24,7 @@
         @click="createImport"
         v-if="request.status === 'pending' && importAction && $store.state.auth.availablePermissions['import.launch']"
         class="ui mini basic green right floated button">Create import</button>
-      
+
     </div>
   </div>
 </template>

front/src/components/requests/RequestsList.vue

@@ -34,8 +34,16 @@
         </div>
       </div>
       <div class="ui hidden divider"></div>
-      <div v-if="result" class="ui stackable three column grid">
+      <div
+        v-if="result"
+        v-masonry
+        transition-duration="0"
+        item-selector=".column"
+        percent-position="true"
+        stagger="0"
+        class="ui stackable three column doubling grid">
         <div
+          v-masonry-tile
           v-if="result.results.length > 0"
           v-for="request in result.results"
           :key="request.id"

front/src/main.js

@@ -9,6 +9,7 @@ import Vue from 'vue'
 import App from './App'
 import router from './router'
 import axios from 'axios'
+import {VueMasonryPlugin} from 'vue-masonry'
 import VueLazyload from 'vue-lazyload'
 import store from './store'
 import config from './config'
@@ -24,7 +25,9 @@ window.$ = window.jQuery = require('jquery')
 // play really nice with webpack and I want to get rid of Google Fonts
 // require('./semantic/semantic.css')
 require('semantic-ui-css/semantic.js')
+require('masonry-layout')
 
+Vue.use(VueMasonryPlugin)
 Vue.use(VueLazyload)
 Vue.config.productionTip = false