yashasingh · yashasingh · Oct 3, 2017 · Oct 5, 2017 · Oct 6, 2017 · Oct 6, 2017
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,2 @@
+*.pyc
+
diff --git a/App/__pycache__/__init__.cpython-34.pyc b/App/__pycache__/__init__.cpython-34.pyc
diff --git a/App/__pycache__/admin.cpython-34.pyc b/App/__pycache__/admin.cpython-34.pyc
diff --git a/App/__pycache__/models.cpython-34.pyc b/App/__pycache__/models.cpython-34.pyc
diff --git a/App/__pycache__/urls.cpython-34.pyc b/App/__pycache__/urls.cpython-34.pyc
diff --git a/App/__pycache__/views.cpython-34.pyc b/App/__pycache__/views.cpython-34.pyc
diff --git a/App/migrations/__pycache__/__init__.cpython-34.pyc b/App/migrations/__pycache__/__init__.cpython-34.pyc
diff --git a/App/templates/App/home.html b/App/templates/App/home.html
@@ -0,0 +1,43 @@
+{% load static %}
+<!DOCTYPE html>
+<html>
+<head>
+	<title>
+		Outreachy Tasks
+	</title>
+	<link type="text/css" rel="stylesheet" href="https://tools-static.wmflabs.org/cdnjs/ajax/libs/materialize/0.100.2/css/materialize.css" ></link>
+	<link href="https://tools-static.wmflabs.org/cdnjs/ajax/libs/font-awesome/4.7.0/css/font-awesome.css">
+  <link type="text/css" rel="stylesheet" href={% static "style.css" %} ></link>
+</head>
+<body>
+	<div class="row">
+		<h2 class="center"> Outreachy Microtasks </h2>
+	</div>
+      <div class="row">
+        <div class="col s12 m6">
+          <div class="card blue lighten-2">
+            <div class="card-content white-text">
+              <span class="card-title">User Contribution Summary</span>
+              <p>A simple tool that takes a username and lists the recent English Wikipedia edits of that user</p>
+            </div>
+            <div class="card-action">
+              <a class="pointer" href="https://github.com/yashasingh/Review/pull/1">Github</a>
+              <a class="pointer" href="{% url 'App:get_recent_english_edits' %}">Microtask1</a>
+            </div>
+          </div>
+        </div>
+      <div class="col s12 m6">
+          <div class="card blue lighten-2">
+            <div class="card-content white-text">
+              <span class="card-title">User Percentile</span>
+              <p>A simple tool that takes a username and tells what percentile the user is at by number of edits.</p>
+            </div>
+            <div class="card-action">
+              <a class="pointer" href="https://github.com/yashasingh/Review/pull/2">Github</a>
+              <a class="pointer" href="{% url 'App:get_the_user_percentile' %}">Microtask2</a>
+            </div>
+          </div>
+        </div>
+      </div>
+</body>
+</html>
diff --git a/App/templates/App/index.html b/App/templates/App/index.html
@@ -0,0 +1,80 @@
+{% load static %}
+<!DOCTYPE html>
+<html>
+<head>
+	<title>
+		Microtask 1
+	</title>
+	<link type="text/css" rel="stylesheet" href="https://tools-static.wmflabs.org/cdnjs/ajax/libs/materialize/0.100.2/css/materialize.css" ></link>
+	<link type="text/css" rel="stylesheet" href={% static "style.css" %} ></link>
+</head>
+<body>
+  <div class="row">
+  <nav>
+    <div class="nav-wrapper pd-left-20">
+      <a href="{% url 'App:get_recent_english_edits' %}" class="brand-logo">Microtask 1: Recent english edits</a>
+      <ul id="nav-mobile" class="right hide-on-med-and-down">
+        <li><a href="{% url 'App:get_the_user_percentile' %}">Microtask2</a></li>
+        <li><a href="{% url 'App:index' %}">Home</a></li>
+      </ul>
+    </div>
+  </nav>
+  </div>
+<center><h4>Tool to display the recent English Wikipedia edits of that user</h4></center>
+  <div class="row">
+      <form class="col s12" method="post">
+        {% csrf_token %}
+        <div class="row">
+          <div class="input-field col s6 m6 offset-m3">
+            <input id="username" name="username" type="text">
+            <label for="username">Username</label>
+          </div>
+        </div>
+        <div class="row">
+          <div class="col s6 m6 offset-m3">
+            <button class="btn waves-effect waves-light blue-color" type="submit" name="action">Search
+            </button>
+          </div>
+        </div>
+      </form>
+  </div>
+  {% if error %}
+  <div class="row">
+    <div class="col s12 m6 offset-m3">
+      <div class="card blue lighten-2">
+        <div class="card-content white-text">
+        {{error}}   
+        </div>
+      </div>
+    </div>
+  </div>
+      {% endif %}
+  <!-- loop -->
+  {% for x in contribution %}
+
+  <div class="row">
+    <div class="col s12 m6 offset-m3">
+      <div class="card blue lighten-2">
+        <div class="card-content white-text">
+          <span class="card-title"> User : {{x.user}}</span>
+          <ul>
+            <li>Title = {{x.title}} </li>
+            <li>PageID = {{x.pageid}} </li>
+            <li>RevisionID = {{x.revid}} </li>
+            <li>ParentID = {{x.parentid}} </li>
+            <li>ns = {{x.ns}}</li>
+            <li>Timestamp = {{x.timestamp}} </li>
+            <li>Size = {{x.size}} </li>
+            <li><a href="https://en.wikipedia.org/w/index.php?title=User:{{x.user}}&amp;diff=prev&amp;oldid={{x.revid}}">
+          Click here to view the edit.
+        </a> </li>
+          </ul>
+        </div>
+      </div>
+    </div>
+  </div>
+
+  {% endfor %}
+</body>
+</html>
+
diff --git a/App/urls.py b/App/urls.py
@@ -1,2 +1,11 @@
 from django.conf.urls import url
 
