Skip to content
Snippets Groups Projects
Commit fc083070 authored by Henrik Askjer's avatar Henrik Askjer
Browse files

Revert merges

parent 1aa68596
No related branches found
No related tags found
No related merge requests found
...@@ -32,36 +32,9 @@ ...@@ -32,36 +32,9 @@
</router-link> </router-link>
</div> </div>
</div> </div>
<div class="share" v-if="webShareApiSupported"> </article>
<button @click="shareViaWebShare">
Del ordet <font-awesome-icon icon="share-alt-square" size = "lg"/>
</button>
</div>
<div class="share" v-else>
<button class="share-button">
<ShareNetwork network="facebook"
:url="share_link"
title="TITLE"
description="DESCRIPTION"
quote="QUOTE">
<font-awesome-icon :icon="['fab', 'facebook-square']" size="lg" />
</ShareNetwork>
</button>
<button class="share-button">
<ShareNetwork
network="twitter"
:url="share_link"
title="TITLE"
description="DESCRIPTION"
hashtags="Ordbøkene">
<font-awesome-icon :icon="['fab', 'twitter-square']" size="lg" />
</ShareNetwork>
</button>
</div>
</article>
</template> </template>
<script src="/dist/vue-social-sharing.js"></script>
<script> <script>
import DefElement from './DefElement.vue' import DefElement from './DefElement.vue'
import Definition from './Definition.vue' import Definition from './Definition.vue'
...@@ -101,20 +74,13 @@ export default { ...@@ -101,20 +74,13 @@ export default {
props: { props: {
article: Object article: Object
}, },
computed: { computed: {
webShareApiSupported() {
return navigator.share
},
link_to_self: function() { link_to_self: function() {
return { return {
ref: '/' + this.dictionary + '/' + this.article.article_id + '/' + encodeURIComponent(this.article.lemmas[0].lemma), ref: '/' + this.dictionary + '/' + this.article.article_id + '/' + encodeURIComponent(this.article.lemmas[0].lemma),
article: this.article article: this.article
} }
}, },
share_link: function() {
let host = window.location.hostname === 'localhost'? 'https://dev.ordbok.uib.no' : 'https://' + window.location.host
return host + "/" + this.dictionary + '/' + this.article.article_id + '/' + encodeURIComponent(this.article.lemmas[0].lemma)
},
dictionary: function() { dictionary: function() {
return this.article.dictionary return this.article.dictionary
}, },
...@@ -138,13 +104,6 @@ export default { ...@@ -138,13 +104,6 @@ export default {
Header Header
}, },
methods: { methods: {
shareViaWebShare() {
navigator.share({
title: 'Title to be shared',
text: 'Text to be shared',
url: 'URL to be shared'
})
},
article_link_click: function(item) { article_link_click: function(item) {
this.$emit('article-click', item) this.$emit('article-click', item)
}, },
...@@ -182,15 +141,6 @@ h3 { ...@@ -182,15 +141,6 @@ h3 {
font-variant: small-caps; font-variant: small-caps;
} }
div.share {
color: #560027;
padding-top: 24px;
}
.share-button {
padding-right: 4px;
}
section.etymology > h3, section.pronunciation > h3 { section.etymology > h3, section.pronunciation > h3 {
display: inline; display: inline;
font-size: 14px; font-size: 14px;
......
...@@ -7,18 +7,6 @@ import VueRouter from 'vue-router' ...@@ -7,18 +7,6 @@ import VueRouter from 'vue-router'
import { VuePlausible } from 'vue-plausible' import { VuePlausible } from 'vue-plausible'
import vuetify from './plugins/vuetify' import vuetify from './plugins/vuetify'
import VueSocialSharing from 'vue-social-sharing'
Vue.use(VueSocialSharing);
import { library } from '@fortawesome/fontawesome-svg-core'
import { faShareAltSquare } from '@fortawesome/free-solid-svg-icons'
import { faFacebookSquare, faTwitterSquare } from '@fortawesome/free-brands-svg-icons'
import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome'
library.add(faFacebookSquare, faTwitterSquare, faShareAltSquare)
Vue.component('font-awesome-icon', FontAwesomeIcon);
Vue.config.productionTip = false Vue.config.productionTip = false
Vue.use(VueRouter) Vue.use(VueRouter)
Vue.use(VuePlausible, { Vue.use(VuePlausible, {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment