Merge branch 'master' into celery

Dockerfile

@@ -1,4 +1,3 @@
-# Dockerfile - this is a comment. Delete me if you want.
 FROM python:3.7
 COPY . /app
 WORKDIR /app

README.md

@@ -12,7 +12,7 @@ I've grown tired of SEO agencies making us pay hundreds of euros for simple tool
 ## Why you need it
 
 
-- It's **free** to use, easy and open source. No credit cards required.
+- It's **free**, easy and open source. 
 - It has a growing list of features
 - It's easy to install
 

toolkit/routes/graphs/api.py

@@ -7,6 +7,7 @@
 import time
 
 import urllib
+from urllib.parse import urlparse
 from toolkit.controller.graphs.core import generate_graph_internal_link_interactive
 from toolkit.lib.api_tools import generate_answer
 from toolkit.celeryapp.tasks import GraphsGenerate
@@ -27,7 +28,6 @@ def get_post_graphs():
             time.sleep(0.3)
         results = Graphs.query.all()
         result_arr= {"results":[]}
-        print(result_arr)
         for i in results:
             result_arr["results"].append({"id": i.id, "urls": i.urls, "status_job": i.status_job,"task_id": i.task_id, "begin_date": i.begin_date})
         return generate_answer(data=result_arr)

toolkit/routes/graphs/dashboard.py

@@ -14,8 +14,8 @@ def graphs_get():
     if request.method == "POST":
         results = post_request_api("/api/graphs", request.form) 
     else:
-        results= get_request_api("/api/graphs")
-    return render_template("graphs/graphs_all.jinja2", result=results["results"])
+        results = get_request_api("/api/graphs")
+    return render_template("graphs/graphs_all.jinja2", result=results["results"], error=results["error"])
 
 @app.route('/graphs/<id>', methods=["GET"])
 def graphs_get_by_id(id):

toolkit/templates/graphs/graphs_all.jinja2

@@ -11,9 +11,9 @@
         <button class="btn btn-primary" type="submit" id="submit">Submit</button>
     </div>
 </form>
-{% if error %}
+{% if error is not none%}
 <div class="alert alert-danger" role="alert">
-    {{error.limit}}
+    {{error}}
 </div>
 {% endif %}