0.17.1

components/actors/tile.vue

@@ -2,7 +2,7 @@
 	<div
 		class="tile"
 		:class="{
-			unstashed: !favorited && pageStash && user && pageStash.id === user.primaryStash?.id
+			unstashed: !favorited && pageStash && user && pageStash.user.id === user.id,
 		}"
 	>
 		<span class="name">{{ actor.name }}</span>
@@ -33,8 +33,8 @@
 				:item="actor"
 				:show-secondary="false"
 				class="light tiled"
-				@stashed="(stash) => { favorited = stash.isPrimary ? true : favorited; }"
-				@unstashed="(stash) => { favorited = stash.isPrimary ? false : favorited; }"
+				@stashed="(stash) => { favorited = stash.id === currentStash.id ? true : favorited; }"
+				@unstashed="(stash) => { favorited = stash.id === currentStash.id ? false : favorited; }"
 			/>
 		</div>
 
@@ -88,8 +88,9 @@ const props = defineProps({
 const pageContext = inject('pageContext');
 const { user } = pageContext;
 const pageStash = pageContext.pageProps.stash;
+const currentStash = pageStash || user.primaryStash;
 
-const favorited = ref(props.actor.stashes?.some((sceneStash) => sceneStash.isPrimary) || false);
+const favorited = ref(props.actor.stashes.some((actorStash) => actorStash.id === currentStash.id));
 </script>
 
 <style scoped>

components/movies/tile.vue

@@ -1,7 +1,9 @@
 <template>
 	<div
 		class="movie-tile"
-		:class="{ unstashed: !favorited && pageStash && user && pageStash.id === user.primaryStash?.id }"
+		:class="{
+			unstashed: !favorited && pageStash && user && pageStash.user.id === user.id,
+		}"
 	>
 		<div
 			class="cover-container"
@@ -31,8 +33,8 @@
 				:item="movie"
 				:show-secondary="false"
 				class="light tiled"
-				@stashed="(stash) => { favorited = stash.isPrimary ? true : favorited; }"
-				@unstashed="(stash) => { favorited = stash.isPrimary ? false : favorited; }"
+				@stashed="(stash) => { favorited = stash.id === currentStash.id ? true : favorited; }"
+				@unstashed="(stash) => { favorited = stash.id === currentStash.id ? false : favorited; }"
 			/>
 		</div>
 
@@ -118,10 +120,11 @@ const props = defineProps({
 const pageContext = inject('pageContext');
 const user = pageContext.user;
 const pageStash = pageContext.pageProps.stash;
+const currentStash = pageStash || user.primaryStash;
 
 const currentYear = new Date().getFullYear();
 
-const favorited = ref(props.movie.stashes.some((sceneStash) => sceneStash.isPrimary));
+const favorited = ref(props.movie.stashes.some((movieStash) => movieStash.id === currentStash.id));
 </script>
 
 <style scoped>

components/scenes/tile.vue

@@ -2,7 +2,7 @@
 	<div
 		class="tile"
 		:class="{
-			unstashed: !favorited && pageStash && user && pageStash.id === user.primaryStash?.id,
+			unstashed: !favorited && pageStash && user && pageStash.user.id === user.id,
 			'is-new': scene.isNew,
 		}"
 	>
@@ -32,8 +32,8 @@
 				:item="scene"
 				:show-secondary="false"
 				class="light tiled"
-				@stashed="(stash) => { favorited = stash.isPrimary ? true : favorited; }"
-				@unstashed="(stash) => { favorited = stash.isPrimary ? false : favorited; }"
+				@stashed="(stash) => { favorited = stash.id === currentStash.id ? true : favorited; }"
+				@unstashed="(stash) => { favorited = stash.id === currentStash.id ? false : favorited; }"
 			/>
 
 			<span
@@ -126,8 +126,9 @@ const props = defineProps({
 const pageContext = inject('pageContext');
 const user = pageContext.user;
 const pageStash = pageContext.pageProps.stash;
+const currentStash = pageStash || user.primaryStash;
 
-const favorited = ref(props.scene.stashes.some((sceneStash) => sceneStash.isPrimary));
+const favorited = ref(props.scene.stashes.some((sceneStash) => sceneStash.id === currentStash.id));
 </script>
 
 <style scoped>

components/stashes/heart.vue

@@ -29,17 +29,17 @@
 		</VDropdown>
 
 		<Icon
-			v-if="itemStashes.some((itemStash) => itemStash.isPrimary)"
-			icon="heart7"
+			v-if="itemStashes.some((itemStash) => itemStash.id === currentStash.id)"
+			:icon="currentStash.isPrimary ? 'heart7' : 'folder-heart'"
 			class="heart favorited noselect"
-			@click.native.stop="unstashItem(user.primaryStash)"
+			@click.native.stop="unstashItem(currentStash)"
 		/>
 
 		<Icon
 			v-else
-			icon="heart8"
+			:icon="currentStash.isPrimary ? 'heart8' : 'folder-heart'"
 			class="heart noselect"
-			@click.native.stop="stashItem(user.primaryStash)"
+			@click.native.stop="stashItem(currentStash)"
 		/>
 	</div>
 </template>
@@ -70,7 +70,8 @@ const props = defineProps({
 
 const emit = defineEmits(['stashed', 'unstashed']);
 
-const { user } = inject('pageContext');
+const { user, pageProps } = inject('pageContext');
+const currentStash = pageProps.stash || user.primaryStash;
 
 const itemStashes = ref(props.item.stashes);
 

package-lock.json

@@ -1,11 +1,11 @@
 {
   "name": "traxxx-web",
-  "version": "0.17.0",
+  "version": "0.17.1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
-      "version": "0.17.0",
+      "version": "0.17.1",
       "dependencies": {
         "@brillout/json-serializer": "^0.5.8",
         "@dicebear/collection": "^7.0.5",

package.json

@@ -72,5 +72,5 @@
     "postcss-custom-media": "^10.0.2",
     "postcss-nesting": "^12.0.2"
   },
-  "version": "0.17.0"
+  "version": "0.17.1"
 }