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.

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

[bugfix] target ocm link generation #1

Merged
merged 1 commit into from
Mar 15, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/index.html
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><title>Mesh Directory | ScienceMesh</title><meta name="description" content="Choose your provider to collaborate in the ScienceMesh."><meta property="og:type" content="website"><meta property="og:url" content="https://sciencemesh.io"><meta property="og:title" content="Mesh Directory | ScienceMesh"><meta property="og:description" content="Choose your provider to collaborate in the ScienceMesh."><meta property="og:image" content="assets/images/seo-image.png"><meta property="twitter:card" content="summary_large_image"><meta property="twitter:url" content="https://sciencemesh.io"><meta property="twitter:title" content="Mesh Directory | ScienceMesh"><meta property="twitter:description" content="Choose your provider to collaborate in the ScienceMesh."><meta property="twitter:image" content="assets/images/seo-image.png"><link rel="icon" type="image/png" sizes="128x128" href="icons/favicon-128x128.png"><link rel="icon" type="image/png" sizes="96x96" href="icons/favicon-96x96.png"><link rel="icon" type="image/png" sizes="32x32" href="icons/favicon-32x32.png"><link rel="icon" type="image/png" sizes="16x16" href="icons/favicon-16x16.png"><link rel="icon" type="image/ico" href="favicon.ico"><link href="css/chunk-1deba92c.60b65453.css" rel="prefetch"><link href="js/chunk-1deba92c.e1f66004.js" rel="prefetch"><link href="css/app.b95793a8.css" rel="preload" as="style"><link href="css/chunk-vendors.501fb1dc.css" rel="preload" as="style"><link href="js/app.ab176d65.js" rel="preload" as="script"><link href="js/chunk-vendors.065901f3.js" rel="preload" as="script"><link href="css/chunk-vendors.501fb1dc.css" rel="stylesheet"><link href="css/app.b95793a8.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but meshdirectory-ui doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div><script src="js/chunk-vendors.065901f3.js"></script><script src="js/app.ab176d65.js"></script></body></html>
<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><title>Mesh Directory | ScienceMesh</title><meta name="description" content="Choose your provider to collaborate in the ScienceMesh."><meta property="og:type" content="website"><meta property="og:url" content="https://sciencemesh.io"><meta property="og:title" content="Mesh Directory | ScienceMesh"><meta property="og:description" content="Choose your provider to collaborate in the ScienceMesh."><meta property="og:image" content="assets/images/seo-image.png"><meta property="twitter:card" content="summary_large_image"><meta property="twitter:url" content="https://sciencemesh.io"><meta property="twitter:title" content="Mesh Directory | ScienceMesh"><meta property="twitter:description" content="Choose your provider to collaborate in the ScienceMesh."><meta property="twitter:image" content="assets/images/seo-image.png"><link rel="icon" type="image/png" sizes="128x128" href="icons/favicon-128x128.png"><link rel="icon" type="image/png" sizes="96x96" href="icons/favicon-96x96.png"><link rel="icon" type="image/png" sizes="32x32" href="icons/favicon-32x32.png"><link rel="icon" type="image/png" sizes="16x16" href="icons/favicon-16x16.png"><link rel="icon" type="image/ico" href="favicon.ico"><link href="css/chunk-10f6c022.d19cedb0.css" rel="prefetch"><link href="js/chunk-10f6c022.5fe1a4ac.js" rel="prefetch"><link href="css/app.b95793a8.css" rel="preload" as="style"><link href="css/chunk-vendors.501fb1dc.css" rel="preload" as="style"><link href="js/app.64d303c5.js" rel="preload" as="script"><link href="js/chunk-vendors.4e02d2c7.js" rel="preload" as="script"><link href="css/chunk-vendors.501fb1dc.css" rel="stylesheet"><link href="css/app.b95793a8.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but meshdirectory-ui doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div><script src="js/chunk-vendors.4e02d2c7.js"></script><script src="js/app.64d303c5.js"></script></body></html>
2 changes: 2 additions & 0 deletions dist/js/app.64d303c5.js

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions dist/js/app.64d303c5.js.map

Large diffs are not rendered by default.

2 changes: 0 additions & 2 deletions dist/js/app.ab176d65.js

This file was deleted.

1 change: 0 additions & 1 deletion dist/js/app.ab176d65.js.map

This file was deleted.

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions dist/js/chunk-10f6c022.5fe1a4ac.js.map

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion dist/js/chunk-1deba92c.e1f66004.js.map

This file was deleted.

17 changes: 0 additions & 17 deletions dist/js/chunk-vendors.065901f3.js

This file was deleted.

1 change: 0 additions & 1 deletion dist/js/chunk-vendors.065901f3.js.map

This file was deleted.

17 changes: 17 additions & 0 deletions dist/js/chunk-vendors.4e02d2c7.js

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions dist/js/chunk-vendors.4e02d2c7.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "meshdirectory-ui",
"version": "1.0.0",
"version": "1.0.1",
"private": true,
"scripts": {
"serve": "vue-cli-service serve --modern",
Expand Down
2 changes: 1 addition & 1 deletion src/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ export default {
const {validLink, baseUrl} = useUrl()
const {md, lg} = useBreakpoints()

fetchProviders(`${baseUrl.value}/providers`)
fetchProviders(`${baseUrl.value}providers`)
// TODO: replace locations asset with Mentix locations provider in IOP
// fetchLocations('~assets/data/providers.loc.json')
fetchLocations()
Expand Down
4 changes: 2 additions & 2 deletions src/components/MeshMap.vue
Original file line number Diff line number Diff line change
Expand Up @@ -132,8 +132,8 @@ export default {
opacity: 0;
animation-name: staggered-marching-ants;
animation-duration: 30s;
animation-delay: calc(var(--animation-order) * 2200ms);
animation-fill-mode: both;
animation-delay: calc(var(--animation-order) * 3200ms);
animation-fill-mode: forwards;
animation-timing-function: ease-in-out;
animation-iteration-count: infinite;
}
Expand Down
2 changes: 1 addition & 1 deletion src/use/map.js
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ export default function useMap(center, statesRef, mapRef) {
// Pick 10 random connections proportional to number of locations
connections.value = connections.value
.sort(() => 0.5 - Math.random())
.slice(0, _locations.length % connections.value.length - 1)
.slice(0, Math.ceil((_locations.length % connections.value.length - 1) % 1.2))
}

function getProviderPoint(provider) {
Expand Down
2 changes: 1 addition & 1 deletion src/use/providers.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ export default function useProviders() {
return new URL(
`?${encodeURI(searchParams.value.toString())}`,
new URL('invites/forward',
new URL(targetOCMService.value.endpoint.path)
new URL(targetOCMService.value.endpoint.path.replace(/\/?$/, '/'))
)
)
})
Expand Down
2 changes: 1 addition & 1 deletion src/use/query.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ export default function useUrl() {
})

const baseUrl = computed(() => {
return `${window.location.pathname === '/'? '' : window.location.pathname}`;
return window.location.pathname.replace(/\/?$/, '/')
})

const validLink = computed(() => {
Expand Down