Components naming update

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>

16 files changed, 89 insertions, 38 deletions

diff --git a/src/components/contentDetails.vue b/src/components/ContactDetails.vue
index f49a184a..6f9ca56c 100644
--- a/src/components/contentDetails.vue
+++ b/src/components/ContactDetails.vue
@@ -80,17 +80,19 @@
 
 			<!-- contact details -->
 			<section>
-				<property v-for="(property, index) in contact.properties" :key="index" :property="property" />
+				<contact-details-property v-for="(property, index) in contact.properties" :key="index" :property="property" />
 			</section>
 		</template>
 	</div>
 </template>
 
 <script>
+import popoverMenu from './core/popoverMenu'
+import contactDetailsProperty from './ContactDetails/ContactDetailsProperty'
+
 import Contact from '../models/contact'
+
 import ICAL from 'ical.js'
-import popoverMenu from './popoverMenu'
-import property from './contentDetails/property'
 import ClickOutside from 'vue-click-outside'
 import Vue from 'vue'
 import VTooltip from 'v-tooltip'
@@ -98,10 +100,10 @@ import VTooltip from 'v-tooltip'
 Vue.use(VTooltip)
 
 export default {
-	name: 'ContentDetails',
+	name: 'ContactDetails',
 	components: {
 		popoverMenu,
-		property
+		contactDetailsProperty
 	},
 	directives: {
 		ClickOutside
diff --git a/src/components/contentDetails/property.vue b/src/components/ContactDetails/ContactDetailsProperty.vue
index 927b1a52..a315ab99 100644
--- a/src/components/contentDetails/property.vue
+++ b/src/components/ContactDetails/ContactDetailsProperty.vue
@@ -34,7 +34,7 @@ import PropertyMultipleText from '../properties/PropertyMultipleText'
 // import PropertySelect from '../properties/PropertyMultipleText'
 
 export default {
-	name: 'Property',
+	name: 'ContactDetailsProperty',
 
 	props: {
 		property: {
diff --git a/src/components/contentList.vue b/src/components/ContentList.vue
index 81638fb2..543b7b81 100644
--- a/src/components/contentList.vue
+++ b/src/components/ContentList.vue
@@ -29,7 +29,7 @@
 </template>
 
 <script>
-import contentListItem from './contentList/contentListItem'
+import contentListItem from './ContentList/ContentListItem'
 
 export default {
 	name: 'ContentList',
diff --git a/src/components/contentList/contentListItem.vue b/src/components/ContentList/ContentListItem.vue
index 16f182a2..227ff912 100644
--- a/src/components/contentList/contentListItem.vue
+++ b/src/components/ContentList/ContentListItem.vue
@@ -17,7 +17,7 @@
 
 <script>
 export default {
-	name: 'ContentlistItem',
+	name: 'ContentListItem',
 	filters: {
 		firstLetter(value) {
 			return value.charAt(0)
diff --git a/src/components/addressBook.vue b/src/components/Settings/SettingsAddressBook.vue
index c31a8b49..0b393d7b 100644
--- a/src/components/addressBook.vue
+++ b/src/components/Settings/SettingsAddressBook.vue
@@ -44,11 +44,13 @@
 </template>
 
 <script>
-import popoverMenu from './popoverMenu'
-import shareAddressBook from './settingsNavigation/shareAddressBook'
+import popoverMenu from '../core/popoverMenu'
+import shareAddressBook from './SettingsAddressBookShare'
+
 import clickOutside from 'vue-click-outside'
 
 export default {
+	name: 'SettingsAddressBook',
 	components: {
 		popoverMenu,
 		shareAddressBook,
diff --git a/src/components/settingsNavigation/shareAddressBook.vue b/src/components/Settings/SettingsAddressBookShare.vue
index 59d232da..cc2847da 100644
--- a/src/components/settingsNavigation/shareAddressBook.vue
+++ b/src/components/Settings/SettingsAddressBookShare.vue
@@ -54,7 +54,7 @@
 		</div>
 		<!-- list of user or groups addressbook is shared with -->
 		<ul v-if="addressbook.shares.length > 0" class="addressbook__shares__list">
-			<sharee v-for="sharee in addressbook.shares" :key="sharee.name" :sharee="sharee" />
+			<address-book-sharee v-for="sharee in addressbook.shares" :key="sharee.name" :sharee="sharee" />
 		</ul>
 	</div>
 </template>
@@ -62,13 +62,14 @@
 <script>
 import clickOutside from 'vue-click-outside'
 import Multiselect from 'vue-multiselect'
-import Sharee from './sharee'
+import addressBookSharee from './SettingsAddressBookSharee'
 
 export default {
+	name: 'SettingsShareAddressBook',
 	components: {
 		clickOutside,
 		Multiselect,
-		Sharee
+		addressBookSharee
 	},
 	directives: {
 		clickOutside
diff --git a/src/components/settingsNavigation/sharee.vue b/src/components/Settings/SettingsAddressBookSharee.vue
index 9fe52b05..f28b35ed 100644
--- a/src/components/settingsNavigation/sharee.vue
+++ b/src/components/Settings/SettingsAddressBookSharee.vue
@@ -43,6 +43,7 @@
 import clickOutside from 'vue-click-outside'
 
 export default {
+	name: 'SettingsShareSharee',
 	components: {
 		clickOutside
 	},
diff --git a/src/components/settingsNavigation/importContacts.vue b/src/components/Settings/SettingsImportContacts.vue
index 1799910e..c67fdb63 100644
--- a/src/components/settingsNavigation/importContacts.vue
+++ b/src/components/Settings/SettingsImportContacts.vue
@@ -39,6 +39,7 @@ import clickOutside from 'vue-click-outside'
 import Multiselect from 'vue-multiselect'
 
 export default {
+	name: 'SettingsImportContacts',
 	components: {
 		clickOutside,
 		Multiselect
diff --git a/src/components/settingsNavigation/addAddressBook.vue b/src/components/Settings/SettingsNewAddressBook.vue
index 3a54e2c8..f403c455 100644
--- a/src/components/settingsNavigation/addAddressBook.vue
+++ b/src/components/Settings/SettingsNewAddressBook.vue
@@ -23,7 +23,7 @@
 <template>
 	<form id="new-addressbook-form" name="new-addressbook-form" class="new-address-book"
 		@submit.prevent="addAddressBook">
-		<input ref="addressBook" :id="addressBook" class="new-address-book-input"
+		<input id="new-address-book" ref="addressBook" class="new-address-book-input"
 			placeholder="Address book name"
 			type="text"
 			autocomplete="off" autocorrect="off"
@@ -40,6 +40,7 @@
 import clickOutside from 'vue-click-outside'
 
 export default {
+	name: 'SettingsNewAddressBook',
 	components: {
 		clickOutside
 	},
diff --git a/src/components/settingsNavigation/sortContacts.vue b/src/components/Settings/SettingsSortContacts.vue
index 1e893db6..440e7d00 100644
--- a/src/components/settingsNavigation/sortContacts.vue
+++ b/src/components/Settings/SettingsSortContacts.vue
@@ -41,6 +41,7 @@ import clickOutside from 'vue-click-outside'
 import Multiselect from 'vue-multiselect'
 
 export default {
+	name: 'SettingsSortContacts',
 	components: {
 		clickOutside,
 		Multiselect
diff --git a/src/components/SettingsSection.vue b/src/components/SettingsSection.vue
new file mode 100644
index 00000000..4743e6ae
--- /dev/null
+++ b/src/components/SettingsSection.vue
@@ -0,0 +1,56 @@
+<!--
+  - @copyright Copyright (c) 2018 John Molakvoæ <skjnldsv@protonmail.com>
+  -
+  - @author John Molakvoæ <skjnldsv@protonmail.com>
+  -
+  - @license GNU AGPL version 3 or any later version
+  -
+  - This program is free software: you can redistribute it and/or modify
+  - it under the terms of the GNU Affero General Public License as
+  - published by the Free Software Foundation, either version 3 of the
+  - License, or (at your option) any later version.
+  -
+  - This program is distributed in the hope that it will be useful,
+  - but WITHOUT ANY WARRANTY; without even the implied warranty of
+  - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  - GNU Affero General Public License for more details.
+  -
+  - You should have received a copy of the GNU Affero General Public License
+  - along with this program. If not, see <http://www.gnu.org/licenses/>.
+  -
+  -->
+
+<template>
+	<div>
+		<ul id="address-book-list">
+			<address-book v-for="addressbook in addressbooks" :key="addressbook.id" :addressbook="addressbook" />
+		</ul>
+		<add-address-book :addressbooks="addressbooks" />
+
+		<import-contacts :addressbooks="addressbooks" class="settings-section" />
+		<sort-contacts class="settings-section" />
+	</div>
+</template>
+
+<script>
+import addressBook from '../components/Settings/SettingsAddressBook'
+import addAddressBook from '../components/Settings/SettingsNewAddressBook'
+import importContacts from '../components/Settings/SettingsImportContacts'
+import sortContacts from '../components/Settings/SettingsSortContacts'
+
+export default {
+	name: 'ContentList',
+	components: {
+		addressBook,
+		addAddressBook,
+		importContacts,
+		sortContacts
+	},
+	computed: {
+		// store getters
+		addressbooks() {
+			return this.$store.getters.getAddressbooks
+		}
+	}
+}
+</script>
diff --git a/src/components/appNavigation.vue b/src/components/core/appNavigation.vue
index 8793e9eb..8793e9eb 100644
--- a/src/components/appNavigation.vue
+++ b/src/components/core/appNavigation.vue
diff --git a/src/components/appNavigation/navigationItem.vue b/src/components/core/appNavigation/navigationItem.vue
index 925ed4c2..925ed4c2 100644
--- a/src/components/appNavigation/navigationItem.vue
+++ b/src/components/core/appNavigation/navigationItem.vue
diff --git a/src/components/popoverMenu.vue b/src/components/core/popoverMenu.vue
index 6c1a0541..6c1a0541 100644
--- a/src/components/popoverMenu.vue
+++ b/src/components/core/popoverMenu.vue
diff --git a/src/components/popoverMenu/popoverItem.vue b/src/components/core/popoverMenu/popoverItem.vue
index e7c0b092..e7c0b092 100644
--- a/src/components/popoverMenu/popoverItem.vue
+++ b/src/components/core/popoverMenu/popoverItem.vue
diff --git a/src/views/Contacts.vue b/src/views/Contacts.vue
index 73f2cc49..de1b9e6d 100644
--- a/src/views/Contacts.vue
+++ b/src/views/Contacts.vue
@@ -23,19 +23,10 @@
 <template>
 	<div id="content" class="app-contacts">
 
-		<!-- new-button + navigation + settings -->
+		<!-- new-contact-button + navigation + settings -->
 		<app-navigation :menu="menu">
 			<!-- settings -->
-			<template slot="settings-content">
-				<ul id="address-book-list">
-					<address-book v-for="addressbook in addressbooks" :key="addressbook.id" :addressbook="addressbook" />
-				</ul>
-				<add-address-book :addressbooks="addressbooks" />
-
-				<import-contacts :addressbooks="addressbooks" class="settings-section" />
-				<sort-contacts class="settings-section" />
-
-			</template>
+			<settings-section slot="settings-content" />
 		</app-navigation>
 
 		<!-- main content -->
@@ -44,7 +35,7 @@
 				<!-- contacts list -->
 				<content-list :list="contactsList" :contacts="contacts" :loading="loading" />
 				<!-- main contacts details -->
-				<content-details :loading="loading" :uid="selectedContact" />
+				<contact-details :loading="loading" :uid="selectedContact" />
 			</div>
 		</div>
 
@@ -52,24 +43,19 @@
 </template>
 
 <script>
-import appNavigation from '../components/appNavigation'
-import contentList from '../components/contentList'
-import contentDetails from '../components/contentDetails'
-import addressBook from '../components/addressBook'
+import appNavigation from '../components/core/appNavigation'
+import settingsSection from '../components/SettingsSection'
+import contentList from '../components/ContentList'
+import contactDetails from '../components/ContactDetails'
+
 import Contact from '../models/contact'
-import importContacts from '../components/settingsNavigation/importContacts'
-import sortContacts from '../components/settingsNavigation/sortContacts'
-import addAddressBook from '../components/settingsNavigation/addAddressBook'
 
 export default {
 	components: {
 		appNavigation,
+		settingsSection,
 		contentList,
-		contentDetails,
-		addressBook,
-		importContacts,
-		sortContacts,
-		addAddressBook
+		contactDetails
 	},
 
 	// passed by the router