Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open Biolucida viewer from image viewer #326

Draft
wants to merge 10 commits into
base: master
Choose a base branch
from
Draft

Open Biolucida viewer from image viewer #326

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
5e782ce
Bump browserslist from 4.16.3 to 4.16.8
dependabot[bot] Aug 24, 2021
9a5bc86
Bump striptags from 3.1.1 to 3.2.0
dependabot[bot] Aug 24, 2021
ef811b7
Bump path-parse from 1.0.6 to 1.0.7
dependabot[bot] Aug 24, 2021
5f5a627
Apply stash fixing conflicts.
hsorby Aug 24, 2021
f404e4a
Remove https certs for local development.
hsorby Aug 24, 2021
d53c408
Merge branch 'dependabot/npm_and_yarn/browserslist-4.16.8' of github.…
hsorby Aug 24, 2021
5bd7e48
Merge branch 'dependabot/npm_and_yarn/striptags-3.2.0' of github.com:…
hsorby Aug 24, 2021
6c486f8
Merge branch 'dependabot/npm_and_yarn/path-parse-1.0.7' of github.com…
hsorby Aug 24, 2021
2ace847
Implement use of blv link, used to open Biolucida viewer application …
hsorby Aug 24, 2021
80682d5
Update nuxt.config.js
hsorby Aug 25, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 3 additions & 8 deletions components/BiolucidaViewer/BiolucidaViewer.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,9 @@
<div class="biolucida-viewer">
<template v-if="data.status !== 'error'">
<p>
<a :href="data.share_link" target="_blank">
<a :href="data.blv_link" target="_blank">
<bf-button>
View Full Screen
<svg-icon
class="icon-full-screen"
name="icon-full-screen"
height="24"
width="24"
/>
View in 3D
</bf-button>
</a>
</p>
Expand Down Expand Up @@ -42,6 +36,7 @@ export default {
default: () => {
return {
biolucida_image_id: '',
blv_link: '',
share_link: '',
status: ''
}
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
"prettier": "^1.19.1",
"ramda": "^0.26.1",
"redirect-ssl": "^1.4.1",
"striptags": "^3.1.1",
"striptags": "^3.2.0",
"vue": "^2.6.10",
"vue-clipboard2": "^0.3.1",
"vue-infinite-loading": "^2.4.4",
Expand Down
12 changes: 10 additions & 2 deletions pages/datasets/biolucidaviewer/_id.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,10 +105,16 @@ export default {
const image_identifier = route.params.id
const identifier = route.query.item_id.substring(2)

const [image_info, dataset_response, xmp_metadata] = await Promise.all([
const [
image_info,
dataset_response,
xmp_metadata,
blv_link
] = await Promise.all([
biolucida.getImageInfo(image_identifier),
scicrunch.getDatasetInfoFromObjectIdentifier(identifier),
biolucida.getXMPInfo(image_identifier)
biolucida.getXMPInfo(image_identifier),
biolucida.getBLVLink(image_identifier)
])

let dataset_info = dataset_response.data.result[0]
Expand All @@ -117,6 +123,7 @@ export default {
}

return {
blv_link,
image_info,
xmp_metadata,
readme: dataset_info.readme,
Expand Down Expand Up @@ -147,6 +154,7 @@ export default {
biolucidaData: function() {
return {
biolucida_image_id: '',
blv_link: this.blv_link,
share_link: process.env.BL_SHARE_LINK_PREFIX + this.$route.query.view,
status: ''
}
Expand Down
6 changes: 6 additions & 0 deletions services/biolucida.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,11 @@ const getXMPInfo = async id => {
return response.data
}

const getBLVLink = async id => {
const response = await apiClient.get('/image_blv_link/' + id)
return response.data
}

const getThumbnail = async id => {
return apiClient.get('thumbnail/' + id)
}
Expand All @@ -42,6 +47,7 @@ const getCollectionInfo = async id => {
}

export default {
getBLVLink,
getThumbnail,
getNeurolucidaThumbnail,
searchDataset,
Expand Down
60 changes: 30 additions & 30 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4665,15 +4665,15 @@ browserify-zlib@^0.2.0:
pako "~1.0.5"

browserslist@*, browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4.14.5, browserslist@^4.16.3, browserslist@^4.6.4:
version "4.16.3"
resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.3.tgz#340aa46940d7db878748567c5dea24a48ddf3717"
integrity sha512-vIyhWmIkULaq04Gt93txdh+j02yX/JzlyhLYbV3YQCn/zvES3JnY7TifHHvvr1w5hTDluNKMkV05cs4vy8Q7sw==
version "4.16.8"
resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.8.tgz#cb868b0b554f137ba6e33de0ecff2eda403c4fb0"
integrity sha512-sc2m9ohR/49sWEbPj14ZSSZqp+kbi16aLao42Hmn3Z8FpjuMaq2xCA2l4zl9ITfyzvnvyE0hcg62YkIGKxgaNQ==
dependencies:
caniuse-lite "^1.0.30001181"
colorette "^1.2.1"
electron-to-chromium "^1.3.649"
caniuse-lite "^1.0.30001251"
colorette "^1.3.0"
electron-to-chromium "^1.3.811"
escalade "^3.1.1"
node-releases "^1.1.70"
node-releases "^1.1.75"

[email protected]:
version "2.1.1"
Expand Down Expand Up @@ -4873,10 +4873,10 @@ caniuse-api@^3.0.0:
lodash.memoize "^4.1.2"
lodash.uniq "^4.5.0"

caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001181, caniuse-lite@^1.0.30001191:
version "1.0.30001197"
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001197.tgz#47ad15b977d2f32b3ec2fe2b087e0c50443771db"
integrity sha512-8aE+sqBqtXz4G8g35Eg/XEaFr2N7rd/VQ6eABGBmNtcB8cN6qNJhMi6oSFy4UWWZgqgL3filHT8Nha4meu3tsw==
caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001191, caniuse-lite@^1.0.30001251:
version "1.0.30001251"
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001251.tgz#6853a606ec50893115db660f82c094d18f096d85"
integrity sha512-HOe1r+9VkU4TFmnU70z+r7OLmtR+/chB1rdcJUeQlAinjEeb0cKL20tlAtOagNZhbrtLnCvV19B4FmF1rgzl6A==

canonicalize@^1.0.1:
version "1.0.5"
Expand Down Expand Up @@ -5285,10 +5285,10 @@ color@^3.0.0:
color-convert "^1.9.1"
color-string "^1.5.4"

colorette@^1.2.1:
version "1.2.2"
resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.2.2.tgz#cbcc79d5e99caea2dbf10eb3a26fd8b3e6acfa94"
integrity sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w==
colorette@^1.2.1, colorette@^1.3.0:
version "1.3.0"
resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.3.0.tgz#ff45d2f0edb244069d3b772adeb04fed38d0a0af"
integrity sha512-ecORCqbSFP7Wm8Y6lyqMJjexBQqXSF7SSeaTyGGphogUjBlFP9m9o08wy86HL2uB7fMTxtOUzLMk7ogKcxMg1w==

colormap@^2.3.1:
version "2.3.2"
Expand Down Expand Up @@ -6554,10 +6554,10 @@ ejs@^2.6.1:
resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.7.4.tgz#48661287573dcc53e366c7a1ae52c3a120eec9ba"
integrity sha512-7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA==

electron-to-chromium@^1.3.649:
version "1.3.684"
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.684.tgz#053fbb0a4b2d5c076dfa6e1d8ecd06a3075a558a"
integrity sha512-GV/vz2EmmtRSvfGSQ5A0Lucic//IRSDijgL15IgzbBEEnp4rfbxeUSZSlBfmsj7BQvE4sBdgfsvPzLCnp6L21w==
electron-to-chromium@^1.3.811:
version "1.3.815"
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.815.tgz#2372090c909cb52cb0afe1642cffa91cbe08b721"
integrity sha512-2QaE8L5l3BDf82ZXcm0TpWOPoCVUwrp3lKiYzgUbdhRAO2sW60ZdKS5T8yq4r7y1ZeiKJXnf5u8n9u3ldnj5Bw==

element-size@^1.1.1:
version "1.1.1"
Expand Down Expand Up @@ -11050,10 +11050,10 @@ node-object-hash@^1.2.0:
resolved "https://registry.yarnpkg.com/node-object-hash/-/node-object-hash-1.4.2.tgz#385833d85b229902b75826224f6077be969a9e94"
integrity sha512-UdS4swXs85fCGWWf6t6DMGgpN/vnlKeSGEQ7hJcrs7PBFoxoKLmibc3QRb7fwiYsjdL7PX8iI/TMSlZ90dgHhQ==

node-releases@^1.1.70:
version "1.1.71"
resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.71.tgz#cb1334b179896b1c89ecfdd4b725fb7bbdfc7dbb"
integrity sha512-zR6HoT6LrLCRBwukmrVbHv0EpEQjksO6GmFcZQQuCAy139BEsoVKPYnf3jongYW83fAa1torLGYwxxky/p28sg==
node-releases@^1.1.75:
version "1.1.75"
resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.75.tgz#6dd8c876b9897a1b8e5a02de26afa79bb54ebbfe"
integrity sha512-Qe5OUajvqrqDSy6wrWFmMwfJ0jVgwiw4T3KqmbTcZ62qW0gQkheXYhcFM1+lOVcGUoRxcEcfyvFMAnDgaF1VWw==

node-res@^5.0.1:
version "5.0.1"
Expand Down Expand Up @@ -11632,9 +11632,9 @@ path-key@^3.0.0, path-key@^3.1.0:
integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==

path-parse@^1.0.6:
version "1.0.6"
resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c"
integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==
version "1.0.7"
resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735"
integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==

[email protected]:
version "0.1.7"
Expand Down Expand Up @@ -14607,10 +14607,10 @@ strip-json-comments@^3.0.1:
resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"
integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==

striptags@^3.1.1:
version "3.1.1"
resolved "https://registry.yarnpkg.com/striptags/-/striptags-3.1.1.tgz#c8c3e7fdd6fb4bb3a32a3b752e5b5e3e38093ebd"
integrity sha1-yMPn/db7S7OjKjt1LltePjgJPr0=
striptags@^3.2.0:
version "3.2.0"
resolved "https://registry.yarnpkg.com/striptags/-/striptags-3.2.0.tgz#cc74a137db2de8b0b9a370006334161f7dd67052"
integrity sha512-g45ZOGzHDMe2bdYMdIvdAfCQkCTDMGBazSw1ypMowwGIee7ZQ5dU0rBJ8Jqgl+jAKIv4dbeE1jscZq9wid1Tkw==

strongly-connected-components@^1.0.1:
version "1.0.1"
Expand Down