Merge remote-tracking branch 'origin' into add-share-button

package.json

@@ -8,10 +8,6 @@
     "lint": "vue-cli-service lint"
   },
   "dependencies": {
-    "@fortawesome/fontawesome-svg-core": "^1.2.35",
-    "@fortawesome/free-brands-svg-icons": "^5.15.3",
-    "@fortawesome/free-solid-svg-icons": "^5.15.3",
-    "@fortawesome/vue-fontawesome": "^2.0.2",
     "axios": "^0.19.2",
     "core-js": "~3.6.5",
     "debounce": "^1.2.1",
@@ -20,7 +16,6 @@
     "vue-material-design-icons": "^4.11.0",
     "vue-plausible": "^1.1.4",
     "vue-router": "^3.5.1",
-    "vue-social-sharing": "^3.0.8",
     "vuetify": "^2.4.8"
   },
   "devDependencies": {

src/components/Article.vue

@@ -32,36 +32,9 @@
         </router-link>
       </div>
     </div>
-    <div class="share" v-if="webShareApiSupported">
-      <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>
+  </article>
 </template>
 
-<script src="/dist/vue-social-sharing.js"></script>
 <script>
 import DefElement from './DefElement.vue'
 import Definition from './Definition.vue'
@@ -101,20 +74,13 @@ export default {
   props: {
     article: Object
   },
-    computed: {
-    webShareApiSupported() {
-      return navigator.share
-    },
+  computed: {
     link_to_self: function() {
       return  {
         ref: '/' + this.dictionary + '/' + this.article.article_id + '/' + encodeURIComponent(this.article.lemmas[0].lemma),
         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() {
       return this.article.dictionary
     },
@@ -138,13 +104,6 @@ export default {
     Header
   },
   methods: {
-    shareViaWebShare() {
-      navigator.share({
-        title: 'Title to be shared',
-        text: 'Text to be shared',
-        url: 'URL to be shared'
-      })
-    },
     article_link_click: function(item) {
       this.$emit('article-click', item)
     },
@@ -182,15 +141,6 @@ h3 {
   font-variant: small-caps;
 }
 
-div.share {
-  color: #560027;
-  padding-top: 24px;
-}
-
-.share-button {
-  padding-right: 4px;
-}
-
 section.etymology > h3, section.pronunciation > h3 {
   display: inline;
   font-size: 14px;

src/main.js

@@ -7,18 +7,6 @@ import VueRouter from 'vue-router'
 import { VuePlausible } from 'vue-plausible'
 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.use(VueRouter)
 Vue.use(VuePlausible, {