Merged with dev

.gitignore

@@ -55,6 +55,7 @@ typings/
 
 # Yarn Integrity file
 .yarn-integrity
+yarn.lock
 
 # dotenv environment variables file
 .env
@@ -77,8 +78,8 @@ assets/reactjs/node_modules/
 package-lock.json
 composer.lock
 .idea/
-.vscode/
 .DS_Store
 assets/reactjs/yarn.lock
 *.zip
 qubely/*
+yarn.lock

.prettierrc

@@ -0,0 +1,5 @@
+{
+	"tabWidth": 4,
+	"useTabs": true,
+	"printWidth": 120
+}

.vscode/settings.json

@@ -0,0 +1,20 @@
+{
+	"emmet.includeLanguages": {
+		"javascript": "javascriptreact"
+	},
+	"editor.defaultFormatter": "esbenp.prettier-vscode",
+	"editor.formatOnType": true,
+	"editor.formatOnSave": true,
+	"editor.tabSize": 4,
+	"prettier.singleQuote": true,
+	"prettier.printWidth": 120,
+	"emmet.triggerExpansionOnTab": true,
+	"prettier.useTabs": true,
+	"prettier.trailingComma": "all",
+	"editor.codeActionsOnSave": {
+		"source.fixAll.eslint": true
+	},
+	"[php]": {
+		"editor.defaultFormatter": "bmewburn.vscode-intelephense-client"
+	}
+}