Resolved merge conflict.
This commit is contained in:
		| @@ -7,24 +7,7 @@ | |||||||
|         <img class="movie-item__img is-loaded" |         <img class="movie-item__img is-loaded" | ||||||
|              ref="poster-image" |              ref="poster-image" | ||||||
|              src="~assets/placeholder.png"> |              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> | ||||||
| <!--         <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> |       <h1 class="movie__title" v-if="movie">{{ movie.title }}</h1> | ||||||
|       <loading-placeholder v-else :count="1" /> |       <loading-placeholder v-else :count="1" /> | ||||||
| @@ -75,7 +58,7 @@ | |||||||
|         <div class="movie__info"> |         <div class="movie__info"> | ||||||
|  |  | ||||||
|           <!-- Loading placeholder --> |           <!-- Loading placeholder --> | ||||||
|           <div class="movie__description" |           <div class="movie__description noselect" | ||||||
|                @click="truncatedDescription=!truncatedDescription" |                @click="truncatedDescription=!truncatedDescription" | ||||||
|                v-if="!loading"> |                v-if="!loading"> | ||||||
|             <span :class="truncatedDescription ? 'truncated':null">{{ movie.overview }}</span> |             <span :class="truncatedDescription ? 'truncated':null">{{ movie.overview }}</span> | ||||||
| @@ -211,13 +194,7 @@ export default { | |||||||
|       return numTorrents !== null ? numTorrents + ' results' : null |       return numTorrents !== null ? numTorrents + ' results' : null | ||||||
|     }, |     }, | ||||||
|     isPlexAuthenticated: () => { |     isPlexAuthenticated: () => { | ||||||
|       const settings = store.getters['userModule/settings'] |       return store.getters['userModule/isPlexAuthenticated'] | ||||||
|       console.log('fetchedSettings', settings) |  | ||||||
|  |  | ||||||
|       if (settings == null || settings['plex_userid'] == null) |  | ||||||
|         return false |  | ||||||
|  |  | ||||||
|       return true |  | ||||||
|     } |     } | ||||||
|   }, |   }, | ||||||
|   methods: { |   methods: { | ||||||
|   | |||||||
| @@ -9,7 +9,9 @@ | |||||||
| export default { | export default { | ||||||
|   name: 'seasonedButton', |   name: 'seasonedButton', | ||||||
|   props: { |   props: { | ||||||
|     active: Boolean |     required: false, | ||||||
|  |     active: Boolean, | ||||||
|  |     default: false | ||||||
|   }, |   }, | ||||||
|   methods: { |   methods: { | ||||||
|     emit() { |     emit() { | ||||||
| @@ -46,9 +48,16 @@ export default { | |||||||
|     padding: 6px 20px 5px 20px; |     padding: 6px 20px 5px 20px; | ||||||
|   } |   } | ||||||
|  |  | ||||||
|   body:not(.touch) &:hover, &:focus, &:active, &.active { |   &:focus, &:active, &.active { | ||||||
|     background: $text-color; |     background: $text-color; | ||||||
|     color: $background-color; |     color: $background-color; | ||||||
|   } |   } | ||||||
|  |  | ||||||
|  |   @media (hover: hover) { | ||||||
|  |     &:hover { | ||||||
|  |       background: $text-color; | ||||||
|  |       color: $background-color; | ||||||
|  |     } | ||||||
|  |   } | ||||||
| } | } | ||||||
| </style> | </style> | ||||||
|   | |||||||
| @@ -69,6 +69,10 @@ export default { | |||||||
|  |  | ||||||
|       ifMissingSettingsAndTokenExistsFetchSettings() |       ifMissingSettingsAndTokenExistsFetchSettings() | ||||||
|       return undefined |       return undefined | ||||||
|  |     }, | ||||||
|  |     isPlexAuthenticated: (state) => { | ||||||
|  |       let hasPlexId = state.settings['plex_userid'] | ||||||
|  |       return hasPlexId != undefined | ||||||
|     } |     } | ||||||
|   }, |   }, | ||||||
|   mutations: { |   mutations: { | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user