Merge branch 'master' of https://github.com/nextcloud/contacts into d…

…ownload-contact-group-nextcloud#39

Signed-off-by: John Molakvoæ (skjnldsv) <[email protected]>

.eslintrc.js

@@ -15,15 +15,29 @@ module.exports = {
 		VueRouter: true
 	},
 	parserOptions: {
-		parser: 'babel-eslint'
+		parser: 'babel-eslint',
+		ecmaVersion: 8
 	},
 	extends: [
 		'eslint:recommended',
+		'plugin:import/errors',
+		'plugin:import/warnings',
 		'plugin:node/recommended',
 		'plugin:vue/essential',
 		'plugin:vue/recommended',
 		'standard'
 	],
+	settings: {
+		'import/resolver': {
+			webpack: {
+				config: 'webpack.common.js'
+			},
+			node: {
+				paths: ['src'],
+				extensions: ['.js', '.vue']
+			}
+		}
+	},
 	plugins: ['vue', 'node'],
 	rules: {
 		// space before function ()
@@ -42,8 +56,6 @@ module.exports = {
 		'no-console': ['error', { allow: ['error', 'warn', 'debug'] }],
 		// classes blocks
 		'padded-blocks': ['error', { classes: 'always' }],
-		// always add a trailing comma, for diff readability
-		'comma-dangle': ["error", "only-multiline"],
 		// always have the operator in front
 		'operator-linebreak': ['error', 'before'],
 		// ternary on multiline
@@ -58,9 +70,11 @@ module.exports = {
 		}],
 		// es6 import/export and require
 		'node/no-unpublished-require': ['off'],
-		'node/no-unsupported-features': ['off'],
+		'node/no-unsupported-features/es-syntax': ['off'],
 		// space before self-closing elements
 		'vue/html-closing-bracket-spacing': 'error',
+		// no ending html tag on a new line
+		'vue/html-closing-bracket-newline': ['error', { multiline: 'never' }],
 		// code spacing with attributes
 		'vue/max-attributes-per-line': [
 			'error',
@@ -73,4 +87,4 @@ module.exports = {
 			}
 		]
 	}
-};
+}

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,135 @@
+---
+name: Bug report
+about: Create a bug report to help us improve
+
+---
+
+⚠ Please report only issues corresponding to the contacts app for Nextcloud ⚠
+
+Migration and CardDAV issues belong in the server repo!
+https://github.com/nextcloud/server/issues
+
+If you have any questions, head over to https://help.nextcloud.com/c/apps/contacts
+__________________________________________________________________
+
+### Describe the bug
+A clear and concise description of what the bug is.
+......
+......
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+Tell us what you expected to happen.
+
+**Actual behavior**
+Tell us what happened instead.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+### Server configuration
+<!--
+You can use the Issue Template application to prefill most of the required information: https://apps.nextcloud.com/apps/issuetemplate
+-->
+
+**Operating system**: Windows, Linux, MacOS...
+
+**Web server:** Apache, Nginx...
+
+**Database:** MariaDB, MySQL, PostgreSQL... 
+
+**PHP version:** 7.0, 7.1, 7.2...
+
+**Nextcloud version:** (see Nextcloud admin page)
+
+**Contacts version:** (see Nextcloud apps page)
+
+**Updated from an older Nextcloud or fresh install:**
+
+**Signing status:**
+```
+Login as admin user into your Nextcloud and access 
+http://example.com/index.php/settings/integrity/failed 
+paste the results here.
+```
+
+**List of activated apps:**
+```
+If you have access to your command line run e.g.:
+sudo -u www-data php occ app:list
+from within your Nextcloud installation folder
+```
+
+**Nextcloud configuration:**
+```
+If you have access to your command line run e.g.:
+sudo -u www-data php occ config:list system
+from within your instance's installation folder
+
+or
+
+Insert your config.php content here
+Make sure to remove all sensitive content such as passwords. (e.g. database password, passwordsalt, secret, smtp password, …)
+```
+
+### Client configuration
+**Browser:**
+
+**Operating system:**
+
+**CardDAV-clients:**
+
+### Logs
+#### *Web server error log*
+```
+Insert your webserver log here
+```
+
+### Nextcloud log
+#### *data/nextcloud.log*
+```
+Insert your Nextcloud log here
+```
+
+#### Browser log
+<details>
+<summary>How to access your browser console (Click to expand)</summary>
+
+# Chrome
+- Press either CTRL + SHIFT + J to open the “console” tab of the Developer Tools.
+- Alternative method:
+    1. Press either CTRL + SHIFT + I or F12 to open the Developer Tools.
+    2. Click the “console” tab.
+
+# Safari
+- Press CTRL + ALT + I to open the Web Inspector.
+- See Chrome’s step 2. (Chrome and Safari have pretty much identical dev tools.)
+
+# IE9
+1. Press F12 to open the developer tools.
+2. Click the “console” tab.
+
+# Firefox
+- Press CTRL + SHIFT + K to open the Web console (COMMAND + SHIFT + K on Macs).
+- or, if Firebug is installed (recommended):
+    1. Press F12 to open Firebug.
+    2. Click on the “console” tab.
+
+# Opera
+1. Press CTRL + SHIFT + I to open Dragonfly.
+2. Click on the “console” tab.
+</details>
+
+```
+Insert your browser log here, this could for example include:
+
+a) The javascript console log
+b) The network log 
+c) ...
+```

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,17 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

