From 1cac100942b30593bdcba14b77e5bb07afacdd88 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?John=20Molakvo=C3=A6=20=28skjnldsv=29?=
 <skjnldsv@protonmail.com>
Date: Tue, 28 Aug 2018 18:37:16 +0200
Subject: Rebase and compile fixes
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
---
 src/components/Settings/SettingsImportContacts.vue | 15 +--------------
 src/components/SettingsSection.vue                 | 17 +----------------
 src/views/Contacts.vue                             |  3 ++-
 3 files changed, 4 insertions(+), 31 deletions(-)

(limited to 'src')

diff --git a/src/components/Settings/SettingsImportContacts.vue b/src/components/Settings/SettingsImportContacts.vue
index 608f054d..53cf2f01 100644
--- a/src/components/Settings/SettingsImportContacts.vue
+++ b/src/components/Settings/SettingsImportContacts.vue
@@ -1,3 +1,4 @@
+
 <!--
 	- @copyright Copyright (c) 2018 Team Popcorn <teampopcornberlin@gmail.com>
 	-
@@ -19,7 +20,6 @@
 	- along with this program. If not, see <http://www.gnu.org/licenses/>.
 	-
 -->
-// ☞ 5bfb0d3f-5288-48ce-9dc1-94c2b08cf3ca
 
 <template>
 	<div class="import-contact">
@@ -50,18 +50,6 @@ export default {
 	directives: {
 		clickOutside
 	},
-	props: {
-		importState: {
-			type: Object,
-			default: () => {
-				return {
-					total: 0,
-					accepted: 0,
-					denied: 0
-				}
-			}
-		}
-	},
 	data() {
 		return {
 			importDestination: ''
@@ -111,4 +99,3 @@ export default {
 	}
 }
 </script>
-// ☞ f34b2e1a-1610-4a5f-bdbf-9a83325796fe
diff --git a/src/components/SettingsSection.vue b/src/components/SettingsSection.vue
index 14f9e150..1f37dab4 100644
--- a/src/components/SettingsSection.vue
+++ b/src/components/SettingsSection.vue
@@ -26,7 +26,7 @@
 			<address-book v-for="addressbook in addressbooks" :key="addressbook.id" :addressbook="addressbook" />
 		</ul>
 		<add-address-book :addressbooks="addressbooks" />
-		<import-contacts :addressbooks="addressbooks" :import-state="importState" class="settings-section"
+		<import-contacts :addressbooks="addressbooks" class="settings-section"
 			@clicked="onClickImport" @fileLoaded="onLoad" />
 		<sort-contacts class="settings-section" />
 	</div>
@@ -46,25 +46,10 @@ export default {
 		importContacts,
 		sortContacts
 	},
-	props: {
-		importState: {
-			type: Object,
-			default: () => {
-				return {
-					total: 0,
-					accepted: 0,
-					denied: 0
-				}
-			}
-		}
-	},
 	computed: {
 		// store getters
 		addressbooks() {
 			return this.$store.getters.getAddressbooks
-		},
-		importState() {
-			return this.$store.getters.getImportState
 		}
 	},
 	methods: {
diff --git a/src/views/Contacts.vue b/src/views/Contacts.vue
index e66f1eca..57c99675 100644
--- a/src/views/Contacts.vue
+++ b/src/views/Contacts.vue
@@ -61,7 +61,8 @@ export default {
 		appNavigation,
 		settingsSection,
 		contentList,
-		contactDetails
+		contactDetails,
+		importScreen
 	},
 
 	// passed by the router
-- 
cgit v1.2.3