+from . import views
+
+app_name='App'
+urlpatterns = [
+    url(r'^$', views.index, name='index'),
+    url(r'^Microtask1/', views.get_recent_english_edits, name='get_recent_english_edits'),
+    url(r'^Microtask2/', views.get_the_user_percentile, name='get_the_user_percentile'),
+]
+
diff --git a/App/views.py b/App/views.py
@@ -0,0 +1,66 @@
+import json
+import requests
+import urllib.parse
+
+from django.http import HttpResponse
+from django.shortcuts import render
+
+
+def get_recent_english_edits(request):
+    """
+    Display the recent english edits of the user.
+    """
+
+    if request.method == 'POST':
+
+        # Here, we get the username
+        username = request.POST['username']
+        # if username is submitted blank 
+        if not username:
+            return render(request, "App/index.html", {"error": "Please enter a username"})
+
+        # if username is not blank
+        params = {'ucuser': username}
+
+        encoded = urllib.parse.urlencode(params)
+
+        URL = "https://en.wikipedia.org/w/api.php?action=query&format=json&list=usercontribs&"
+
+        URL = "{}{}".format(URL, encoded)
+
+        # Recieved data in json-format
+        response = requests.get(URL)
+
+        if response.status_code == 200:
+            lst = json.loads(response.text)
+            try:
+                # if username contains invalid value
+                if lst['error']:
+                    return render(request,
+                                  'App/index.html',
+                                  {"error":lst['error']['info']}
+                                 )
+            except:
+                # Contribution data extracted
+                sub_lst = lst['query']['usercontribs']
+
+                # if user has no edits 
+                if len(sub_lst) == 0:
+                    return render(request,
+                                  'App/index.html',
+                                  {"error": "0 edits found for username {}".format(username)})
+
+                # Send contribution data for display
+                return render(request,
+                              'App/index.html',
+                              {"contribution": sub_lst, "username": username})
+        else:
+            return render(request,
+                          'App/index.html',
+                          {"error": 'Exit code {}'.format(str(response.status_code)),
+                           }
+                          )
+
+    if request.method == 'GET':
+        return render(request, 'App/index.html')
+
diff --git a/Project/__pycache__/__init__.cpython-34.pyc b/Project/__pycache__/__init__.cpython-34.pyc
diff --git a/Project/__pycache__/settings.cpython-34.pyc b/Project/__pycache__/settings.cpython-34.pyc
diff --git a/Project/__pycache__/urls.cpython-34.pyc b/Project/__pycache__/urls.cpython-34.pyc
diff --git a/Project/settings.py b/Project/settings.py
@@ -100,6 +100,10 @@
     },
 ]
 
+STATICFILES_DIRS = [
+    os.path.join(BASE_DIR, "static"),
+]
+
 
 # Internationalization
 # https://docs.djangoproject.com/en/1.11/topics/i18n/

diff --git a/app.py b/app.py
@@ -5,4 +5,3 @@
 os.environ.setdefault("DJANGO_SETTINGS_MODULE", "Project.settings")
 
 app = get_wsgi_application()
-
diff --git a/static/style.css b/static/style.css
@@ -0,0 +1,35 @@
+.center {
+	text-align: center;
+}
+.pointer {
+	cursor: pointer;
+}
+
+.yellow {
+	color: yellow !important;
+}
+
+nav {
+	background-color: #64b5f6;
+	color: white;
+}
+input:active ~ label, input:valid ~ label 		{
+  top:-20px;
+  font-size:14px;
+  color:#5264AE;
+}
+
+.blue-color {
+	background-color: #64b5f6;
+}
+
+.pd-left-20 {
+	padding-left: 20px;
+}
+.btn:hover, .btn-large:hover {
+	background-color: #64b5f6;
+}
+.btn:focus, .btn-large:focus, .btn-floating:focus {
+	background-color: #64b5f6;
+
+}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -5,4 +5,3 @@
		os.environ.setdefault("DJANGO_SETTINGS_MODULE", "Project.settings")

		app = get_wsgi_application()