Resolve merge conflict

S2606 · S2606 · commit bae7f7cdcbeb · 2017-10-29T14:29:31.000+05:30
diff --git a/.eslintignore b/.eslintignore
@@ -0,0 +1,6 @@
+**/node_modules/**
+react-es6-popup/**/dist
+mocha-client-tests
+store-collected-images/webextension-plain/deps
+src/scripts/jquery-3.2.1.min.js
+src/materialize
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -0,0 +1,26 @@
+module.exports = {
+    "env": {
+        "browser": true,
+        "webextensions": true
+    },
+    "extends": "eslint:recommended",
+    "rules": {
+        "indent": [
+            "error",
+            "tab"
+        ],
+        "linebreak-style": [
+            "error",
+            "unix"
+        ],
+        "quotes": [
+            "error",
+            "double"
+        ],
+        "semi": [
+            "error",
+            "always"
+        ],
+        "no-unused-vars": [0]
+    }
+};
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
@@ -0,0 +1,15 @@
+**Actual Behaviour**
+
+Please state here what is currently happening.
+
+**Expected Behaviour**
+
+State here what the feature should enable the user to do.
+
+**Screenshots of the issue**
+
+Where-ever possible attach a screenshot of the issue.
+
+**Would you like to work on the issue?**
+
+Please let us know if you can work on it or the issue should be assigned to someone else.
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,5 @@
+Fixes issue #[Add issue number here. If you do not solve the issue entirely, please change the message e.g. "First steps for issues #IssueNumber]
+
+Changes: [Add here what changes were made in this issue and if possible provide links.]
+
+Screenshots for the change:
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,13 @@
+language: node_js
+node_js: stable
+sudo: false
+script:
+  - npm test
+
+cache:
+  directories:
+    - node_modules
+
+branches:
+  only:
+    - master
diff --git a/README.md b/README.md
@@ -8,9 +8,9 @@ This chrome extension helps you to write scrums in google groups for FOSSASIA re
 3. Turn on developer mode if not already on.
 4. Load unpacked extension from `src` folder.
 5. Click on the Scrum Helper icon you see on your browser toolbar.
