KevinMidboe/seasoned
1
0
Fork 0
Code Issues 12 Pull Requests 1 Packages Projects Releases 1 Wiki Activity

Resolved merge conflict.

Browse Source
This commit is contained in:
Kevin
2020-02-21 22:52:36 +01:00
parent 0bd45ed777 3912766982
commit fc2c3664d9
3 changed files with 19 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/components/Movie.vue
View File

@@ -7,27 +7,10 @@
<img class="movie-item__img is-loaded"
ref="poster-image"
src="~assets/placeholder.png">
<!-- -->
<!-- <img v-else class="movie-item__img is-loaded" src="~assets/no-image.png" ref="image" alt="No image - linked image unavailable"> -->
</figure>
<!-- <figure class="movie__poster">
<img v-if="movie && poster === null"
class="movies-item__img is-loaded"
alt="movie poster image"
src="~assets/no-image.png">
<img v-else-if="poster === undefined"
class="movies-item__img grey"
alt="movie poster image"
src="~assets/placeholder.png">
<img v-else
class="movies-item__img is-loaded"
alt="movie poster image"
:src="ASSET_URL + ASSET_SIZES[0] + poster">
</figure> -->
<h1 class="movie__title" v-if="movie">{{ movie.title }}</h1>
<loading-placeholder v-else :count="1" />
<h1 class="movie__title" v-if="movie">{{ movie.title }}</h1>
<loading-placeholder v-else :count="1" />
</header>
<!-- Siderbar and movie info -->
@@ -75,7 +58,7 @@
<div class="movie__info">
<!-- Loading placeholder -->
<div class="movie__description"
<div class="movie__description noselect"
@click="truncatedDescription=!truncatedDescription"
v-if="!loading">
<span :class="truncatedDescription ? 'truncated':null">{{ movie.overview }}</span>
@@ -211,13 +194,7 @@ export default {
return numTorrents !== null ? numTorrents + ' results' : null
},
isPlexAuthenticated: () => {
const settings = store.getters['userModule/settings']
console.log('fetchedSettings', settings)
if (settings == null || settings['plex_userid'] == null)
return false
return true
return store.getters['userModule/isPlexAuthenticated']
}
},
methods: {