diff --git a/lookyloo/__init__.py b/lookyloo/__init__.py index 9930ba72..a7587867 100644 --- a/lookyloo/__init__.py +++ b/lookyloo/__init__.py @@ -28,7 +28,7 @@ def load_tree(report_dir): ct = CrawledTree(har_files) ct.find_parents() ct.join_trees() - return ct.jsonify() + return ct.jsonify(), ct.start_time.isoformat(), ct.user_agent, ct.root_url @app.route('/scrape', methods=['GET', 'POST']) @@ -66,8 +66,9 @@ def get_report_dirs(): @app.route('/tree/', methods=['GET']) def tree(tree_id): report_dir = get_report_dirs()[tree_id] - tree_json = load_tree(report_dir) - return render_template('tree.html', tree_json=tree_json) + tree_json, start_time, user_agent, root_url = load_tree(report_dir) + return render_template('tree.html', tree_json=tree_json, start_time=start_time, + user_agent=user_agent, root_url=root_url) @app.route('/', methods=['GET']) diff --git a/lookyloo/static/lookyloo.jpeg b/lookyloo/static/lookyloo.jpeg new file mode 100644 index 00000000..1bbc64ad Binary files /dev/null and b/lookyloo/static/lookyloo.jpeg differ diff --git a/lookyloo/static/tree.css b/lookyloo/static/tree.css index fa4be6fc..90ca1062 100644 --- a/lookyloo/static/tree.css +++ b/lookyloo/static/tree.css @@ -13,3 +13,39 @@ stroke: #ccc; stroke-width: 2px; } + +#lookyloo-icon { + position: fixed; + top: 5px; + left: 5px; + background-image: url("lookyloo.jpeg"); + background-size: cover; + width: 200px; + height: 110px; + resize: both; + border: 2px solid; +} + +#legend { + position: fixed; + bottom: 5px; + left: 5px; + background: white; + border: 2px solid; + padding-top: 5px; + padding-right: 5px; + padding-bottom: 5px; + padding-left: 5px; +} + +#tree-details { + position: fixed; + bottom: 5px; + right: 5px; + background: white; + border: 2px solid; + padding-top: 5px; + padding-right: 5px; + padding-bottom: 5px; + padding-left: 5px; +} diff --git a/lookyloo/static/tree.js b/lookyloo/static/tree.js index 98c22063..4dc7287b 100644 --- a/lookyloo/static/tree.js +++ b/lookyloo/static/tree.js @@ -334,4 +334,3 @@ function update(source) { update(d); } } - diff --git a/lookyloo/templates/main.html b/lookyloo/templates/main.html index 1cb48e50..c2668873 100644 --- a/lookyloo/templates/main.html +++ b/lookyloo/templates/main.html @@ -10,3 +10,7 @@ {{ super() }} {% endblock %} + +{% block content %} + {{ super() }} +{% endblock %} diff --git a/lookyloo/templates/tree.html b/lookyloo/templates/tree.html index ea5d112a..c0c85393 100644 --- a/lookyloo/templates/tree.html +++ b/lookyloo/templates/tree.html @@ -5,7 +5,32 @@ {% block content %} +{{super()}} -{% endblock %} + +
+
+ JavaScript Javascript
+ + Cookie received Cookie received
+ + Cookie read Cookie read
+ + Redirect Redirect
+ + Cookie in URL Cookie in URL
+
+
Tree details

+ Root URL: {{ root_url }}
+ Start time: {{ start_time }}
+ User Agent: {{ user_agent }}
+
+ +{% endblock content %}