diff --git a/newsaggregator/core/__pycache__/views.cpython-312.pyc b/newsaggregator/core/__pycache__/views.cpython-312.pyc index 2bcb8c2..d9fa301 100644 Binary files a/newsaggregator/core/__pycache__/views.cpython-312.pyc and b/newsaggregator/core/__pycache__/views.cpython-312.pyc differ diff --git a/newsaggregator/core/views.py b/newsaggregator/core/views.py index 3ffcc4b..954ca5c 100644 --- a/newsaggregator/core/views.py +++ b/newsaggregator/core/views.py @@ -57,6 +57,7 @@ def news_list(request): "object_list": headlines,} return render(request, "core/index.html", context) +@login_required(login_url='userauths:sign-in') def index(request): Headline.objects.all().delete() session = requests.Session() @@ -93,12 +94,14 @@ def index(request): } return render(request, "core/index.html", context) +@login_required(login_url='userauths:sign-in') def about(request): context={ } return render(request, "core/about.html", context) +@login_required(login_url='userauths:sign-in') def contact(request): today_date = datetime.now().strftime('%Y-%m-%d') if request.method == "POST": @@ -129,12 +132,14 @@ def contact(request): } return render(request,"core/contact.html",context) +@login_required(login_url='userauths:sign-in') def advertise(request): context={ } return render(request, "core/advertise.html", context) +@login_required(login_url='userauths:sign-in') def privacy(request): context={ diff --git a/newsaggregator/db.sqlite3 b/newsaggregator/db.sqlite3 index 6bd9a6f..e34c82e 100644 Binary files a/newsaggregator/db.sqlite3 and b/newsaggregator/db.sqlite3 differ diff --git a/newsaggregator/newsaggregator/__pycache__/settings.cpython-312.pyc b/newsaggregator/newsaggregator/__pycache__/settings.cpython-312.pyc index cdb917e..033103a 100644 Binary files a/newsaggregator/newsaggregator/__pycache__/settings.cpython-312.pyc and b/newsaggregator/newsaggregator/__pycache__/settings.cpython-312.pyc differ diff --git a/newsaggregator/static/assets/css/userauth.css b/newsaggregator/static/assets/css/userauth.css index 345916d..35b6ff3 100644 --- a/newsaggregator/static/assets/css/userauth.css +++ b/newsaggregator/static/assets/css/userauth.css @@ -30,7 +30,6 @@ body { } .container { - height: 100vh; display: flex; flex-direction: column; } @@ -42,9 +41,6 @@ body { .main-content { margin: 32px auto; - display: flex; - align-items: center; - justify-content: center; max-width: 935px; flex-grow: 1; } @@ -131,7 +127,7 @@ body { .box { border: 1px solid var(--box-border-color); - background-color: var(--box-bg); + background-color: var(--background-primary); border-radius: 3px; } @@ -142,6 +138,9 @@ body { .form-content .logo { text-align: center; + display: flex; + align-items: center; + justify-content: center; height: 51px; width: 175px; margin: 22px auto 12px; @@ -229,7 +228,7 @@ body { display: inline; } -.btn-group { +.btn-groupss { padding: 8px 40px; } diff --git a/newsaggregator/static/assets/images/sign-in-animate.svg b/newsaggregator/static/assets/images/sign-in-animate.svg new file mode 100644 index 0000000..59839e5 --- /dev/null +++ b/newsaggregator/static/assets/images/sign-in-animate.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/newsaggregator/static/assets/images/sign-up-animate.svg b/newsaggregator/static/assets/images/sign-up-animate.svg new file mode 100644 index 0000000..d20da0e --- /dev/null +++ b/newsaggregator/static/assets/images/sign-up-animate.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/newsaggregator/templates/components/navbar.html b/newsaggregator/templates/components/navbar.html index d504e15..7e7963a 100644 --- a/newsaggregator/templates/components/navbar.html +++ b/newsaggregator/templates/components/navbar.html @@ -33,7 +33,8 @@ Contact -
  • {% if not request.user %} +
  • + {% if not request.user.is_authenticated %} Sign-in/Sign-up {% else %} Sign-out diff --git a/newsaggregator/templates/partials/base.html b/newsaggregator/templates/partials/base.html index 69fb6f4..01267ee 100644 --- a/newsaggregator/templates/partials/base.html +++ b/newsaggregator/templates/partials/base.html @@ -17,6 +17,7 @@ + @@ -42,6 +43,11 @@ {% block category %} {% endblock category %} {% block index %} + + + {% block authentication %} + {% endblock authentication %} + {% endblock index %} {% include 'components/footer.html' %} @@ -53,6 +59,7 @@ + diff --git a/newsaggregator/templates/partials/base_auth.html b/newsaggregator/templates/partials/base_auth.html index d303242..9944559 100644 --- a/newsaggregator/templates/partials/base_auth.html +++ b/newsaggregator/templates/partials/base_auth.html @@ -4,22 +4,36 @@ - Intern - - + Onion News + + + - - {% block content %} + {% block authentication %} - {% endblock content %} + {% endblock authentication %} + +
    +
    + {% include 'components/navbar.html' %} + {% load social_share %} +
    + {% block category %} + {% endblock category %} + {% block index %} + {% endblock index %} +
    + {% include 'components/footer.html' %} + + diff --git a/newsaggregator/templates/userauths/sign-in.html b/newsaggregator/templates/userauths/sign-in.html index 8c2b2a5..b47d1fc 100644 --- a/newsaggregator/templates/userauths/sign-in.html +++ b/newsaggregator/templates/userauths/sign-in.html @@ -1,69 +1,63 @@ -{% extends 'partials/base_auth.html' %} +{% extends 'partials/base.html' %} {% load static %} -{% block content %} +{% block authentication %}
    -
    -
    - - -
    - {% csrf_token %} -
    -{% endblock content %} \ No newline at end of file +{% endblock authentication %} \ No newline at end of file diff --git a/newsaggregator/templates/userauths/sign-up.html b/newsaggregator/templates/userauths/sign-up.html index 76f5db9..73b091b 100644 --- a/newsaggregator/templates/userauths/sign-up.html +++ b/newsaggregator/templates/userauths/sign-up.html @@ -1,94 +1,88 @@ -{% extends 'partials/base_auth.html' %} +{% extends 'partials/base.html' %} {% load static %} -{% block content %} +{% block authentication %}
    -
    -
    - - - -
    - {% csrf_token %} -
    -{% endblock content %} \ No newline at end of file +{% endblock authentication %} \ No newline at end of file