Skip to content

Commit

Permalink
Merge pull request #113 from OpenTechStrategies/89-exclude-current-ar…
Browse files Browse the repository at this point in the history
…twork

89 exclude current artwork
  • Loading branch information
hminsky2002 authored Sep 30, 2024
2 parents f0dce52 + 78bbde0 commit 336ce40
Show file tree
Hide file tree
Showing 7 changed files with 24 additions and 31 deletions.
4 changes: 2 additions & 2 deletions archesdataviewer/static/vite_build/.vite/manifest.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"index.html": {
"file": "assets/index-BdIGXfw8.js",
"file": "assets/index-CzuP9OZb.js",
"name": "index",
"src": "index.html",
"isEntry": true,
"css": [
"assets/index-Ds3kQY6k.css"
"assets/index-BUk10Zdh.css"
]
}
}

Large diffs are not rendered by default.

Large diffs are not rendered by default.

This file was deleted.

4 changes: 2 additions & 2 deletions archesdataviewer/static/vite_build/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Arches Data Viewer</title>
<script type="module" crossorigin src="/assets/index-BdIGXfw8.js"></script>
<link rel="stylesheet" crossorigin href="/assets/index-Ds3kQY6k.css">
<script type="module" crossorigin src="/assets/index-CzuP9OZb.js"></script>
<link rel="stylesheet" crossorigin href="/assets/index-BUk10Zdh.css">
</head>
<body>
<div id="app"></div>
Expand Down
5 changes: 4 additions & 1 deletion front-end/src/components/MoreArtworksByArtist.vue
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,9 @@
</div>
<div class="more-artworks-by-artist-gallery">
<MoreArtworksByArtistItem
v-for="artwork in relatedArtworks"
v-for="artwork in relatedArtworks?.filter(
(artwork) => artwork?.resourceinstanceid !== props.resource?.resourceinstanceid
)"
:key="artwork.resourceinstanceid"
:artwork="artwork"
:image-tile-data="
Expand Down Expand Up @@ -85,6 +87,7 @@ const relatedArtworks = computed(() => {
align-items: flex-start;
align-content: flex-start;
padding: 0px;
margin-top: var(--wac--accessible-spacing--1x);
gap: 16px;
isolation: isolate;
}
Expand Down
12 changes: 1 addition & 11 deletions front-end/src/components/MoreArtworksByArtistItem.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<RouterLink :to="`/archesdataviewer/home/resource/${props.artwork.resourceinstanceid}`">
<div>
<img
:class="['more-artwork-image', { blocked: isBlocked }]"
class="more-artwork-image"
:src="resolvedImageUrl || fallbackImageUrl"
:alt="resolvedImageUrl ? 'Thumbnail image' : 'No image available'"
/>
Expand All @@ -13,9 +13,6 @@
<script setup lang="ts">
import { computed } from 'vue';
import type { ImageTileData, Resource } from '@/types';
import { useRoute } from 'vue-router';
const route = useRoute();
const props = defineProps<{
artwork: Resource;
Expand All @@ -35,8 +32,6 @@ const fallbackImageUrl = computed(() =>
? 'https://arches-app-demo.opentechstrategies.com/archesdataviewer/noimage.png'
: '/noimage.png'
);
const isBlocked = computed(() => route.params?.id === props.artwork.resourceinstanceid);
</script>

<style scoped>
Expand All @@ -54,9 +49,4 @@ const isBlocked = computed(() => route.params?.id === props.artwork.resourceinst
.more-artwork-image:hover {
opacity: 0.5;
}
.blocked {
filter: brightness(50%);
pointer-events: none;
}
</style>

0 comments on commit 336ce40

Please sign in to comment.