Merge branch 'fix-osubscribe'

This commit is contained in:
william Murphy 2019-11-19 19:32:46 -06:00
commit 7c580b991e
11 changed files with 11 additions and 11 deletions

View file

@ -1 +1 @@
#app{font-family:Avenir,Helvetica,Arial,sans-serif;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;color:#2c3e50}.fas[data-v-c1288b72]{margin-right:8px}.profile[data-v-9c330358]{width:300px}.profile-grid[data-v-9c330358]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-flow:row wrap;flex-flow:row wrap;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;-ms-flex-line-pack:justify;align-content:space-between}.profile-image{width:75px}.icon[data-v-26eca70a]{width:32px;height:32px}.invisible{display:none}.ellipsis:after{content:"\2026"}.w3-container.w3-content[data-v-120217d8]{max-width:800px}.profile-main[data-v-120217d8]{height:256px;width:256px} #app{font-family:Avenir,Helvetica,Arial,sans-serif;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;color:#2c3e50}.fas[data-v-c1288b72]{margin-right:8px}.profile[data-v-9c330358]{width:300px}.profile-grid[data-v-9c330358]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-flow:row wrap;flex-flow:row wrap;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;-ms-flex-line-pack:justify;align-content:space-between}.profile-image{width:75px}.icon[data-v-26eca70a]{width:32px;height:32px}.invisible{display:none}.ellipsis:after{content:"\2026"}.w3-container.w3-content[data-v-2eec363b]{max-width:800px}.profile-main[data-v-2eec363b]{height:256px;width:256px}

2
web/dist/index.html vendored
View file

@ -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"><link rel=icon href=/web/favicon.ico><link rel=stylesheet href=/web/w3.css><link rel=stylesheet href="https://fonts.googleapis.com/css?family=Lato"><link rel=stylesheet href=/web/fontawesome/all.min.css><title>web</title><link href=/web/css/app.5c5d8f9b.css rel=preload as=style><link href=/web/js/app.0d4cd2d8.js rel=modulepreload as=script><link href=/web/js/chunk-vendors.f470a39b.js rel=modulepreload as=script><link href=/web/css/app.5c5d8f9b.css rel=stylesheet></head><body><noscript><strong>We're sorry but web doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script type=module src=/web/js/chunk-vendors.f470a39b.js></script><script type=module src=/web/js/app.0d4cd2d8.js></script><script>!function(){var e=document,t=e.createElement("script");if(!("noModule"in t)&&"onbeforeload"in t){var n=!1;e.addEventListener("beforeload",function(e){if(e.target===t)n=!0;else if(!e.target.hasAttribute("nomodule")||!n)return;e.preventDefault()},!0),t.type="module",t.src=".",e.head.appendChild(t),t.remove()}}();</script><script src=/web/js/chunk-vendors-legacy.e214c0f7.js nomodule></script><script src=/web/js/app-legacy.9f4201df.js nomodule></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"><link rel=icon href=/web/favicon.ico><link rel=stylesheet href=/web/w3.css><link rel=stylesheet href="https://fonts.googleapis.com/css?family=Lato"><link rel=stylesheet href=/web/fontawesome/all.min.css><title>web</title><link href=/web/css/app.b51b581f.css rel=preload as=style><link href=/web/js/app.6e4929ce.js rel=modulepreload as=script><link href=/web/js/chunk-vendors.f470a39b.js rel=modulepreload as=script><link href=/web/css/app.b51b581f.css rel=stylesheet></head><body><noscript><strong>We're sorry but web doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script type=module src=/web/js/chunk-vendors.f470a39b.js></script><script type=module src=/web/js/app.6e4929ce.js></script><script>!function(){var e=document,t=e.createElement("script");if(!("noModule"in t)&&"onbeforeload"in t){var n=!1;e.addEventListener("beforeload",function(e){if(e.target===t)n=!0;else if(!e.target.hasAttribute("nomodule")||!n)return;e.preventDefault()},!0),t.type="module",t.src=".",e.head.appendChild(t),t.remove()}}();</script><script src=/web/js/chunk-vendors-legacy.e214c0f7.js nomodule></script><script src=/web/js/app-legacy.a96d9fef.js nomodule></script></body></html>

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

2
web/dist/js/app-legacy.a96d9fef.js vendored Normal file

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

2
web/dist/js/app.6e4929ce.js vendored Normal file

File diff suppressed because one or more lines are too long

1
web/dist/js/app.6e4929ce.js.map vendored Normal file

File diff suppressed because one or more lines are too long

View file

@ -20,7 +20,7 @@
<span @click.prevent="unreachable = false" class="w3-button w3-large w3-display-topright">×</span> <span @click.prevent="unreachable = false" class="w3-button w3-large w3-display-topright">×</span>
<h3>Oops</h3> <h3>Oops</h3>
<p>Couldn't connect with your host.</p> <p>Couldn't connect with your host.</p>
<p>You could try going back to your app and entering {{ groupHandle }} in the search instead</p> <p>You could try going back to your app and entering @{{ groupHandle }} in the search instead</p>
</div> </div>
<div class="w3-container w3-content w3-padding-64"> <div class="w3-container w3-content w3-padding-64">
<h2 class="w3-wide w3-center">Recent group posts</h2> <h2 class="w3-wide w3-center">Recent group posts</h2>
@ -68,7 +68,7 @@ export default {
groupHandle() { groupHandle() {
if (this.actor.id && this.actor.preferredUsername) { if (this.actor.id && this.actor.preferredUsername) {
const url = new window.URL(this.actor.id) const url = new window.URL(this.actor.id)
return `@${this.actor.preferredUsername.toLowerCase()}@${url.host}` return `${this.actor.preferredUsername.toLowerCase()}@${url.host}`
} }
return '' return ''
} }
@ -95,7 +95,7 @@ export default {
.then(res => res.json()) .then(res => res.json())
.then(json => { .then(json => {
const link = json.links.find(l => l.rel === 'http://ostatus.org/schema/1.0/subscribe') const link = json.links.find(l => l.rel === 'http://ostatus.org/schema/1.0/subscribe')
window.location.href = link.template.replace('{uri}', '{{ groupAcct }}') window.location.href = link.template.replace('{uri}', this.groupHandle)
}) })
.catch(err => { .catch(err => {
console.log(err) console.log(err)