diff --git a/README.md b/README.md index 69c1560..6b63324 100644 --- a/README.md +++ b/README.md @@ -7,24 +7,27 @@ FeedCrunch.IO - Empower RSS feeds to a whole new level [![ReadTheDocs](https://img.shields.io/badge/docs-latest-brightgreen.svg?style=flat&maxAge=86400&label=documentation)](http://feedcrunch.readthedocs.io/en/latest/) [![Twitter Follow](https://img.shields.io/twitter/follow/born2data.svg?style=flat&label=Follow%20me:%20@born2data)](https://twitter.com/intent/user?screen_name=born2data) +[![Updates](https://pyup.io/repos/github/DEKHTIARJonathan/FeedCrunch.IO/shield.svg)](https://pyup.io/repos/github/DEKHTIARJonathan/FeedCrunch.IO/) +[![Python 3](https://pyup.io/repos/github/DEKHTIARJonathan/FeedCrunch.IO/python-3-shield.svg)](https://pyup.io/repos/github/DEKHTIARJonathan/FeedCrunch.IO/) + __________________ Production Metrics
[![Build Status - Master](https://img.shields.io/travis/DEKHTIARJonathan/FeedCrunch.IO/master.svg?label=Travis%20-%20Master)](https://travis-ci.org/DEKHTIARJonathan/FeedCrunch.IO) -[![Updates](https://pyup.io/repos/github/DEKHTIARJonathan/FeedCrunch.IO/shield.svg)](https://pyup.io/repos/github/DEKHTIARJonathan/FeedCrunch.IO/) -[![Python 3](https://pyup.io/repos/github/DEKHTIARJonathan/FeedCrunch.IO/python-3-shield.svg)](https://pyup.io/repos/github/DEKHTIARJonathan/FeedCrunch.IO/) -[![Coverage Status](https://img.shields.io/coveralls/DEKHTIARJonathan/FeedCrunch.IO/master.svg?label=coveralls)](https://coveralls.io/github/DEKHTIARJonathan/FeedCrunch.IO?branch=master) -[![Codacy Badge](https://api.codacy.com/project/badge/Grade/f06c89cf87d44180ae9170b5c720ff54)](https://www.codacy.com/app/DEKHTIARJonathan/FeedCrunch.IO) -[![codecov](https://img.shields.io/codecov/c/github/DEKHTIARJonathan/FeedCrunch.IO/master.svg?label=codecov)](https://codecov.io/gh/DEKHTIARJonathan/FeedCrunch.IO) +[![Codacy Master grade](https://img.shields.io/codacy/grade/f06c89cf87d44180ae9170b5c720ff54/master.svg?label=codacy)](https://www.codacy.com/app/DEKHTIARJonathan/FeedCrunch.IO) +[![Codacy Master coverage](https://img.shields.io/codacy/coverage/f06c89cf87d44180ae9170b5c720ff54/master.svg?label=codacy%20coverage)](https://www.codacy.com/app/DEKHTIARJonathan/FeedCrunch.IO) +[![Coverage Status](https://img.shields.io/coveralls/DEKHTIARJonathan/FeedCrunch.IO/master.svg?label=coveralls%20coverage)](https://coveralls.io/github/DEKHTIARJonathan/FeedCrunch.IO?branch=master) +[![codecov](https://img.shields.io/codecov/c/github/DEKHTIARJonathan/FeedCrunch.IO/master.svg?label=codecov%20coverage)](https://codecov.io/gh/DEKHTIARJonathan/FeedCrunch.IO) [![Code Health](https://landscape.io/github/DEKHTIARJonathan/FeedCrunch.IO/master/landscape.svg?style=flat)](https://landscape.io/github/DEKHTIARJonathan/FeedCrunch.IO/master) [![Website](https://img.shields.io/website-up-down-green-red/http/www.feedcrunch.io.svg?label=Feedcrunch.io)](https://www.feedcrunch.io) __________________ Development Metrics
[![Build Status - Dev](https://img.shields.io/travis/DEKHTIARJonathan/FeedCrunch.IO/dev.svg?label=Travis%20-%20Dev)](https://travis-ci.org/DEKHTIARJonathan/FeedCrunch.IO) -[![Coverage Status](https://img.shields.io/coveralls/DEKHTIARJonathan/FeedCrunch.IO/dev.svg?label=coveralls)](https://coveralls.io/github/DEKHTIARJonathan/FeedCrunch.IO?branch=master) -[![Codacy Badge](https://api.codacy.com/project/badge/Grade/f06c89cf87d44180ae9170b5c720ff54?branch=dev)](https://www.codacy.com/app/DEKHTIARJonathan/FeedCrunch.IO) -[![Codecov Status](https://img.shields.io/codecov/c/github/DEKHTIARJonathan/FeedCrunch.IO/dev.svg?label=codecov)](https://codecov.io/gh/DEKHTIARJonathan/FeedCrunch.IO) -[![Code Health](https://landscape.io/github/DEKHTIARJonathan/FeedCrunch.IO/dev/landscape.svg?style=flat)](https://landscape.io/github/DEKHTIARJonathan/FeedCrunch.IO/dev) +[![Codacy Master grade](https://img.shields.io/codacy/grade/f06c89cf87d44180ae9170b5c720ff54/dev.svg?label=codacy)](https://www.codacy.com/app/DEKHTIARJonathan/FeedCrunch.IO) +[![Codacy Master coverage](https://img.shields.io/codacy/coverage/f06c89cf87d44180ae9170b5c720ff54/dev.svg?label=codacy%20coverage)](https://www.codacy.com/app/DEKHTIARJonathan/FeedCrunch.IO) +[![Coverage Status](https://img.shields.io/coveralls/DEKHTIARJonathan/FeedCrunch.IO/dev.svg?label=coveralls%20coverage)](https://coveralls.io/github/DEKHTIARJonathan/FeedCrunch.IO?branch=master) +[![codecov](https://img.shields.io/codecov/c/github/DEKHTIARJonathan/FeedCrunch.IO/dev.svg?label=codecov%20coverage)](https://codecov.io/gh/DEKHTIARJonathan/FeedCrunch.IO) +[![Code Health](https://landscape.io/github/DEKHTIARJonathan/FeedCrunch.IO/dev/landscape.svg?style=flat)](https://landscape.io/github/DEKHTIARJonathan/FeedCrunch.IO/master) [![Website](https://img.shields.io/website-up-down-green-red/http/feedcrunch-dev.eu-gb.mybluemix.net.svg?label=Feedcrunch.io%20-%20Dev)](https://feedcrunch-dev.eu-gb.mybluemix.net/) __________________ diff --git a/feedcrunch_home/views.py b/feedcrunch_home/views.py index 868f707..ae68a7e 100644 --- a/feedcrunch_home/views.py +++ b/feedcrunch_home/views.py @@ -9,6 +9,8 @@ from django.shortcuts import render_to_response, redirect from django.template import RequestContext, loader +from rest_framework.authtoken.models import Token + from feedcrunch.models import Country, Option, FeedUser from custom_render import myrender as render @@ -66,7 +68,16 @@ def signUPView(request): password = request.POST['password'] birthdate = request.POST['birthdate'] - tmp_usr = FeedUser.objects.create_user(username, email, password, firstname=firstname, lastname=lastname, country=country, gender=gender, birthdate=birthdate) + tmp_usr = FeedUser.objects.create_user( + username, + email, + password, + firstname=firstname, + lastname=lastname, + country=country, + gender=gender, + birthdate=birthdate + ) user = authenticate(username=username, password=password) login(request, user) diff --git a/feedcrunch_rssadmin/templates/admin/admin_personal.html b/feedcrunch_rssadmin/templates/admin/admin_personal.html index 31b3562..e691b5c 100644 --- a/feedcrunch_rssadmin/templates/admin/admin_personal.html +++ b/feedcrunch_rssadmin/templates/admin/admin_personal.html @@ -32,6 +32,10 @@ +
+ + +
-
- - -
diff --git a/feedcrunch_rssadmin/templates/admin/onboarding.html b/feedcrunch_rssadmin/templates/admin/onboarding.html index a56a4b7..cfe9737 100644 --- a/feedcrunch_rssadmin/templates/admin/onboarding.html +++ b/feedcrunch_rssadmin/templates/admin/onboarding.html @@ -378,9 +378,7 @@

Create Opportunities

- +
diff --git a/requirements.txt b/requirements.txt index d6a7537..214e149 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ amqp==2.2.2 -asn1crypto==0.22.0 +asn1crypto==0.23.0 billiard==3.5.0.3 boto==2.48.0 celery==4.1.0 @@ -29,7 +29,7 @@ dnspython==1.15.0 dnspython3==1.15.0 facebook-sdk==2.0.0 factory-boy==2.9.2 -Faker==0.8.3 +Faker==0.8.4 feedgen==0.5.1 feedparser==5.2.1 future==0.16.0 @@ -47,7 +47,7 @@ pycparser==2.18 pyIsEmail==1.3.1 pyOpenSSL==17.3.0 python-dateutil==2.6.1 -python3-linkedin==1.0.1 +python3-linkedin==1.0.2 pytz==2017.2 requests==2.18.4 requests-oauthlib==0.8.0