-6. Fill in the settings in the popup
-7. Open https://groups.google.com/forum/#!newtopic/<groupname>
-8. Refresh the page for new settings to reflect
+6. Fill in the settings in the popup.
+7. Open https://groups.google.com/forum/#!newtopic/<groupname>.
+8. Refresh the page for new settings to reflect.
 ```
 ## Setting up the code locally
 
@@ -24,3 +24,7 @@ $ npm install
 
 ![POPUP](https://github.com/hkedia321/scrum_helper_extension/blob/master/src/docs/screenshots/popup.png)
 
+## About contributing
+- Follow the Issues and PRs templates as far as possible.
+- If you want to make a PR, please mention in the corresponding issue that you are working on it.
+- Please run `npm run test` locally to check for syntax errors before making a PR.
diff --git a/src/docs/screenshots/scrum.png b/src/docs/screenshots/scrum.png
diff --git a/src/manifest.json b/src/manifest.json
@@ -2,7 +2,7 @@
   "manifest_version": 2,
   "name": "Scrum Helper Extension",
   "version": "1.0",
-  "description": "This extension helps in writing Srums in google groups, particularly related to FOSSASIA. It converts a link to a github PR or an Issue to display the PR or the Issue's name along with the link to it.",
+  "description": "This extension helps in writing Scrums in Google groups, particularly related to FOSSASIA. ",
   "browser_action": {
     "default_popup": "popup.html",
     "default_title" : "SCRUM Helper"
@@ -20,7 +20,7 @@
     "js": ["scripts/jquery-3.2.1.min.js","scripts/scrumHelper.js"]
   }
 ],
-  "content_security_policy": "script-src 'self' https://cdn.jsdelivr.net/ https://api.github.com/; object-src 'self'",
+  "content_security_policy": "script-src 'self' https://cdn.jsdelivr.net/ https://api.github.com/ https://use.fontawesome.com/; object-src 'self'",
 
   "permissions":[
     "http://*/*",
diff --git a/src/materialize/css/font-awesome.min.css b/src/materialize/css/font-awesome.min.css
diff --git a/src/popup.html b/src/popup.html
@@ -5,8 +5,8 @@
 	<meta name="viewport" content="width=device-width, initial-scale=1.0">
 	<meta http-equiv="X-UA-Compatible" content="ie=edge">
 	<link href="materialize/css/materialize.min.css" type="text/css" rel="stylesheet">
-	<link href="materialize/css/font-awesome.min.css" type="text/css" rel="stylesheet">
 	<link rel="stylesheet" type="text/css" href="index.css">
+	<script src="https://use.fontawesome.com/73d6eff847.js"></script>
 </head>
 <body>
 	<div class="container">
@@ -27,11 +27,7 @@ <h6 class="center">
 		</div>
 		<br />
 		<div class="row">
-			<div class="input-field col s12">
-				<input placeholder="Enter your name to appear on scrum subject" id="name" type="text">
-				<label for="first_name">Your Name</label>
-			</div>
-			<div class="input-field col s12">
+		  <div class="input-field col s12">
 				<input placeholder="Required for getting data from github" id="githubUsername" type="text">
 				<label for="githubUsername">Your Github Username</label>
 			</div>
diff --git a/src/scripts/main.js b/src/scripts/main.js
@@ -1,4 +1,3 @@
-var nameElement = document.getElementById("name");
 var enableToggleElement = document.getElementById("enable");
 var githubUsernameElement = document.getElementById("githubUsername");
 var startingDateElement = document.getElementById("startingDate");
@@ -7,69 +6,58 @@ var showOpenLabelElement = document.getElementById("showOpenLabel");
 var showClosedLabelElement = document.getElementById("showClosedLabel");
 
 function handleBodyOnLoad(){
-    // prefill name
-    chrome.storage.local.get(["name","githubUsername","enableToggle","startingDate","endingDate","showOpenLabel","showClosedLabel"],function(items){
-        if(items.name){
-            var value = items.name;
-            nameElement.value=value;
-        }
-        if(items.githubUsername){
-            var value = items.githubUsername;
-            githubUsernameElement.value=value;
-        }
-        if(items.enableToggle){
-            var value = items.enableToggle;
-            enableToggleElement.checked=value;
-        }
-        if(items.endingDate){
-            endingDateElement.value = items.endingDate;
-        }
-        if(items.startingDate){
-            startingDateElement.value = items.startingDate;
-        }
-        if(items.showOpenLabel){
-            showOpenLabelElement.checked= items.showOpenLabel;
-        }
-        if(items.showClosedLabel){
-            showClosedLabelElement.checked= items.showClosedLabel;
-        }
-    });
-}
-function handleNameChange(){
-    var value = nameElement.value;
-    chrome.storage.local.set({'name': value});
+	// prefill name
+	chrome.storage.local.get(["githubUsername","enableToggle","startingDate","endingDate","showOpenLabel","showClosedLabel"],function(items){
+		if(items.githubUsername){
+			githubUsernameElement.value=items.githubUsername;
+		}
+		if(items.enableToggle){
+			enableToggleElement.checked=items.enableToggle;
+		}
+		if(items.endingDate){
+			endingDateElement.value = items.endingDate;
+		}
+		if(items.startingDate){
+			startingDateElement.value = items.startingDate;
+		}
+		if(items.showOpenLabel){
+			showOpenLabelElement.checked= items.showOpenLabel;
+		}
+		if(items.showClosedLabel){
+			showClosedLabelElement.checked= items.showClosedLabel;
+		}
+	});
 }
 function handleEnableChange(){
-    var value = enableToggleElement.checked;
-    chrome.storage.local.set({'enableToggle': value});
+	var value = enableToggleElement.checked;
+	chrome.storage.local.set({"enableToggle": value});
 }
 function handleStartingDateChange(){
-    var value = startingDateElement.value;
-    chrome.storage.local.set({'startingDate': value});
+	var value = startingDateElement.value;
+	chrome.storage.local.set({"startingDate": value});
 }
 function handleEndingDateChange(){
-    var value = endingDateElement.value;
-    chrome.storage.local.set({'endingDate': value});
+	var value = endingDateElement.value;
+	chrome.storage.local.set({"endingDate": value});
 }
 function handleGithubUsernameChange(){
-    var value = githubUsernameElement.value;
-    chrome.storage.local.set({'githubUsername': value});
+	var value = githubUsernameElement.value;
+	chrome.storage.local.set({"githubUsername": value});
 }
 function handleOpenLabelChange(){
-    var value = showOpenLabelElement.checked;
-    chrome.storage.local.set({'showOpenLabel': value});
+	var value = showOpenLabelElement.checked;
+	chrome.storage.local.set({"showOpenLabel": value});
 }
 function handleClosedLabelChange(){
-    var value = showClosedLabelElement.checked;
-    chrome.storage.local.set({'showClosedLabel': value});
+	var value = showClosedLabelElement.checked;
+	chrome.storage.local.set({"showClosedLabel": value});
 }
 function handleRefresh(){
-    window.close();
-    chrome.tabs.executeScript({
-    code: 'document.location.reload()'
-  });
+	window.close();
+	chrome.tabs.executeScript({
+		code: "document.location.reload()"
+	});
 }
-nameElement.addEventListener("keyup", handleNameChange);
 enableToggleElement.addEventListener("change", handleEnableChange);
 githubUsernameElement.addEventListener("keyup", handleGithubUsernameChange);
 startingDateElement.addEventListener("keyup", handleStartingDateChange);
diff --git a/src/scripts/scrumHelper.js b/src/scripts/scrumHelper.js
diff --git a/src/src.zip b/src/src.zip