.travis.yml

@@ -8,3 +8,4 @@ script:
 - npm run build
 - npm run lint
 - npm run stylelint
+- npm run test

COPYING

@@ -639,7 +639,7 @@ the "copyright" line and a pointer to where the full notice is found.
 
     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
+    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

Makefile

@@ -58,6 +58,7 @@ stylelint-fix:
 clean:
 	rm -f js/contacts.js
 	rm -f js/contacts.js.map
+	rm -Rf js/chunks
 
 clean-dev:
 	rm -rf node_modules

README.md

@@ -1,9 +1,10 @@
 # Nextcloud Contacts
-
-![Downloads](https://img.shields.io/github/downloads/nextcloud/contacts/total.svg)
-[![irc](https://img.shields.io/badge/IRC-%23nextcloud--contacts%20on%20freenode-blue.svg)](https://webchat.freenode.net/?channels=nextcloud-contacts)
-[![Build Status](https://travis-ci.org/nextcloud/contacts.svg?branch=master)](https://travis-ci.org/nextcloud/contacts)
-[![Code coverage](https://img.shields.io/codecov/c/github/nextcloud/contacts.svg?maxAge=2592000)](https://codecov.io/gh/nextcloud/contacts/)
+![Downloads](https://img.shields.io/github/downloads/nextcloud/contacts/total.svg?style=flat-square)
+[![travis build status](https://img.shields.io/travis/com/nextcloud/contacts/master.svg?style=flat-square)](https://travis-ci.com/nextcloud/contacts)
+[![Codacy Badge](https://img.shields.io/codacy/grade/ea24ea9fccb942419d73ec05105938aa.svg?style=flat-square)](https://app.codacy.com/app/skjnldsv/contacts)
+[![Code coverage](https://img.shields.io/codecov/c/github/nextcloud/contacts.svg?style=flat-square)](https://codecov.io/gh/nextcloud/contacts/)
+[![Dependabot status](https://img.shields.io/badge/Dependabot-enabled-brightgreen.svg?longCache=true&style=flat-square&logo=dependabot)](https://dependabot.com)
+[![irc](https://img.shields.io/badge/IRC-%23nextcloud--contacts%20on%20freenode-blue.svg?style=flat-square)](https://webchat.freenode.net/?channels=nextcloud-contacts)
 
 **A contacts app for [Nextcloud](https://nextcloud.com). Easily sync contacts from various devices with your Nextcloud and edit them online.**
 

appinfo/info.xml

@@ -29,7 +29,7 @@
 	<repository type="git">https://github.com/nextcloud/contacts.git</repository>
 	<screenshot>https://raw.githubusercontent.com/nextcloud/screenshots/master/apps/Contacts/contacts.png</screenshot>
 	<dependencies>
-		<nextcloud min-version="14" max-version="15" />
+		<nextcloud min-version="15" max-version="15" />
 	</dependencies>
 	<contactsmenu>
 		<provider>OCA\Contacts\ContactsMenu\Providers\DetailsProvider</provider>

appinfo/routes.php

@@ -13,7 +13,7 @@
  *
  * 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
+ * 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

css/ContactDetails.scss

@@ -12,7 +12,7 @@
  *
  * 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
+ * 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
@@ -71,19 +71,24 @@
 				position: relative;
 				height: 44px;
 				width: 44px;
-				border-radius: 22px;
-				&.menu-icon--pulse {
-					margin: 8px;
-					width: 16px;
-					height: 16px;
-				}
 			}
-			[class^='icon-'],
-			[class*=' icon-'] {
+			.header-icon {
 				height: 44px;
 				width: 44px;
 				padding: 14px;
+				border-radius: 22px;
 				cursor: pointer;
+				background-size: 16px;
+				opacity: .7;
+				&:hover,
+				&:focus {
+					opacity: 1;
+				}
+				&.header-icon--pulse {
+					margin: 8px;
+					width: 16px;
+					height: 16px;
+				}
 			}
 		}
 	}

css/ContactDetailsAvatar.scss

@@ -13,7 +13,7 @@
  *
  * 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
+ * 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
@@ -52,8 +52,8 @@
 		width: 100%;
 		height: 100%;
 		&:hover,
-		a:active,
-		a:focus {
+		&:active,
+		&:focus {
 			opacity: .7;
 		}
 	}

css/ContentListItem.scss → css/ContactsListItem.scss

@@ -12,7 +12,7 @@
  *
  * 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
+ * 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

css/importScreen.scss → css/ImportScreen.scss

@@ -12,7 +12,7 @@
  *
  * 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
+ * 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