diff --git a/TealCode/analytics/static/analytics/base.css b/TealCode/analytics/static/analytics/base.css deleted file mode 100644 index e69de29..0000000 diff --git a/TealCode/analytics/templates/analytics/base.html b/TealCode/analytics/templates/analytics/base.html deleted file mode 100644 index 2ba14a2..0000000 --- a/TealCode/analytics/templates/analytics/base.html +++ /dev/null @@ -1,26 +0,0 @@ -{% load static %} - - - - - - - - - - - TealCode | Analytics - - -
-

TealCode | Analytics

- -
- TealCode -
-
-
- {% block content %}{% endblock %} -
- - \ No newline at end of file diff --git a/TealCode/analytics/templates/analytics/index.html b/TealCode/analytics/templates/analytics/index.html index e574e92..532307b 100644 --- a/TealCode/analytics/templates/analytics/index.html +++ b/TealCode/analytics/templates/analytics/index.html @@ -1,4 +1,20 @@ -{% extends "analytics/base.html" %} +{% extends "base.html" %} {% block content %} +

Analytics

+
+
Clicks Last 30 Days
+
+ +
+
Clicks In Total
+
+ +
+
Clicks From Coutries Last 30 Days
+
+ +
+
Clicks From Coutries In Total
+
{% endblock content %} \ No newline at end of file diff --git a/TealCode/main/static/main/css/base.css b/TealCode/main/static/css/base.css similarity index 95% rename from TealCode/main/static/main/css/base.css rename to TealCode/main/static/css/base.css index 1559a19..d67036d 100644 --- a/TealCode/main/static/main/css/base.css +++ b/TealCode/main/static/css/base.css @@ -31,7 +31,7 @@ header div{ margin-right: 0px; } -header div a{ +header a{ letter-spacing: 1.5px; padding-right: 10px; padding-left: 10px; @@ -45,12 +45,13 @@ header div a{ text-align: center ; } -header div .a-current{ + +header .a-current{ color:rgb(0, 255, 106); text-decoration: underline; } -header div a:hover{ +header a:hover{ color:rgb(0, 255, 106); text-decoration: underline; } @@ -61,8 +62,6 @@ main{ min-height: 85%; } - - main #main-content{ background-color: rgb(26, 26, 29); width: 700px; @@ -75,6 +74,13 @@ main #main-content{ margin-top: 40px; } +main .main-content-block{ + width: 100%; + padding-top: 10px; + padding-bottom: 10px; + +} + main .main-text{ width: 90%; display: block; @@ -170,7 +176,7 @@ footer .footer-links a:hover{ @media screen and (max-width:900px) { header{ - height: 80px; + height: 90px; padding-left: 10px; } diff --git a/TealCode/main/static/main/css/fonts.css b/TealCode/main/static/css/fonts.css similarity index 100% rename from TealCode/main/static/main/css/fonts.css rename to TealCode/main/static/css/fonts.css diff --git a/TealCode/main/static/main/css/category.css b/TealCode/main/static/main/css/category.css index bc510d6..ed47491 100644 --- a/TealCode/main/static/main/css/category.css +++ b/TealCode/main/static/main/css/category.css @@ -7,7 +7,7 @@ main #main-content #list{ main #main-content #list .list-item{ width: 90%; - margin-left: 50px; + margin-left: 35px; margin-top: 10px; padding-top: 10px; padding-bottom: 10px; diff --git a/TealCode/main/templates/main/base.html b/TealCode/main/templates/base.html similarity index 90% rename from TealCode/main/templates/main/base.html rename to TealCode/main/templates/base.html index 0d14454..f5673df 100644 --- a/TealCode/main/templates/main/base.html +++ b/TealCode/main/templates/base.html @@ -6,8 +6,8 @@ - - + + @@ -53,7 +53,7 @@
-

TealCode

+

TealCode

Python @@ -63,6 +63,12 @@ Java JavaScript
+ + {% if user.is_authenticated %} +
+ Analytics +
+ {% endif %}
@@ -79,6 +85,8 @@ {% else %} document.getElementById("a-{{ category_obj.title }}").classList.add("a-current"); {% endif %} + +