From e3d0bd1008c70ee8a3de54af98952c6724f41a34 Mon Sep 17 00:00:00 2001
From: Julien Calixte <juliencalixte@gmail.com>
Date: Sun, 23 Aug 2020 11:56:34 +0200
Subject: [PATCH] :bug: (share) fix share url

---
 src/components/AccountShare.vue | 4 ++--
 src/services/CouchService.ts    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/AccountShare.vue b/src/components/AccountShare.vue
index d52d444..924e474 100644
--- a/src/components/AccountShare.vue
+++ b/src/components/AccountShare.vue
@@ -84,7 +84,7 @@ export default class Home extends Vue {
   }
 
   public get accountUrl(): string {
-    let url = window.location.href.replace('/setting', '')
+    let url = `${window.location.origin}${window.location.pathname}`
     if (this.account.isPublic) {
       url = `${url}/public`
     }
@@ -110,7 +110,7 @@ export default class Home extends Vue {
 }
 </script>
 
-<style lang='scss' scoped>
+<style lang="scss" scoped>
 $padding-fab: 24px;
 
 .is-fab {
diff --git a/src/services/CouchService.ts b/src/services/CouchService.ts
index f92c657..6ca79e1 100644
--- a/src/services/CouchService.ts
+++ b/src/services/CouchService.ts
@@ -1,4 +1,4 @@
-import uuid from 'uuid/v4'
+import { v4 as uuid } from 'uuid'
 import PouchDb from 'pouchdb-browser'
 import PouchDbAuthentication from 'pouchdb-authentication'
 import bus, { SYNC } from '@/utils/bus-event'