diff --git a/TealCode/TealCode/settings.py b/TealCode/TealCode/settings.py index cb59c68..6b45e23 100644 --- a/TealCode/TealCode/settings.py +++ b/TealCode/TealCode/settings.py @@ -41,6 +41,7 @@ INSTALLED_APPS = [ 'django.contrib.messages', 'django.contrib.staticfiles', 'main.apps.MainConfig', + 'analytics.apps.AnalyticsConfig', ] MIDDLEWARE = [ diff --git a/TealCode/TealCode/urls.py b/TealCode/TealCode/urls.py index 8c7a324..763fcdf 100644 --- a/TealCode/TealCode/urls.py +++ b/TealCode/TealCode/urls.py @@ -18,5 +18,6 @@ from django.urls import path, include urlpatterns = [ path('', include('main.urls')), + path('analytics/', include('analytics.urls')), path('admin/', admin.site.urls), ] diff --git a/TealCode/analytics/__init__.py b/TealCode/analytics/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/TealCode/analytics/admin.py b/TealCode/analytics/admin.py new file mode 100644 index 0000000..8c38f3f --- /dev/null +++ b/TealCode/analytics/admin.py @@ -0,0 +1,3 @@ +from django.contrib import admin + +# Register your models here. diff --git a/TealCode/analytics/apps.py b/TealCode/analytics/apps.py new file mode 100644 index 0000000..258d4dd --- /dev/null +++ b/TealCode/analytics/apps.py @@ -0,0 +1,6 @@ +from django.apps import AppConfig + + +class AnalyticsConfig(AppConfig): + default_auto_field = 'django.db.models.BigAutoField' + name = 'analytics' diff --git a/TealCode/analytics/migrations/__init__.py b/TealCode/analytics/migrations/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/TealCode/analytics/models.py b/TealCode/analytics/models.py new file mode 100644 index 0000000..71a8362 --- /dev/null +++ b/TealCode/analytics/models.py @@ -0,0 +1,3 @@ +from django.db import models + +# Create your models here. diff --git a/TealCode/analytics/static/analytics/base.css b/TealCode/analytics/static/analytics/base.css new file mode 100644 index 0000000..e69de29 diff --git a/TealCode/analytics/templates/analytics/base.html b/TealCode/analytics/templates/analytics/base.html new file mode 100644 index 0000000..2ba14a2 --- /dev/null +++ b/TealCode/analytics/templates/analytics/base.html @@ -0,0 +1,26 @@ +{% 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 new file mode 100644 index 0000000..e574e92 --- /dev/null +++ b/TealCode/analytics/templates/analytics/index.html @@ -0,0 +1,4 @@ +{% extends "analytics/base.html" %} +{% block content %} + +{% endblock content %} \ No newline at end of file diff --git a/TealCode/analytics/tests.py b/TealCode/analytics/tests.py new file mode 100644 index 0000000..7ce503c --- /dev/null +++ b/TealCode/analytics/tests.py @@ -0,0 +1,3 @@ +from django.test import TestCase + +# Create your tests here. diff --git a/TealCode/analytics/urls.py b/TealCode/analytics/urls.py new file mode 100644 index 0000000..64abca1 --- /dev/null +++ b/TealCode/analytics/urls.py @@ -0,0 +1,6 @@ +from django.urls import path +from . import views + +urlpatterns = [ + path('', views.index, name="analytics-index"), +] diff --git a/TealCode/analytics/views.py b/TealCode/analytics/views.py new file mode 100644 index 0000000..0dfc116 --- /dev/null +++ b/TealCode/analytics/views.py @@ -0,0 +1,4 @@ +from django.shortcuts import render + +def index(req): + return render(req, 'analytics/index.html') \ No newline at end of file diff --git a/TealCode/main/static/main/css/base.css b/TealCode/main/static/main/css/base.css index c98d734..1559a19 100644 --- a/TealCode/main/static/main/css/base.css +++ b/TealCode/main/static/main/css/base.css @@ -1,11 +1,13 @@ *{ padding: 0; margin: 0; + transition-timing-function: linear; } html,body{ background-color: rgba(38, 38, 42, 1); height: 100%; + } /* HEADER */ @@ -13,19 +15,28 @@ header{ background-color: rgb(34, 102, 71); padding: 10px; padding-left: 150px; + margin-top: 0px; + height: 35px; box-shadow: 0px 1px 20px 3px #1f1d1d; + +} + +header h1{ + float:left; } header div{ float: right; - margin-top: -25px; - margin-right: 100px; + margin-top: 10px; + margin-right: 0px; } header div a{ letter-spacing: 1.5px; padding-right: 10px; padding-left: 10px; + padding-top: 5px; + padding-bottom: 5px; cursor:pointer; transition: 0.1s; transition-timing-function: linear; @@ -65,7 +76,7 @@ main #main-content{ } main .main-text{ - width: 650px; + width: 90%; display: block; margin-left: auto; margin-right: auto; @@ -121,7 +132,7 @@ footer .footer-links a:hover{ font-size: 13pt; color: white; font-weight: bold; - margin-top: 18px; + margin-top: 8px; margin-left: 200px; } @@ -130,7 +141,7 @@ footer .footer-links a:hover{ margin-right: 200px; width: 150px; height: 40px; - margin-top: -30px; + margin-top: -40px; border: 3px solid green; background-color: rgba(77, 77, 77, 0.5); color: white; @@ -144,4 +155,62 @@ footer .footer-links a:hover{ #cookie_banner button:hover{ background-color: rgba(77, 77, 77, 0.801); border: 3px solid rgb(1, 180, 1); +} + + +/* BREAKPOINTS */ +@media screen and (max-width:1100px) { + #cookie_banner button{ + margin-right: 5px; + } + + +} + + +@media screen and (max-width:900px) { + header{ + height: 80px; + padding-left: 10px; + } + + header div{ + float:left; + width: 100%; + } + + #cookie_banner p{ + margin-left: 5px; + } +} + +@media screen and (max-width:700px) { + #main-content{ + width:100%; + } + + +} + +@media screen and (max-width:670px) { + + #cookie_banner p{ + margin-left: 5px; + width: 100%; + } + #cookie_banner button{ + margin-top: 10px; + } + + #cookie_banner { + height: 130px; + } +} + +@media screen and (max-width:500px) { + + + #cookie_banner { + height: 160px; + } } \ No newline at end of file diff --git a/TealCode/main/static/main/css/category.css b/TealCode/main/static/main/css/category.css index 2e65b84..bc510d6 100644 --- a/TealCode/main/static/main/css/category.css +++ b/TealCode/main/static/main/css/category.css @@ -1,12 +1,12 @@ /* TOPIC LIST */ main #main-content #list{ - width: 700px; + width: 100%; margin-top: 50px; margin-bottom: 50px; } main #main-content #list .list-item{ - width: 600px; + width: 90%; margin-left: 50px; margin-top: 10px; padding-top: 10px; diff --git a/TealCode/main/templates/main/base.html b/TealCode/main/templates/main/base.html index 05865eb..0d14454 100644 --- a/TealCode/main/templates/main/base.html +++ b/TealCode/main/templates/main/base.html @@ -22,7 +22,7 @@